From 888667ded525135939363a6b0dd3470b762ddff7 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 12 Aug 2022 23:27:25 +0530 Subject: [PATCH 1/8] Avoid null pointer exception --- .../com/simplemobiletools/keyboard/views/MyKeyboardView.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) From b304707363ef3c5306f1a2ab2b70712c61807b8a Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 13 Aug 2022 19:46:16 +0530 Subject: [PATCH 2/8] Add Bulgarian language support --- .../keyboard/activities/SettingsActivity.kt | 5 +- .../keyboard/helpers/Constants.kt | 1 + .../keyboard/services/SimpleKeyboardIME.kt | 1 + .../main/res/xml/keys_letters_bulgarian.xml | 140 ++++++++++++++++++ 4 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/xml/keys_letters_bulgarian.xml 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 f2a970f..fe7db53 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -2,6 +2,7 @@ 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 @@ -114,7 +115,8 @@ class SettingsActivity : SimpleActivity() { 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_BULGARIAN, getKeyboardLanguageText(LANGUAGE_BULGARIAN)), ) RadioGroupDialog(this@SettingsActivity, items, config.keyboardLanguage) { @@ -134,6 +136,7 @@ class SettingsActivity : SimpleActivity() { 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) 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 b3bec15..13f7133 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -26,6 +26,7 @@ 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 EMOJI_SPEC_FILE_PATH = "media/emoji_spec.txt" 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..088d053 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -257,6 +257,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL 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 else -> R.xml.keys_letters_english_qwerty } } 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 136e4d70d1615a89b48c6fd3ce044611caa0076b Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 13 Aug 2022 23:10:00 +0530 Subject: [PATCH 3/8] Add Turkish-Q keyboard --- .../keyboard/activities/SettingsActivity.kt | 2 + .../keyboard/helpers/Constants.kt | 1 + .../keyboard/services/SimpleKeyboardIME.kt | 1 + .../main/res/xml/keys_letters_turkish_q.xml | 150 ++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 app/src/main/res/xml/keys_letters_turkish_q.xml 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 fe7db53..ea97c3b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -117,6 +117,7 @@ class SettingsActivity : SimpleActivity() { 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)), ) RadioGroupDialog(this@SettingsActivity, items, config.keyboardLanguage) { @@ -137,6 +138,7 @@ class SettingsActivity : SimpleActivity() { 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)" 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 13f7133..d5e2263 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,7 @@ 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 EMOJI_SPEC_FILE_PATH = "media/emoji_spec.txt" 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 088d053..1e91341 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -258,6 +258,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL 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 else -> R.xml.keys_letters_english_qwerty } } 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 31162b655dfe9139e48c522c17053e4570a0ee82 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 19 Aug 2022 12:34:27 +0530 Subject: [PATCH 4/8] Add lithuanian keyboard --- .../keyboard/activities/SettingsActivity.kt | 2 + .../keyboard/helpers/Constants.kt | 1 + .../keyboard/services/SimpleKeyboardIME.kt | 1 + .../main/res/xml/keys_letters_lithuanian.xml | 142 ++++++++++++++++++ 4 files changed, 146 insertions(+) create mode 100644 app/src/main/res/xml/keys_letters_lithuanian.xml 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 ea97c3b..2a56bd8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -118,6 +118,7 @@ class SettingsActivity : SimpleActivity() { 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) { @@ -139,6 +140,7 @@ class SettingsActivity : SimpleActivity() { 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) 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 d5e2263..55dff42 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -28,6 +28,7 @@ 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 EMOJI_SPEC_FILE_PATH = "media/emoji_spec.txt" 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 1e91341..3aa2028 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt @@ -259,6 +259,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL LANGUAGE_ROMANIAN -> R.xml.keys_letters_romanian LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian LANGUAGE_TURKISH_Q -> R.xml.keys_letters_turkish_q + LANGUAGE_LITHUANIAN -> R.xml.keys_letters_lithuanian else -> R.xml.keys_letters_english_qwerty } } 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From aaac36a9a986fb5977136f80b20c5ecef4d668ee Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 19 Aug 2022 13:04:28 +0530 Subject: [PATCH 5/8] Sort language items --- .../keyboard/activities/SettingsActivity.kt | 21 +++++++++---------- .../keyboard/services/SimpleKeyboardIME.kt | 18 ++++++++-------- 2 files changed, 19 insertions(+), 20 deletions(-) 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 } } From 98b97e6970c8a5da4a1af6cd0ab7769b657bc6b8 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 19 Aug 2022 13:50:09 +0530 Subject: [PATCH 6/8] Update commons dependency --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 275333f..0034d5d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' From 98469ed7886d79f3aff9b888f6a0bf5b8c2f5477 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 19 Aug 2022 13:57:19 +0530 Subject: [PATCH 7/8] Target SDK 33 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0034d5d..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 From 431ce7050c7e4505813ec268031dca613f6d1812 Mon Sep 17 00:00:00 2001 From: Naveen Date: Fri, 19 Aug 2022 15:28:00 +0530 Subject: [PATCH 8/8] Add bengali keyboard --- .../keyboard/activities/SettingsActivity.kt | 2 + .../keyboard/helpers/Constants.kt | 1 + .../keyboard/services/SimpleKeyboardIME.kt | 1 + app/src/main/res/xml/keys_letters_bengali.xml | 179 ++++++++++++++++++ 4 files changed, 183 insertions(+) create mode 100644 app/src/main/res/xml/keys_letters_bengali.xml 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 be9723b..dcaa88c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -106,6 +106,7 @@ 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)), @@ -129,6 +130,7 @@ 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)" 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 55dff42..48c2e7f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -29,6 +29,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 const val EMOJI_SPEC_FILE_PATH = "media/emoji_spec.txt" 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 15e581c..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,6 +249,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL private fun getKeyboardLayoutXML(): Int { return when (baseContext.config.keyboardLanguage) { + LANGUAGE_BENGALI -> R.xml.keys_letters_bengali LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian LANGUAGE_ENGLISH_DVORAK -> R.xml.keys_letters_english_dvorak LANGUAGE_ENGLISH_QWERTZ -> R.xml.keys_letters_english_qwertz 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +