diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt index 2a56bd8..be9723b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.keyboard.activities import android.content.Intent import android.os.Bundle -import androidx.core.content.ContextCompat.startActivity import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.NavigationIcon @@ -107,18 +106,18 @@ class SettingsActivity : SimpleActivity() { settings_keyboard_language.text = getKeyboardLanguageText(config.keyboardLanguage) settings_keyboard_language_holder.setOnClickListener { val items = arrayListOf( + RadioItem(LANGUAGE_BULGARIAN, getKeyboardLanguageText(LANGUAGE_BULGARIAN)), RadioItem(LANGUAGE_ENGLISH_QWERTY, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTY)), RadioItem(LANGUAGE_ENGLISH_QWERTZ, getKeyboardLanguageText(LANGUAGE_ENGLISH_QWERTZ)), RadioItem(LANGUAGE_ENGLISH_DVORAK, getKeyboardLanguageText(LANGUAGE_ENGLISH_DVORAK)), RadioItem(LANGUAGE_FRENCH, getKeyboardLanguageText(LANGUAGE_FRENCH)), RadioItem(LANGUAGE_GERMAN, getKeyboardLanguageText(LANGUAGE_GERMAN)), + RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)), RadioItem(LANGUAGE_ROMANIAN, getKeyboardLanguageText(LANGUAGE_ROMANIAN)), RadioItem(LANGUAGE_RUSSIAN, getKeyboardLanguageText(LANGUAGE_RUSSIAN)), RadioItem(LANGUAGE_SLOVENIAN, getKeyboardLanguageText(LANGUAGE_SLOVENIAN)), RadioItem(LANGUAGE_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)), - RadioItem(LANGUAGE_BULGARIAN, getKeyboardLanguageText(LANGUAGE_BULGARIAN)), RadioItem(LANGUAGE_TURKISH_Q, getKeyboardLanguageText(LANGUAGE_TURKISH_Q)), - RadioItem(LANGUAGE_LITHUANIAN, getKeyboardLanguageText(LANGUAGE_LITHUANIAN)), ) RadioGroupDialog(this@SettingsActivity, items, config.keyboardLanguage) { @@ -130,17 +129,17 @@ class SettingsActivity : SimpleActivity() { private fun getKeyboardLanguageText(language: Int): String { return when (language) { + LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian) + LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" + LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)" LANGUAGE_FRENCH -> getString(R.string.translation_french) LANGUAGE_GERMAN -> getString(R.string.translation_german) - LANGUAGE_RUSSIAN -> getString(R.string.translation_russian) - LANGUAGE_ENGLISH_QWERTZ -> "${getString(R.string.translation_english)} (QWERTZ)" - LANGUAGE_ENGLISH_DVORAK -> "${getString(R.string.translation_english)} (DVORAK)" - LANGUAGE_SPANISH -> getString(R.string.translation_spanish) - LANGUAGE_SLOVENIAN -> getString(R.string.translation_slovenian) - LANGUAGE_ROMANIAN -> getString(R.string.translation_romanian) - LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian) - LANGUAGE_TURKISH_Q -> "${getString(R.string.translation_turkish)} (Q)" LANGUAGE_LITHUANIAN -> getString(R.string.translation_lithuanian) + LANGUAGE_ROMANIAN -> getString(R.string.translation_romanian) + LANGUAGE_RUSSIAN -> getString(R.string.translation_russian) + LANGUAGE_SLOVENIAN -> getString(R.string.translation_slovenian) + LANGUAGE_SPANISH -> getString(R.string.translation_spanish) + LANGUAGE_TURKISH_Q -> "${getString(R.string.translation_turkish)} (Q)" else -> "${getString(R.string.translation_english)} (QWERTY)" } } diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt index 3aa2028..15e581c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -249,17 +249,17 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL private fun getKeyboardLayoutXML(): Int { return when (baseContext.config.keyboardLanguage) { - LANGUAGE_FRENCH -> R.xml.keys_letters_french - LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian - LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz - LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak - LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty - LANGUAGE_GERMAN -> R.xml.keys_letters_german - LANGUAGE_SLOVENIAN -> R.xml.keys_letters_slovenian - LANGUAGE_ROMANIAN -> R.xml.keys_letters_romanian LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian - LANGUAGE_TURKISH_Q -> R.xml.keys_letters_turkish_q + LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak + LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz + LANGUAGE_FRENCH -> R.xml.keys_letters_french + LANGUAGE_GERMAN -> R.xml.keys_letters_german LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian + LANGUAGE_ROMANIAN -> R.xml.keys_letters_romanian + LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian + LANGUAGE_SLOVENIAN -> R.xml.keys_letters_slovenian + LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty + LANGUAGE_TURKISH_Q -> R.xml.keys_letters_turkish_q else -> R.xml.keys_letters_english_qwerty } }