MessagEase fixes (#709)

* fix MessagEase numeric keyboard and MessagEase spanish keyboard * formatting * fix MessagEase EN layout * separate numeric layers for EN and ES messagEase * split numeric EN/ES ME layouts in their own files, and fix some symbol names
dessalines · Feb 10, 2024 · fb54a4a · fb54a4a
1 parent 25567d1
commit fb54a4a
Show file tree

Hide file tree

Showing 6 changed files with 446 additions and 135 deletions.
diff --git a/...lines/thumbkey/keyboards/ENMessageEase.kt → ...alines/thumbkey/keyboards/ENMessagEase.kt b/...lines/thumbkey/keyboards/ENMessageEase.kt → ...alines/thumbkey/keyboards/ENMessagEase.kt
@@ -20,7 +20,7 @@ import com.dessalines.thumbkey.utils.SwipeNWay
 import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
-val KB_EN_MESSAGEEASE_MAIN =
+val KB_EN_MESSAGEASE_MAIN =
     KeyboardC(
         listOf(
             listOf(
@@ -224,8 +224,8 @@ val KB_EN_MESSAGEEASE_MAIN =
                                 ),
                             SwipeDirection.BOTTOM_RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("-"),
-                                    action = KeyAction.CommitText("-"),
+                                    display = KeyDisplay.TextDisplay(":"),
+                                    action = KeyAction.CommitText(":"),
                                     color = ColorVariant.MUTED,
                                 ),
                             SwipeDirection.BOTTOM to
@@ -269,7 +269,7 @@ val KB_EN_MESSAGEEASE_MAIN =
         ),
     )
 
-val KB_EN_MESSAGEEASE_SHIFTED =
+val KB_EN_MESSAGEASE_SHIFTED =
     KeyboardC(
         listOf(
             listOf(
@@ -480,8 +480,8 @@ val KB_EN_MESSAGEEASE_SHIFTED =
                                 ),
                             SwipeDirection.BOTTOM_RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("-"),
-                                    action = KeyAction.CommitText("-"),
+                                    display = KeyDisplay.TextDisplay(":"),
+                                    action = KeyAction.CommitText(":"),
                                     color = ColorVariant.MUTED,
                                 ),
                             SwipeDirection.BOTTOM to
@@ -525,14 +525,14 @@ val KB_EN_MESSAGEEASE_SHIFTED =
         ),
     )
 
-val KB_EN_MESSAGEEASE: KeyboardDefinition =
+val KB_EN_MESSAGEASE: KeyboardDefinition =
     KeyboardDefinition(
-        title = "english messageease",
+        title = "English MessagEase",
         modes =
             KeyboardDefinitionModes(
-                main = KB_EN_MESSAGEEASE_MAIN,
-                shifted = KB_EN_MESSAGEEASE_SHIFTED,
-                numeric = NUMERIC_KEYBOARD,
+                main = KB_EN_MESSAGEASE_MAIN,
+                shifted = KB_EN_MESSAGEASE_SHIFTED,
+                numeric = KB_EN_MESSAGEASE_NUMERIC,
             ),
         settings =
             KeyboardDefinitionSettings(