From 000c907a02c414a9b44b0da95033cf042cc6b07a Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 20 May 2023 11:36:03 +1000
Subject: [PATCH 01/11] ShiftState refactored

---
 .../keyboard/helpers/Constants.kt             |  9 ++++---
 .../keyboard/helpers/MyKeyboard.kt            |  5 ++--
 .../keyboard/services/SimpleKeyboardIME.kt    | 26 +++++++++----------
 .../keyboard/views/MyKeyboardView.kt          | 12 ++++-----
 4 files changed, 27 insertions(+), 25 deletions(-)

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 78a59fc6..9c81f55a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
@@ -1,8 +1,10 @@
 package com.simplemobiletools.keyboard.helpers
 
-const val SHIFT_OFF = 0
-const val SHIFT_ON_ONE_CHAR = 1
-const val SHIFT_ON_PERMANENT = 2
+enum class ShiftState {
+    OFF,
+    ON_ONE_CHAR,
+    ON_PERMANENT;
+}
 
 // limit the count of alternative characters that show up at long pressing a key
 const val MAX_KEYS_PER_MINI_ROW = 9
@@ -11,6 +13,7 @@ const val MAX_KEYS_PER_MINI_ROW = 9
 const val VIBRATE_ON_KEYPRESS = "vibrate_on_keypress"
 const val SHOW_POPUP_ON_KEYPRESS = "show_popup_on_keypress"
 const val SHOW_KEY_BORDERS = "show_key_borders"
