From e0b6fe62580766996362d7c0c1823429213810ba Mon Sep 17 00:00:00 2001 From: Winston Sung Date: Thu, 13 Mar 2025 10:45:15 +0800 Subject: [PATCH] LanguagePreferenceFragment: Add "System default" option Bug: #103 Change-Id: I8791ea515b593fe2c58532926f2cf42953dc8961 --- .../app/opass/ccip/ui/LanguagePreferenceFragment.kt | 13 ++++++++++++- app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt b/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt index 4f7b2f73..2103dea8 100644 --- a/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt +++ b/app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt @@ -34,6 +34,11 @@ class LanguagePreferenceFragment : DialogFragment() { layoutManager = LinearLayoutManager(requireContext()) adapter = LanguagePreferenceAdapter( items = listOf( + LanguageOptionItem( + languageTag = "x-default", + localName = requireContext().getString(R.string.lang_translated_name_x_default), + translatedName = requireContext().getString(R.string.lang_translated_name_x_default) + ), LanguageOptionItem( languageTag = "en-US", localName = requireContext().getString(R.string.lang_local_name_en_us), @@ -78,7 +83,13 @@ class LanguagePreferenceFragment : DialogFragment() { ) { item -> dialog?.dismiss() AppCompatDelegate.setApplicationLocales( - LocaleListCompat.forLanguageTags(item.languageTag) + ( + if (item.languageTag == "x-default") { + LocaleListCompat.getEmptyLocaleList() + } else { + LocaleListCompat.forLanguageTags(item.languageTag) + } + ) ) } } diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ed970304..9276994d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -95,6 +95,7 @@ 無法儲存 Wi-Fi 網路資訊。網路密碼已複製到剪貼簿。 切換語言 選擇應用程式語言 + 系統預設 英語 閩南語 - 傳統漢字 閩南語 - 白話字 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5530bdf9..f1a9f8d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -96,6 +96,7 @@ Failed to save the Wi-Fi information. Password copied to clipboard. Switch language Choose app language + System default English English 閩南語 - 傳統漢字