From 2f7c055cdb156d0d98289c8ba045d02099be5e94 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 27 Nov 2023 18:16:48 +0530
Subject: [PATCH] LocaleView: Show localized display language

display language seems to be more or less always empty/blank. Let's just
use localized display language instead. This will ensure both lines don't show
same values unless same locale is applied.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../aurora/store/view/epoxy/views/preference/LocaleView.kt  | 5 +----
 app/src/main/res/layout/view_locale.xml                     | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LocaleView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LocaleView.kt
index a2c0cfedc..cd1fd5620 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LocaleView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LocaleView.kt
@@ -63,10 +63,7 @@ class LocaleView : RelativeLayout {
     @ModelProp
     fun locale(locale: Locale) {
         B.line1.text = locale.displayName
-        B.line2.text = if (locale.displayCountry.isNotEmpty())
-            locale.displayCountry
-        else
-            locale.displayLanguage
+        B.line2.text = locale.getDisplayLanguage(locale)
     }
 
     @ModelProp
diff --git a/app/src/main/res/layout/view_locale.xml b/app/src/main/res/layout/view_locale.xml
index 4f30ea990..56ae4a234 100644
--- a/app/src/main/res/layout/view_locale.xml
+++ b/app/src/main/res/layout/view_locale.xml
@@ -39,7 +39,9 @@
         android:layout_below="@+id/line1"
         android:layout_alignStart="@id/line1"
         android:layout_alignEnd="@id/line1"
-        android:layout_marginTop="@dimen/margin_xxsmall" />
+        android:layout_marginTop="@dimen/margin_xxsmall"
+        android:textAlignment="viewStart"
+        android:textDirection="locale" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox"
@@ -48,4 +50,4 @@
         android:layout_alignParentEnd="true"
         android:layout_centerInParent="true"
         android:minWidth="0dp" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>