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

Fixes for English MessagEase keyboard #719

Merged
merged 4 commits into from
Feb 12, 2024
Merged

Fixes for English MessagEase keyboard #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7933c0
MessagEase fixes: ':' on E-BOTTOM_RIGHT in Symbols shifted, '\t' on T…
JDeeth Feb 7, 2024
3727652
ENMessagEaseNumeric: Use ABC_KEY_ITEM instead of manual key item
mpsijm Feb 9, 2024
a2c49f1
ENMessagEaseNumeric: move `<` from 7-BOTTOM_LEFT to 7-LEFT
mpsijm Feb 12, 2024
6812091
ENMessagEaseSymbols.kt: fix indentation
mpsijm Feb 12, 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
20 changes: 7 additions & 13 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseNumeric.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import com.dessalines.thumbkey.utils.ColorVariant
import com.dessalines.thumbkey.utils.FontSizeVariant
import com.dessalines.thumbkey.utils.KeyAction
Expand Down Expand Up @@ -226,16 +224,7 @@ val KB_EN_MESSAGEASE_NUMERIC =
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
ABC_KEY_ITEM,
),
listOf(
KeyItemC(
Expand All @@ -253,7 +242,7 @@ val KB_EN_MESSAGEASE_NUMERIC =
display = KeyDisplay.TextDisplay("~"),
action = KeyAction.CommitText("~"),
),
SwipeDirection.BOTTOM_LEFT to
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("<"),
action = KeyAction.CommitText("<"),
Expand All @@ -263,6 +252,11 @@ val KB_EN_MESSAGEASE_NUMERIC =
display = KeyDisplay.TextDisplay("*"),
action = KeyAction.CommitText("*"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("⇥"),
action = KeyAction.CommitText("\t"),
),
),
),
KeyItemC(
Expand Down
34 changes: 19 additions & 15 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/ENMessagEaseSymbols.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ val KB_EN_MESSAGEASE_SYMBOLS_MAIN =
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
// swipeType = SwipeNWay.FOUR_WAY_DIAGONAL,
swipes =
mapOf(
SwipeDirection.TOP_RIGHT to
Expand All @@ -334,8 +333,8 @@ val KB_EN_MESSAGEASE_SYMBOLS_MAIN =
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
display = KeyDisplay.TextDisplay("⇥"),
action = KeyAction.CommitText("\t"),
color = ColorVariant.MUTED,
),
SwipeDirection.LEFT to
Expand All @@ -356,6 +355,12 @@ val KB_EN_MESSAGEASE_SYMBOLS_MAIN =
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
color = ColorVariant.MUTED,
),
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("w"),
Expand All @@ -372,12 +377,6 @@ val KB_EN_MESSAGEASE_SYMBOLS_MAIN =
display = KeyDisplay.TextDisplay("z"),
action = KeyAction.CommitText("z"),
),
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(":"),
Expand Down Expand Up @@ -754,7 +753,6 @@ val KB_EN_MESSAGEASE_SYMBOLS_SHIFTED =
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
// swipeType = SwipeNWay.FOUR_WAY_DIAGONAL,
swipes =
mapOf(
SwipeDirection.TOP_RIGHT to
Expand Down Expand Up @@ -782,8 +780,8 @@ val KB_EN_MESSAGEASE_SYMBOLS_SHIFTED =
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
display = KeyDisplay.TextDisplay("⇥"),
action = KeyAction.CommitText("\t"),
color = ColorVariant.MUTED,
),
),
Expand All @@ -798,6 +796,12 @@ val KB_EN_MESSAGEASE_SYMBOLS_SHIFTED =
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
color = ColorVariant.MUTED,
),
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("W"),
Expand All @@ -814,10 +818,10 @@ val KB_EN_MESSAGEASE_SYMBOLS_SHIFTED =
display = KeyDisplay.TextDisplay("Z"),
action = KeyAction.CommitText("Z"),
),
SwipeDirection.TOP_LEFT to
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