diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/BGMessagEasePhoneticSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/BGMessagEasePhoneticSymbols.kt index 35846c8e4..f25641816 100644 --- 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 index 92f4fdcd1..e619d51ff 100644 --- 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 index 9255a7e41..c36509d03 100644 --- 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 index 6c3ed6c3d..f28517c63 100644 --- 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 index 32cb910ba..dfbe08b27 100644 --- 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 index 634fa16ad..7d3027786 100644 --- 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 index fb8c02486..21546bcd1 100644 --- 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 index 070137360..4a7ccaa0a 100644 --- 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 index f27b66f12..c082a3c59 100644 --- 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 index 5ef8d9281..79edf1761 100644 --- 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 index 41da9b8cc..e76d3e8e4 100644 --- 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 index 08a7c1034..c2d3dcd36 100644 --- 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 index 2fe7ce597..fb1183d97 100644 --- 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 = diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENTwoHandsSymbolsNumbers.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENTwoHandsSymbolsNumbers.kt index b5843c995..f42d79758 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENTwoHandsSymbolsNumbers.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENTwoHandsSymbolsNumbers.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_NUMBERS_MAIN = +val KB_EN_SYMBOLS_NUMBERS_TWO_HANDS_MAIN = KeyboardC( listOf( listOf( @@ -1005,7 +1005,7 @@ val KB_EN_TWO_HANDS_SYMBOLS_NUMBERS_MAIN = ), ) -val KB_EN_TWO_HANDS_SYMBOLS_NUMBERS_SHIFTED = +val KB_EN_SYMBOLS_NUMBERS_TWO_HANDS_SHIFTED = KeyboardC( listOf( listOf( @@ -1997,13 +1997,13 @@ val KB_EN_TWO_HANDS_SYMBOLS_NUMBERS_SHIFTED = ), ) -val KB_EN_TWO_HANDS_SYMBOLS_NUMBERS: KeyboardDefinition = +val KB_EN_SYMBOLS_NUMBERS_TWO_HANDS: KeyboardDefinition = KeyboardDefinition( title = "english symbols-numbers two-hands", modes = KeyboardDefinitionModes( - main = KB_EN_TWO_HANDS_SYMBOLS_NUMBERS_MAIN, - shifted = KB_EN_TWO_HANDS_SYMBOLS_NUMBERS_SHIFTED, + main = KB_EN_SYMBOLS_NUMBERS_TWO_HANDS_MAIN, + shifted = KB_EN_SYMBOLS_NUMBERS_TWO_HANDS_SHIFTED, numeric = TWO_HANDS_NUMERIC_KEYBOARD, ), settings = diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/EOENDEThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/EOENDEThumbKey.kt index 1033ba8b2..0706628de 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/EOENDEThumbKey.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/EOENDEThumbKey.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_EOENDE_THUMBKEY_MAIN = +val KB_EO_EN_DE_THUMBKEY_MAIN = KeyboardC( listOf( listOf( @@ -328,7 +328,7 @@ val KB_EOENDE_THUMBKEY_MAIN = ), ) -val KB_EOENDE_THUMBKEY_SHIFTED = +val KB_EO_EN_DE_THUMBKEY_SHIFTED = KeyboardC( listOf( listOf( @@ -642,13 +642,13 @@ val KB_EOENDE_THUMBKEY_SHIFTED = ), ) -val KB_EOENDE_THUMBKEY: KeyboardDefinition = +val KB_EO_EN_DE_THUMBKEY: KeyboardDefinition = KeyboardDefinition( title = "esperanto english deutsch thumb-key", modes = KeyboardDefinitionModes( - main = KB_EOENDE_THUMBKEY_MAIN, - shifted = KB_EOENDE_THUMBKEY_SHIFTED, + main = KB_EO_EN_DE_THUMBKEY_MAIN, + shifted = KB_EO_EN_DE_THUMBKEY_SHIFTED, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/IDThumbKeySymbolsNumbersV1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/IDThumbKeySymbolsNumbersV1.kt index fbd900947..702c365df 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/IDThumbKeySymbolsNumbersV1.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/IDThumbKeySymbolsNumbersV1.kt @@ -17,7 +17,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes import com.dessalines.thumbkey.utils.SwipeDirection // Adds more punctuation options to the main screen to reduce switches to the numeric keyboard -val KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1_MAIN = +val KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1_MAIN = KeyboardC( listOf( listOf( @@ -503,7 +503,7 @@ val KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1_MAIN = ), ) -val KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1_SHIFTED = +val KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1_SHIFTED = KeyboardC( listOf( listOf( @@ -990,13 +990,13 @@ val KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1_SHIFTED = ), ) -val KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1: KeyboardDefinition = +val KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1: KeyboardDefinition = KeyboardDefinition( title = "bahasa indonesia thumb-key symbols-numbers v1", modes = KeyboardDefinitionModes( - main = KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1_MAIN, - shifted = KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1_SHIFTED, + main = KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1_MAIN, + shifted = KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1_SHIFTED, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaThumbKey.kt index 0730823b8..2cc94871a 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaThumbKey.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaThumbKey.kt @@ -12,7 +12,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay -val KB_JA_THUMBKEY_HIRAGANA_MAIN = +val KB_JA_HIRAGANA_THUMBKEY_MAIN = KeyboardC( listOf( listOf( @@ -393,7 +393,7 @@ val KB_JA_THUMBKEY_HIRAGANA_MAIN = ), ) -val KB_JA_THUMBKEY_HIRAGANA_SHIFTED = +val KB_JA_HIRAGANA_THUMBKEY_SHIFTED = KeyboardC( listOf( listOf( @@ -589,13 +589,13 @@ val KB_JA_THUMBKEY_HIRAGANA_SHIFTED = ), ) -val KB_JA_THUMBKEY_HIRAGANA: KeyboardDefinition = +val KB_JA_HIRAGANA_THUMBKEY: KeyboardDefinition = KeyboardDefinition( title = "japanese hiragana thumb-key", modes = KeyboardDefinitionModes( - main = KB_JA_THUMBKEY_HIRAGANA_MAIN, - shifted = KB_JA_THUMBKEY_HIRAGANA_SHIFTED, + main = KB_JA_HIRAGANA_THUMBKEY_MAIN, + shifted = KB_JA_HIRAGANA_THUMBKEY_SHIFTED, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaTypeSplit.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaTypeSplit.kt index 2c6ffd43e..8ca5576a7 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaTypeSplit.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAHiraganaTypeSplit.kt @@ -12,7 +12,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay -val KB_JA_TYPESPLIT_HIRAGANA_MAIN = +val KB_JA_HIRAGANA_TYPESPLIT_MAIN = KeyboardC( listOf( listOf( @@ -431,7 +431,7 @@ val KB_JA_TYPESPLIT_HIRAGANA_MAIN = ), ) -val KB_JA_TYPESPLIT_HIRAGANA_SHIFTED = +val KB_JA_HIRAGANA_TYPESPLIT_SHIFTED = KeyboardC( listOf( listOf( @@ -807,13 +807,13 @@ val KB_JA_TYPESPLIT_HIRAGANA_SHIFTED = ), ) -val KB_JA_TYPESPLIT_HIRAGANA: KeyboardDefinition = +val KB_JA_HIRAGANA_TYPESPLIT: KeyboardDefinition = KeyboardDefinition( title = "japanese hiragana type-split", modes = KeyboardDefinitionModes( - main = KB_JA_TYPESPLIT_HIRAGANA_MAIN, - shifted = KB_JA_TYPESPLIT_HIRAGANA_SHIFTED, + main = KB_JA_HIRAGANA_TYPESPLIT_MAIN, + shifted = KB_JA_HIRAGANA_TYPESPLIT_SHIFTED, numeric = TYPESPLIT_NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKanaThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKanaThumbKey.kt index 2f978e60d..6ee9d53dd 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKanaThumbKey.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKanaThumbKey.kt @@ -12,7 +12,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay -val KB_JA_THUMBKEY_KANA_HIRAGANA = +val KB_JA_KANA_THUMBKEY_HIRAGANA = KeyboardC( listOf( listOf( @@ -426,7 +426,7 @@ val KB_JA_THUMBKEY_KANA_HIRAGANA = ), ) -val KB_JA_THUMBKEY_KANA_KATAKANA = +val KB_JA_KANA_THUMBKEY_KATAKANA = KeyboardC( listOf( listOf( @@ -840,13 +840,13 @@ val KB_JA_THUMBKEY_KANA_KATAKANA = ), ) -val KB_JA_THUMBKEY_KANA: KeyboardDefinition = +val KB_JA_KANA_THUMBKEY: KeyboardDefinition = KeyboardDefinition( title = "japanese kana thumb-key", modes = KeyboardDefinitionModes( - main = KB_JA_THUMBKEY_KANA_HIRAGANA, - shifted = KB_JA_THUMBKEY_KANA_KATAKANA, + main = KB_JA_KANA_THUMBKEY_HIRAGANA, + shifted = KB_JA_KANA_THUMBKEY_KATAKANA, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaThumbKey.kt index db1bdea75..60127dbd2 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaThumbKey.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaThumbKey.kt @@ -12,7 +12,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay -val KB_JA_THUMBKEY_KATAKANA_MAIN = +val KB_JA_KATAKANA_THUMBKEY_MAIN = KeyboardC( listOf( listOf( @@ -388,7 +388,7 @@ val KB_JA_THUMBKEY_KATAKANA_MAIN = ), ) -val KB_JA_THUMBKEY_KATAKANA_SHIFTED = +val KB_JA_KATAKANA_THUMBKEY_SHIFTED = KeyboardC( listOf( listOf( @@ -584,13 +584,13 @@ val KB_JA_THUMBKEY_KATAKANA_SHIFTED = ), ) -val KB_JA_THUMBKEY_KATAKANA: KeyboardDefinition = +val KB_JA_KATAKANA_THUMBKEY: KeyboardDefinition = KeyboardDefinition( title = "japanese katakana thumb-key", modes = KeyboardDefinitionModes( - main = KB_JA_THUMBKEY_KATAKANA_MAIN, - shifted = KB_JA_THUMBKEY_KATAKANA_SHIFTED, + main = KB_JA_KATAKANA_THUMBKEY_MAIN, + shifted = KB_JA_KATAKANA_THUMBKEY_SHIFTED, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaTypeSplit.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaTypeSplit.kt index 3d1919c60..e0b31cc55 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaTypeSplit.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/JAKatakanaTypeSplit.kt @@ -12,7 +12,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay -val KB_JA_TYPESPLIT_KATAKANA_MAIN = +val KB_JA_KATAKANA_TYPESPLIT_MAIN = KeyboardC( listOf( listOf( @@ -431,7 +431,7 @@ val KB_JA_TYPESPLIT_KATAKANA_MAIN = ), ) -val KB_JA_TYPESPLIT_KATAKANA_SHIFTED = +val KB_JA_KATAKANA_TYPESPLIT_SHIFTED = KeyboardC( listOf( listOf( @@ -807,13 +807,13 @@ val KB_JA_TYPESPLIT_KATAKANA_SHIFTED = ), ) -val KB_JA_TYPESPLIT_KATAKANA: KeyboardDefinition = +val KB_JA_KATAKANA_TYPESPLIT: KeyboardDefinition = KeyboardDefinition( title = "japanese katakana type-split", modes = KeyboardDefinitionModes( - main = KB_JA_TYPESPLIT_KATAKANA_MAIN, - shifted = KB_JA_TYPESPLIT_KATAKANA_SHIFTED, + main = KB_JA_KATAKANA_TYPESPLIT_MAIN, + shifted = KB_JA_KATAKANA_TYPESPLIT_SHIFTED, numeric = TYPESPLIT_NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericENMessagEaseTwoHands.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericENMessagEaseTwoHands.kt index a568e704f..94604441e 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericENMessagEaseTwoHands.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericENMessagEaseTwoHands.kt @@ -10,7 +10,7 @@ import com.dessalines.thumbkey.utils.KeyboardC import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.getLocalCurrency -val KB_EN_TWO_HANDS_MESSAGEASE_NUMERIC = +val KB_EN_MESSAGEASE_TWO_HANDS_NUMERIC = KeyboardC( listOf( listOf( diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericNordicMessagEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericNordicMessagEase.kt index 394aaf256..bab90671e 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericNordicMessagEase.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericNordicMessagEase.kt @@ -12,7 +12,7 @@ import com.dessalines.thumbkey.utils.KeyboardC import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.getLocalCurrency -val KB_DE_NORDIC_MESSAGEASE_NUMERIC = +val KB_NORDIC_MESSAGEASE_NUMERIC = KeyboardC( listOf( listOf( diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/SKThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/SKThumbKey.kt index 4bcb340f5..e5692e119 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/SKThumbKey.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/SKThumbKey.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_SK_THUMBKEY_MAIN = +val KB_SK_THUMBKEY_V1_MAIN = KeyboardC( listOf( listOf( @@ -350,7 +350,7 @@ val KB_SK_THUMBKEY_MAIN = ), ) -val KB_SK_THUMBKEY_SHIFTED = +val KB_SK_THUMBKEY_V1_SHIFTED = KeyboardC( listOf( listOf( @@ -685,13 +685,13 @@ val KB_SK_THUMBKEY_SHIFTED = ), ) -val KB_SK_THUMBKEY: KeyboardDefinition = +val KB_SK_THUMBKEY_V1: KeyboardDefinition = KeyboardDefinition( title = "slovenčina thumb-key v1", modes = KeyboardDefinitionModes( - main = KB_SK_THUMBKEY_MAIN, - shifted = KB_SK_THUMBKEY_SHIFTED, + main = KB_SK_THUMBKEY_V1_MAIN, + shifted = KB_SK_THUMBKEY_V1_SHIFTED, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/TOKSitelenThumbkeyEmoji.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/TOKSitelenThumbkeyEmoji.kt index 1bcd3c016..77602814e 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/TOKSitelenThumbkeyEmoji.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/TOKSitelenThumbkeyEmoji.kt @@ -16,7 +16,7 @@ import com.dessalines.thumbkey.utils.SwipeDirection // Frequencies from here: https://www.reddit.com/r/tokipona/comments/cxlpt5/frequency_list_of_toki_pona_words_from_tatoeba // Since these aren't vowels, no need to alternate, just do bottom right to left, bottom to top -val KB_TOK_SITELEN_EMOJI_THUMBKEY_MAIN = +val KB_TOK_SITELEN_THUMBKEY_EMOJI_MAIN = KeyboardC( listOf( listOf( @@ -409,7 +409,7 @@ val KB_TOK_SITELEN_EMOJI_THUMBKEY_MAIN = ), ) -val KB_TOK_SITELEN_EMOJI_THUMBKEY_SHIFTED = +val KB_TOK_SITELEN_THUMBKEY_EMOJI_SHIFTED = KeyboardC( listOf( listOf( @@ -717,13 +717,13 @@ val KB_TOK_SITELEN_EMOJI_THUMBKEY_SHIFTED = ), ) -val KB_TOK_SITELEN_EMOJI_THUMBKEY: KeyboardDefinition = +val KB_TOK_SITELEN_THUMBKEY_EMOJI: KeyboardDefinition = KeyboardDefinition( title = "toki pona sitelen thumb-key emoji", modes = KeyboardDefinitionModes( - main = KB_TOK_SITELEN_EMOJI_THUMBKEY_MAIN, - shifted = KB_TOK_SITELEN_EMOJI_THUMBKEY_SHIFTED, + main = KB_TOK_SITELEN_THUMBKEY_EMOJI_MAIN, + shifted = KB_TOK_SITELEN_THUMBKEY_EMOJI_SHIFTED, numeric = NUMERIC_KEYBOARD, ), ) diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt index 7c5542f42..64170cdf4 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -1,14 +1,13 @@ package com.dessalines.thumbkey.utils -import com.dessalines.thumbkey.keyboards.KB_BG_PHONETIC_MESSAGEASE_SYMBOLS +import com.dessalines.thumbkey.keyboards.KB_BG_MESSAGEASE_PHONETIC_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_BG_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_BR_FR_THUMBKEY 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_PROG +import com.dessalines.thumbkey.keyboards.KB_CZ_MESSAGEASE_PROGRAMMING import com.dessalines.thumbkey.keyboards.KB_DA_THUMBKEY -import com.dessalines.thumbkey.keyboards.KB_DE_EN_AE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEASE import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_DE_NORDIC_MESSAGEASE @@ -16,13 +15,14 @@ import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY_MULTILINGUAL import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_DE_TYPESPLIT -import com.dessalines.thumbkey.keyboards.KB_ENEO_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_CZ_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_DA_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_DE_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_EN_DE_THUMBKEY_AE import com.dessalines.thumbkey.keyboards.KB_EN_DE_THUMBKEY_V2 import com.dessalines.thumbkey.keyboards.KB_EN_DOUBLE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_EE_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_EN_EO_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_EO_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_ES_CA_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_FR_MESSAGEASE_SYMBOLS @@ -32,9 +32,10 @@ import com.dessalines.thumbkey.keyboards.KB_EN_LA_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_COMPOSE import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_LEFT +import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_LEFT_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_SYMBOLS -import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_SYMBOLS_LEFT -import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS +import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS +import com.dessalines.thumbkey.keyboards.KB_EN_MESSAGEASE_TWO_HANDS import com.dessalines.thumbkey.keyboards.KB_EN_MI_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_MI_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_NO_MESSAGEASE_SYMBOLS @@ -45,25 +46,24 @@ import com.dessalines.thumbkey.keyboards.KB_EN_PL_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_QBASED import com.dessalines.thumbkey.keyboards.KB_EN_QBASED_LEFT import com.dessalines.thumbkey.keyboards.KB_EN_QWERTEASE +import com.dessalines.thumbkey.keyboards.KB_EN_QWERTEASE_TWO_HANDS import com.dessalines.thumbkey.keyboards.KB_EN_QWERTYFOUR import com.dessalines.thumbkey.keyboards.KB_EN_QWERTYFOUR_COMPOSE import com.dessalines.thumbkey.keyboards.KB_EN_RO_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_SK_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_EN_SYMBOLS_NUMBERS_TWO_HANDS +import com.dessalines.thumbkey.keyboards.KB_EN_SYMBOLS_TWO_HANDS import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_COMPOSE -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_PROGRAMMING +import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_PROGRAMMING_WIDE import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_WIDE import com.dessalines.thumbkey.keyboards.KB_EN_THUMBKEY_WRITER import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS -import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS_MESSAGEASE -import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS_QWERTEASE -import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS_SYMBOLS -import com.dessalines.thumbkey.keyboards.KB_EN_TWO_HANDS_SYMBOLS_NUMBERS import com.dessalines.thumbkey.keyboards.KB_EN_TYPESPLIT -import com.dessalines.thumbkey.keyboards.KB_EOENDE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EO_CYRILLIC_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_EO_EN_DE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_ES_CA_MESSAGEASE import com.dessalines.thumbkey.keyboards.KB_ES_CA_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_ES_EO_THUMBKEY @@ -93,18 +93,18 @@ import com.dessalines.thumbkey.keyboards.KB_HR_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_HR_TWO_HANDS import com.dessalines.thumbkey.keyboards.KB_HU_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_HU_TYPESPLIT -import com.dessalines.thumbkey.keyboards.KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1 +import com.dessalines.thumbkey.keyboards.KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1 import com.dessalines.thumbkey.keyboards.KB_ID_THUMBKEY_SYMBOLS_V1 import com.dessalines.thumbkey.keyboards.KB_ID_THUMBKEY_SYMBOLS_V2 import com.dessalines.thumbkey.keyboards.KB_IT_MESSAGEASE import com.dessalines.thumbkey.keyboards.KB_IT_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_IT_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_IT_TYPESPLIT -import com.dessalines.thumbkey.keyboards.KB_JA_THUMBKEY_HIRAGANA -import com.dessalines.thumbkey.keyboards.KB_JA_THUMBKEY_KANA -import com.dessalines.thumbkey.keyboards.KB_JA_THUMBKEY_KATAKANA -import com.dessalines.thumbkey.keyboards.KB_JA_TYPESPLIT_HIRAGANA -import com.dessalines.thumbkey.keyboards.KB_JA_TYPESPLIT_KATAKANA +import com.dessalines.thumbkey.keyboards.KB_JA_HIRAGANA_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_JA_HIRAGANA_TYPESPLIT +import com.dessalines.thumbkey.keyboards.KB_JA_KANA_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_JA_KATAKANA_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_JA_KATAKANA_TYPESPLIT import com.dessalines.thumbkey.keyboards.KB_KA_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_KZ_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_LT_THUMBKEY @@ -123,14 +123,14 @@ import com.dessalines.thumbkey.keyboards.KB_RU_MESSAGEASE import com.dessalines.thumbkey.keyboards.KB_RU_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_RU_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_RU_THUMBKEY_SYMBOLS -import com.dessalines.thumbkey.keyboards.KB_SK_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_SK_THUMBKEY_V1 import com.dessalines.thumbkey.keyboards.KB_SK_THUMBKEY_V2 import com.dessalines.thumbkey.keyboards.KB_SK_THUMBKEY_V3 import com.dessalines.thumbkey.keyboards.KB_SL_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_SV_MESSAGEASE import com.dessalines.thumbkey.keyboards.KB_SV_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_T9 -import com.dessalines.thumbkey.keyboards.KB_TOK_SITELEN_EMOJI_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_TOK_SITELEN_THUMBKEY_EMOJI import com.dessalines.thumbkey.keyboards.KB_TOK_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_TR_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_UK_MESSAGEASE_SYMBOLS @@ -144,7 +144,7 @@ enum class KeyboardLayout( val keyboardDefinition: KeyboardDefinition, ) { ENThumbKey(KB_EN_THUMBKEY), - ENThumbKeyProgrammer(KB_EN_THUMBKEY_PROGRAMMER), + ENThumbKeyProgramming(KB_EN_THUMBKEY_PROGRAMMING), DEThumbKey(KB_DE_THUMBKEY), DAThumbKey(KB_DA_THUMBKEY), ESThumbKey(KB_ES_THUMBKEY), @@ -174,8 +174,8 @@ enum class KeyboardLayout( FRMessagEase(KB_FR_MESSAGEASE), RUMessagEaseSymbols(KB_RU_MESSAGEASE_SYMBOLS), T9(KB_T9), - JAThumbKeyHiragana(KB_JA_THUMBKEY_HIRAGANA), - JAThumbKeyKatakana(KB_JA_THUMBKEY_KATAKANA), + JAHiraganaThumbKey(KB_JA_HIRAGANA_THUMBKEY), + JAKatakanaThumbKey(KB_JA_KATAKANA_THUMBKEY), FRThumbKeyV2(KB_FR_THUMBKEY_V2), SVThumbKey(KB_SV_THUMBKEY), TRThumbKey(KB_TR_THUMBKEY), @@ -187,13 +187,13 @@ enum class KeyboardLayout( PTTypeSplit(KB_PT_TYPESPLIT), PLTypeSplit(KB_PL_TYPESPLIT), ENTwoHands(KB_EN_TWO_HANDS), - ENThumbKeyProgrammerWide(KB_EN_THUMBKEY_PROGRAMMER_WIDE), + ENThumbKeyProgrammingWide(KB_EN_THUMBKEY_PROGRAMMING_WIDE), HUThumbKey(KB_HU_THUMBKEY), ESEOThumbKey(KB_ES_EO_THUMBKEY), ITMessagEase(KB_IT_MESSAGEASE), ENSKThumbKey(KB_EN_SK_THUMBKEY), HEThumbKey(KB_HE_THUMBKEY), - EOENDEThumbKey(KB_EOENDE_THUMBKEY), + EOENDEThumbKey(KB_EO_EN_DE_THUMBKEY), GRThumbKey(KB_GR_THUMBKEY), ENCZThumbKey(KB_EN_CZ_THUMBKEY), ESMessagEase(KB_ES_MESSAGEASE), @@ -206,23 +206,23 @@ enum class KeyboardLayout( LVLTGThumbKey(KB_LV_LTG_THUMBKEY), LTThumbKey(KB_LT_THUMBKEY), IDThumbKeySymbolsV2(KB_ID_THUMBKEY_SYMBOLS_V2), - IDThumbKeySymbolsNumeric(KB_ID_THUMBKEY_SYMBOLS_NUMERIC_V1), + IDThumbKeySymbolsNumbers(KB_ID_THUMBKEY_SYMBOLS_NUMBERS_V1), ESCAThumbKey(KB_ES_CA_THUMBKEY), ENITThumbKey(KB_EN_IT_THUMBKEY), - ENEOMessagEaseSymbols(KB_ENEO_MESSAGEASE_SYMBOLS), + ENEOMessagEaseSymbols(KB_EN_EO_MESSAGEASE_SYMBOLS), UKRUMessagEaseSymbols(KB_UK_RU_MESSAGEASE_SYMBOLS), DEMessagEaseSymbols(KB_DE_MESSAGEASE_SYMBOLS), CAThumbKey(KB_CA_THUMBKEY), MATHThumbKey(KB_MATH_THUMBKEY), ENEEThumbKey(KB_EN_EE_THUMBKEY), - SKThumbKey(KB_SK_THUMBKEY), + SKThumbKeyV1(KB_SK_THUMBKEY_V1), ENNOTypeSplit(KB_EN_NO_TYPESPLIT), ENThumbKeyCompose(KB_EN_THUMBKEY_COMPOSE), ENNOThumbKey(KB_EN_NO_THUMBKEY), - ENTwoHandsSymbols(KB_EN_TWO_HANDS_SYMBOLS), - ENTwoHandsSymbolsNumbers(KB_EN_TWO_HANDS_SYMBOLS_NUMBERS), - JATypeSplitHiragana(KB_JA_TYPESPLIT_HIRAGANA), - JATypeSplitKatakana(KB_JA_TYPESPLIT_KATAKANA), + ENSymbolsTwoHands(KB_EN_SYMBOLS_TWO_HANDS), + ENSymbolsNumbersTwoHands(KB_EN_SYMBOLS_NUMBERS_TWO_HANDS), + JAHiraganaTypeSplit(KB_JA_HIRAGANA_TYPESPLIT), + JAKatakanaTypeSplit(KB_JA_KATAKANA_TYPESPLIT), EUESThumbKey(KB_EU_ES_THUMBKEY), ENQwertyFour(KB_EN_QWERTYFOUR), KZThumbKey(KB_KZ_THUMBKEY), @@ -235,14 +235,14 @@ enum class KeyboardLayout( ENDAThumbKeySymbols(KB_EN_DA_THUMBKEY_SYMBOLS), FIEEMessagEase(KB_FI_EE_MESSAGEASE_SYMBOLS), ENPLThumbkey(KB_EN_PL_THUMBKEY), - BGPhoneticMessagEaseSymbols(KB_BG_PHONETIC_MESSAGEASE_SYMBOLS), + BGMessagEasePhoneticSymbols(KB_BG_MESSAGEASE_PHONETIC_SYMBOLS), UKMessagEaseSymbols(KB_UK_MESSAGEASE_SYMBOLS), ENFRMessagEaseSymbols(KB_EN_FR_MESSAGEASE_SYMBOLS), HEMessagEaseSymbols(KB_HE_MESSAGEASE_SYMBOLS), ENNOMessagEaseSymbols(KB_EN_NO_MESSAGEASE_SYMBOLS), SLMessagEaseSymbols(KB_SL_MESSAGEASE_SYMBOLS), ENMessagEaseLeft(KB_EN_MESSAGEASE_LEFT), - ENMessagEaseSymbolsLeft(KB_EN_MESSAGEASE_SYMBOLS_LEFT), + ENMessagEaseLeftSymbols(KB_EN_MESSAGEASE_LEFT_SYMBOLS), ENEOThumbKey(KB_EN_EO_THUMBKEY), ENPHMessagEase(KB_EN_PH_MESSAGEASE), EOCyrillicThumbKey(KB_EO_CYRILLIC_THUMBKEY), @@ -253,31 +253,31 @@ enum class KeyboardLayout( PLMessagEase(KB_PL_MESSAGEASE), ENMessagEaseCompose(KB_EN_MESSAGEASE_COMPOSE), BRFRThumbKey(KB_BR_FR_THUMBKEY), - ENTwoHandsMessagEase(KB_EN_TWO_HANDS_MESSAGEASE), + ENMessagEaseTwoHands(KB_EN_MESSAGEASE_TWO_HANDS), ENDEThumbKey(KB_EN_DE_THUMBKEY), ENHRMessagEase(KB_EN_HR_MESSAGEASE), - CZprogrammerMessagease(KB_CZ_PROG), + CZMessagEaseProgramming(KB_CZ_MESSAGEASE_PROGRAMMING), ENDEThumbKeyV2(KB_EN_DE_THUMBKEY_V2), ENESCAThumbKey(KB_EN_ES_CA_THUMBKEY), DENordicMessagEase(KB_DE_NORDIC_MESSAGEASE), VNThumbKey(KB_VN_THUMBKEY), TOKThumbKey(KB_TOK_THUMBKEY), - TOKSitelenEmojiThumbKey(KB_TOK_SITELEN_EMOJI_THUMBKEY), + TOKSitelenThumbKeyEmoji(KB_TOK_SITELEN_THUMBKEY_EMOJI), PLTypeSplitSymbols(KB_PL_TYPESPLIT_SYMBOLS), SKThumbKeyV2(KB_SK_THUMBKEY_V2), ITMessagEaseSymbols(KB_IT_MESSAGEASE_SYMBOLS), ENQwertease(KB_EN_QWERTEASE), - ENQTwoHandsQwertease(KB_EN_TWO_HANDS_QWERTEASE), + ENQwerteaseTwoHands(KB_EN_QWERTEASE_TWO_HANDS), ENThumbKeyWide(KB_EN_THUMBKEY_WIDE), ENQBased(KB_EN_QBASED), ENQBasedLeft(KB_EN_QBASED_LEFT), DEThumbkeySymbols(KB_DE_THUMBKEY_SYMBOLS), ENQwertyFourCompose(KB_EN_QWERTYFOUR_COMPOSE), ENThumbKeyWriter(KB_EN_THUMBKEY_WRITER), - JAThumbKeyKana(KB_JA_THUMBKEY_KANA), + JAKanaThumbKey(KB_JA_KANA_THUMBKEY), FAThumbKeySamsung(KB_FA_THUMBKEY_SAMSUNG), - DEENAEThumbkey(KB_DE_EN_AE_THUMBKEY), + DEENThumbkeyAE(KB_EN_DE_THUMBKEY_AE), SKThumbKeyV3(KB_SK_THUMBKEY_V3), EuropeThumbkey(KB_EUROPE_THUMBKEY), - ENTwoHandsMessagEaseSymbols(KB_EN_MESSAGEASE_TWO_HANDS_SYMBOLS), + ENMessagEaseSymbolsTwoHands(KB_EN_MESSAGEASE_SYMBOLS_TWO_HANDS), }