dessalines#702 Also rename constants to match layout titles

mpsijm · Aug 6, 2024 · da5e866 · da5e866
1 parent 34bca61
commit da5e866
Show file tree

Hide file tree

Showing 26 changed files with 153 additions and 153 deletions.
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/BGMessagEasePhoneticSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/BGMessagEasePhoneticSymbols.kt
@@ -19,7 +19,7 @@ import com.dessalines.thumbkey.utils.SwipeDirection
 import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
-val KB_BG_PHONETIC_MESSAGEASE_SYMBOLS_MAIN =
+val KB_BG_MESSAGEASE_PHONETIC_SYMBOLS_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -478,7 +478,7 @@ val KB_BG_PHONETIC_MESSAGEASE_SYMBOLS_MAIN =
  ),
  )
 
-val KB_BG_PHONETIC_MESSAGEASE_SYMBOLS_SHIFTED =
+val KB_BG_MESSAGEASE_PHONETIC_SYMBOLS_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -940,13 +940,13 @@ val KB_BG_PHONETIC_MESSAGEASE_SYMBOLS_SHIFTED =
  ),
  )
 
-val KB_BG_PHONETIC_MESSAGEASE_SYMBOLS: KeyboardDefinition =
+val KB_BG_MESSAGEASE_PHONETIC_SYMBOLS: KeyboardDefinition =
  KeyboardDefinition(
  title = "bulgarian messagease phonetic symbols",
  modes =
  KeyboardDefinitionModes(
- main = KB_BG_PHONETIC_MESSAGEASE_SYMBOLS_MAIN,
- shifted = KB_BG_PHONETIC_MESSAGEASE_SYMBOLS_SHIFTED,
+ main = KB_BG_MESSAGEASE_PHONETIC_SYMBOLS_MAIN,
+ shifted = KB_BG_MESSAGEASE_PHONETIC_SYMBOLS_SHIFTED,
  numeric = KB_EN_MESSAGEASE_NUMERIC,
  ),
  settings =

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/CZProgrammerMessagEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/CZProgrammerMessagEase.kt
@@ -16,7 +16,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinition
 import com.dessalines.thumbkey.utils.KeyboardDefinitionModes
 import com.dessalines.thumbkey.utils.SwipeDirection
 
-val KB_CZ_PROG_MAIN =
+val KB_CZ_MESSAGEASE_PROGRAMMING_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -525,7 +525,7 @@ val KB_CZ_PROG_MAIN =
  ),
  )
 
-val KB_CZ_PROG_SHIFTED =
+val KB_CZ_MESSAGEASE_PROGRAMMING_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -1031,13 +1031,13 @@ val KB_CZ_PROG_SHIFTED =
  ),
  )
 
-val KB_CZ_PROG: KeyboardDefinition =
+val KB_CZ_MESSAGEASE_PROGRAMMING: KeyboardDefinition =
  KeyboardDefinition(
  title = "čeština messagease programming",
  modes =
  KeyboardDefinitionModes(
- main = KB_CZ_PROG_MAIN,
- shifted = KB_CZ_PROG_SHIFTED,
+ main = KB_CZ_MESSAGEASE_PROGRAMMING_MAIN,
+ shifted = KB_CZ_MESSAGEASE_PROGRAMMING_SHIFTED,
  numeric = KB_EN_MESSAGEASE_NUMERIC,
  ),
  )
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt
@@ -242,7 +242,7 @@ val SPACEBAR_KEY_ITEM =
 val SPACEBAR_SKINNY_KEY_ITEM = SPACEBAR_KEY_ITEM.copy(widthMultiplier = 1)
 val SPACEBAR_DOUBLE_KEY_ITEM = SPACEBAR_KEY_ITEM.copy(widthMultiplier = 2)
 
-val SPACEBAR_PROGRAMMER_KEY_ITEM =
+val SPACEBAR_PROGRAMMING_KEY_ITEM =
  KeyItemC(
  center =
  KeyC(

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/DEENAEThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/DEENAEThumbKey.kt
@@ -15,7 +15,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinition
 import com.dessalines.thumbkey.utils.KeyboardDefinitionModes
 import com.dessalines.thumbkey.utils.SwipeDirection
 
-val KB_DE_EN_AE_THUMBKEY_MAIN =
+val KB_EN_DE_THUMBKEY_AE_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -498,7 +498,7 @@ val KB_DE_EN_AE_THUMBKEY_MAIN =
  ),
  )
 
-val KB_DE_EN_AE_THUMBKEY_SHIFTED =
+val KB_EN_DE_THUMBKEY_AE_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -981,13 +981,13 @@ val KB_DE_EN_AE_THUMBKEY_SHIFTED =
  ),
  )
 
-val KB_DE_EN_AE_THUMBKEY =
+val KB_EN_DE_THUMBKEY_AE =
  KeyboardDefinition(
  title = "english deutsch thumb-key +æ",
  modes =
  KeyboardDefinitionModes(
- main = KB_DE_EN_AE_THUMBKEY_MAIN,
- shifted = KB_DE_EN_AE_THUMBKEY_SHIFTED,
+ main = KB_EN_DE_THUMBKEY_AE_MAIN,
+ shifted = KB_EN_DE_THUMBKEY_AE_SHIFTED,
  numeric = NUMERIC_KEYBOARD,
  ),
  )
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/DEMessagEaseNordic.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/DEMessagEaseNordic.kt
@@ -957,6 +957,6 @@ val KB_DE_NORDIC_MESSAGEASE: KeyboardDefinition =
  KeyboardDefinitionModes(
  main = KB_DE_NORDIC_MESSAGEASE_MAIN,
  shifted = KB_DE_NORDIC_MESSAGEASE_SHIFTED,
- numeric = KB_DE_NORDIC_MESSAGEASE_NUMERIC,
+ numeric = KB_NORDIC_MESSAGEASE_NUMERIC,
  ),
  )
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENEOMessagEaseSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENEOMessagEaseSymbols.kt
@@ -17,7 +17,7 @@ import com.dessalines.thumbkey.utils.SwipeDirection
 import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
-val KB_ENEO_MESSAGEASE_SYMBOLS_MAIN =
+val KB_EN_EO_MESSAGEASE_SYMBOLS_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -557,7 +557,7 @@ val KB_ENEO_MESSAGEASE_SYMBOLS_MAIN =
  ),
  )
 
-val KB_ENEO_MESSAGEASE_SYMBOLS_SHIFTED =
+val KB_EN_EO_MESSAGEASE_SYMBOLS_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -1091,13 +1091,13 @@ val KB_ENEO_MESSAGEASE_SYMBOLS_SHIFTED =
  ),
  )
 
-val KB_ENEO_MESSAGEASE_SYMBOLS: KeyboardDefinition =
+val KB_EN_EO_MESSAGEASE_SYMBOLS: KeyboardDefinition =
  KeyboardDefinition(
  title = "english esperanto messagease symbols",
  modes =
  KeyboardDefinitionModes(
- main = KB_ENEO_MESSAGEASE_SYMBOLS_MAIN,
- shifted = KB_ENEO_MESSAGEASE_SYMBOLS_SHIFTED,
+ main = KB_EN_EO_MESSAGEASE_SYMBOLS_MAIN,
+ shifted = KB_EN_EO_MESSAGEASE_SYMBOLS_SHIFTED,
  numeric = KB_EN_MESSAGEASE_NUMERIC,
  ),
  settings =

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseLeftSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseLeftSymbols.kt
@@ -7,7 +7,7 @@ import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 import com.dessalines.thumbkey.utils.lastColKeysToFirst
 
-val KB_EN_MESSAGEASE_SYMBOLS_LEFT: KeyboardDefinition =
+val KB_EN_MESSAGEASE_LEFT_SYMBOLS: KeyboardDefinition =
  KeyboardDefinition(
  title = "english messagease left-handed symbols",
  modes =

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseSymbolsTwoHands.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseSymbolsTwoHands.kt
@@ -7,7 +7,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionSettings
 import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
-val KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS_MAIN =
+val KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS_MAIN =
  KeyboardC(
  listOf(
  KB_EN_MESSAGEASE_SYMBOLS_MAIN.arr[0] +
@@ -21,7 +21,7 @@ val KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS_MAIN =
  ),
  )
 
-val KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS_SHIFTED =
+val KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS_SHIFTED =
  KeyboardC(
  listOf(
  KB_EN_MESSAGEASE_SYMBOLS_SHIFTED.arr[0] +
@@ -50,13 +50,13 @@ val NUMERIC_KEYBOARD_MESSAGEASE_TWO_HANDS =
  ),
  )
 
-val KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS: KeyboardDefinition =
+val KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS: KeyboardDefinition =
  KeyboardDefinition(
  title = "english messagease symbols two-hands",
  modes =
  KeyboardDefinitionModes(
- main = KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS_MAIN,
- shifted = KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS_SHIFTED,
+ main = KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS_MAIN,
+ shifted = KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS_SHIFTED,
  numeric = NUMERIC_KEYBOARD_MESSAGEASE_TWO_HANDS,
  ),
  settings =

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseTwoHands.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseTwoHands.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_TWO_HANDS_MESSAGEASE_MAIN =
+val KB_EN_MESSAGEASE_TWO_HANDS_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -514,7 +514,7 @@ val KB_EN_TWO_HANDS_MESSAGEASE_MAIN =
  ),
  )
 
-val KB_EN_TWO_HANDS_MESSAGEASE_SHIFTED =
+val KB_EN_MESSAGEASE_TWO_HANDS_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -1014,14 +1014,14 @@ val KB_EN_TWO_HANDS_MESSAGEASE_SHIFTED =
  ),
  )
 
