Merge pull request #11482 from t895/rtl-fixes

Android: Fix RTL layout in several views
dolphin-emu · Jan 24, 2023 · f4a8f80 · f4a8f80
2 parents cb55921 + c3a1a7d
commit f4a8f80
Show file tree

Hide file tree

Showing 24 changed files with 217 additions and 182 deletions.
diff --git a/Source/Android/app/src/main/res/layout-land/activity_user_data.xml b/Source/Android/app/src/main/res/layout-land/activity_user_data.xml
@@ -50,6 +50,7 @@
                 android:id="@+id/text_type"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toTopOf="@id/text_path"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintEnd_toStartOf="@id/divider"
@@ -62,6 +63,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
+                android:textAlignment="viewStart"
                 tools:text="/storage/emulated/0/Android/data/org.dolphinemu.dolphinemu/files"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -75,6 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:text="@string/user_data_new_location_android_11"
+                android:textAlignment="viewStart"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/divider"

diff --git a/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml b/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
@@ -21,7 +21,8 @@
         android:layout_marginEnd="@dimen/spacing_large"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_toStartOf="@+id/cheat_switch"
-        android:gravity="center_vertical|end"
+        android:gravity="center_vertical|start"
+        android:textAlignment="viewStart"
         android:textSize="16sp"
         tools:text="Hyrule Field Speed Hack" />
 

diff --git a/Source/Android/app/src/main/res/layout-w600dp/dialog_about.xml b/Source/Android/app/src/main/res/layout-w600dp/dialog_about.xml
@@ -56,48 +56,53 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/name_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/about_dolphin"
                         android:textAppearance="@style/TextAppearance.AppCompat.Display3"
-                        android:textColor="?attr/colorOnSurface" />
+                        android:textColor="?attr/colorOnSurface"
+                        android:textAlignment="viewStart" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/version_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:textAppearance="@style/TextAppearance.AppCompat.Large"
                         android:textColor="?attr/colorOnSurface"
                         android:textIsSelectable="true"
+                        android:textAlignment="viewStart"
                         tools:text="5.0-XXXXX" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/branch_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:textColor="?attr/colorOnSurface"
                         android:textIsSelectable="true"
+                        android:textAlignment="viewStart"
                         tools:text="Branch:\nmaster" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/revision_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:textColor="?attr/colorOnSurface"
                         android:textIsSelectable="true"
+                        android:textAlignment="viewStart"
                         tools:text="Revision:\nf4f94396e94dad9cd4d7d7fb6defa096966a4ab8" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/about_dolphin_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:focusable="false"
                         android:text="@string/about_dolphin_description"
-                        android:textColor="?attr/colorOnSurface" />
+                        android:textColor="?attr/colorOnSurface"
+                        android:textAlignment="viewStart" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"

diff --git a/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml b/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml
@@ -50,6 +50,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@string/convert_format_info"
+                android:textAlignment="viewStart"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintTop_toTopOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/activity_convert.xml b/Source/Android/app/src/main/res/layout/activity_convert.xml
@@ -71,6 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
                 android:text="@string/convert_format_info"
+                android:textAlignment="viewStart"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -50,6 +50,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/spacing_large"
+                android:textAlignment="viewStart"
                 tools:text="@string/riivolution_sd_root"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

diff --git a/Source/Android/app/src/main/res/layout/activity_user_data.xml b/Source/Android/app/src/main/res/layout/activity_user_data.xml
@@ -53,6 +53,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/spacing_medlarge"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toTopOf="@id/text_path"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -66,6 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_medlarge"
                 android:layout_marginBottom="@dimen/spacing_medlarge"
+                android:textAlignment="viewStart"
                 tools:text="/storage/emulated/0/Android/data/org.dolphinemu.dolphinemu/files"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -79,6 +81,7 @@
                 android:layout_marginTop="@dimen/spacing_medlarge"
                 android:layout_marginBottom="@dimen/spacing_medlarge"
                 android:text="@string/user_data_new_location_android_11"
+                android:textAlignment="viewStart"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/text_path"

diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -54,6 +54,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingTop="8dp"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/card_game_art"
         app:layout_constraintStart_toStartOf="@+id/card_game_art"
         app:layout_constraintTop_toBottomOf="@+id/card_game_art"
@@ -68,6 +69,7 @@
         android:lines="1"
         android:maxLines="1"
         android:paddingTop="8dp"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/card_game_art"
         app:layout_constraintStart_toStartOf="@+id/card_game_art"
         app:layout_constraintTop_toBottomOf="@+id/text_game_title"