Skip to content

Commit 535409e

Browse files
committed
Merge branch 'languages_refactoring' into scandinavian_language_layouts
2 parents f68396d + 5738029 commit 535409e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fun Context.setupKeyboardDialogStuff(
149149
}
150150

151151
fun Context.getKeyboardLanguages(): ArrayList<RadioItem> {
152-
val languages = Language.values().map { RadioItem(it.ordinal, it.getName(this)) }
152+
val languages = Language.sorted(this).map { RadioItem(it.ordinal, it.getName(this)) }
153153
return ArrayList(languages)
154154
}
155155

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ enum class Language(@StringRes private val stringRes: Int, private val layout: I
6969
}
7070

7171
companion object {
72+
fun sorted(context: Context) = Language.values().sortedBy { context.getString(it.stringRes) }
73+
7274
fun getKeyboardLayout(keyboardLanguage: Int): Int {
7375
return Language.values().getOrElse(keyboardLanguage) { ENGLISH_QWERTY }.layout
7476
}

0 commit comments

Comments
 (0)