From dba3599e103b94034557810f09cbbbf05248c096 Mon Sep 17 00:00:00 2001 From: Silico_Biomancer Date: Fri, 9 Feb 2024 15:31:46 +1300 Subject: [PATCH] Use messagease symbol layout for messagease number board (#695) * 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 * Match NumericMessagEase to actual messagease See previous commit for image evidence * Reference NUMERIC_KEYBOARD_MESSAGEASE for messagease numbers * grade format --------- Co-authored-by: bluedrink9 Co-authored-by: Dessalines --- .../thumbkey/keyboards/CommonKeys.kt | 12 ++ .../keyboards/ENMessageEaseSymbols.kt | 2 +- .../thumbkey/keyboards/NumericMessagEase.kt | 106 +++++++++++++++++- 3 files changed, 116 insertions(+), 4 deletions(-) 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..37b56569 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt @@ -897,7 +897,7 @@ val KB_EN_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinitionModes( main = KB_EN_MESSAGEEASE_SYMBOLS_MAIN, shifted = KB_EN_MESSAGEEASE_SYMBOLS_SHIFTED, - numeric = NUMERIC_KEYBOARD, + numeric = NUMERIC_KEYBOARD_MESSAGEASE, ), settings = KeyboardDefinitionSettings( 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..ae0b27bb 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt @@ -26,11 +26,38 @@ val NUMERIC_KEYBOARD_MESSAGEASE = ), 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( @@ -38,6 +65,7 @@ val NUMERIC_KEYBOARD_MESSAGEASE = KeyC( display = KeyDisplay.TextDisplay("-"), action = KeyAction.CommitText("-"), + color = ColorVariant.MUTED, ), ) getLocalCurrency()?.let { @@ -47,6 +75,7 @@ val NUMERIC_KEYBOARD_MESSAGEASE = KeyC( display = KeyDisplay.TextDisplay(it), action = KeyAction.CommitText(it), + color = ColorVariant.MUTED, ), ) } @@ -67,36 +96,49 @@ val NUMERIC_KEYBOARD_MESSAGEASE = 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, ), ), ), @@ -110,25 +152,41 @@ val NUMERIC_KEYBOARD_MESSAGEASE = ), swipes = mapOf( - SwipeDirection.LEFT to + 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 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.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, ), ), ), @@ -149,26 +207,31 @@ val NUMERIC_KEYBOARD_MESSAGEASE = 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_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, ), ), ), @@ -182,10 +245,29 @@ val NUMERIC_KEYBOARD_MESSAGEASE = ), swipes = 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, ), ), ), @@ -203,26 +285,31 @@ val NUMERIC_KEYBOARD_MESSAGEASE = 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, ), ), ), @@ -252,16 +339,19 @@ val NUMERIC_KEYBOARD_MESSAGEASE = 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 KeyC( display = KeyDisplay.TextDisplay("*"), action = KeyAction.CommitText("*"), + color = ColorVariant.MUTED, ), ), ), @@ -279,26 +369,31 @@ val NUMERIC_KEYBOARD_MESSAGEASE = 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, ), ), ), @@ -316,26 +411,31 @@ val NUMERIC_KEYBOARD_MESSAGEASE = 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 + 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, ), ), ),