android-apps-mirrors/HeliBoard
0
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-28 19:59:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't pre-select unavailable locale when adding dictionary

Browse source
This commit is contained in:
Helium314 2025-06-19 09:35:08 +02:00
parent 7b0c511857
commit 77a728e390
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/helium314/keyboard/settings/dialogs/NewDictionaryDialog.kt
View file

@ -47,12 +47,12 @@ fun NewDictionaryDialog(
} else if (header != null) { } else if (header != null) {
val ctx = LocalContext.current val ctx = LocalContext.current
val dictLocale = header.mLocaleString.constructLocale() val dictLocale = header.mLocaleString.constructLocale()
var locale by remember { mutableStateOf(mainLocale ?: dictLocale) }
val enabledLanguages = SubtypeSettings.getEnabledSubtypes().map { it.locale().language } val enabledLanguages = SubtypeSettings.getEnabledSubtypes().map { it.locale().language }
val comparer = compareBy<Locale>({ it != mainLocale }, { it != dictLocale }, { it.language !in enabledLanguages }, { it.script() != dictLocale.script() }) val comparer = compareBy<Locale>({ it != mainLocale }, { it != dictLocale }, { it.language !in enabledLanguages }, { it.script() != dictLocale.script() })
val locales = SubtypeSettings.getAvailableSubtypeLocales() val locales = SubtypeSettings.getAvailableSubtypeLocales()
.filter { it.script() == dictLocale.script() || it.script() == mainLocale?.script() } .filter { it.script() == dictLocale.script() || it.script() == mainLocale?.script() }
.sortedWith(comparer) .sortedWith(comparer)
var locale by remember { mutableStateOf(mainLocale ?: dictLocale.takeIf { it in locales } ?: locales.first()) }
val cacheDir = DictionaryInfoUtils.getCacheDirectoryForLocale(locale, ctx) val cacheDir = DictionaryInfoUtils.getCacheDirectoryForLocale(locale, ctx)
val dictFile = File(cacheDir, header.mIdString.substringBefore(":") + "_" + DictionaryInfoUtils.USER_DICTIONARY_SUFFIX) val dictFile = File(cacheDir, header.mIdString.substringBefore(":") + "_" + DictionaryInfoUtils.USER_DICTIONARY_SUFFIX)
val type = header.mIdString.substringBefore(":") val type = header.mIdString.substringBefore(":")