+const val SENTENCES_CAPITALIZATION = "show_key_borders"
 const val LAST_EXPORTED_CLIPS_FOLDER = "last_exported_clips_folder"
 const val KEYBOARD_LANGUAGE = "keyboard_language"
 const val HEIGHT_MULTIPLIER = "height_multiplier"
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index b2c77c00..97ccc3c8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -34,7 +34,7 @@ class MyKeyboard {
     var mKeyboardHeightMultiplier: Float = 1F
 
     /** Is the keyboard in the shifted state  */
-    var mShiftState = SHIFT_OFF
+    var mShiftState = ShiftState.OFF
 
     /** Total height of the keyboard, including the padding and keys  */
     var mHeight = 0
@@ -312,12 +312,11 @@ class MyKeyboard {
         mRows.add(row)
     }
 
-    fun setShifted(shiftState: Int): Boolean {
+    fun setShifted(shiftState: ShiftState): Boolean {
         if (this.mShiftState != shiftState) {
             this.mShiftState = shiftState
             return true
         }
-
         return false
     }
 
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 8e1192e0..1fdc9ece 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -75,9 +75,9 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
     private fun updateShiftKeyState() {
         if (keyboardMode == KEYBOARD_LETTERS) {
             val editorInfo = currentInputEditorInfo
-            if (editorInfo != null && editorInfo.inputType != InputType.TYPE_NULL && keyboard?.mShiftState != SHIFT_ON_PERMANENT) {
+            if (editorInfo != null && editorInfo.inputType != InputType.TYPE_NULL && keyboard?.mShiftState != ShiftState.ON_PERMANENT) {
                 if (currentInputConnection.getCursorCapsMode(editorInfo.inputType) != 0) {
-                    keyboard?.setShifted(SHIFT_ON_ONE_CHAR)
+                    keyboard?.setShifted(ShiftState.ON_ONE_CHAR)
                     keyboardView?.invalidateAllKeys()
                 }
             }
@@ -96,8 +96,8 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
 
         when (code) {
             MyKeyboard.KEYCODE_DELETE -> {
-                if (keyboard!!.mShiftState == SHIFT_ON_ONE_CHAR) {
-                    keyboard!!.mShiftState = SHIFT_OFF
+                if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR) {
+                    keyboard!!.mShiftState = ShiftState.OFF
                 }
 
                 val selectedText = inputConnection.getSelectedText(0)
@@ -112,10 +112,10 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
             MyKeyboard.KEYCODE_SHIFT -> {
                 if (keyboardMode == KEYBOARD_LETTERS) {
                     when {
-                        keyboard!!.mShiftState == SHIFT_ON_PERMANENT -> keyboard!!.mShiftState = SHIFT_OFF
-                        System.currentTimeMillis() - lastShiftPressTS < SHIFT_PERM_TOGGLE_SPEED -> keyboard!!.mShiftState = SHIFT_ON_PERMANENT
-                        keyboard!!.mShiftState == SHIFT_ON_ONE_CHAR -> keyboard!!.mShiftState = SHIFT_OFF
-                        keyboard!!.mShiftState == SHIFT_OFF -> keyboard!!.mShiftState = SHIFT_ON_ONE_CHAR
+                        keyboard!!.mShiftState == ShiftState.ON_PERMANENT -> keyboard!!.mShiftState = ShiftState.OFF
+                        System.currentTimeMillis() - lastShiftPressTS < SHIFT_PERM_TOGGLE_SPEED -> keyboard!!.mShiftState = ShiftState.ON_PERMANENT
+                        keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR -> keyboard!!.mShiftState = ShiftState.OFF
+                        keyboard!!.mShiftState == ShiftState.OFF -> keyboard!!.mShiftState = ShiftState.ON_ONE_CHAR
                     }
 
                     lastShiftPressTS = System.currentTimeMillis()
@@ -157,7 +157,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
             }
             else -> {
                 var codeChar = code.toChar()
-                if (Character.isLetter(codeChar) && keyboard!!.mShiftState > SHIFT_OFF) {
+                if (Character.isLetter(codeChar) && keyboard!!.mShiftState > ShiftState.OFF) {
                     codeChar = Character.toUpperCase(codeChar)
                 }
 
@@ -173,8 +173,8 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                     inputConnection.commitText(codeChar.toString(), 1)
                 }
 
-                if (keyboard!!.mShiftState == SHIFT_ON_ONE_CHAR && keyboardMode == KEYBOARD_LETTERS) {
-                    keyboard!!.mShiftState = SHIFT_OFF
+                if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR && keyboardMode == KEYBOARD_LETTERS) {
+                    keyboard!!.mShiftState = ShiftState.OFF
                     keyboardView!!.invalidateAllKeys()
                 }
             }
@@ -191,9 +191,9 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
             keyboard = MyKeyboard(this, getKeyboardLayoutXML(), enterKeyType)
 
             val editorInfo = currentInputEditorInfo
-            if (editorInfo != null && editorInfo.inputType != InputType.TYPE_NULL && keyboard?.mShiftState != SHIFT_ON_PERMANENT) {
+            if (editorInfo != null && editorInfo.inputType != InputType.TYPE_NULL && keyboard?.mShiftState != ShiftState.ON_PERMANENT) {
                 if (currentInputConnection.getCursorCapsMode(editorInfo.inputType) != 0) {
-                    keyboard?.setShifted(SHIFT_ON_ONE_CHAR)
+                    keyboard?.setShifted(ShiftState.ON_ONE_CHAR)
                 }
             }
 
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 dd1f5202..50a184c6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -455,7 +455,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
      * @param shifted whether or not to enable the state of the shift key
      * @return true if the shift key state changed, false if there was no change
      */
-    private fun setShifted(shiftState: Int) {
+    private fun setShifted(shiftState: ShiftState) {
         if (mKeyboard?.setShifted(shiftState) == true) {
             invalidateAllKeys()
         }
@@ -466,7 +466,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
      * @return true if the shift is in a pressed state, false otherwise
      */
     private fun isShifted(): Boolean {
-        return (mKeyboard?.mShiftState ?: SHIFT_OFF) > SHIFT_OFF
+        return (mKeyboard?.mShiftState ?: ShiftState.OFF) > ShiftState.OFF
     }
 
     private fun setPopupOffset(x: Int, y: Int) {
@@ -479,7 +479,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
 
     private fun adjustCase(label: CharSequence): CharSequence? {
         var newLabel: CharSequence? = label
-        if (newLabel != null && newLabel.isNotEmpty() && mKeyboard!!.mShiftState > SHIFT_OFF && newLabel.length < 3 && Character.isLowerCase(newLabel[0])) {
+        if (newLabel != null && newLabel.isNotEmpty() && mKeyboard!!.mShiftState != ShiftState.OFF && newLabel.length < 3 && Character.isLowerCase(newLabel[0])) {
             newLabel = newLabel.toString().uppercase(Locale.getDefault())
         }
         return newLabel
@@ -602,8 +602,8 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
             } else if (key.icon != null && mKeyboard != null) {
                 if (code == KEYCODE_SHIFT) {
                     val drawableId = when (mKeyboard!!.mShiftState) {
-                        SHIFT_OFF -> R.drawable.ic_caps_outline_vector
-                        SHIFT_ON_ONE_CHAR -> R.drawable.ic_caps_vector
+                        ShiftState.OFF -> R.drawable.ic_caps_outline_vector
+                        ShiftState.ON_ONE_CHAR -> R.drawable.ic_caps_vector
                         else -> R.drawable.ic_caps_underlined_vector
                     }
                     key.icon = resources.getDrawable(drawableId)
@@ -1129,7 +1129,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
                 mMiniKeyboardSelectedKeyIndex = selectedKeyIndex
                 mMiniKeyboard!!.invalidateAllKeys()
 
-                val miniShiftStatus = if (isShifted()) SHIFT_ON_PERMANENT else SHIFT_OFF
+                val miniShiftStatus = if (isShifted()) ShiftState.ON_PERMANENT else ShiftState.OFF
                 mMiniKeyboard!!.setShifted(miniShiftStatus)
                 mPopupKeyboard.contentView = mMiniKeyboardContainer
                 mPopupKeyboard.width = mMiniKeyboardContainer!!.measuredWidth

From 62e639afc35a7609cbdd1039314ae7410cac2d9c Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 20 May 2023 11:37:27 +1000
Subject: [PATCH 02/11] Added capitalization setting in SettingsActivity

---
 .../keyboard/activities/SettingsActivity.kt      | 10 ++++++++++
 .../simplemobiletools/keyboard/helpers/Config.kt |  4 ++++
 app/src/main/res/layout/activity_settings.xml    | 16 ++++++++++++++++
 app/src/main/res/values/strings.xml              |  3 ++-
 4 files changed, 32 insertions(+), 1 deletion(-)

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 df9aa832..8c9e4a17 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
@@ -44,6 +44,7 @@ class SettingsActivity : SimpleActivity() {
         setupKeyboardLanguage()
         setupKeyboardHeightMultiplier()
         setupShowClipboardContent()
+        setupSentencesCapitalization()
         setupShowNumbersRow()
 
         updateTextColors(settings_nested_scrollview)
@@ -160,6 +161,15 @@ class SettingsActivity : SimpleActivity() {
             config.showClipboardContent = settings_show_clipboard_content.isChecked
         }
     }
+
+    private fun setupSentencesCapitalization() {
+        settings_enable_sentences_capitalization_row.isChecked = config.enableSentencesCapitalization
+        settings_enable_capitalization_row_holder.setOnClickListener {
+            settings_enable_sentences_capitalization_row.toggle()
+            config.enableSentencesCapitalization = settings_show_numbers_row.isChecked
+        }
+    }
+
     private fun setupShowNumbersRow() {
         settings_show_numbers_row.isChecked = config.showNumbersRow
         settings_show_numbers_row_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
index cb17a744..6bf321f7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
@@ -17,6 +17,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(SHOW_POPUP_ON_KEYPRESS, true)
         set(showPopupOnKeypress) = prefs.edit().putBoolean(SHOW_POPUP_ON_KEYPRESS, showPopupOnKeypress).apply()
 
+    var enableSentencesCapitalization: Boolean
+        get() = prefs.getBoolean(SENTENCES_CAPITALIZATION, false)
+        set(enableCapitalization) = prefs.edit().putBoolean(SENTENCES_CAPITALIZATION, enableCapitalization).apply()
+
     var showKeyBorders: Boolean
         get() = prefs.getBoolean(SHOW_KEY_BORDERS, false)
         set(showKeyBorders) = prefs.edit().putBoolean(SHOW_KEY_BORDERS, showKeyBorders).apply()
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1230d13b..2210ae86 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -190,6 +190,7 @@
                     android:text="@string/show_clipboard_content" />
 
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_show_numbers_row_holder"
                 style="@style/SettingsHolderCheckboxStyle"
@@ -205,6 +206,21 @@
 
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/settings_enable_capitalization_row_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                    android:id="@+id/settings_enable_sentences_capitalization_row"
+                    style="@style/SettingsCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/enable_sentences_capitalization" />
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_keyboard_language_holder"
                 style="@style/SettingsHolderTextViewStyle"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b26fb32b..a75ccc70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,8 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <!-- Emojis -->
+    <string name="enable_sentences_capitalization">Capisalise the first word of each sentence</string>
+c    <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
         Haven't found some strings? There's more at

From 47e5e56b30d7fa2fa2ab591f7f665213e347cd1d Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 20 May 2023 11:37:27 +1000
Subject: [PATCH 03/11] Added capitalization setting in SettingsActivity

---
 .../keyboard/activities/SettingsActivity.kt      | 10 ++++++++++
 .../simplemobiletools/keyboard/helpers/Config.kt |  4 ++++
 app/src/main/res/layout/activity_settings.xml    | 16 ++++++++++++++++
 app/src/main/res/values/strings.xml              |  3 ++-
 4 files changed, 32 insertions(+), 1 deletion(-)

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 df9aa832..0e1b6abd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
@@ -44,6 +44,7 @@ class SettingsActivity : SimpleActivity() {
         setupKeyboardLanguage()
         setupKeyboardHeightMultiplier()
         setupShowClipboardContent()
+        setupSentencesCapitalization()
         setupShowNumbersRow()
 
         updateTextColors(settings_nested_scrollview)
@@ -160,6 +161,15 @@ class SettingsActivity : SimpleActivity() {
             config.showClipboardContent = settings_show_clipboard_content.isChecked
         }
     }
+
+    private fun setupSentencesCapitalization() {
+        settings_enable_sentences_capitalization_row.isChecked = config.enableSentencesCapitalization
+        settings_enable_capitalization_row_holder.setOnClickListener {
+            settings_enable_sentences_capitalization_row.toggle()
+            config.enableSentencesCapitalization = settings_enable_sentences_capitalization_row.isChecked
+        }
+    }
+
     private fun setupShowNumbersRow() {
         settings_show_numbers_row.isChecked = config.showNumbersRow
         settings_show_numbers_row_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
index cb17a744..6bf321f7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
@@ -17,6 +17,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(SHOW_POPUP_ON_KEYPRESS, true)
         set(showPopupOnKeypress) = prefs.edit().putBoolean(SHOW_POPUP_ON_KEYPRESS, showPopupOnKeypress).apply()
 
+    var enableSentencesCapitalization: Boolean
+        get() = prefs.getBoolean(SENTENCES_CAPITALIZATION, false)
+        set(enableCapitalization) = prefs.edit().putBoolean(SENTENCES_CAPITALIZATION, enableCapitalization).apply()
+
     var showKeyBorders: Boolean
         get() = prefs.getBoolean(SHOW_KEY_BORDERS, false)
         set(showKeyBorders) = prefs.edit().putBoolean(SHOW_KEY_BORDERS, showKeyBorders).apply()
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1230d13b..2210ae86 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -190,6 +190,7 @@
                     android:text="@string/show_clipboard_content" />
 
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_show_numbers_row_holder"
                 style="@style/SettingsHolderCheckboxStyle"
@@ -205,6 +206,21 @@
 
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/settings_enable_capitalization_row_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                    android:id="@+id/settings_enable_sentences_capitalization_row"
+                    style="@style/SettingsCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/enable_sentences_capitalization" />
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/settings_keyboard_language_holder"
                 style="@style/SettingsHolderTextViewStyle"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b26fb32b..a75ccc70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,8 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <!-- Emojis -->
+    <string name="enable_sentences_capitalization">Capisalise the first word of each sentence</string>
+c    <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
         Haven't found some strings? There's more at

From 95f05a7b964a39e61f06f581cc7499ab1e698319 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 20 May 2023 16:49:09 +1000
Subject: [PATCH 04/11] Added sentences capitalization support (without
 pressing enter)

---
 .../keyboard/helpers/Constants.kt             | 40 ++++++++++++
 .../keyboard/helpers/MyKeyboard.kt            |  3 +-
 .../keyboard/services/SimpleKeyboardIME.kt    | 62 +++++++++++++++----
 3 files changed, 91 insertions(+), 14 deletions(-)

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 d836eb91..8d7cf90d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
@@ -1,9 +1,49 @@
 package com.simplemobiletools.keyboard.helpers
 
+import android.content.Context
+import com.simplemobiletools.keyboard.extensions.config
+import com.simplemobiletools.keyboard.helpers.MyKeyboard.Companion.KEYCODE_SPACE
+
 enum class ShiftState {
     OFF,
     ON_ONE_CHAR,
     ON_PERMANENT;
+
+    companion object {
+        private val endOfSentenceChars: List<Char> = listOf('.', '?', '!')
+
+        fun getDefaultShiftState(context: Context): ShiftState {
+            return when (context.config.enableSentencesCapitalization) {
+                true -> ON_ONE_CHAR
+                else -> OFF
+            }
+        }
+
+        fun getShiftStateForText(context: Context, newText: CharSequence?): ShiftState {
+            if (context.config.enableSentencesCapitalization.not()) return OFF
+
+            val twoLastSymbols = newText?.takeLast(2)
+            return when {
+                twoLastSymbols?.getOrNull(1) == KEYCODE_SPACE.toChar() && endOfSentenceChars.contains(twoLastSymbols.getOrNull(0)) -> {
+                    ON_ONE_CHAR
+                }
+
+                else -> OFF
+            }
+        }
+
+        fun shouldCapitalizeSentence(previousChar: Char?, currentChar: Char): Boolean {
+            return currentChar.code == KEYCODE_SPACE && endOfSentenceChars.contains(previousChar)
+        }
+
+        fun shouldCapitalizeOnDelete(text: CharSequence?): Boolean {
+            if (text.isNullOrEmpty()) {
+                return true
+            }
+
+            return shouldCapitalizeSentence(currentChar = text.last(), previousChar = text.getOrNull(text.lastIndex - 1))
+        }
+    }
 }
 
 // limit the count of alternative characters that show up at long pressing a key
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index 97ccc3c8..0a8a0f21 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -255,13 +255,14 @@ class MyKeyboard {
      * @param enterKeyType determines what icon should we show on Enter key
      */
     @JvmOverloads
-    constructor(context: Context, @XmlRes xmlLayoutResId: Int, enterKeyType: Int) {
+    constructor(context: Context, @XmlRes xmlLayoutResId: Int, enterKeyType: Int, shiftState: ShiftState = ShiftState.OFF) {
         mDisplayWidth = context.resources.displayMetrics.widthPixels
         mDefaultHorizontalGap = 0
         mDefaultWidth = mDisplayWidth / 10
         mDefaultHeight = mDefaultWidth
         mKeyboardHeightMultiplier = getKeyboardHeightMultiplier(context.config.keyboardHeightMultiplier)
         mKeys = ArrayList()
+        mShiftState = shiftState
         mEnterKeyType = enterKeyType
         loadKeyboard(context, context.resources.getXml(xmlLayoutResId))
     }
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 1fdc9ece..7dbcc29a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -20,7 +20,8 @@ import com.simplemobiletools.keyboard.R
 import com.simplemobiletools.keyboard.extensions.config
 import com.simplemobiletools.keyboard.helpers.*
 import com.simplemobiletools.keyboard.views.MyKeyboardView
-import kotlinx.android.synthetic.main.keyboard_view_keyboard.view.*
+import kotlinx.android.synthetic.main.keyboard_view_keyboard.view.keyboard_holder
+import kotlinx.android.synthetic.main.keyboard_view_keyboard.view.keyboard_view
 
 // based on https://www.androidauthority.com/lets-build-custom-keyboard-android-832362/
 class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionListener, SharedPreferences.OnSharedPreferenceChangeListener {
@@ -41,7 +42,6 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
 
     override fun onInitializeInterface() {
         super.onInitializeInterface()
-        keyboard = MyKeyboard(this, getKeyboardLayoutXML(), enterKeyType)
         getSharedPrefs().registerOnSharedPreferenceChangeListener(this)
     }
 
@@ -65,8 +65,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
         super.onStartInput(attribute, restarting)
         inputTypeClass = attribute!!.inputType and TYPE_MASK_CLASS
         enterKeyType = attribute.imeOptions and (IME_MASK_ACTION or IME_FLAG_NO_ENTER_ACTION)
-
-        keyboard = getKeyBoard()
+        keyboard = createNewKeyboard()
         keyboardView?.setKeyboard(keyboard!!)
         keyboardView?.setEditorInfo(attribute)
         updateShiftKeyState()
@@ -97,7 +96,14 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
         when (code) {
             MyKeyboard.KEYCODE_DELETE -> {
                 if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR) {
-                    keyboard!!.mShiftState = ShiftState.OFF
+                    keyboard!!.setShifted(ShiftState.OFF)
+                }
+
+                if (config.enableSentencesCapitalization) {
+                    val extractedText = inputConnection.getTextBeforeCursor(3, 0)?.dropLast(1)
+                    if (ShiftState.shouldCapitalizeOnDelete(text = extractedText)) {
+                        keyboard!!.setShifted(ShiftState.ON_ONE_CHAR)
+                    }
                 }
 
                 val selectedText = inputConnection.getSelectedText(0)
@@ -109,6 +115,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                 }
                 keyboardView!!.invalidateAllKeys()
             }
+
             MyKeyboard.KEYCODE_SHIFT -> {
                 if (keyboardMode == KEYBOARD_LETTERS) {
                     when {
@@ -132,6 +139,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                 }
                 keyboardView!!.invalidateAllKeys()
             }
+
             MyKeyboard.KEYCODE_ENTER -> {
                 val imeOptionsActionId = getImeOptionsActionId()
                 if (imeOptionsActionId != IME_ACTION_NONE) {
@@ -139,8 +147,13 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                 } else {
                     inputConnection.sendKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER))
                     inputConnection.sendKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER))
+
+                    if (config.enableSentencesCapitalization) {
+                        keyboard!!.mShiftState = ShiftState.ON_ONE_CHAR
+                    }
                 }
             }
+
             MyKeyboard.KEYCODE_MODE_CHANGE -> {
                 val keyboardXml = if (keyboardMode == KEYBOARD_LETTERS) {
                     keyboardMode = KEYBOARD_SYMBOLS
@@ -152,11 +165,15 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                 keyboard = MyKeyboard(this, keyboardXml, enterKeyType)
                 keyboardView!!.setKeyboard(keyboard!!)
             }
+
             MyKeyboard.KEYCODE_EMOJI -> {
                 keyboardView?.openEmojiPalette()
             }
+
             else -> {
                 var codeChar = code.toChar()
+                val originalText = inputConnection.getExtractedText(ExtractedTextRequest(), 0)?.text ?: return
+
                 if (Character.isLetter(codeChar) && keyboard!!.mShiftState > ShiftState.OFF) {
                     codeChar = Character.toUpperCase(codeChar)
                 }
@@ -165,18 +182,28 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                 // However, avoid doing that in cases when the EditText for example requires numbers as the input.
                 // We can detect that by the text not changing on pressing Space.
                 if (keyboardMode != KEYBOARD_LETTERS && code == MyKeyboard.KEYCODE_SPACE) {
-                    val originalText = inputConnection.getExtractedText(ExtractedTextRequest(), 0)?.text ?: return
                     inputConnection.commitText(codeChar.toString(), 1)
                     val newText = inputConnection.getExtractedText(ExtractedTextRequest(), 0)?.text
-                    switchToLetters = originalText != newText
+                    if (originalText != newText) {
+                        switchToLetters = true
+                    }
                 } else {
                     inputConnection.commitText(codeChar.toString(), 1)
                 }
 
-                if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR && keyboardMode == KEYBOARD_LETTERS) {
-                    keyboard!!.mShiftState = ShiftState.OFF
+                if (keyboardMode == KEYBOARD_LETTERS) {
+                    if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR) {
+                        keyboard!!.setShifted(ShiftState.OFF)
+                    }
+                    if (config.enableSentencesCapitalization && ShiftState.shouldCapitalizeSentence(
+                            previousChar = originalText.lastOrNull(), currentChar = code.toChar()
+                        )
+                    ) {
+                        keyboard!!.setShifted(ShiftState.ON_ONE_CHAR)
+                    }
                     keyboardView!!.invalidateAllKeys()
                 }
+
             }
         }
 
@@ -187,8 +214,12 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
 
     override fun onActionUp() {
         if (switchToLetters) {
+            // TODO: Change keyboardMode to enum class
             keyboardMode = KEYBOARD_LETTERS
-            keyboard = MyKeyboard(this, getKeyboardLayoutXML(), enterKeyType)
+            val text = currentInputConnection?.getExtractedText(ExtractedTextRequest(), 0)?.text
+            val newShiftState = ShiftState.getShiftStateForText(this, text)
+
+            keyboard = MyKeyboard(this, getKeyboardLayoutXML(), enterKeyType, shiftState = newShiftState)
 
             val editorInfo = currentInputEditorInfo
             if (editorInfo != null && editorInfo.inputType != InputType.TYPE_NULL && keyboard?.mShiftState != ShiftState.ON_PERMANENT) {
@@ -215,32 +246,37 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
     }
 
     override fun reloadKeyboard() {
-        val keyboard = getKeyBoard()
+        val keyboard = createNewKeyboard()
         this.keyboard = keyboard
         keyboardView?.setKeyboard(keyboard)
     }
 
-    private fun getKeyBoard(): MyKeyboard {
+    private fun createNewKeyboard(): MyKeyboard {
         val keyboardXml = when (inputTypeClass) {
             TYPE_CLASS_NUMBER -> {
                 keyboardMode = KEYBOARD_NUMBERS
                 R.xml.keys_numbers
             }
+
             TYPE_CLASS_PHONE -> {
                 keyboardMode = KEYBOARD_PHONE
                 R.xml.keys_phone
             }
+
             TYPE_CLASS_DATETIME -> {
                 keyboardMode = KEYBOARD_SYMBOLS
                 R.xml.keys_symbols
             }
+
             else -> {
                 keyboardMode = KEYBOARD_LETTERS
                 getKeyboardLayoutXML()
             }
         }
 
-        return MyKeyboard(this, keyboardXml, enterKeyType)
+        return MyKeyboard(
+            context = this, xmlLayoutResId = keyboardXml, enterKeyType = enterKeyType, shiftState = ShiftState.getDefaultShiftState(this)
+        )
     }
 
     override fun onUpdateSelection(oldSelStart: Int, oldSelEnd: Int, newSelStart: Int, newSelEnd: Int, candidatesStart: Int, candidatesEnd: Int) {

From 84e1b8bca9a09fd7affee24d7b6456f7bd54e1eb Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 20 May 2023 16:53:14 +1000
Subject: [PATCH 05/11] Added autoCapitalization on Enter button press

---
 .../simplemobiletools/keyboard/services/SimpleKeyboardIME.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 7dbcc29a..02d8c545 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -149,7 +149,8 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                     inputConnection.sendKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER))
 
                     if (config.enableSentencesCapitalization) {
-                        keyboard!!.mShiftState = ShiftState.ON_ONE_CHAR
+                        keyboard!!.setShifted(ShiftState.ON_ONE_CHAR)
+                        keyboardView!!.invalidateAllKeys()
                     }
                 }
             }

From a25fececc94eed4bd36836e033d53690355301c0 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sat, 20 May 2023 21:57:36 +1000
Subject: [PATCH 06/11] Removed wrong string and settings layout capitalization
 item refactored

---
 .../keyboard/activities/SettingsActivity.kt               | 8 ++++----
 app/src/main/res/layout/activity_settings.xml             | 6 +++---
 app/src/main/res/values/strings.xml                       | 2 +-
 3 files changed, 8 insertions(+), 8 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 0e1b6abd..9f57edb0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
@@ -163,10 +163,10 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupSentencesCapitalization() {
-        settings_enable_sentences_capitalization_row.isChecked = config.enableSentencesCapitalization
-        settings_enable_capitalization_row_holder.setOnClickListener {
-            settings_enable_sentences_capitalization_row.toggle()
-            config.enableSentencesCapitalization = settings_enable_sentences_capitalization_row.isChecked
+        settings_start_sentences_capitalised_row.isChecked = config.enableSentencesCapitalization
+        settings_start_sentences_capitalised_holder.setOnClickListener {
+            settings_start_sentences_capitalised_row.toggle()
+            config.enableSentencesCapitalization = settings_start_sentences_capitalised_row.isChecked
         }
     }
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2210ae86..2785238a 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -207,17 +207,17 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_enable_capitalization_row_holder"
+                android:id="@+id/settings_start_sentences_capitalised_holder"
                 style="@style/SettingsHolderCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_enable_sentences_capitalization_row"
+                    android:id="@+id/settings_start_sentences_capitalised_row"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/enable_sentences_capitalization" />
+                    android:text="@string/start_sentences_capitalised" />
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 12fd0053..84e9bc60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="enable_sentences_capitalization">Capisalise the first word of each sentence</string>
+    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--

From 129eea692a2e8df051a947b4c0727c29c6465c57 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sun, 21 May 2023 21:24:29 +1000
Subject: [PATCH 07/11] renamed capitalise -> capitalize

---
 .../keyboard/activities/SettingsActivity.kt               | 8 ++++----
 app/src/main/res/layout/activity_settings.xml             | 6 +++---
 app/src/main/res/values-ar/strings.xml                    | 4 ++--
 app/src/main/res/values-be/strings.xml                    | 4 ++--
 app/src/main/res/values-bg/strings.xml                    | 4 ++--
 app/src/main/res/values-ca/strings.xml                    | 4 ++--
 app/src/main/res/values-ckb/strings.xml                   | 2 +-
 app/src/main/res/values-cs/strings.xml                    | 4 ++--
 app/src/main/res/values-da/strings.xml                    | 2 +-
 app/src/main/res/values-de/strings.xml                    | 4 ++--
 app/src/main/res/values-el/strings.xml                    | 2 +-
 app/src/main/res/values-eo/strings.xml                    | 2 +-
 app/src/main/res/values-es/strings.xml                    | 4 ++--
 app/src/main/res/values-et/strings.xml                    | 4 ++--
 app/src/main/res/values-fi/strings.xml                    | 4 ++--
 app/src/main/res/values-fr/strings.xml                    | 4 ++--
 app/src/main/res/values-gl/strings.xml                    | 4 ++--
 app/src/main/res/values-hr/strings.xml                    | 4 ++--
 app/src/main/res/values-hu/strings.xml                    | 4 ++--
 app/src/main/res/values-in/strings.xml                    | 4 ++--
 app/src/main/res/values-it/strings.xml                    | 4 ++--
 app/src/main/res/values-iw/strings.xml                    | 2 +-
 app/src/main/res/values-ja/strings.xml                    | 4 ++--
 app/src/main/res/values-lt/strings.xml                    | 2 +-
 app/src/main/res/values-ml/strings.xml                    | 2 +-
 app/src/main/res/values-nb-rNO/strings.xml                | 2 +-
 app/src/main/res/values-nl/strings.xml                    | 4 ++--
 app/src/main/res/values-pa-rPK/strings.xml                | 2 +-
 app/src/main/res/values-pa/strings.xml                    | 2 +-
 app/src/main/res/values-pl/strings.xml                    | 4 ++--
 app/src/main/res/values-pt-rBR/strings.xml                | 2 +-
 app/src/main/res/values-pt/strings.xml                    | 4 ++--
 app/src/main/res/values-ro/strings.xml                    | 4 ++--
 app/src/main/res/values-ru/strings.xml                    | 4 ++--
 app/src/main/res/values-sk/strings.xml                    | 2 +-
 app/src/main/res/values-sl/strings.xml                    | 4 ++--
 app/src/main/res/values-sr/strings.xml                    | 2 +-
 app/src/main/res/values-sv/strings.xml                    | 4 ++--
 app/src/main/res/values-th/strings.xml                    | 2 +-
 app/src/main/res/values-tr/strings.xml                    | 4 ++--
 app/src/main/res/values-uk/strings.xml                    | 4 ++--
 app/src/main/res/values-zh-rCN/strings.xml                | 4 ++--
 app/src/main/res/values-zh-rTW/strings.xml                | 2 +-
 app/src/main/res/values/strings.xml                       | 2 +-
 44 files changed, 75 insertions(+), 75 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 9f57edb0..8b939617 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt
@@ -163,10 +163,10 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupSentencesCapitalization() {
-        settings_start_sentences_capitalised_row.isChecked = config.enableSentencesCapitalization
-        settings_start_sentences_capitalised_holder.setOnClickListener {
-            settings_start_sentences_capitalised_row.toggle()
-            config.enableSentencesCapitalization = settings_start_sentences_capitalised_row.isChecked
+        settings_start_sentences_capitalized.isChecked = config.enableSentencesCapitalization
+        settings_start_sentences_capitalized_holder.setOnClickListener {
+            settings_start_sentences_capitalized.toggle()
+            config.enableSentencesCapitalization = settings_start_sentences_capitalized.isChecked
         }
     }
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2785238a..9e563568 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -207,17 +207,17 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_start_sentences_capitalised_holder"
+                android:id="@+id/settings_start_sentences_capitalized_holder"
                 style="@style/SettingsHolderCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <com.simplemobiletools.commons.views.MyAppCompatCheckbox
-                    android:id="@+id/settings_start_sentences_capitalised_row"
+                    android:id="@+id/settings_start_sentences_capitalized"
                     style="@style/SettingsCheckboxStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/start_sentences_capitalised" />
+                    android:text="@string/start_sentences_capitalized" />
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bd6e4d59..0a6ed84d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">ارتفاع لوحة المفاتيح</string>
     <string name="show_key_borders">إظهار حدود المفاتيح</string>
     <string name="show_numbers_row">إظهار الأرقام في صف منفصل</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">الرموز التعبيرية</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index f7ebd64f..8b584fb6 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Вышыня клавіятуры</string>
     <string name="show_key_borders">Паказаць контуры клавіш</string>
     <string name="show_numbers_row">Паказаць лічбы ў асобным радку</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Эмодзі</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index dd081308..cc35140f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Височина на клавиатурата</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Емоджита</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 18aed198..8ef49929 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Alçada del teclat</string>
     <string name="show_key_borders">Mostra les vores de les tecles</string>
     <string name="show_numbers_row">Mostra els números en una fila separada</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index d5c4aada..94993468 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">قەبارەی تەختەکلیل</string>
     <string name="show_key_borders">لێواری دوگمەکان</string>
     <string name="show_numbers_row">پیشاندانی لیستی ژمارەکان بەجیا</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">خەندەکان</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 778ebba0..db987b08 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Výška klávesnice</string>
     <string name="show_key_borders">Zobrazit ohraničení kláves</string>
     <string name="show_numbers_row">Zobrazit čísla na samostatném řádku</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emotikony</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index eb41991b..3fbab327 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 961c9285..6c2fd98f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Höhe der Tastatur</string>
     <string name="show_key_borders">Tastenränder anzeigen</string>
     <string name="show_numbers_row">Zahlen in einer separaten Zeile anzeigen</string>
-    <string name="start_sentences_capitalised">Sätze mit einem Großbuchstaben beginnen</string>
+    <string name="start_sentences_capitalized">Sätze mit einem Großbuchstaben beginnen</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 3b9421fd..7e2ac5aa 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Ύψος πληκτρολογίου</string>
     <string name="show_key_borders">Εμφάνιση ορίων πλήκτρου</string>
     <string name="show_numbers_row">Εμφάνιση αριθμών σε ξεχωριστή γραμμή</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 84e9bc60..14ce48a0 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 36028151..f40bd128 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Altura del teclado</string>
     <string name="show_key_borders">Mostrar bordes de las teclas</string>
     <string name="show_numbers_row">Mostrar los números en una fila separada</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoticonos</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index e8ae78fb..95c9690f 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Klaviatuuri kõrgus</string>
     <string name="show_key_borders">Näita klahvide ääriseid</string>
     <string name="show_numbers_row">Näita numbreid eraldi real</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojid</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index fb274201..f934aac7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Näppäimistön korkeus</string>
     <string name="show_key_borders">Näytä näppäinten ääriviivat</string>
     <string name="show_numbers_row">Näytä erillinen numerorivi</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojit</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5bd78266..b6d1b0f0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Hauteur du clavier</string>
     <string name="show_key_borders">Afficher les bordures des touches</string>
     <string name="show_numbers_row">Afficher les chiffres sur une ligne distincte</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Émojis</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 6b48081c..9446f780 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Altura do teclado</string>
     <string name="show_key_borders">Mostralos bordes das teclas</string>
     <string name="show_numbers_row">Mostralos números nunha fila afastada</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoticona</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 3ca072dd..592ec638 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Visina tipkovnice</string>
     <string name="show_key_borders">Prikaži obrube ključeva</string>
     <string name="show_numbers_row">Pokaži brojeve u zasebnom retku</string>
-    <string name="start_sentences_capitalised">Počni rečenice s velikim slovom</string>
+    <string name="start_sentences_capitalized">Počni rečenice s velikim slovom</string>
     <!-- Emojis -->
     <string name="emojis">Emoji</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6bd97097..e1821dfc 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Billentyűzet magassága</string>
     <string name="show_key_borders">Gombszélek megjelenítése</string>
     <string name="show_numbers_row">Számok megjelenítése külön sorban</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojik</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 2967e9cc..705987e5 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Tinggi papan tik</string>
     <string name="show_key_borders">Tampilkan garis luar tombol</string>
     <string name="show_numbers_row">Tampilkan nomor di baris terpisah</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoji</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 73c80c6b..267b3d66 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Altezza della tastiera</string>
     <string name="show_key_borders">Mostra i bordi dei tasti</string>
     <string name="show_numbers_row">Mostra i numeri su una riga separata</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoji</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 9df60029..e7a984cd 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 30641802..b2edb3cb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">キーボードの高さ</string>
     <string name="show_key_borders">キー枠を表示する</string>
     <string name="show_numbers_row">数字を別の行に表示する</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">絵文字</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 3a209a4a..ae49ca6e 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index c1144749..8df0fe8d 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">കീബോർഡ് ഉയരം</string>
     <string name="show_key_borders">പ്രധാന അതിരുകൾ കാണിക്കുക</string>
     <string name="show_numbers_row">ഒരു പ്രത്യേക വരിയിൽ സംഖ്യകൾ കാണിക്കുക</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">ഇമോജികൾ</string>
 </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 84e9bc60..14ce48a0 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 272c7dfb..41deffec 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Hoogte toetsenbord</string>
     <string name="show_key_borders">Toetsen omranden</string>
     <string name="show_numbers_row">Cijfers op een aparte rij</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoji\'s</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 432ad316..4860f70d 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">کیبورڈ دی اُچائی</string>
     <string name="show_key_borders">کنجیاں دے حد ویکھو</string>
     <string name="show_numbers_row">وکھری قطار وچ نمبر ویکھو</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">ایموجیاں</string>
 </resources>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index bd7eea37..47e09d30 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">ਕੀਬੋਰਡ ਦੀ ਉਚਾਈ</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">ਇਮੋਜੀਆਂ</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d3751419..ff6feddb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Wysokość klawiatury</string>
     <string name="show_key_borders">Pokazuj obramowania klawiszy</string>
     <string name="show_numbers_row">Pokazuj cyfry w osobnym wierszu</string>
-    <string name="start_sentences_capitalised">Zaczynaj zdania wielką literą</string>
+    <string name="start_sentences_capitalized">Zaczynaj zdania wielką literą</string>
     <!-- Emojis -->
     <string name="emojis">Emoji</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 74546a3f..ee694efd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 459235c2..e5a06b42 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Altura do teclado</string>
     <string name="show_key_borders">Mostrar contorno das teclas</string>
     <string name="show_numbers_row">Mostrar números em linha distinta</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a9a62d47..410545a6 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Înălțime tastatură</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoticoane</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 10520aa6..ffe904b0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Высота клавиатуры</string>
     <string name="show_key_borders">Показывать границы кнопок</string>
     <string name="show_numbers_row">Показывать цифры отдельной строкой</string>
-    <string name="start_sentences_capitalised">Начинать предложения с заглавной буквы</string>
+    <string name="start_sentences_capitalized">Начинать предложения с заглавной буквы</string>
     <!-- Emojis -->
     <string name="emojis">Эмодзи</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6017e362..63320317 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Výška klávesnice</string>
     <string name="show_key_borders">Zobraziť hranice kláves</string>
     <string name="show_numbers_row">Zobraziť čísla na samostatnom riadku</string>
-    <string name="start_sentences_capitalised">Začať vety veľkým písmenom</string>
+    <string name="start_sentences_capitalized">Začať vety veľkým písmenom</string>
     <!-- Emojis -->
     <string name="emojis">Emoji</string>
     <!--
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 359f8996..f4838c06 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Višina tipkovnice</string>
     <string name="show_key_borders">Prikaži meje ključa</string>
     <string name="show_numbers_row">Prikažite številke v ločeni vrstici</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emoji-ji</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 928e8e1a..1a790f39 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Висина тастатуре</string>
     <string name="show_key_borders">Прикажи ивице кључева</string>
     <string name="show_numbers_row">Прикажи бројеве у посебном реду</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Емоји</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 08ab6978..9399c1c4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Tangentbordshöjd</string>
     <string name="show_key_borders">Visa ramar runt tangenterna</string>
     <string name="show_numbers_row">Visa siffror på en separat rad</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojier</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 84e9bc60..14ce48a0 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 825453c3..d357e48b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Klavye yüksekliği</string>
     <string name="show_key_borders">Tuş sınırlarını göster</string>
     <string name="show_numbers_row">Sayıları ayrı bir satırda göster</string>
-    <string name="start_sentences_capitalised">Cümlelere büyük harfle başla</string>
+    <string name="start_sentences_capitalized">Cümlelere büyük harfle başla</string>
     <!-- Emojis -->
     <string name="emojis">Emojiler</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 86183506..dc8cb258 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">Висота клавіатури</string>
     <string name="show_key_borders">Показати рамки клавіш</string>
     <string name="show_numbers_row">Відображення чисел в окремому рядку</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Емодзі</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c9bcae62..cbc7f2cc 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -34,11 +34,11 @@
     <string name="keyboard_height">键盘高度</string>
     <string name="show_key_borders">显示键符边界</string>
     <string name="show_numbers_row">在单独的行上显示数字</string>
-    <string name="start_sentences_capitalised">句子开头使用大写字母</string>
+    <string name="start_sentences_capitalized">句子开头使用大写字母</string>
     <!-- Emojis -->
     <string name="emojis">表情符号</string>
     <!--
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 12bb5d7d..f9db284f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -35,7 +35,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 84e9bc60..14ce48a0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="keyboard_height">Keyboard height</string>
     <string name="show_key_borders">Show key borders</string>
     <string name="show_numbers_row">Show numbers on a separate row</string>
-    <string name="start_sentences_capitalised">Start sentences with a capital letter</string>
+    <string name="start_sentences_capitalized">Start sentences with a capital letter</string>
     <!-- Emojis -->
     <string name="emojis">Emojis</string>
     <!--

From d14d6346a6b8776316ff683c71c25c7ddcf5a355 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Sun, 21 May 2023 22:10:08 +1000
Subject: [PATCH 08/11] Sentences capitalization refactored

---
 .../keyboard/helpers/Constants.kt             | 39 ++++++++++++-------
 .../keyboard/services/SimpleKeyboardIME.kt    | 23 +++--------
 2 files changed, 30 insertions(+), 32 deletions(-)

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 8d7cf90d..8fc898b5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
@@ -19,30 +19,41 @@ enum class ShiftState {
             }
         }
 
-        fun getShiftStateForText(context: Context, newText: CharSequence?): ShiftState {
-            if (context.config.enableSentencesCapitalization.not()) return OFF
+        fun getShiftStateForText(context: Context, newText: String?): ShiftState {
+            if (context.config.enableSentencesCapitalization.not()) {
+                return OFF
+            }
 
             val twoLastSymbols = newText?.takeLast(2)
             return when {
-                twoLastSymbols?.getOrNull(1) == KEYCODE_SPACE.toChar() && endOfSentenceChars.contains(twoLastSymbols.getOrNull(0)) -> {
+                shouldCapitalizeSentence(previousChar = twoLastSymbols?.getOrNull(0), currentChar = twoLastSymbols?.getOrNull(1)) -> {
                     ON_ONE_CHAR
                 }
-
-                else -> OFF
+                else -> {
+                    OFF
+                }
             }
         }
 
-        fun shouldCapitalizeSentence(previousChar: Char?, currentChar: Char): Boolean {
+        fun getCapitalizationOnDelete(context: Context, text: CharSequence?): ShiftState {
+            if (context.config.enableSentencesCapitalization.not()) {
+                return OFF
+            }
+
+            return if (text.isNullOrEmpty() || shouldCapitalizeSentence(currentChar = text.last(), previousChar = text.getOrNull(text.lastIndex - 1))) {
+                ON_ONE_CHAR
+            } else {
+                OFF
+            }
+        }
+
+        private fun shouldCapitalizeSentence(previousChar: Char?, currentChar: Char?): Boolean {
+            if (previousChar == null || currentChar == null) {
+                return false
+            }
+
             return currentChar.code == KEYCODE_SPACE && endOfSentenceChars.contains(previousChar)
         }
-
-        fun shouldCapitalizeOnDelete(text: CharSequence?): Boolean {
-            if (text.isNullOrEmpty()) {
-                return true
-            }
-
-            return shouldCapitalizeSentence(currentChar = text.last(), previousChar = text.getOrNull(text.lastIndex - 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 02d8c545..305820a1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -95,15 +95,10 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
 
         when (code) {
             MyKeyboard.KEYCODE_DELETE -> {
-                if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR) {
-                    keyboard!!.setShifted(ShiftState.OFF)
-                }
 
-                if (config.enableSentencesCapitalization) {
+                if (keyboard!!.mShiftState != ShiftState.ON_PERMANENT) {
                     val extractedText = inputConnection.getTextBeforeCursor(3, 0)?.dropLast(1)
-                    if (ShiftState.shouldCapitalizeOnDelete(text = extractedText)) {
-                        keyboard!!.setShifted(ShiftState.ON_ONE_CHAR)
-                    }
+                    keyboard!!.setShifted(ShiftState.getCapitalizationOnDelete(context = this, text = extractedText))
                 }
 
                 val selectedText = inputConnection.getSelectedText(0)
@@ -192,16 +187,8 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
                     inputConnection.commitText(codeChar.toString(), 1)
                 }
 
-                if (keyboardMode == KEYBOARD_LETTERS) {
-                    if (keyboard!!.mShiftState == ShiftState.ON_ONE_CHAR) {
-                        keyboard!!.setShifted(ShiftState.OFF)
-                    }
-                    if (config.enableSentencesCapitalization && ShiftState.shouldCapitalizeSentence(
-                            previousChar = originalText.lastOrNull(), currentChar = code.toChar()
-                        )
-                    ) {
-                        keyboard!!.setShifted(ShiftState.ON_ONE_CHAR)
-                    }
+                if (keyboardMode == KEYBOARD_LETTERS && keyboard!!.mShiftState != ShiftState.ON_PERMANENT) {
+                    keyboard!!.setShifted(ShiftState.getShiftStateForText(this, newText = "$originalText$codeChar"))
                     keyboardView!!.invalidateAllKeys()
                 }
 
@@ -218,7 +205,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
             // TODO: Change keyboardMode to enum class
             keyboardMode = KEYBOARD_LETTERS
             val text = currentInputConnection?.getExtractedText(ExtractedTextRequest(), 0)?.text
-            val newShiftState = ShiftState.getShiftStateForText(this, text)
+            val newShiftState = ShiftState.getShiftStateForText(this, text?.toString().orEmpty())
 
             keyboard = MyKeyboard(this, getKeyboardLayoutXML(), enterKeyType, shiftState = newShiftState)
 

From 893b4967674cf9d437da46ee95c346026c6a4c71 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Mon, 22 May 2023 09:47:07 +1000
Subject: [PATCH 09/11] Boolean.not() -> !Boolean

---
 .../com/simplemobiletools/keyboard/helpers/Constants.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 8fc898b5..28fcfed1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
@@ -20,7 +20,7 @@ enum class ShiftState {
         }
 
         fun getShiftStateForText(context: Context, newText: String?): ShiftState {
-            if (context.config.enableSentencesCapitalization.not()) {
+            if (!context.config.enableSentencesCapitalization) {
                 return OFF
             }
 
@@ -36,7 +36,7 @@ enum class ShiftState {
         }
 
         fun getCapitalizationOnDelete(context: Context, text: CharSequence?): ShiftState {
-            if (context.config.enableSentencesCapitalization.not()) {
+            if (!context.config.enableSentencesCapitalization) {
                 return OFF
             }
 

From 448de752aedcaacd545067ba47243fefd3da367e Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Mon, 22 May 2023 19:48:57 +1000
Subject: [PATCH 10/11] Default capitalization value set to true

---
 .../kotlin/com/simplemobiletools/keyboard/helpers/Config.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
index 6bf321f7..c612e27e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt
@@ -18,7 +18,7 @@ class Config(context: Context) : BaseConfig(context) {
         set(showPopupOnKeypress) = prefs.edit().putBoolean(SHOW_POPUP_ON_KEYPRESS, showPopupOnKeypress).apply()
 
     var enableSentencesCapitalization: Boolean
-        get() = prefs.getBoolean(SENTENCES_CAPITALIZATION, false)
+        get() = prefs.getBoolean(SENTENCES_CAPITALIZATION, true)
         set(enableCapitalization) = prefs.edit().putBoolean(SENTENCES_CAPITALIZATION, enableCapitalization).apply()
 
     var showKeyBorders: Boolean

From de6e704453024f730820fc97a2881fa895450ca1 Mon Sep 17 00:00:00 2001
From: merkost <konstantinlikes@gmail.com>
Date: Mon, 22 May 2023 22:45:21 +1000
Subject: [PATCH 11/11] Auto capitalization based on editorInfo turned off
 while keyboard's capitalization setting is off

---
 .../simplemobiletools/keyboard/services/SimpleKeyboardIME.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 305820a1..8709ec3d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/services/SimpleKeyboardIME.kt
@@ -195,7 +195,7 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
             }
         }
 
-        if (code != MyKeyboard.KEYCODE_SHIFT) {
+        if (code != MyKeyboard.KEYCODE_SHIFT && config.enableSentencesCapitalization) {
             updateShiftKeyState()
         }
     }