Merge pull request #108 from winstonsung/dev-108

LanguagePreferenceFragment: Order LanguageOptionItem by language tag

Author: theimpulson

app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt

@@ -46,6 +46,11 @@ class LanguagePreferenceFragment : DialogFragment() {
                         localName = requireContext().getString(R.string.lang_local_name_en_us),
                         translatedName = requireContext().getString(R.string.lang_translated_name_en_us)
                     ),
+                    LanguageOptionItem(
+                        languageTag = "hi-IN",
+                        localName = requireContext().getString(R.string.lang_local_name_hi_in),
+                        translatedName = requireContext().getString(R.string.lang_translated_name_hi_in)
+                    ),
                     LanguageOptionItem(
                         languageTag = "nan-Hant-TW",
                         localName = requireContext().getString(R.string.lang_local_name_nan_hant_tw),
@@ -61,11 +66,6 @@ class LanguagePreferenceFragment : DialogFragment() {
                         localName = requireContext().getString(R.string.lang_local_name_nan_latn_tw_tailo),
                         translatedName = requireContext().getString(R.string.lang_translated_name_nan_latn_tw_tailo)
                     ),
-                    LanguageOptionItem(
-                        languageTag = "hi-IN",
-                        localName = requireContext().getString(R.string.lang_local_name_hi_in),
-                        translatedName = requireContext().getString(R.string.lang_translated_name_hi_in)
-                    ),
                     LanguageOptionItem(
                         languageTag = "nb-NO",
                         localName = requireContext().getString(R.string.lang_local_name_nb_no),

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

@@ -99,14 +99,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>