diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/WideLayoutENProgrammer.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENProgrammerWide.kt similarity index 96% rename from app/src/main/java/com/dessalines/thumbkey/keyboards/WideLayoutENProgrammer.kt rename to app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENProgrammerWide.kt index 45239d0d..95ec007e 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/WideLayoutENProgrammer.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyENProgrammerWide.kt @@ -19,10 +19,10 @@ import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay // 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 WIDE_LAYOUT_EN_PROGRAMMER = KeyboardC( +val THUMBKEY_EN_PROGRAMMER_WIDE = KeyboardC( listOf( listOf( - SPACEBAR_TYPESPLIT_TOP_KEY_ITEM, + EMOJI_KEY_ITEM, KeyItemC( center = KeyC( display = KeyDisplay.TextDisplay("s"), @@ -351,10 +351,10 @@ val WIDE_LAYOUT_EN_PROGRAMMER = KeyboardC( ), ) -val WIDE_LAYOUT_EN_PROGRAMMER_SHIFTED = KeyboardC( +val THUMBKEY_EN_PROGRAMMER_WIDE_SHIFTED = KeyboardC( listOf( listOf( - SPACEBAR_TYPESPLIT_TOP_KEY_ITEM, + EMOJI_BACK_KEY_ITEM, KeyItemC( center = KeyC( display = KeyDisplay.TextDisplay("S"), @@ -958,8 +958,8 @@ val NUMERIC_KEYBOARD_WIDE = KeyboardC( ), ) -val WIDE_LAYOUT_EN_PROGRAMMER_KEYBOARD_MODES: Map = mapOf( - KeyboardMode.MAIN to WIDE_LAYOUT_EN_PROGRAMMER, - KeyboardMode.SHIFTED to WIDE_LAYOUT_EN_PROGRAMMER_SHIFTED, +val THUMBKEY_EN_PROGRAMMER_WIDE_KEYBOARD_MODES: Map = mapOf( + KeyboardMode.MAIN to THUMBKEY_EN_PROGRAMMER_WIDE, + KeyboardMode.SHIFTED to THUMBKEY_EN_PROGRAMMER_WIDE_SHIFTED, KeyboardMode.NUMERIC to NUMERIC_KEYBOARD_WIDE, ) diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt index d45a3f18..08240887 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt @@ -145,7 +145,7 @@ enum class KeyboardLayout(val title: String, val index: Int) { TypeSplitPTv1("Type-Split português v1", 41), TypeSplitPLv1("Type-Split polski v1", 42), TwoHandsENv1("Two Hands english v1", 43), - WideLayoutENProgrammer("Wide Layout English Programmer", 44), + ThumbKeyEnProgrammerWide("Wide programmer (Thumb-Key english)", 44), ThumbKeyHUv1("Thumb-Key magyar nyelv v1", 45), ThumbKeyESEOv1("Thumb-Key español esperanto v1", 46), MessageEaseIT("MessageEase italiano", 47), diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt index f4c92b6f..5c78f906 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt @@ -51,6 +51,7 @@ import com.dessalines.thumbkey.keyboards.THUMBKEY_CZ_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_DA_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_DE_V2_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_DE_V2_MULTILINGUAL_KEYBOARD_MODES +import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_PROGRAMMER_WIDE_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_V4_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_V4_MULTI_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_EN_V4_PROGRAMMER_KEYBOARD_MODES @@ -98,7 +99,6 @@ import com.dessalines.thumbkey.keyboards.TYPESPLIT_FR_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.TYPESPLIT_IT_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.TYPESPLIT_PL_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.TYPESPLIT_PT_V1_KEYBOARD_MODES -import com.dessalines.thumbkey.keyboards.WIDE_LAYOUT_EN_PROGRAMMER_KEYBOARD_MODES import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -181,7 +181,7 @@ fun keyboardLayoutToModes(layout: KeyboardLayout): Map KeyboardLayout.TypeSplitPTv1 -> TYPESPLIT_PT_V1_KEYBOARD_MODES KeyboardLayout.TypeSplitPLv1 -> TYPESPLIT_PL_V1_KEYBOARD_MODES KeyboardLayout.TwoHandsENv1 -> TWO_HANDS_EN_V1_KEYBOARD_MODES - KeyboardLayout.WideLayoutENProgrammer -> WIDE_LAYOUT_EN_PROGRAMMER_KEYBOARD_MODES + KeyboardLayout.ThumbKeyEnProgrammerWide -> THUMBKEY_EN_PROGRAMMER_WIDE_KEYBOARD_MODES KeyboardLayout.ThumbKeyHUv1 -> THUMBKEY_HU_V1_KEYBOARD_MODES KeyboardLayout.ThumbKeyESEOv1 -> THUMBKEY_ES_EO_V1_KEYBOARD_MODES KeyboardLayout.MessageEaseIT -> MESSAGEEASE_IT_KEYBOARD_MODES