fix inconsistent layout naming (#497)

* partially fix #495

* fix math layout naming

* de is a true multi layout

* rename RU-UA layout as RU derivative

* consistent symbol naming

* rename ukrainian layout

* import and show EOENDE layout

* formatting

* rename czech keyboard to an english derivative

* revert de multi naming

* add back french messageease layout

* change UA to UK

* Fixing UA -> UK.

* Fixing with

* Fix UK keyboard naming.

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Dessalines <tyhou13@gmx.com>

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

@@ -767,7 +767,7 @@ val KB_DE_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
 )
 
 val KB_DE_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
-    title = "DE MessageEase deutch with symbols",
+    title = "DE MessageEase deutsch symbols",
     modes = KeyboardDefinitionModes(
         main = KB_DE_MESSAGEEASE_SYMBOLS_MAIN,
         shifted = KB_DE_MESSAGEEASE_SYMBOLS_SHIFTED,

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

@@ -724,7 +724,7 @@ val KB_DE_THUMBKEY_MULTILINGUAL_SHIFTED = KeyboardC(
 )
 
 val KB_DE_THUMBKEY_MULTILINGUAL: KeyboardDefinition = KeyboardDefinition(
-    title = "DE Thumb-Key deutsch v2 multilingual",
+    title = "DE Thumb-Key deutsch multilingual",
     modes = KeyboardDefinitionModes(
         main = KB_DE_THUMBKEY_MULTILINGUAL_MAIN,
         shifted = KB_DE_THUMBKEY_MULTILINGUAL_SHIFTED,

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

@@ -872,7 +872,7 @@ val KB_ENEO_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
 )
 
 val KB_ENEO_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
-    title = "ENEO MessageEase english esperanto with symbols",
+    title = "ENEO MessageEase english esperanto symbols",
     modes = KeyboardDefinitionModes(
         main = KB_ENEO_MESSAGEEASE_SYMBOLS_MAIN,
         shifted = KB_ENEO_MESSAGEEASE_SYMBOLS_SHIFTED,

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

@@ -745,7 +745,7 @@ val KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
 )
 
 val KB_EN_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
-    title = "EN MessageEase english with symbols",
+    title = "EN MessageEase english symbols",
     modes = KeyboardDefinitionModes(
         main = KB_EN_MESSAGEEASE_SYMBOLS_MAIN,
         shifted = KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED,

app/src/main/java/com/dessalines/thumbkey/keyboards/CZThumbKey.kt → app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyMultiCZ.kt

@@ -17,7 +17,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes
 import com.dessalines.thumbkey.utils.SwipeDirection
 import com.dessalines.thumbkey.utils.SwipeNWay
 
-val KB_CZ_THUMBKEY_MAIN = KeyboardC(
+val KB_EN_THUMBKEY_MULTI_CZ_MAIN = KeyboardC(
     listOf(
         listOf(
             KeyItemC(
@@ -278,7 +278,7 @@ val KB_CZ_THUMBKEY_MAIN = KeyboardC(
     ),
 )
 
-val KB_CZ_THUMBKEY_SHIFTED = KeyboardC(
+val KB_EN_THUMBKEY_MULTI_CZ_SHIFTED = KeyboardC(
     listOf(
         listOf(
             KeyItemC(
@@ -546,11 +546,11 @@ val KB_CZ_THUMBKEY_SHIFTED = KeyboardC(
     ),
 )
 
-val KB_CZ_THUMBKEY: KeyboardDefinition = KeyboardDefinition(
-    title = "CZ Thumb-Key čeština",
+val KB_EN_THUMBKEY_MULTI_CZ: KeyboardDefinition = KeyboardDefinition(
+    title = "EN Thumb-key english (EN+CZ multi)",
     modes = KeyboardDefinitionModes(
-        main = KB_CZ_THUMBKEY_MAIN,
-        shifted = KB_CZ_THUMBKEY_SHIFTED,
+        main = KB_EN_THUMBKEY_MULTI_CZ_MAIN,
+        shifted = KB_EN_THUMBKEY_MULTI_CZ_SHIFTED,
         numeric = NUMERIC_KEYBOARD,
     ),
 )

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

@@ -488,7 +488,7 @@ val KB_EN_THUMBKEY_MULTI_EE_SHIFTED = KeyboardC(
 )
 
 val KB_EN_THUMBKEY_MULTI_EE: KeyboardDefinition = KeyboardDefinition(
-    title = "EN Thumb-Key english (EN+EE)",
+    title = "EN Thumb-Key english (EN+EE multi)",
     modes = KeyboardDefinitionModes(
         main = KB_EN_THUMBKEY_MULTI_EE_MAIN,
         shifted = KB_EN_THUMBKEY_MULTI_EE_SHIFTED,

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

@@ -540,7 +540,7 @@ val KB_MATH_THUMBKEY_SLASH = KeyboardC(
 )
 
 val KB_MATH_THUMBKEY: KeyboardDefinition = KeyboardDefinition(
-    title = "Math Thumb-Key",
+    title = "MATH Thumb-Key",
     modes = KeyboardDefinitionModes(
         main = KB_MATH_THUMBKEY_MAIN,
         shifted = KB_MATH_THUMBKEY_SLASH,

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

@@ -781,7 +781,7 @@ val KB_RU_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
 )
 
 val KB_RU_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
-    title = "RU MessageEase русский with symbols",
+    title = "RU MessageEase русский symbols",
     modes = KeyboardDefinitionModes(
         main = KB_RU_MESSAGEEASE_SYMBOLS_MAIN,
         shifted = KB_RU_MESSAGEEASE_SYMBOLS_SHIFTED,

app/src/main/java/com/dessalines/thumbkey/keyboards/UARUMessageEaseSymbols.kt → app/src/main/java/com/dessalines/thumbkey/keyboards/UKRUMessageEaseSymbols.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_UA_RU_MESSAGEEASE_SYMBOLS_MAIN = KeyboardC(
+val KB_UK_RU_MESSAGEEASE_SYMBOLS_MAIN = KeyboardC(
     listOf(
         listOf(
             KeyItemC(
@@ -395,7 +395,7 @@ val KB_UA_RU_MESSAGEEASE_SYMBOLS_MAIN = KeyboardC(
     ),
 )
 
-val KB_UA_RU_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
+val KB_UK_RU_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
     listOf(
         listOf(
             KeyItemC(
@@ -780,11 +780,11 @@ val KB_UA_RU_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
     ),
 )
 
-val KB_UA_RU_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
-    title = "UA RU MessageEase український-русский with Symbols",
+val KB_UK_RU_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
+    title = "UK RU MessageEase русский (UK+RU multi) symbols",
     modes = KeyboardDefinitionModes(
-        main = KB_UA_RU_MESSAGEEASE_SYMBOLS_MAIN,
-        shifted = KB_UA_RU_MESSAGEEASE_SYMBOLS_SHIFTED,
+        main = KB_UK_RU_MESSAGEEASE_SYMBOLS_MAIN,
+        shifted = KB_UK_RU_MESSAGEEASE_SYMBOLS_SHIFTED,
         numeric = NUMERIC_KEYBOARD,
     ),
 )

app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt

@@ -4,7 +4,6 @@ import com.dessalines.thumbkey.keyboards.KB_BG_THUMBKEY_SYMBOLS
 import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY_SYMBOLS
 import com.dessalines.thumbkey.keyboards.KB_CA_THUMBKEY
-import com.dessalines.thumbkey.keyboards.KB_CZ_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_DA_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEEASE
 import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEEASE_SYMBOLS
@@ -16,13 +15,15 @@ import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEEASE
 import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEEASE_SYMBOLS
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI
+import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI_CZ
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI_EE
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_MULTI_IT
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_PROGRAMMER
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_PROGRAMMER_WIDE
 import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_SYMBOLS
 import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS
 import com.dessalines.thumbkey.keyboards.KB_EN_TYPESPLIT
+import com.dessalines.thumbkey.keyboards.KB_EOENDE_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_ES_CA_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_ES_EO_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_ES_MESSAGEEASE
@@ -33,6 +34,7 @@ import com.dessalines.thumbkey.keyboards.KB_FA_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_FI_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_FI_THUMBKEY_WIDE
 import com.dessalines.thumbkey.keyboards.KB_FI_TYPESPLIT
+import com.dessalines.thumbkey.keyboards.KB_FR_MESSAGEEASE
 import com.dessalines.thumbkey.keyboards.KB_FR_THUMBKEY_V1
 import com.dessalines.thumbkey.keyboards.KB_FR_THUMBKEY_V2
 import com.dessalines.thumbkey.keyboards.KB_FR_TYPESPLIT
@@ -69,7 +71,7 @@ import com.dessalines.thumbkey.keyboards.KB_SK_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_SV_THUMBKEY
 import com.dessalines.thumbkey.keyboards.KB_T9
 import com.dessalines.thumbkey.keyboards.KB_TR_THUMBKEY
-import com.dessalines.thumbkey.keyboards.KB_UA_RU_MESSAGEEASE_SYMBOLS
+import com.dessalines.thumbkey.keyboards.KB_UK_RU_MESSAGEEASE_SYMBOLS
 import com.dessalines.thumbkey.keyboards.KB_UK_THUMBKEY
 
 // Make sure new keyboards have a new index, even if they are in the middle
@@ -79,7 +81,6 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini
     BYThumbKey(19, KB_BY_THUMBKEY),
     BYThumbKeySymbols(20, KB_BY_THUMBKEY_SYMBOLS),
     CAThumbKey(69, KB_CA_THUMBKEY),
-    CZThumbKey(52, KB_CZ_THUMBKEY),
     DAThumbKey(3, KB_DA_THUMBKEY),
     DEThumbKey(2, KB_DE_THUMBKEY),
     DEThumbKeyMultiLingual(25, KB_DE_THUMBKEY_MULTILINGUAL),
@@ -91,13 +92,14 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini
     ENThumbKeyProgrammer(1, KB_EN_THUMBKEY_PROGRAMMER),
     ENThumbKeyProgrammerWide(44, KB_EN_THUMBKEY_PROGRAMMER_WIDE),
     ENThumbKeyMulti(48, KB_EN_THUMBKEY_MULTI),
+    ENThumbKeyMultiCZ(52, KB_EN_THUMBKEY_MULTI_CZ),
     ENMessageEase(15, KB_EN_MESSAGEEASE),
     ENMessageEaseSymbols(16, KB_EN_MESSAGEEASE_SYMBOLS),
     ENTypeSplit(36, KB_EN_TYPESPLIT),
     ENTwoHands(43, KB_EN_TWO_HANDS),
     ENThumbKeyMultiIT(65, KB_EN_THUMBKEY_MULTI_IT),
     ENEOMessageEaseSymbols(66, KB_ENEO_MESSAGEEASE_SYMBOLS),
-    EOENDEThumbKey(50, KB_ES_EO_THUMBKEY),
+    EOENDEThumbKey(50, KB_EOENDE_THUMBKEY),
     ESThumbKey(4, KB_ES_THUMBKEY),
     ESMessageEase(53, KB_ES_MESSAGEEASE),
     ESTypeSplit(37, KB_ES_TYPESPLIT),
@@ -110,7 +112,7 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini
     FITypeSplit(59, KB_FI_TYPESPLIT),
     FRThumbKeyV1(8, KB_FR_THUMBKEY_V1),
     FRThumbKeyV2(33, KB_FR_THUMBKEY_V2),
-    FRMessageEase(28, KB_FR_THUMBKEY_V1),
+    FRMessageEase(28, KB_FR_MESSAGEEASE),
     FRTypeSplit(39, KB_FR_TYPESPLIT),
     GRThumbKey(51, KB_GR_THUMBKEY),
     HEThumbKey(49, KB_HE_THUMBKEY),
@@ -141,10 +143,10 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini
     RUMessageEase(54, KB_RU_MESSAGEEASE),
     RUMessageEaseSymbols(29, KB_RU_MESSAGEEASE_SYMBOLS),
     SVThumbKey(34, KB_SV_THUMBKEY),
-    T9v1(30, KB_T9),
+    T9(30, KB_T9),
     TRThumbKey(35, KB_TR_THUMBKEY),
-    UKThumbKeyUKv1(14, KB_UK_THUMBKEY),
-    UKRUMessageEaseSymbols(67, KB_UA_RU_MESSAGEEASE_SYMBOLS),
+    UKThumbKey(14, KB_UK_THUMBKEY),
+    UKRUMessageEaseSymbols(67, KB_UK_RU_MESSAGEEASE_SYMBOLS),
     MATHThumbKey(70, KB_MATH_THUMBKEY),
     ENThumbKeyMultiEE(71, KB_EN_THUMBKEY_MULTI_EE),
     SKThumbKey(72, KB_SK_THUMBKEY),