diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKey.kt index 41e77e3f6..9fde7742c 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKey.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKey.kt @@ -27,7 +27,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("s"), action = KeyAction.CommitText("s"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -37,7 +36,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.BOTTOM_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("w"), action = KeyAction.CommitText("w"), ), ), @@ -45,7 +43,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("r"), action = KeyAction.CommitText("r"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -55,7 +52,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.BOTTOM to KeyC( - display = KeyDisplay.TextDisplay("g"), action = KeyAction.CommitText("g"), ), ), @@ -63,7 +59,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("o"), action = KeyAction.CommitText("o"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -73,7 +68,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.BOTTOM_LEFT to KeyC( - display = KeyDisplay.TextDisplay("u"), action = KeyAction.CommitText("u"), ), ), @@ -84,7 +78,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("n"), action = KeyAction.CommitText("n"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -94,7 +87,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.RIGHT to KeyC( - display = KeyDisplay.TextDisplay("m"), action = KeyAction.CommitText("m"), ), ), @@ -102,7 +94,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("h"), action = KeyAction.CommitText("h"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -111,42 +102,34 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.TOP_LEFT to KeyC( - display = KeyDisplay.TextDisplay("j"), action = KeyAction.CommitText("j"), ), SwipeDirection.TOP to KeyC( - display = KeyDisplay.TextDisplay("q"), action = KeyAction.CommitText("q"), ), SwipeDirection.TOP_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("b"), action = KeyAction.CommitText("b"), ), SwipeDirection.RIGHT to KeyC( - display = KeyDisplay.TextDisplay("p"), action = KeyAction.CommitText("p"), ), SwipeDirection.BOTTOM_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("y"), action = KeyAction.CommitText("y"), ), SwipeDirection.BOTTOM to KeyC( - display = KeyDisplay.TextDisplay("x"), action = KeyAction.CommitText("x"), ), SwipeDirection.BOTTOM_LEFT to KeyC( - display = KeyDisplay.TextDisplay("v"), action = KeyAction.CommitText("v"), ), SwipeDirection.LEFT to KeyC( - display = KeyDisplay.TextDisplay("k"), action = KeyAction.CommitText("k"), ), ), @@ -154,7 +137,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("a"), action = KeyAction.CommitText("a"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -164,7 +146,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.LEFT to KeyC( - display = KeyDisplay.TextDisplay("l"), action = KeyAction.CommitText("l"), ), SwipeDirection.TOP to @@ -181,7 +162,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("t"), action = KeyAction.CommitText("t"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -191,7 +171,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.TOP_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("c"), action = KeyAction.CommitText("c"), ), ), @@ -199,7 +178,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("i"), action = KeyAction.CommitText("i"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -208,35 +186,29 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.TOP to KeyC( - display = KeyDisplay.TextDisplay("f"), action = KeyAction.CommitText("f"), ), SwipeDirection.TOP_RIGHT 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("-"), 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, ), @@ -245,7 +217,6 @@ val KB_EN_THUMBKEY_MAIN = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("e"), action = KeyAction.CommitText("e"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -255,7 +226,6 @@ val KB_EN_THUMBKEY_MAIN = mapOf( SwipeDirection.TOP_LEFT to KeyC( - display = KeyDisplay.TextDisplay("d"), action = KeyAction.CommitText("d"), ), ), @@ -276,7 +246,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("S"), action = KeyAction.CommitText("S"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -286,7 +255,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.BOTTOM_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("W"), action = KeyAction.CommitText("W"), ), ), @@ -294,7 +262,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("R"), action = KeyAction.CommitText("R"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -304,7 +271,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.BOTTOM to KeyC( - display = KeyDisplay.TextDisplay("G"), action = KeyAction.CommitText("G"), ), ), @@ -312,7 +278,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("O"), action = KeyAction.CommitText("O"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -322,7 +287,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.BOTTOM_LEFT to KeyC( - display = KeyDisplay.TextDisplay("U"), action = KeyAction.CommitText("U"), ), ), @@ -333,7 +297,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("N"), action = KeyAction.CommitText("N"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -343,7 +306,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.RIGHT to KeyC( - display = KeyDisplay.TextDisplay("M"), action = KeyAction.CommitText("M"), ), ), @@ -351,7 +313,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("H"), action = KeyAction.CommitText("H"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -360,42 +321,34 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.TOP_LEFT to KeyC( - display = KeyDisplay.TextDisplay("J"), action = KeyAction.CommitText("J"), ), SwipeDirection.TOP to KeyC( - display = KeyDisplay.TextDisplay("Q"), action = KeyAction.CommitText("Q"), ), SwipeDirection.TOP_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("B"), action = KeyAction.CommitText("B"), ), SwipeDirection.RIGHT to KeyC( - display = KeyDisplay.TextDisplay("P"), action = KeyAction.CommitText("P"), ), SwipeDirection.BOTTOM_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("Y"), action = KeyAction.CommitText("Y"), ), SwipeDirection.BOTTOM to KeyC( - display = KeyDisplay.TextDisplay("X"), action = KeyAction.CommitText("X"), ), SwipeDirection.BOTTOM_LEFT to KeyC( - display = KeyDisplay.TextDisplay("V"), action = KeyAction.CommitText("V"), ), SwipeDirection.LEFT to KeyC( - display = KeyDisplay.TextDisplay("K"), action = KeyAction.CommitText("K"), ), ), @@ -403,7 +356,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("A"), action = KeyAction.CommitText("A"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -413,7 +365,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.LEFT to KeyC( - display = KeyDisplay.TextDisplay("L"), action = KeyAction.CommitText("L"), ), SwipeDirection.BOTTOM to @@ -437,7 +388,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("T"), action = KeyAction.CommitText("T"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -447,7 +397,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.TOP_RIGHT to KeyC( - display = KeyDisplay.TextDisplay("C"), action = KeyAction.CommitText("C"), ), ), @@ -455,7 +404,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("I"), action = KeyAction.CommitText("I"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -464,35 +412,29 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.TOP to KeyC( - display = KeyDisplay.TextDisplay("F"), action = KeyAction.CommitText("F"), ), SwipeDirection.TOP_RIGHT 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("-"), 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, ), @@ -501,7 +443,6 @@ val KB_EN_THUMBKEY_SHIFTED = KeyItemC( center = KeyC( - display = KeyDisplay.TextDisplay("E"), action = KeyAction.CommitText("E"), size = FontSizeVariant.LARGE, color = ColorVariant.PRIMARY, @@ -511,7 +452,6 @@ val KB_EN_THUMBKEY_SHIFTED = mapOf( SwipeDirection.TOP_LEFT to KeyC( - display = KeyDisplay.TextDisplay("D"), action = KeyAction.CommitText("D"), ), ), diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt index ea6c523a7..abe6c3b20 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt @@ -51,9 +51,13 @@ data class KeyItemC( ) data class KeyC( - val display: KeyDisplay?, - val capsModeDisplay: KeyDisplay? = null, val action: KeyAction, + val display: KeyDisplay? = + when (action) { + is KeyAction.CommitText -> KeyDisplay.TextDisplay(action.text) + else -> null + }, + val capsModeDisplay: KeyDisplay? = null, val color: ColorVariant = ColorVariant.SECONDARY, val size: FontSizeVariant = FontSizeVariant.SMALL, )