-val KB_EN_TWO_HANDS_MESSAGEASE: KeyboardDefinition =
+val KB_EN_MESSAGEASE_TWO_HANDS: KeyboardDefinition =
  KeyboardDefinition(
  title = "english messagease two-hands",
  modes =
  KeyboardDefinitionModes(
- main = KB_EN_TWO_HANDS_MESSAGEASE_MAIN,
- shifted = KB_EN_TWO_HANDS_MESSAGEASE_SHIFTED,
- numeric = KB_EN_TWO_HANDS_MESSAGEASE_NUMERIC,
+ main = KB_EN_MESSAGEASE_TWO_HANDS_MAIN,
+ shifted = KB_EN_MESSAGEASE_TWO_HANDS_SHIFTED,
+ numeric = KB_EN_MESSAGEASE_TWO_HANDS_NUMERIC,
  ),
  settings =
  KeyboardDefinitionSettings(

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENQwertEaseTwoHands.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENQwertEaseTwoHands.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_TWO_HANDS_QWERTEASE_MAIN =
+val KB_EN_QWERTEASE_TWO_HANDS_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -552,7 +552,7 @@ val KB_EN_TWO_HANDS_QWERTEASE_MAIN =
  ),
  )
 
-val KB_EN_TWO_HANDS_QWERTEASE_SHIFTED =
+val KB_EN_QWERTEASE_TWO_HANDS_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -1090,14 +1090,14 @@ val KB_EN_TWO_HANDS_QWERTEASE_SHIFTED =
  ),
  )
 
-val KB_EN_TWO_HANDS_QWERTEASE: KeyboardDefinition =
+val KB_EN_QWERTEASE_TWO_HANDS: KeyboardDefinition =
  KeyboardDefinition(
  title = "english qwertease two-hands",
  modes =
  KeyboardDefinitionModes(
- main = KB_EN_TWO_HANDS_QWERTEASE_MAIN,
- shifted = KB_EN_TWO_HANDS_QWERTEASE_SHIFTED,
- numeric = KB_EN_TWO_HANDS_MESSAGEASE_NUMERIC,
+ main = KB_EN_QWERTEASE_TWO_HANDS_MAIN,
+ shifted = KB_EN_QWERTEASE_TWO_HANDS_SHIFTED,
+ numeric = KB_EN_MESSAGEASE_TWO_HANDS_NUMERIC,
  ),
  settings =
  KeyboardDefinitionSettings(

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammer.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammer.kt
@@ -22,7 +22,7 @@ import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
 // Adds more punctuation options to the main screen to reduce switches to the numeric keyboard
-val KB_EN_THUMBKEY_PROGRAMMER_MAIN =
+val KB_EN_THUMBKEY_PROGRAMMING_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -418,13 +418,13 @@ val KB_EN_THUMBKEY_PROGRAMMER_MAIN =
  BACKSPACE_KEY_ITEM,
  ),
  listOf(
- SPACEBAR_PROGRAMMER_KEY_ITEM,
+ SPACEBAR_PROGRAMMING_KEY_ITEM,
  RETURN_KEY_ITEM,
  ),
  ),
  )
 
-val KB_EN_THUMBKEY_PROGRAMMER_SHIFTED =
+val KB_EN_THUMBKEY_PROGRAMMING_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -834,19 +834,19 @@ val KB_EN_THUMBKEY_PROGRAMMER_SHIFTED =
  BACKSPACE_KEY_ITEM,
  ),
  listOf(
- SPACEBAR_PROGRAMMER_KEY_ITEM,
+ SPACEBAR_PROGRAMMING_KEY_ITEM,
  RETURN_KEY_ITEM,
  ),
  ),
  )
 
