From 5738029991e06deb09e21d25ae8af28c5aec2aef Mon Sep 17 00:00:00 2001 From: merkost Date: Thu, 25 May 2023 23:19:53 +1000 Subject: [PATCH] Language.kt - added sorted function --- .../kotlin/com/simplemobiletools/keyboard/extensions/Context.kt | 2 +- .../kotlin/com/simplemobiletools/keyboard/helpers/Language.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt index 8b842be4..75e8aa89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/extensions/Context.kt @@ -149,7 +149,7 @@ fun Context.setupKeyboardDialogStuff( } fun Context.getKeyboardLanguages(): ArrayList { - 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) } diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Language.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Language.kt index 9fe9d87e..dd6be24b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Language.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Language.kt @@ -60,6 +60,8 @@ enum class Language(@StringRes private val stringRes: Int, private val layout: I } companion object { + fun sorted(context: Context) = Language.values().sortedBy { context.getString(it.stringRes) } + fun getKeyboardLayout(keyboardLanguage: Int): Int { return Language.values().getOrElse(keyboardLanguage) { ENGLISH_QWERTY }.layout }