Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use messagease symbol layout for messagease number board #695

Merged
merged 5 commits into from
Feb 9, 2024
Merged

Use messagease symbol layout for messagease number board #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
600ae3b
Use messagease symbol layout for messagease number board
Feb 8, 2024
0adf82b
Match NumericMessagEase to actual messagease
Feb 9, 2024
ce8c62a
Reference NUMERIC_KEYBOARD_MESSAGEASE for messagease numbers
Feb 9, 2024
6431f6b
grade format
Feb 9, 2024
33caf4c
Merge branch 'main' into messageease_fix
dessalines Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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