fenix/Simple-Keyboard
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git synced 2025-06-05 21:49:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'languages_refactoring' into scandinavian_language_layouts

Browse Source
This commit is contained in:
merkost
2023-05-25 23:22:05 +10:00
parent f68396d24e 5738029991
commit 535409e9ee
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt
View File

@@ -149,7 +149,7 @@ fun Context.setupKeyboardDialogStuff(
} }
fun Context.getKeyboardLanguages(): ArrayList<RadioItem> { fun Context.getKeyboardLanguages(): ArrayList<RadioItem> {
val languages = Language.values().map { RadioItem(it.ordinal, it.getName(this)) } val languages = Language.sorted(this).map { RadioItem(it.ordinal, it.getName(this)) }
return ArrayList(languages) return ArrayList(languages)
} }

2
app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Language.kt
View File

@@ -69,6 +69,8 @@ enum class Language(@StringRes private val stringRes: Int, private val layout: I
} }
companion object { companion object {
fun sorted(context: Context) = Language.values().sortedBy { context.getString(it.stringRes) }
fun getKeyboardLayout(keyboardLanguage: Int): Int { fun getKeyboardLayout(keyboardLanguage: Int): Int {
return Language.values().getOrElse(keyboardLanguage) { ENGLISH_QWERTY }.layout return Language.values().getOrElse(keyboardLanguage) { ENGLISH_QWERTY }.layout
} }