From 25672d2d492c5e301f00e38b62f7e3328edb666f Mon Sep 17 00:00:00 2001 From: Winston Sung Date: Tue, 18 Mar 2025 16:46:16 +0800 Subject: [PATCH] androidApp: Order LanguageOptionItem by language tag Bug: #11 Change-Id: I1defc8525f81c342098b3c210e33141eb643b553 --- .../ccip/android/ui/menu/LanguageDropdownMenu.kt | 11 +++++------ androidApp/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/androidApp/src/main/java/app/opass/ccip/android/ui/menu/LanguageDropdownMenu.kt b/androidApp/src/main/java/app/opass/ccip/android/ui/menu/LanguageDropdownMenu.kt index c34e6ff..04ffb2d 100644 --- a/androidApp/src/main/java/app/opass/ccip/android/ui/menu/LanguageDropdownMenu.kt +++ b/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 diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 14d2e28..1f778f2 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -15,14 +15,14 @@ System default English English + हिन्दी + Hindi 閩南語 - 傳統漢字 Hokkien - Traditional Han script Bân-lâm-gú - Pe̍h-ōe-jī Hokkien - Pe̍h-ōe-jī Bân-lâm-gú - Tâi-lô Hokkien - Tâi-lô - हिन्दी - Hindi norsk bokmål Norwegian Bokmål தமிழ்