From 600ae3b6cd9ae2c9155f9c02acd0d8950dc6f778 Mon Sep 17 00:00:00 2001 From: bluedrink9 Date: Fri, 9 Feb 2024 09:30:11 +1300 Subject: [PATCH 1/4] Use messagease symbol layout for messagease number board Better match the [messagease layout](https://www.exideas.com/ME/iosfaq/numbers.png) Small variation from the real ME in that blank spaces have been filled with some of the extra math symbols that ME has on swipe-return keys, which we can't have on TK --- .../thumbkey/keyboards/CommonKeys.kt | 12 + .../keyboards/ENMessageEaseSymbols.kt | 383 +++++++++++++++++- 2 files changed, 394 insertions(+), 1 deletion(-) 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 a0d74ec9..87e58992 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt @@ -32,6 +32,18 @@ import com.dessalines.thumbkey.utils.SlideType import com.dessalines.thumbkey.utils.SwipeDirection import com.dessalines.thumbkey.utils.SwipeNWay +val ABC_KEY_ITEM = + KeyItemC( + center = + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.Abc), + action = KeyAction.ToggleNumericMode(false), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + backgroundColor = ColorVariant.SURFACE_VARIANT, + ) + val NUMERIC_KEY_ITEM = KeyItemC( center = diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt index 27bab4d2..b193c016 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt @@ -890,6 +890,387 @@ val KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED = ), ) +val KB_EN_MESSAGEEASE_SYMBOLS_NUMBERS = + KeyboardC( + listOf( + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("1"), + action = KeyAction.CommitText("1"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_RIGHT to + KeyC( + // em dash/long minus + display = KeyDisplay.TextDisplay("—"), + action = KeyAction.CommitText("—"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + // en dash/long minus + display = KeyDisplay.TextDisplay("–"), + action = KeyAction.CommitText("–"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + // Normal minus + display = KeyDisplay.TextDisplay("-"), + action = KeyAction.CommitText("-"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("$"), + action = KeyAction.CommitText("$"), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("2"), + action = KeyAction.CommitText("2"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("`"), + action = KeyAction.CommitText("`"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.TextDisplay("^"), + action = KeyAction.CommitText("^"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("´"), + action = KeyAction.CommitText("´"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("!"), + action = KeyAction.CommitText("!"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("×"), + action = KeyAction.CommitText("×"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("\\"), + action = KeyAction.CommitText("\\"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("/"), + action = KeyAction.CommitText("/"), + color = ColorVariant.MUTED, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("+"), + action = KeyAction.CommitText("+"), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("3"), + action = KeyAction.CommitText("3"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("÷"), + action = KeyAction.CommitText("÷"), + color = ColorVariant.MUTED, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("?"), + action = KeyAction.CommitText("?"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("±"), + action = KeyAction.CommitText("±"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("€"), + action = KeyAction.CommitText("€"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("="), + action = KeyAction.CommitText("="), + color = ColorVariant.MUTED, + ), + ), + ), + EMOJI_KEY_ITEM, + ), + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("4"), + action = KeyAction.CommitText("4"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("{"), + action = KeyAction.CommitText("{"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("%"), + action = KeyAction.CommitText("%"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("_"), + action = KeyAction.CommitText("_"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("¬"), + action = KeyAction.CommitText("¬"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("["), + action = KeyAction.CommitText("["), + color = ColorVariant.MUTED, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("("), + action = KeyAction.CommitText("("), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("5"), + action = KeyAction.CommitText("5"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf(), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("6"), + action = KeyAction.CommitText("6"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("|"), + action = KeyAction.CommitText("|"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("}"), + action = KeyAction.CommitText("}"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay(")"), + action = KeyAction.CommitText(")"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("]"), + action = KeyAction.CommitText("]"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("@"), + action = KeyAction.CommitText("@"), + color = ColorVariant.MUTED, + ), + ), + ), + ABC_KEY_ITEM, + ), + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("7"), + action = KeyAction.CommitText("7"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("~"), + action = KeyAction.CommitText("~"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("*"), + action = KeyAction.CommitText("*"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay(":"), + action = KeyAction.CommitText(":"), + color = ColorVariant.MUTED, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("<"), + action = KeyAction.CommitText("<"), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("8"), + action = KeyAction.CommitText("8"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("'"), + action = KeyAction.CommitText("'"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("\""), + action = KeyAction.CommitText("\""), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay(":"), + action = KeyAction.CommitText(":"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("."), + action = KeyAction.CommitText("."), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay(","), + action = KeyAction.CommitText(","), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("9"), + action = KeyAction.CommitText("9"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.TextDisplay("&"), + action = KeyAction.CommitText("&"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("°"), + action = KeyAction.CommitText("°"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay(">"), + action = KeyAction.CommitText(">"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay(";"), + action = KeyAction.CommitText(";"), + color = ColorVariant.MUTED, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("#"), + action = KeyAction.CommitText("#"), + color = ColorVariant.MUTED, + ), + ), + ), + BACKSPACE_KEY_ITEM, + ), + listOf( + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM, + ), + ), + ) + val KB_EN_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition( title = "english symbols messageease", @@ -897,7 +1278,7 @@ val KB_EN_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinitionModes( main = KB_EN_MESSAGEEASE_SYMBOLS_MAIN, shifted = KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED, - numeric = NUMERIC_KEYBOARD, + numeric = KB_EN_MESSAGEEASE_SYMBOLS_NUMBERS, ), settings = KeyboardDefinitionSettings( From 0adf82b08b0052bb74200ba61b3d35a0700fea4e Mon Sep 17 00:00:00 2001 From: bluedrink9 Date: Fri, 9 Feb 2024 13:52:23 +1300 Subject: [PATCH 2/4] Match NumericMessagEase to actual messagease See previous commit for image evidence --- .../thumbkey/keyboards/NumericMessagEase.kt | 386 +++++++++++------- 1 file changed, 243 insertions(+), 143 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt index e29b4804..5586a1b7 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt @@ -18,338 +18,438 @@ val NUMERIC_KEYBOARD_MESSAGEASE = listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("1"), - action = KeyAction.CommitText("1"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("1"), + action = KeyAction.CommitText("1"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - buildMap { - put( - SwipeDirection.BOTTOM_LEFT, - KeyC( - display = KeyDisplay.TextDisplay("$"), - action = KeyAction.CommitText("$"), - ), - ) - put( - SwipeDirection.RIGHT, - KeyC( - display = KeyDisplay.TextDisplay("-"), - action = KeyAction.CommitText("-"), - ), - ) - getLocalCurrency()?.let { - if (it !in setOf("$", "£", "€")) { - put( - SwipeDirection.BOTTOM_RIGHT, - KeyC( - display = KeyDisplay.TextDisplay(it), - action = KeyAction.CommitText(it), - ), - ) - } + buildMap { + put( + SwipeDirection.LEFT, + KeyC( + display = KeyDisplay.TextDisplay("≤"), + action = KeyAction.CommitText("≤"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.BOTTOM_LEFT, + KeyC( + display = KeyDisplay.TextDisplay("$"), + action = KeyAction.CommitText("$"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.TOP, + KeyC( + // em dash/long minus + display = KeyDisplay.TextDisplay("—"), + action = KeyAction.CommitText("—"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.TOP_RIGHT, + KeyC( + // en dash/long minus + display = KeyDisplay.TextDisplay("–"), + action = KeyAction.CommitText("–"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.RIGHT, + KeyC( + display = KeyDisplay.TextDisplay("-"), + action = KeyAction.CommitText("-"), + color = ColorVariant.MUTED, + ), + ) + getLocalCurrency()?.let { + if (it !in setOf("$", "£", "€")) { + put( + SwipeDirection.BOTTOM_RIGHT, + KeyC( + display = KeyDisplay.TextDisplay(it), + action = KeyAction.CommitText(it), + color = ColorVariant.MUTED, + ), + ) } - }, + } + }, ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("2"), - action = KeyAction.CommitText("2"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("2"), + action = KeyAction.CommitText("2"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("`"), action = KeyAction.CommitText("`"), + color = ColorVariant.MUTED, ), - SwipeDirection.TOP to + SwipeDirection.TOP to KeyC( display = KeyDisplay.TextDisplay("^"), action = KeyAction.CommitText("^"), + color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("´"), action = KeyAction.CommitText("´"), + color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("!"), + action = KeyAction.CommitText("!"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("¡"), action = KeyAction.CommitText("¡"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("\\"), action = KeyAction.CommitText("\\"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("/"), action = KeyAction.CommitText("/"), + color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("+"), action = KeyAction.CommitText("+"), + color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("3"), - action = KeyAction.CommitText("3"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("3"), + action = KeyAction.CommitText("3"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("¿"), action = KeyAction.CommitText("¿"), + color = ColorVariant.MUTED, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("?"), + action = KeyAction.CommitText("?"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("€"), action = KeyAction.CommitText("€"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("£"), action = KeyAction.CommitText("£"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM to + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("="), action = KeyAction.CommitText("="), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("≥"), + action = KeyAction.CommitText("≥"), + color = ColorVariant.MUTED, ), - ), + ), ), EMOJI_KEY_ITEM, ), listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("4"), - action = KeyAction.CommitText("4"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("4"), + action = KeyAction.CommitText("4"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("{"), action = KeyAction.CommitText("{"), + color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("%"), action = KeyAction.CommitText("%"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("_"), action = KeyAction.CommitText("_"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("["), action = KeyAction.CommitText("["), + color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("("), action = KeyAction.CommitText("("), + color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("5"), - action = KeyAction.CommitText("5"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("5"), + action = KeyAction.CommitText("5"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP to + mapOf( + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("÷"), + action = KeyAction.CommitText("÷"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP to KeyC( display = KeyDisplay.TextDisplay("¬"), action = KeyAction.CommitText("¬"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("×"), + action = KeyAction.CommitText("×"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("±"), + action = KeyAction.CommitText("±"), + color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("6"), - action = KeyAction.CommitText("6"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("6"), + action = KeyAction.CommitText("6"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("|"), action = KeyAction.CommitText("|"), + color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("}"), action = KeyAction.CommitText("}"), + color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay(")"), action = KeyAction.CommitText(")"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("]"), action = KeyAction.CommitText("]"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("@"), action = KeyAction.CommitText("@"), + color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.IconDisplay(Icons.Outlined.Abc), - action = KeyAction.ToggleNumericMode(false), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.Abc), + action = KeyAction.ToggleNumericMode(false), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), backgroundColor = ColorVariant.SURFACE_VARIANT, ), ), listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("7"), - action = KeyAction.CommitText("7"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("7"), + action = KeyAction.CommitText("7"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("~"), action = KeyAction.CommitText("~"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("<"), action = KeyAction.CommitText("<"), + color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay("*"), action = KeyAction.CommitText("*"), + color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("8"), - action = KeyAction.CommitText("8"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("8"), + action = KeyAction.CommitText("8"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("\""), action = KeyAction.CommitText("\""), + color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("'"), action = KeyAction.CommitText("'"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay(":"), action = KeyAction.CommitText(":"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM to + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("."), action = KeyAction.CommitText("."), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay(","), action = KeyAction.CommitText(","), + color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("9"), - action = KeyAction.CommitText("9"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("9"), + action = KeyAction.CommitText("9"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP to + mapOf( + SwipeDirection.TOP to KeyC( display = KeyDisplay.TextDisplay("&"), action = KeyAction.CommitText("&"), + color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("°"), action = KeyAction.CommitText("°"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay(">"), action = KeyAction.CommitText(">"), + color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay(";"), action = KeyAction.CommitText(";"), + color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("#"), action = KeyAction.CommitText("#"), + color = ColorVariant.MUTED, ), - ), + ), ), BACKSPACE_KEY_ITEM, ), listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("0"), - action = KeyAction.CommitText("0"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("0"), + action = KeyAction.CommitText("0"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), widthMultiplier = 2, ), SPACEBAR_SKINNY_KEY_ITEM, From ce8c62aa50e6bae7665b30f06bc62a19d63fb218 Mon Sep 17 00:00:00 2001 From: bluedrink9 Date: Fri, 9 Feb 2024 14:02:16 +1300 Subject: [PATCH 3/4] Reference NUMERIC_KEYBOARD_MESSAGEASE for messagease numbers --- .../keyboards/ENMessageEaseSymbols.kt | 383 +----------------- 1 file changed, 1 insertion(+), 382 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt index b193c016..37b56569 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt @@ -890,387 +890,6 @@ val KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED = ), ) -val KB_EN_MESSAGEEASE_SYMBOLS_NUMBERS = - KeyboardC( - listOf( - listOf( - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("1"), - action = KeyAction.CommitText("1"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP_RIGHT to - KeyC( - // em dash/long minus - display = KeyDisplay.TextDisplay("—"), - action = KeyAction.CommitText("—"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - // en dash/long minus - display = KeyDisplay.TextDisplay("–"), - action = KeyAction.CommitText("–"), - color = ColorVariant.MUTED, - ), - SwipeDirection.RIGHT to - KeyC( - // Normal minus - display = KeyDisplay.TextDisplay("-"), - action = KeyAction.CommitText("-"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("$"), - action = KeyAction.CommitText("$"), - color = ColorVariant.MUTED, - ), - ), - ), - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("2"), - action = KeyAction.CommitText("2"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("`"), - action = KeyAction.CommitText("`"), - color = ColorVariant.MUTED, - ), - SwipeDirection.TOP to - KeyC( - display = KeyDisplay.TextDisplay("^"), - action = KeyAction.CommitText("^"), - color = ColorVariant.MUTED, - ), - SwipeDirection.TOP_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("´"), - action = KeyAction.CommitText("´"), - color = ColorVariant.MUTED, - ), - SwipeDirection.RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("!"), - action = KeyAction.CommitText("!"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM to - KeyC( - display = KeyDisplay.TextDisplay("×"), - action = KeyAction.CommitText("×"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("\\"), - action = KeyAction.CommitText("\\"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("/"), - action = KeyAction.CommitText("/"), - color = ColorVariant.MUTED, - ), - SwipeDirection.LEFT to - KeyC( - display = KeyDisplay.TextDisplay("+"), - action = KeyAction.CommitText("+"), - color = ColorVariant.MUTED, - ), - ), - ), - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("3"), - action = KeyAction.CommitText("3"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("÷"), - action = KeyAction.CommitText("÷"), - color = ColorVariant.MUTED, - ), - SwipeDirection.LEFT to - KeyC( - display = KeyDisplay.TextDisplay("?"), - action = KeyAction.CommitText("?"), - color = ColorVariant.MUTED, - ), - SwipeDirection.RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("±"), - action = KeyAction.CommitText("±"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("€"), - action = KeyAction.CommitText("€"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM to - KeyC( - display = KeyDisplay.TextDisplay("="), - action = KeyAction.CommitText("="), - color = ColorVariant.MUTED, - ), - ), - ), - EMOJI_KEY_ITEM, - ), - listOf( - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("4"), - action = KeyAction.CommitText("4"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("{"), - action = KeyAction.CommitText("{"), - color = ColorVariant.MUTED, - ), - SwipeDirection.TOP_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("%"), - action = KeyAction.CommitText("%"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("_"), - action = KeyAction.CommitText("_"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM to - KeyC( - display = KeyDisplay.TextDisplay("¬"), - action = KeyAction.CommitText("¬"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("["), - action = KeyAction.CommitText("["), - color = ColorVariant.MUTED, - ), - SwipeDirection.LEFT to - KeyC( - display = KeyDisplay.TextDisplay("("), - action = KeyAction.CommitText("("), - color = ColorVariant.MUTED, - ), - ), - ), - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("5"), - action = KeyAction.CommitText("5"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf(), - ), - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("6"), - action = KeyAction.CommitText("6"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("|"), - action = KeyAction.CommitText("|"), - color = ColorVariant.MUTED, - ), - SwipeDirection.TOP_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("}"), - action = KeyAction.CommitText("}"), - color = ColorVariant.MUTED, - ), - SwipeDirection.RIGHT to - KeyC( - display = KeyDisplay.TextDisplay(")"), - action = KeyAction.CommitText(")"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("]"), - action = KeyAction.CommitText("]"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("@"), - action = KeyAction.CommitText("@"), - color = ColorVariant.MUTED, - ), - ), - ), - ABC_KEY_ITEM, - ), - listOf( - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("7"), - action = KeyAction.CommitText("7"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("~"), - action = KeyAction.CommitText("~"), - color = ColorVariant.MUTED, - ), - SwipeDirection.RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("*"), - action = KeyAction.CommitText("*"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay(":"), - action = KeyAction.CommitText(":"), - color = ColorVariant.MUTED, - ), - SwipeDirection.LEFT to - KeyC( - display = KeyDisplay.TextDisplay("<"), - action = KeyAction.CommitText("<"), - color = ColorVariant.MUTED, - ), - ), - ), - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("8"), - action = KeyAction.CommitText("8"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("'"), - action = KeyAction.CommitText("'"), - color = ColorVariant.MUTED, - ), - SwipeDirection.TOP_LEFT to - KeyC( - display = KeyDisplay.TextDisplay("\""), - action = KeyAction.CommitText("\""), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay(":"), - action = KeyAction.CommitText(":"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM to - KeyC( - display = KeyDisplay.TextDisplay("."), - action = KeyAction.CommitText("."), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay(","), - action = KeyAction.CommitText(","), - color = ColorVariant.MUTED, - ), - ), - ), - KeyItemC( - center = - KeyC( - display = KeyDisplay.TextDisplay("9"), - action = KeyAction.CommitText("9"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), - swipes = - mapOf( - SwipeDirection.TOP to - KeyC( - display = KeyDisplay.TextDisplay("&"), - action = KeyAction.CommitText("&"), - color = ColorVariant.MUTED, - ), - SwipeDirection.TOP_RIGHT to - KeyC( - display = KeyDisplay.TextDisplay("°"), - action = KeyAction.CommitText("°"), - color = ColorVariant.MUTED, - ), - SwipeDirection.RIGHT to - KeyC( - display = KeyDisplay.TextDisplay(">"), - action = KeyAction.CommitText(">"), - color = ColorVariant.MUTED, - ), - SwipeDirection.BOTTOM_LEFT to - KeyC( - display = KeyDisplay.TextDisplay(";"), - action = KeyAction.CommitText(";"), - color = ColorVariant.MUTED, - ), - SwipeDirection.LEFT to - KeyC( - display = KeyDisplay.TextDisplay("#"), - action = KeyAction.CommitText("#"), - color = ColorVariant.MUTED, - ), - ), - ), - BACKSPACE_KEY_ITEM, - ), - listOf( - SPACEBAR_KEY_ITEM, - RETURN_KEY_ITEM, - ), - ), - ) - val KB_EN_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition( title = "english symbols messageease", @@ -1278,7 +897,7 @@ val KB_EN_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinitionModes( main = KB_EN_MESSAGEEASE_SYMBOLS_MAIN, shifted = KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED, - numeric = KB_EN_MESSAGEEASE_SYMBOLS_NUMBERS, + numeric = NUMERIC_KEYBOARD_MESSAGEASE, ), settings = KeyboardDefinitionSettings( From 6431f6beebff73e069fb9c75d5d28d353240d4e7 Mon Sep 17 00:00:00 2001 From: bluedrink9 Date: Fri, 9 Feb 2024 14:59:03 +1300 Subject: [PATCH 4/4] grade format --- .../thumbkey/keyboards/NumericMessagEase.kt | 356 +++++++++--------- 1 file changed, 178 insertions(+), 178 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt index 5586a1b7..ae0b27bb 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt @@ -18,438 +18,438 @@ val NUMERIC_KEYBOARD_MESSAGEASE = listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("1"), - action = KeyAction.CommitText("1"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("1"), + action = KeyAction.CommitText("1"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - buildMap { - put( - SwipeDirection.LEFT, - KeyC( - display = KeyDisplay.TextDisplay("≤"), - action = KeyAction.CommitText("≤"), - color = ColorVariant.MUTED, - ), - ) - put( - SwipeDirection.BOTTOM_LEFT, - KeyC( - display = KeyDisplay.TextDisplay("$"), - action = KeyAction.CommitText("$"), - color = ColorVariant.MUTED, - ), - ) - put( - SwipeDirection.TOP, - KeyC( - // em dash/long minus - display = KeyDisplay.TextDisplay("—"), - action = KeyAction.CommitText("—"), - color = ColorVariant.MUTED, - ), - ) - put( - SwipeDirection.TOP_RIGHT, - KeyC( - // en dash/long minus - display = KeyDisplay.TextDisplay("–"), - action = KeyAction.CommitText("–"), - color = ColorVariant.MUTED, - ), - ) - put( - SwipeDirection.RIGHT, - KeyC( - display = KeyDisplay.TextDisplay("-"), - action = KeyAction.CommitText("-"), - color = ColorVariant.MUTED, - ), - ) - getLocalCurrency()?.let { - if (it !in setOf("$", "£", "€")) { - put( - SwipeDirection.BOTTOM_RIGHT, - KeyC( - display = KeyDisplay.TextDisplay(it), - action = KeyAction.CommitText(it), - color = ColorVariant.MUTED, - ), - ) + buildMap { + put( + SwipeDirection.LEFT, + KeyC( + display = KeyDisplay.TextDisplay("≤"), + action = KeyAction.CommitText("≤"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.BOTTOM_LEFT, + KeyC( + display = KeyDisplay.TextDisplay("$"), + action = KeyAction.CommitText("$"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.TOP, + KeyC( + // em dash/long minus + display = KeyDisplay.TextDisplay("—"), + action = KeyAction.CommitText("—"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.TOP_RIGHT, + KeyC( + // en dash/long minus + display = KeyDisplay.TextDisplay("–"), + action = KeyAction.CommitText("–"), + color = ColorVariant.MUTED, + ), + ) + put( + SwipeDirection.RIGHT, + KeyC( + display = KeyDisplay.TextDisplay("-"), + action = KeyAction.CommitText("-"), + color = ColorVariant.MUTED, + ), + ) + getLocalCurrency()?.let { + if (it !in setOf("$", "£", "€")) { + put( + SwipeDirection.BOTTOM_RIGHT, + KeyC( + display = KeyDisplay.TextDisplay(it), + action = KeyAction.CommitText(it), + color = ColorVariant.MUTED, + ), + ) + } } - } - }, + }, ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("2"), - action = KeyAction.CommitText("2"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("2"), + action = KeyAction.CommitText("2"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("`"), action = KeyAction.CommitText("`"), color = ColorVariant.MUTED, ), - SwipeDirection.TOP to + SwipeDirection.TOP to KeyC( display = KeyDisplay.TextDisplay("^"), action = KeyAction.CommitText("^"), color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("´"), action = KeyAction.CommitText("´"), color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay("!"), action = KeyAction.CommitText("!"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM to + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("¡"), action = KeyAction.CommitText("¡"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("\\"), action = KeyAction.CommitText("\\"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("/"), action = KeyAction.CommitText("/"), color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("+"), action = KeyAction.CommitText("+"), color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("3"), - action = KeyAction.CommitText("3"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("3"), + action = KeyAction.CommitText("3"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("¿"), action = KeyAction.CommitText("¿"), color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("?"), action = KeyAction.CommitText("?"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("€"), action = KeyAction.CommitText("€"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("£"), action = KeyAction.CommitText("£"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM to + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("="), action = KeyAction.CommitText("="), color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay("≥"), action = KeyAction.CommitText("≥"), color = ColorVariant.MUTED, ), - ), + ), ), EMOJI_KEY_ITEM, ), listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("4"), - action = KeyAction.CommitText("4"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("4"), + action = KeyAction.CommitText("4"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("{"), action = KeyAction.CommitText("{"), color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("%"), action = KeyAction.CommitText("%"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("_"), action = KeyAction.CommitText("_"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("["), action = KeyAction.CommitText("["), color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("("), action = KeyAction.CommitText("("), color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("5"), - action = KeyAction.CommitText("5"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("5"), + action = KeyAction.CommitText("5"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.LEFT to + mapOf( + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("÷"), action = KeyAction.CommitText("÷"), color = ColorVariant.MUTED, ), - SwipeDirection.TOP to + SwipeDirection.TOP to KeyC( display = KeyDisplay.TextDisplay("¬"), action = KeyAction.CommitText("¬"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM to + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("×"), action = KeyAction.CommitText("×"), color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay("±"), action = KeyAction.CommitText("±"), color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("6"), - action = KeyAction.CommitText("6"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("6"), + action = KeyAction.CommitText("6"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("|"), action = KeyAction.CommitText("|"), color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("}"), action = KeyAction.CommitText("}"), color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay(")"), action = KeyAction.CommitText(")"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay("]"), action = KeyAction.CommitText("]"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay("@"), action = KeyAction.CommitText("@"), color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.IconDisplay(Icons.Outlined.Abc), - action = KeyAction.ToggleNumericMode(false), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.Abc), + action = KeyAction.ToggleNumericMode(false), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), backgroundColor = ColorVariant.SURFACE_VARIANT, ), ), listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("7"), - action = KeyAction.CommitText("7"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("7"), + action = KeyAction.CommitText("7"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("~"), action = KeyAction.CommitText("~"), color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("<"), action = KeyAction.CommitText("<"), color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay("*"), action = KeyAction.CommitText("*"), color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("8"), - action = KeyAction.CommitText("8"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("8"), + action = KeyAction.CommitText("8"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP_LEFT to + mapOf( + SwipeDirection.TOP_LEFT to KeyC( display = KeyDisplay.TextDisplay("\""), action = KeyAction.CommitText("\""), color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("'"), action = KeyAction.CommitText("'"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_RIGHT to + SwipeDirection.BOTTOM_RIGHT to KeyC( display = KeyDisplay.TextDisplay(":"), action = KeyAction.CommitText(":"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM to + SwipeDirection.BOTTOM to KeyC( display = KeyDisplay.TextDisplay("."), action = KeyAction.CommitText("."), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay(","), action = KeyAction.CommitText(","), color = ColorVariant.MUTED, ), - ), + ), ), KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("9"), - action = KeyAction.CommitText("9"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("9"), + action = KeyAction.CommitText("9"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), swipes = - mapOf( - SwipeDirection.TOP to + mapOf( + SwipeDirection.TOP to KeyC( display = KeyDisplay.TextDisplay("&"), action = KeyAction.CommitText("&"), color = ColorVariant.MUTED, ), - SwipeDirection.TOP_RIGHT to + SwipeDirection.TOP_RIGHT to KeyC( display = KeyDisplay.TextDisplay("°"), action = KeyAction.CommitText("°"), color = ColorVariant.MUTED, ), - SwipeDirection.RIGHT to + SwipeDirection.RIGHT to KeyC( display = KeyDisplay.TextDisplay(">"), action = KeyAction.CommitText(">"), color = ColorVariant.MUTED, ), - SwipeDirection.BOTTOM_LEFT to + SwipeDirection.BOTTOM_LEFT to KeyC( display = KeyDisplay.TextDisplay(";"), action = KeyAction.CommitText(";"), color = ColorVariant.MUTED, ), - SwipeDirection.LEFT to + SwipeDirection.LEFT to KeyC( display = KeyDisplay.TextDisplay("#"), action = KeyAction.CommitText("#"), color = ColorVariant.MUTED, ), - ), + ), ), BACKSPACE_KEY_ITEM, ), listOf( KeyItemC( center = - KeyC( - display = KeyDisplay.TextDisplay("0"), - action = KeyAction.CommitText("0"), - size = FontSizeVariant.LARGE, - color = ColorVariant.PRIMARY, - ), + KeyC( + display = KeyDisplay.TextDisplay("0"), + action = KeyAction.CommitText("0"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), widthMultiplier = 2, ), SPACEBAR_SKINNY_KEY_ITEM,