Merge pull request #12244 from keymanapp/fix/android/info-arrow-order

fix(android): Fix navigation arrows in Info Activity for RTL 📟
keymanapp · Aug 22, 2024 · 48e8567 · 48e8567
2 parents d5d4646 + b34f095
commit 48e8567
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml b/android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/ms_white"
-    tools:context=".InfoActivity" >
+  xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical"
+  android:background="@color/ms_white"
+  tools:context=".InfoActivity" >
 
   <androidx.appcompat.widget.Toolbar
     android:id="@+id/titlebar"
@@ -15,25 +15,31 @@
     android:layout_alignParentTop="true"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
 
-    <!-- Navigation buttons -->
-    <ImageButton
-      android:id="@+id/back_button"
-      style="?android:attr/actionButtonStyle"
-      app:tint="@color/image_button_color"
+    <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="start"
-      android:contentDescription="@string/label_back"
-      android:src="@drawable/ic_action_back" />
+      android:orientation="horizontal">
 
-    <ImageButton
-      android:id="@+id/forward_button"
-      style="?android:attr/actionButtonStyle"
-      app:tint="@color/image_button_color"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:contentDescription="@string/label_forward"
-      android:src="@drawable/ic_action_forward" />
+      <!-- Navigation buttons in a LinearLayout to mirror on RTL -->
+      <ImageButton
+        android:id="@+id/back_button"
+        style="?android:attr/actionButtonStyle"
+        app:tint="@color/image_button_color"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:contentDescription="@string/label_back"
+        android:src="@drawable/ic_action_back" />
+
+      <ImageButton
+        android:id="@+id/forward_button"
+        style="?android:attr/actionButtonStyle"
+        app:tint="@color/image_button_color"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/label_forward"
+        android:src="@drawable/ic_action_forward" />
+    </LinearLayout>
 
     <ImageButton
       android:id="@+id/close_button"