Skip to content

Commit

Permalink
Use messagease symbol layout for messagease number board (#695)
Browse files Browse the repository at this point in the history 
* 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 <bluedrink9@github.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
  • Loading branch information
@BlueDrink9 @dessalines
3 people committed Feb 9, 2024
1 parent 7c9a151 commit dba3599
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 4 deletions.
12 changes: 12 additions & 0 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessageEaseSymbols.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
106 changes: 103 additions & 3 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/NumericMessagEase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,46 @@ 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(
SwipeDirection.RIGHT,
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
color = ColorVariant.MUTED,
),
)
getLocalCurrency()?.let {
Expand All @@ -47,6 +75,7 @@ val NUMERIC_KEYBOARD_MESSAGEASE =
KeyC(
display = KeyDisplay.TextDisplay(it),
action = KeyAction.CommitText(it),
color = ColorVariant.MUTED,
),
)
}
Expand All @@ -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,
),
),
),
Expand All @@ -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,
),
),
),
Expand All @@ -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,
),
),
),
Expand All @@ -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,
),
),
),
Expand All @@ -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,
),
),
),
Expand Down Expand Up @@ -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,
),
),
),
Expand All @@ -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,
),
),
),
Expand All @@ -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,
),
),
),
Expand Down

0 comments on commit dba3599

Please sign in to comment.