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.

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

MessagEase fixes #709

Merged
merged 5 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
separate numeric layers for EN and ES messagEase
  • Loading branch information
asdkant committed Feb 10, 2024
commit 6946b5a88009b9d7ecd592da4e75122aaf19ea66
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.dessalines.thumbkey.keyboards

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Abc
import androidx.compose.material.icons.outlined.ArrowDropDown
import androidx.compose.material.icons.outlined.ArrowDropUp
import androidx.compose.material.icons.outlined.Copyright
Expand All @@ -19,6 +20,7 @@ import com.dessalines.thumbkey.utils.SwipeDirection
import com.dessalines.thumbkey.utils.SwipeNWay
import com.dessalines.thumbkey.utils.autoCapitalizeI
import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe
import com.dessalines.thumbkey.utils.getLocalCurrency

val KB_EN_MESSAGEEASE_MAIN =
KeyboardC(
Expand Down Expand Up @@ -525,14 +527,360 @@ val KB_EN_MESSAGEEASE_SHIFTED =
),
)

val KB_EN_MESSAGEEASE_NUMERIC =
KeyboardC(
listOf(
listOf(
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("1"),
action = KeyAction.CommitText("1"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
buildMap {
put(
SwipeDirection.BOTTOM_LEFT,
KeyC(
display = KeyDisplay.TextDisplay("$"),
action = KeyAction.CommitText("$"),
),
)
put(
SwipeDirection.RIGHT,
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
),
)
getLocalCurrency()?.let {
if (it !in setOf("$", "£", "€")) {
put(
SwipeDirection.BOTTOM_RIGHT,
KeyC(
display = KeyDisplay.TextDisplay(it),
action = KeyAction.CommitText(it),
),
)
}
}
},
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("2"),
action = KeyAction.CommitText("2"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("`"),
action = KeyAction.CommitText("`"),
),
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("^"),
action = KeyAction.CommitText("^"),
),
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("´"),
action = KeyAction.CommitText("´"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("!"),
action = KeyAction.CommitText("!"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("\\"),
action = KeyAction.CommitText("\\"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("/"),
action = KeyAction.CommitText("/"),
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("+"),
action = KeyAction.CommitText("+"),
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("3"),
action = KeyAction.CommitText("3"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("?"),
action = KeyAction.CommitText("?"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("€"),
action = KeyAction.CommitText("€"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("£"),
action = KeyAction.CommitText("£"),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("="),
action = KeyAction.CommitText("="),
),
),
),
EMOJI_KEY_ITEM,
),
listOf(
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("4"),
action = KeyAction.CommitText("4"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("{"),
action = KeyAction.CommitText("{"),
),
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("%"),
action = KeyAction.CommitText("%"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("_"),
action = KeyAction.CommitText("_"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("["),
action = KeyAction.CommitText("["),
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("("),
action = KeyAction.CommitText("("),
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("5"),
action = KeyAction.CommitText("5"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("¬"),
action = KeyAction.CommitText("¬"),
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("6"),
action = KeyAction.CommitText("6"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("|"),
action = KeyAction.CommitText("|"),
),
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("}"),
action = KeyAction.CommitText("}"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(")"),
action = KeyAction.CommitText(")"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("]"),
action = KeyAction.CommitText("]"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("@"),
action = KeyAction.CommitText("@"),
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.IconDisplay(Icons.Outlined.Abc),
action = KeyAction.ToggleNumericMode(false),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
),
listOf(
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("7"),
action = KeyAction.CommitText("7"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("~"),
action = KeyAction.CommitText("~"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("<"),
action = KeyAction.CommitText("<"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("*"),
action = KeyAction.CommitText("*"),
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("8"),
action = KeyAction.CommitText("8"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
),
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("'"),
action = KeyAction.CommitText("'"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("."),
action = KeyAction.CommitText("."),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay(","),
action = KeyAction.CommitText(","),
),
),
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("9"),
action = KeyAction.CommitText("9"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("&"),
action = KeyAction.CommitText("&"),
),
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("°"),
action = KeyAction.CommitText("°"),
),
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(">"),
action = KeyAction.CommitText(">"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
display = KeyDisplay.TextDisplay(";"),
action = KeyAction.CommitText(";"),
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("#"),
action = KeyAction.CommitText("#"),
),
),
),
BACKSPACE_KEY_ITEM,
),
listOf(
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("0"),
action = KeyAction.CommitText("0"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
widthMultiplier = 2,
),
SPACEBAR_SKINNY_KEY_ITEM,
RETURN_KEY_ITEM,
),
),
)

val KB_EN_MESSAGEEASE: KeyboardDefinition =
KeyboardDefinition(
title = "english messageease",
modes =
KeyboardDefinitionModes(
main = KB_EN_MESSAGEEASE_MAIN,
shifted = KB_EN_MESSAGEEASE_SHIFTED,
numeric = NUMERIC_KEYBOARD_MESSAGEASE,
numeric = KB_EN_MESSAGEEASE_NUMERIC,
),
settings =
KeyboardDefinitionSettings(
Expand Down
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_MESSAGEASE,
numeric = KB_EN_MESSAGEEASE_NUMERIC,
),
settings =
KeyboardDefinitionSettings(
Expand Down
Loading