diff --git a/app/build.gradle b/app/build.gradle index 275333f..7284da6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdk 31 + compileSdk 33 defaultConfig { applicationId "com.simplemobiletools.keyboard" minSdk 23 - targetSdk 31 + targetSdk 33 versionCode 11 versionName "5.2.1" multiDexEnabled true @@ -65,8 +65,8 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:0c82e5f216' - implementation 'androidx.emoji2:emoji2-bundled:1.1.0' + implementation 'com.github.SimpleMobileTools:Simple-Commons:dfcf3990b0' + implementation 'androidx.emoji2:emoji2-bundled:1.2.0' kapt 'androidx.room:room-compiler:2.4.3' implementation 'androidx.room:room-runtime:2.4.3' 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 6a5c4a5..8a2953a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -107,15 +107,19 @@ class SettingsActivity : SimpleActivity() { settings_keyboard_language.text = getKeyboardLanguageText(config.keyboardLanguage) settings_keyboard_language_holder.setOnClickListener { val items = arrayListOf( + RadioItem(LANGUAGE_BENGALI, getKeyboardLanguageText(LANGUAGE_BENGALI)), + 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_SPANISH, getKeyboardLanguageText(LANGUAGE_SPANISH)), + RadioItem(LANGUAGE_TURKISH_Q, getKeyboardLanguageText(LANGUAGE_TURKISH_Q)), ) RadioGroupDialog(this@SettingsActivity, items, config.keyboardLanguage) { @@ -127,14 +131,18 @@ class SettingsActivity : SimpleActivity() { private fun getKeyboardLanguageText(language: Int): String { return when (language) { + LANGUAGE_BENGALI -> getString(R.string.translation_bengali) + 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_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/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt index a856c4b..42b8eea 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -27,6 +27,10 @@ const val LANGUAGE_GERMAN = 5 const val LANGUAGE_ENGLISH_DVORAK = 6 const val LANGUAGE_ROMANIAN = 7 const val LANGUAGE_SLOVENIAN = 8 +const val LANGUAGE_BULGARIAN = 9 +const val LANGUAGE_TURKISH_Q = 10 +const val LANGUAGE_LITHUANIAN = 11 +const val LANGUAGE_BENGALI = 12 // keyboard height multiplier options const val KEYBOARD_HEIGHT_MULTIPLIER_SMALL = 1 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 0691dfe..877f906 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -249,14 +249,18 @@ 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_BENGALI -> R.xml.keys_letters_bengali + LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak - LANGUAGE_SPANISH -> R.xml.keys_letters_spanish_qwerty + LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz + LANGUAGE_FRENCH -> R.xml.keys_letters_french LANGUAGE_GERMAN -> R.xml.keys_letters_german - LANGUAGE_SLOVENIAN -> R.xml.keys_letters_slovenian + 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 } } diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 62ce441..deb6d85 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -1465,10 +1465,10 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } private fun setupEmojiAdapter(emojis: List) { - val emojiItemWidth = context.resources.getDimensionPixelSize(R.dimen.emoji_item_size) - val emojiTopBarElevation = context.resources.getDimensionPixelSize(R.dimen.emoji_top_bar_elevation).toFloat() - mEmojiPaletteHolder?.emojis_list?.apply { + val emojiItemWidth = context.resources.getDimensionPixelSize(R.dimen.emoji_item_size) + val emojiTopBarElevation = context.resources.getDimensionPixelSize(R.dimen.emoji_top_bar_elevation).toFloat() + layoutManager = AutoGridLayoutManager(context, emojiItemWidth) adapter = EmojisAdapter(context = context, items = emojis) { emoji -> mOnKeyboardActionListener!!.onText(emoji) diff --git a/app/src/main/res/xml/keys_letters_bengali.xml b/app/src/main/res/xml/keys_letters_bengali.xml new file mode 100644 index 0000000..d067c9c --- /dev/null +++ b/app/src/main/res/xml/keys_letters_bengali.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/keys_letters_bulgarian.xml b/app/src/main/res/xml/keys_letters_bulgarian.xml new file mode 100644 index 0000000..7434dff --- /dev/null +++ b/app/src/main/res/xml/keys_letters_bulgarian.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/keys_letters_lithuanian.xml b/app/src/main/res/xml/keys_letters_lithuanian.xml new file mode 100644 index 0000000..5ea3ffd --- /dev/null +++ b/app/src/main/res/xml/keys_letters_lithuanian.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/keys_letters_turkish_q.xml b/app/src/main/res/xml/keys_letters_turkish_q.xml new file mode 100644 index 0000000..83d07da --- /dev/null +++ b/app/src/main/res/xml/keys_letters_turkish_q.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +