Merge pull request #11 from winstonsung/dev-11

androidApp: Order LanguageOptionItem by language tag

Author: theimpulson

androidApp/src/main/java/app/opass/ccip/android/ui/menu/LanguageDropdownMenu.kt

@@ -31,6 +31,11 @@ private val languageOptions = listOf(
         localNameResId = R.string.lang_local_name_en_us,
         translatedNameResId = R.string.lang_translated_name_en_us
     ),
+    LanguageOptionItem(
+        languageTag = "hi-IN",
+        localNameResId = R.string.lang_local_name_hi_in,
+        translatedNameResId = R.string.lang_translated_name_hi_in
+    ),
     LanguageOptionItem(
         languageTag = "nan-Hant-TW",
         localNameResId = R.string.lang_local_name_nan_hant_tw,
@@ -46,11 +51,6 @@ private val languageOptions = listOf(
         localNameResId = R.string.lang_local_name_nan_latn_tw_tailo,
         translatedNameResId = R.string.lang_translated_name_nan_latn_tw_tailo
     ),
-    LanguageOptionItem(
-        languageTag = "hi-IN",
-        localNameResId = R.string.lang_local_name_hi_in,
-        translatedNameResId = R.string.lang_translated_name_hi_in
-    ),
     LanguageOptionItem(
         languageTag = "nb-NO",
         localNameResId = R.string.lang_local_name_nb_no,
@@ -68,7 +68,6 @@ private val languageOptions = listOf(
     )
 )
 
-
 /**
  * Dropdown menu for changing app language.
  * @param expanded Whether the menu is expanded or not

androidApp/src/main/res/values/strings.xml

@@ -15,14 +15,14 @@
     <string name="lang_translated_name_x_default">System default</string>
     <string name="lang_local_name_en_us" translatable="false">English</string>
     <string name="lang_translated_name_en_us">English</string>
+    <string name="lang_local_name_hi_in" translatable="false">हिन्दी</string>
+    <string name="lang_translated_name_hi_in">Hindi</string>
     <string name="lang_local_name_nan_hant_tw" translatable="false">閩南語 - 傳統漢字</string>
     <string name="lang_translated_name_nan_hant_tw">Hokkien - Traditional Han script</string>
     <string name="lang_local_name_nan_latn_tw_pehoeji" translatable="false">Bân-lâm-gú - Pe̍h-ōe-jī</string>
     <string name="lang_translated_name_nan_latn_tw_pehoeji">Hokkien - Pe̍h-ōe-jī</string>
     <string name="lang_local_name_nan_latn_tw_tailo" translatable="false">Bân-lâm-gú - Tâi-lô</string>
     <string name="lang_translated_name_nan_latn_tw_tailo">Hokkien - Tâi-lô</string>
-    <string name="lang_local_name_hi_in" translatable="false">हिन्दी</string>
-    <string name="lang_translated_name_hi_in">Hindi</string>
     <string name="lang_local_name_nb_no" translatable="false">norsk bokmål</string>
     <string name="lang_translated_name_nb_no">Norwegian Bokmål</string>
     <string name="lang_local_name_ta_in" translatable="false">தமிழ்</string>