Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Purchases screen RTL fixes

Browse source
This commit is contained in:
cepprice 2021-04-19 16:35:26 +05:00
parent cf26ccc7ab
commit 2be03d04ed
8 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/subscription_layout.xml
View file

@ -64,7 +64,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_padding_small" android:layout_marginTop="@dimen/content_padding_small"
android:layout_gravity="center_vertical"
android:paddingStart="@dimen/content_padding_small" android:paddingStart="@dimen/content_padding_small"
android:paddingLeft="@dimen/content_padding_small" android:paddingLeft="@dimen/content_padding_small"
android:paddingTop="@dimen/content_padding_small_half" android:paddingTop="@dimen/content_padding_small_half"

1
OsmAnd/res/layout/troubleshooting_card.xml
View file

@ -32,7 +32,6 @@
android:id="@+id/troubleshooting_icon" android:id="@+id/troubleshooting_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/map_widget_height" android:layout_marginEnd="@dimen/map_widget_height"
android:layout_marginRight="@dimen/map_widget_height" android:layout_marginRight="@dimen/map_widget_height"
android:paddingBottom="@dimen/dialog_content_bottom_margin" android:paddingBottom="@dimen/dialog_content_bottom_margin"

7
OsmAnd/src/net/osmand/plus/UiUtilities.java
View file

@ -442,15 +442,14 @@ public class UiUtilities {
} catch (Throwable e) { } } catch (Throwable e) { }
} }
public static void rotateImageByLayoutDirection(ImageView image, int layoutDirection) { public static void rotateImageByLayoutDirection(ImageView image, Context context) {
if (image == null) { if (image == null || context == null) {
return; return;
} }
int rotation = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL ? 180 : 0; int rotation = AndroidUtils.getLayoutDirection(context) == ViewCompat.LAYOUT_DIRECTION_RTL ? 180 : 0;
image.setRotationY(rotation); image.setRotationY(rotation);
} }
public static void updateCustomRadioButtons(Context app, View buttonsView, boolean nightMode, public static void updateCustomRadioButtons(Context app, View buttonsView, boolean nightMode,
CustomRadioButtonType buttonType) { CustomRadioButtonType buttonType) {
int activeColor = ContextCompat.getColor(app, nightMode int activeColor = ContextCompat.getColor(app, nightMode

2
OsmAnd/src/net/osmand/plus/activities/PluginInfoFragment.java
View file

@ -109,7 +109,7 @@ public class PluginInfoFragment extends BaseOsmAndFragment implements PluginStat
} }
} }
}); });
UiUtilities.rotateImageByLayoutDirection(closeButton, AndroidUtils.getLayoutDirection(app)); UiUtilities.rotateImageByLayoutDirection(closeButton, app);
Drawable pluginImage = plugin.getAssetResourceImage(); Drawable pluginImage = plugin.getAssetResourceImage();
if (pluginImage != null) { if (pluginImage != null) {

2
OsmAnd/src/net/osmand/plus/activities/PluginsFragment.java
View file

@ -101,7 +101,7 @@ public class PluginsFragment extends BaseOsmAndFragment implements PluginStateLi
} }
} }
}); });
UiUtilities.rotateImageByLayoutDirection(closeButton, AndroidUtils.getLayoutDirection(app)); UiUtilities.rotateImageByLayoutDirection(closeButton, app);
adapter = new PluginsListAdapter(requireContext()); adapter = new PluginsListAdapter(requireContext());

2
OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
View file

@ -493,7 +493,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
}); });
if (closeButton instanceof ImageView) { if (closeButton instanceof ImageView) {
UiUtilities.rotateImageByLayoutDirection( UiUtilities.rotateImageByLayoutDirection(
(ImageView) closeButton, AndroidUtils.getLayoutDirection(app)); (ImageView) closeButton, app);
} }
} }

1
OsmAnd/src/net/osmand/plus/settings/fragments/PurchasesFragment.java
View file

@ -152,6 +152,7 @@ public class PurchasesFragment extends BaseOsmAndFragment implements InAppPurcha
} }
}); });
ImageButton backButton = toolbar.findViewById(R.id.close_button); ImageButton backButton = toolbar.findViewById(R.id.close_button);
UiUtilities.rotateImageByLayoutDirection(backButton, getContext());
backButton.setOnClickListener(new View.OnClickListener() { backButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

5
OsmAnd/src/net/osmand/plus/settings/fragments/TroubleshootingOrPurchasingCard.java
View file

@ -7,10 +7,12 @@ import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.view.View; import android.view.View;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.chooseplan.ChoosePlanDialogFragment; import net.osmand.plus.chooseplan.ChoosePlanDialogFragment;
import net.osmand.plus.inapp.InAppPurchaseHelper; import net.osmand.plus.inapp.InAppPurchaseHelper;
@ -74,6 +76,9 @@ public class TroubleshootingOrPurchasingCard extends BaseCard {
} else { } else {
AndroidUtils.setBackground(mapActivity, getItButton, nightMode, R.drawable.btn_unstroked_light, R.drawable.btn_unstroked_dark); AndroidUtils.setBackground(mapActivity, getItButton, nightMode, R.drawable.btn_unstroked_light, R.drawable.btn_unstroked_dark);
} }
ImageView getItArrow = view.findViewById(R.id.additional_button_icon);
UiUtilities.rotateImageByLayoutDirection(getItArrow, app);
} }
} }