Skip to content

Commit

Permalink
Me es layout (#689)
Browse files Browse the repository at this point in the history 
* fix ESMessagEase keyboard to better resemble MessagEase

* add quotes to E-TOP-LEFT swipe in ESMessageEase

* ran formatter on ESMessageEase.kt

* revert local change

* ran formatter on ESMessageEase.kt

* ran gradlew formatter on ESMessageEase.kt

* move numeric ME keyboard to its own file

* ran gradlew formatter
  • Loading branch information
@asdkant
asdkant committed Feb 8, 2024
1 parent 17836cc commit f27c766
Show file tree
Hide file tree
Showing 2 changed files with 404 additions and 23 deletions.
68 changes: 45 additions & 23 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ESMessageEase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ val KB_ES_MESSAGEEASE_MAIN =
display = KeyDisplay.TextDisplay("á"),
action = KeyAction.CommitText("á"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
),
),
),
KeyItemC(
Expand All @@ -60,8 +65,8 @@ val KB_ES_MESSAGEEASE_MAIN =
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("¡"),
action = KeyAction.CommitText("¡"),
display = KeyDisplay.TextDisplay("!"),
action = KeyAction.CommitText("!"),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM to
Expand Down Expand Up @@ -93,8 +98,8 @@ val KB_ES_MESSAGEEASE_MAIN =
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("¿"),
action = KeyAction.CommitText("¿"),
display = KeyDisplay.TextDisplay("?"),
action = KeyAction.CommitText("?"),
color = ColorVariant.MUTED,
),
),
Expand Down Expand Up @@ -123,11 +128,6 @@ val KB_ES_MESSAGEEASE_MAIN =
display = KeyDisplay.TextDisplay("k"),
action = KeyAction.CommitText("k"),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("ç"),
action = KeyAction.CommitText("ç"),
),
),
),
KeyItemC(
Expand Down Expand Up @@ -234,6 +234,11 @@ val KB_ES_MESSAGEEASE_MAIN =
display = KeyDisplay.TextDisplay("ó"),
action = KeyAction.CommitText("ó"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("*"),
action = KeyAction.CommitText("*"),
),
),
),
KeyItemC(
Expand All @@ -257,15 +262,21 @@ val KB_ES_MESSAGEEASE_MAIN =
action = KeyAction.CommitText("'"),
color = ColorVariant.MUTED,
),
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
color = ColorVariant.MUTED,
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("z"),
action = KeyAction.CommitText("z"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM to
Expand Down Expand Up @@ -338,6 +349,11 @@ val KB_ES_MESSAGEEASE_SHIFTED =
display = KeyDisplay.TextDisplay("Á"),
action = KeyAction.CommitText("Á"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
),
),
),
KeyItemC(
Expand All @@ -357,8 +373,8 @@ val KB_ES_MESSAGEEASE_SHIFTED =
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("¡"),
action = KeyAction.CommitText("¡"),
display = KeyDisplay.TextDisplay("!"),
action = KeyAction.CommitText("!"),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM to
Expand Down Expand Up @@ -390,8 +406,8 @@ val KB_ES_MESSAGEEASE_SHIFTED =
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("¿"),
action = KeyAction.CommitText("¿"),
display = KeyDisplay.TextDisplay("?"),
action = KeyAction.CommitText("?"),
color = ColorVariant.MUTED,
),
),
Expand Down Expand Up @@ -420,11 +436,6 @@ val KB_ES_MESSAGEEASE_SHIFTED =
display = KeyDisplay.TextDisplay("K"),
action = KeyAction.CommitText("K"),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("Ç"),
action = KeyAction.CommitText("Ç"),
),
),
),
KeyItemC(
Expand Down Expand Up @@ -538,6 +549,11 @@ val KB_ES_MESSAGEEASE_SHIFTED =
display = KeyDisplay.TextDisplay("Ó"),
action = KeyAction.CommitText("Ó"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("*"),
action = KeyAction.CommitText("*"),
),
),
),
KeyItemC(
Expand All @@ -561,15 +577,21 @@ val KB_ES_MESSAGEEASE_SHIFTED =
action = KeyAction.CommitText("'"),
color = ColorVariant.MUTED,
),
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
color = ColorVariant.MUTED,
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("Z"),
action = KeyAction.CommitText("Z"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM to
Expand Down Expand Up @@ -625,6 +647,6 @@ val KB_ES_MESSAGEEASE: KeyboardDefinition =
KeyboardDefinitionModes(
main = KB_ES_MESSAGEEASE_MAIN,
shifted = KB_ES_MESSAGEEASE_SHIFTED,
numeric = NUMERIC_KEYBOARD,
numeric = NUMERIC_KEYBOARD_MESSAGEASE,
),
)

0 comments on commit f27c766

Please sign in to comment.