Merge remote-tracking branch 'origin/main'

Author: dessalines

app/src/main/java/com/dessalines/thumbkey/keyboards/MessageEase.kt

@@ -18,7 +18,7 @@ import com.dessalines.thumbkey.utils.KeyboardC
 import com.dessalines.thumbkey.utils.KeyboardMode
 import com.dessalines.thumbkey.utils.SwipeDirection
 
-val messageEaseKeyboard = KeyboardC(
+val MESSAGEEASE_EN_MAIN = KeyboardC(
     arrayOf(
         arrayOf(
             KeyItemC(
@@ -285,7 +285,7 @@ val messageEaseKeyboard = KeyboardC(
     )
 )
 
-val messageEaseKeyboardShifted = KeyboardC(
+val MESSAGEEASE_EN_SHIFTED = KeyboardC(
     arrayOf(
         arrayOf(
             KeyItemC(
@@ -553,7 +553,7 @@ val messageEaseKeyboardShifted = KeyboardC(
 )
 
 val MESSAGEEASE_KEYBOARD_MODES: Map<KeyboardMode, KeyboardC> = mapOf(
-    KeyboardMode.MAIN to messageEaseKeyboard,
-    KeyboardMode.SHIFTED to messageEaseKeyboardShifted,
-    KeyboardMode.NUMERIC to numericKeyboard
+    KeyboardMode.MAIN to MESSAGEEASE_EN_MAIN,
+    KeyboardMode.SHIFTED to MESSAGEEASE_EN_SHIFTED,
+    KeyboardMode.NUMERIC to NUMERIC_KEYBOARD
 )

app/src/main/java/com/dessalines/thumbkey/keyboards/Numeric.kt

@@ -15,7 +15,7 @@ import com.dessalines.thumbkey.utils.KeyItemC
 import com.dessalines.thumbkey.utils.KeyboardC
 import com.dessalines.thumbkey.utils.SwipeDirection
 
-val numericKeyboard = KeyboardC(
+val NUMERIC_KEYBOARD = KeyboardC(
     arrayOf(
         arrayOf(
             KeyItemC(

…salines/thumbkey/keyboards/ThumbKeyV4.kt …lines/thumbkey/keyboards/ThumbKeyENv4.ktapp/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyV4.kt renamed to app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENv4.kt app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyV4.kt renamed to app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENv4.kt

@@ -18,7 +18,7 @@ import com.dessalines.thumbkey.utils.KeyboardC
 import com.dessalines.thumbkey.utils.KeyboardMode
 import com.dessalines.thumbkey.utils.SwipeDirection
 
-val thumbkeyV4Keyboard = KeyboardC(
+val THUMBKEY_EN_V4_MAIN = KeyboardC(
     arrayOf(
         arrayOf(
             KeyItemC(
@@ -285,7 +285,7 @@ val thumbkeyV4Keyboard = KeyboardC(
     )
 )
 
-val thumbkeyV4KeyboardShifted = KeyboardC(
+val THUMBKEY_EN_V4_SHIFTED = KeyboardC(
     arrayOf(
         arrayOf(
             KeyItemC(
@@ -552,8 +552,8 @@ val thumbkeyV4KeyboardShifted = KeyboardC(
     )
 )
 
-val THUMBKEY_V4_KEYBOARD_MODES: Map<KeyboardMode, KeyboardC> = mapOf(
-    KeyboardMode.MAIN to thumbkeyV4Keyboard,
-    KeyboardMode.SHIFTED to thumbkeyV4KeyboardShifted,
-    KeyboardMode.NUMERIC to numericKeyboard
+val THUMBKEY_EN_V4_KEYBOARD_MODES: Map<KeyboardMode, KeyboardC> = mapOf(
+    KeyboardMode.MAIN to THUMBKEY_EN_V4_MAIN,
+    KeyboardMode.SHIFTED to THUMBKEY_EN_V4_SHIFTED,
+    KeyboardMode.NUMERIC to NUMERIC_KEYBOARD
 )