Skip to content

Commit

Permalink
NumericTypeSplit: reorganize interpunction and symbols
Browse files Browse the repository at this point in the history 
On *TypeSplit keyboards, the numeric keyboard is often the only way to
input most special symbols. However, those symbols are poorly organized.
The ones commonly found on the numeric row ('!', '@', '#', ...) are
found on seemingly random digit keys, making it hard to localize them.
Furthermore, the layout is cluttered, with many symbols packed on a
single key (in some cases up to 7 symbols on one key).

Move numeric row symbols to keys where the user would be expecting them:
'!' to 1, '@' to 2, '#' to 3, etc., with the exception of '(', which is
left on the side of the keyboard, so that the brackets lie in
symmetrical places. Each of the 8 symbols is activated by swiping
towards 5 (and '%' is swipe down).

Move a few symbols to one of the currently empty spaces on the left side
to declutter the numpad area.

Remove ',' and '.' from numpad, as they are already available on the
right side of the layout.

Move a few other other symbols to be more evenly spaced out and easier
to access.

Signed-off-by: h67ma <szycikm@gmail.com>
  • Loading branch information
@h67ma
h67ma committed Sep 10, 2024
1 parent 744c137 commit 9c5b3c3
Show file tree
Hide file tree
Showing 2 changed files with 232 additions and 226 deletions.
229 changes: 116 additions & 113 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/NumericFrenchTypeSplit.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,27 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
swipes =
mapOf(
SwipeDirection.BOTTOM_LEFT to
SwipeDirection.BOTTOM_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("$"),
action = KeyAction.CommitText("$"),
display = KeyDisplay.TextDisplay("!"),
action = KeyAction.CommitText("!"),
),
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("¯\\_(ツ)_/¯"),
action = KeyAction.CommitText("¯\\_(ツ)_/¯"),
size = FontSizeVariant.SMALLEST,
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("~"),
action = KeyAction.CommitText("~"),
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("{"),
action = KeyAction.CommitText("{"),
),
),
),
KeyItemC(
Expand All @@ -57,41 +67,21 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
swipes =
mapOf(
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("@"),
action = KeyAction.CommitText("@"),
),
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(
Expand All @@ -104,25 +94,20 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
swipes =
mapOf(
SwipeDirection.LEFT to
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("?"),
action = KeyAction.CommitText("?"),
display = KeyDisplay.TextDisplay("}"),
action = KeyAction.CommitText("}"),
),
SwipeDirection.BOTTOM_RIGHT to
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("€"),
action = KeyAction.CommitText("€"),
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("="),
display = KeyDisplay.TextDisplay("#"),
action = KeyAction.CommitText("#"),
),
),
),
Expand All @@ -137,42 +122,67 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
),
listOf(
SPACEBAR_FRENCH_SKINNY_KEY_ITEM,
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("4"),
action = KeyAction.CommitText("4"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
display = KeyDisplay.TextDisplay(" "),
action = KeyAction.CommitText(" "),
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("{"),
action = KeyAction.CommitText("{"),
display = KeyDisplay.TextDisplay("+"),
action = KeyAction.CommitText("+"),
),
SwipeDirection.TOP_RIGHT to
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("%"),
action = KeyAction.CommitText("%"),
display = KeyDisplay.TextDisplay("="),
action = KeyAction.CommitText("="),
),
SwipeDirection.BOTTOM_RIGHT to
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("_"),
action = KeyAction.CommitText("_"),
),
SwipeDirection.BOTTOM_LEFT to
),
backgroundColor = ColorVariant.SURFACE_VARIANT,
),
KeyItemC(
center =
KeyC(
display = KeyDisplay.TextDisplay("4"),
action = KeyAction.CommitText("4"),
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("["),
action = KeyAction.CommitText("["),
display = KeyDisplay.TextDisplay("\""),
action = KeyAction.CommitText("\""),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
),
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("("),
action = KeyAction.CommitText("("),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("$"),
action = KeyAction.CommitText("$"),
),
),
),
KeyItemC(
Expand All @@ -183,6 +193,24 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
size = FontSizeVariant.LARGE,
color = ColorVariant.PRIMARY,
),
swipes =
mapOf(
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("€"),
action = KeyAction.CommitText("€"),
),
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("£"),
action = KeyAction.CommitText("£"),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("%"),
action = KeyAction.CommitText("%"),
),
),
),
KeyItemC(
center =
Expand All @@ -194,31 +222,26 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
swipes =
mapOf(
SwipeDirection.TOP_LEFT to
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("|"),
action = KeyAction.CommitText("|"),
display = KeyDisplay.TextDisplay("'"),
action = KeyAction.CommitText("'"),
),
SwipeDirection.TOP_RIGHT to
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("}"),
action = KeyAction.CommitText("}"),
display = KeyDisplay.TextDisplay(";"),
action = KeyAction.CommitText(";"),
),
SwipeDirection.LEFT 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(
Expand All @@ -245,13 +268,13 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
mapOf(
SwipeDirection.TOP_LEFT to
KeyC(
display = KeyDisplay.TextDisplay("~"),
action = KeyAction.CommitText("~"),
display = KeyDisplay.TextDisplay("["),
action = KeyAction.CommitText("["),
),
SwipeDirection.BOTTOM_RIGHT to
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(":"),
action = KeyAction.CommitText(":"),
display = KeyDisplay.TextDisplay("&"),
action = KeyAction.CommitText("&"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
Expand All @@ -270,35 +293,25 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
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
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("-"),
action = KeyAction.CommitText("-"),
display = KeyDisplay.TextDisplay("*"),
action = KeyAction.CommitText("*"),
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("."),
action = KeyAction.CommitText("."),
display = KeyDisplay.TextDisplay("?"),
action = KeyAction.CommitText("?"),
),
SwipeDirection.BOTTOM_LEFT to
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("*"),
action = KeyAction.CommitText("*"),
display = KeyDisplay.TextDisplay("/"),
action = KeyAction.CommitText("/"),
),
SwipeDirection.LEFT to
SwipeDirection.RIGHT to
KeyC(
display = KeyDisplay.TextDisplay(","),
action = KeyAction.CommitText(","),
display = KeyDisplay.TextDisplay("\\"),
action = KeyAction.CommitText("\\"),
),
),
),
Expand All @@ -312,31 +325,21 @@ val FRENCH_TYPESPLIT_NUMERIC_KEYBOARD =
),
swipes =
mapOf(
SwipeDirection.TOP to
SwipeDirection.LEFT to
KeyC(
display = KeyDisplay.TextDisplay("&"),
action = KeyAction.CommitText("&"),
display = KeyDisplay.TextDisplay("|"),
action = KeyAction.CommitText("|"),
),
SwipeDirection.TOP_RIGHT to
KeyC(
display = KeyDisplay.TextDisplay("°"),
action = KeyAction.CommitText("°"),
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(
Expand Down
Loading

0 comments on commit 9c5b3c3

Please sign in to comment.