1
0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2025-01-27 22:09:17 +01:00

Fix some bugs

This commit is contained in:
Matthieu 2022-11-25 22:01:36 +01:00
parent 1d6b3c47e7
commit e64c2d6399

@ -142,7 +142,9 @@ class LanguageSettingFragment : DialogFragment() {
val checkedItem: Int =
if(locales.isEmpty) 0
else {
val index = list.indexOf(locales.get(0)?.toLanguageTag())
// For some reason we get a bit inconsistent language tags. This normalises it for
// the currently used languages, but it might break in the future if we add some
val index = list.indexOf(locales.get(0)?.toLanguageTag()?.lowercase()?.replace('_', '-'))
// If found, we want to compensate for the first in the list being the default
if(index == -1) -1
else index + 1
@ -156,8 +158,8 @@ class LanguageSettingFragment : DialogFragment() {
appLocale.get(0)!!.getDisplayName(appLocale.get(0)!!)
}).toTypedArray(), checkedItem) { dialog, which ->
val languageTag = if(which in 1..list.size) list[which - 1] else null
AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(languageTag))
dialog.dismiss()
AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(languageTag))
}
setNegativeButton(android.R.string.ok) { _, _ -> }
}.create()