Adding a caps lock mode. Autocapitalize off starts in lowercase. (#93)

dessalines · web-flow · commit 65aad1a923cc · 2023-03-27T15:39:08.000-04:00
* Adding a caps lock mode. Autocapitalize off starts in lowercase. - Fixes #86 * Misnamed lambda
diff --git a/app/src/main/java/com/dessalines/thumbkey/ComposeKeyboardView.kt b/app/src/main/java/com/dessalines/thumbkey/ComposeKeyboardView.kt
@@ -9,13 +9,13 @@ import androidx.lifecycle.LiveData
 import com.dessalines.thumbkey.db.AppSettings
 import com.dessalines.thumbkey.ui.components.keyboard.KeyboardScreen
 import com.dessalines.thumbkey.ui.theme.ThumbkeyTheme
-import com.dessalines.thumbkey.utils.KeyboardMode
+import com.dessalines.thumbkey.utils.getKeyboardMode
+import com.dessalines.thumbkey.utils.toBool
 
 @SuppressLint("ViewConstructor")
 class ComposeKeyboardView(
     context: Context,
-    private val liveSettings: LiveData<AppSettings>,
-    private val startMode: KeyboardMode
+    private val liveSettings: LiveData<AppSettings>
 ) :
     AbstractComposeView
     (context) {
@@ -24,6 +24,11 @@ class ComposeKeyboardView(
     override fun Content() {
         val settings = liveSettings.observeAsState().value
 
+        val startMode = getKeyboardMode(
+            ime = context as IMEService,
+            autoCapitalize = settings?.autoCapitalize?.toBool() ?: false
+        )
+
         ThumbkeyTheme(
             settings = settings
         ) {
diff --git a/app/src/main/java/com/dessalines/thumbkey/IMEService.kt b/app/src/main/java/com/dessalines/thumbkey/IMEService.kt
@@ -1,16 +1,13 @@
 package com.dessalines.thumbkey
 
 import android.inputmethodservice.InputMethodService
-import android.util.Log
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.*
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryController
 import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-import com.dessalines.thumbkey.utils.TAG
-import com.dessalines.thumbkey.utils.getKeyboardMode
 
 class IMEService :
     InputMethodService(),
@@ -22,8 +19,7 @@ class IMEService :
         val liveSettings = (application as ThumbkeyApplication).appSettingsRepository
             .appSettings
 
-        val startMode = getKeyboardMode(this)
-        val view = ComposeKeyboardView(this, liveSettings, startMode)
+        val view = ComposeKeyboardView(this, liveSettings)
         window?.window?.decorView?.let { decorView ->
             decorView.setViewTreeLifecycleOwner(this)
             decorView.setViewTreeViewModelStoreOwner(this)
@@ -34,7 +30,6 @@ class IMEService :
             view.setViewTreeViewModelStoreOwner(this)
             view.setViewTreeSavedStateRegistryOwner(this)
         }
-        Log.d(TAG, "Thumbkey initialized to mode: $startMode")
         return view
     }
 
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/MessageEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/MessageEase.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -334,6 +335,11 @@ val MESSAGEEASE_EN_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyDEv2.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyDEv2.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -358,6 +359,11 @@ val THUMBKEY_DE_V2_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENv4.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENv4.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -334,6 +335,11 @@ val THUMBKEY_EN_V4_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyFIv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyFIv1.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -354,6 +355,11 @@ val THUMBKEY_FI_V1_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyITv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyITv1.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -370,6 +371,11 @@ val THUMBKEY_IT_V1_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyPTv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyPTv1.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -159,7 +160,7 @@ val THUMBKEY_PT_V1_MAIN = KeyboardC(
                         action = KeyAction.CommitText("é"),
                         color = ColorVariant.MUTED
                     ),
-                    SwipeDirection.BOTTOM to KeyC(
+                    SwipeDirection.RIGHT to KeyC(
                         display = KeyDisplay.TextDisplay("ê"),
                         action = KeyAction.CommitText("ê"),
                         color = ColorVariant.MUTED
@@ -410,7 +411,7 @@ val THUMBKEY_PT_V1_SHIFTED = KeyboardC(
                         display = KeyDisplay.TextDisplay("T"),
                         action = KeyAction.CommitText("T")
                     ),
-                    SwipeDirection.TOP to KeyC(
+                    SwipeDirection.RIGHT to KeyC(
                         display = KeyDisplay.TextDisplay("Ê"),
                         action = KeyAction.CommitText("Ê"),
                         color = ColorVariant.MUTED
@@ -424,6 +425,11 @@ val THUMBKEY_PT_V1_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyRUv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyRUv1.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -370,6 +371,11 @@ val THUMBKEY_RU_V1_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyUKv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyUKv1.kt
@@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
+import androidx.compose.material.icons.outlined.KeyboardCapslock
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -370,6 +371,11 @@ val THUMBKEY_UK_V1_SHIFTED = KeyboardC(
                         display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
                         action = KeyAction.ToggleShiftMode(false),
                         color = ColorVariant.MUTED
+                    ),
+                    SwipeDirection.TOP to KeyC(
+                        display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
+                        action = KeyAction.ToggleCapsLock,
+                        color = ColorVariant.MUTED
                     )
                 )
             ),
diff --git a/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardKey.kt b/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardKey.kt
@@ -61,7 +61,9 @@ fun KeyboardKey(
     keySize: Int,
     minSwipeLength: Int,
     onToggleShiftMode: (enable: Boolean) -> Unit,
-    onToggleNumericMode: (enable: Boolean) -> Unit
+    onToggleNumericMode: (enable: Boolean) -> Unit,
+    onToggleCapsLock: () -> Unit,
+    onAutoCapitalize: (enable: Boolean) -> Unit
 ) {
     // Necessary for swipe settings to get updated correctly
     val id = key.toString() + animationHelperSpeed + animationSpeed + autoCapitalize + vibrateOnTap + soundOnTap + keySize + minSwipeLength
@@ -133,7 +135,9 @@ fun KeyboardKey(
                     ctx = ctx,
                     autoCapitalize = autoCapitalize,
                     onToggleShiftMode = onToggleShiftMode,
-                    onToggleNumericMode = onToggleNumericMode
+                    onToggleNumericMode = onToggleNumericMode,
+                    onToggleCapsLock = onToggleCapsLock,
+                    onAutoCapitalize = onAutoCapitalize
                 )
                 doneKeyAction(scope, action, isDragged, releasedKey, animationHelperSpeed)
             }
@@ -159,7 +163,9 @@ fun KeyboardKey(
                             ctx = ctx,
                             autoCapitalize = autoCapitalize,
                             onToggleShiftMode = onToggleShiftMode,
-                            onToggleNumericMode = onToggleNumericMode
+                            onToggleNumericMode = onToggleNumericMode,
+                            onToggleCapsLock = onToggleCapsLock,
+                            onAutoCapitalize = onAutoCapitalize
                         )
                         lastAction.value = action
 
diff --git a/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt b/app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt
@@ -39,6 +39,10 @@ fun KeyboardScreen(
         mutableStateOf(startMode)
     }
 
+    var capsLock by remember {
+        mutableStateOf(false)
+    }
+
     // TODO get rid of this crap
     val lastAction = remember { mutableStateOf<KeyAction?>(null) }
 
@@ -89,20 +93,32 @@ fun KeyboardScreen(
                                     ?: DEFAULT_ANIMATION_HELPER_SPEED,
                                 minSwipeLength = settings?.minSwipeLength ?: DEFAULT_MIN_SWIPE_LENGTH,
                                 onToggleShiftMode = { enable ->
-                                    if (mode !== KeyboardMode.NUMERIC) {
-                                        mode = if (enable) {
-                                            KeyboardMode.SHIFTED
-                                        } else {
-                                            KeyboardMode.MAIN
-                                        }
+                                    mode = if (enable) {
+                                        KeyboardMode.SHIFTED
+                                    } else {
+                                        capsLock = false
+                                        KeyboardMode.MAIN
                                     }
                                 },
-                                onToggleNumericMode = { numeric ->
-                                    mode = if (numeric) {
+                                onToggleNumericMode = { enable ->
+                                    mode = if (enable) {
                                         KeyboardMode.NUMERIC
                                     } else {
+                                        capsLock = false
                                         KeyboardMode.MAIN
                                     }
+                                },
+                                onToggleCapsLock = {
+                                    capsLock = !capsLock
+                                },
+                                onAutoCapitalize = { enable ->
+                                    if (mode !== KeyboardMode.NUMERIC) {
+                                        if (enable) {
+                                            mode = KeyboardMode.SHIFTED
+                                        } else if (!capsLock) {
+                                            mode = KeyboardMode.MAIN
+                                        }
+                                    }
                                 }
                             )
                         }
diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt
@@ -40,6 +40,7 @@ sealed class KeyAction {
     class ToggleNumericMode(val enable: Boolean) : KeyAction()
     object GotoSettings : KeyAction()
     object IMECompleteAction : KeyAction()
+    object ToggleCapsLock : KeyAction()
 }
 
 enum class KeyboardMode {
diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ sealed class KeyAction {`
`40`	`40`	`class ToggleNumericMode(val enable: Boolean) : KeyAction()`
`41`	`41`	`object GotoSettings : KeyAction()`
`42`	`42`	`object IMECompleteAction : KeyAction()`
	`43`	`+ object ToggleCapsLock : KeyAction()`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`enum class KeyboardMode {`