-val KB_EN_THUMBKEY_PROGRAMMER: KeyboardDefinition =
+val KB_EN_THUMBKEY_PROGRAMMING: KeyboardDefinition =
  KeyboardDefinition(
- title = "english thumb-key programmer",
+ title = "english thumb-key programming",
  modes =
  KeyboardDefinitionModes(
- main = KB_EN_THUMBKEY_PROGRAMMER_MAIN,
- shifted = KB_EN_THUMBKEY_PROGRAMMER_SHIFTED,
+ main = KB_EN_THUMBKEY_PROGRAMMING_MAIN,
+ shifted = KB_EN_THUMBKEY_PROGRAMMING_SHIFTED,
  numeric = NUMERIC_KEYBOARD,
  ),
  settings =

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammerWide.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammerWide.kt
@@ -21,8 +21,8 @@ import com.dessalines.thumbkey.utils.SwipeNWay
 import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
-// uses programmer layout but moves spacebar to the left column in order to make a more aspect ration friendly layout. this grid is 5x3 which is closer to the average phone aspect ration of 16:9 than 4x4 keyboard.
-val KB_EN_THUMBKEY_PROGRAMMER_WIDE_MAIN =
+// uses programming layout but moves spacebar to the left column in order to make a more aspect ration friendly layout. this grid is 5x3 which is closer to the average phone aspect ration of 16:9 than 4x4 keyboard.
+val KB_EN_THUMBKEY_PROGRAMMING_WIDE_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -423,7 +423,7 @@ val KB_EN_THUMBKEY_PROGRAMMER_WIDE_MAIN =
  ),
  )
 
-val KB_EN_THUMBKEY_PROGRAMMER_WIDE_SHIFTED =
+val KB_EN_THUMBKEY_PROGRAMMING_WIDE_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -1148,13 +1148,13 @@ val NUMERIC_KEYBOARD_WIDE =
  ),
  )
 
-val KB_EN_THUMBKEY_PROGRAMMER_WIDE: KeyboardDefinition =
+val KB_EN_THUMBKEY_PROGRAMMING_WIDE: KeyboardDefinition =
  KeyboardDefinition(
  title = "english thumb-key programming wide",
  modes =
  KeyboardDefinitionModes(
- main = KB_EN_THUMBKEY_PROGRAMMER_WIDE_MAIN,
- shifted = KB_EN_THUMBKEY_PROGRAMMER_WIDE_SHIFTED,
+ main = KB_EN_THUMBKEY_PROGRAMMING_WIDE_MAIN,
+ shifted = KB_EN_THUMBKEY_PROGRAMMING_WIDE_SHIFTED,
  numeric = NUMERIC_KEYBOARD_WIDE,
  ),
  settings =

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENTwoHandsSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENTwoHandsSymbols.kt
@@ -19,7 +19,7 @@ import com.dessalines.thumbkey.utils.SwipeNWay
 import com.dessalines.thumbkey.utils.autoCapitalizeI
 import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
 
-val KB_EN_TWO_HANDS_SYMBOLS_MAIN =
+val KB_EN_SYMBOLS_TWO_HANDS_MAIN =
  KeyboardC(
  listOf(
  listOf(
@@ -875,7 +875,7 @@ val KB_EN_TWO_HANDS_SYMBOLS_MAIN =
  ),
  )
 
-val KB_EN_TWO_HANDS_SYMBOLS_SHIFTED =
+val KB_EN_SYMBOLS_TWO_HANDS_SHIFTED =
  KeyboardC(
  listOf(
  listOf(
@@ -1737,13 +1737,13 @@ val KB_EN_TWO_HANDS_SYMBOLS_SHIFTED =
  ),
  )
 
-val KB_EN_TWO_HANDS_SYMBOLS: KeyboardDefinition =
+val KB_EN_SYMBOLS_TWO_HANDS: KeyboardDefinition =
  KeyboardDefinition(
  title = "english symbols two-hands",
  modes =
  KeyboardDefinitionModes(
- main = KB_EN_TWO_HANDS_SYMBOLS_MAIN,
- shifted = KB_EN_TWO_HANDS_SYMBOLS_SHIFTED,
+ main = KB_EN_SYMBOLS_TWO_HANDS_MAIN,
+ shifted = KB_EN_SYMBOLS_TWO_HANDS_SHIFTED,
  numeric = TWO_HANDS_NUMERIC_KEYBOARD,
  ),
  settings =