From 16bb8a456a8d1e895778d4c6545ede7cfe36e9ef Mon Sep 17 00:00:00 2001 From: mariustrap Date: Sat, 9 Sep 2023 23:00:38 +0300 Subject: [PATCH 1/4] lithuanian layout --- .../thumbkey/keyboards/ThumbKeyLTv1.kt | 483 ++++++++++++++++++ 1 file changed, 483 insertions(+) create mode 100644 app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt new file mode 100644 index 00000000..db597f55 --- /dev/null +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt @@ -0,0 +1,483 @@ +package com.dessalines.thumbkey.keyboards + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.ArrowDropDown +import androidx.compose.material.icons.outlined.ArrowDropUp +import androidx.compose.material.icons.outlined.Copyright +import androidx.compose.material.icons.outlined.KeyboardCapslock +import com.dessalines.thumbkey.utils.ColorVariant +import com.dessalines.thumbkey.utils.FontSizeVariant +import com.dessalines.thumbkey.utils.KeyAction +import com.dessalines.thumbkey.utils.KeyC +import com.dessalines.thumbkey.utils.KeyDisplay +import com.dessalines.thumbkey.utils.KeyItemC +import com.dessalines.thumbkey.utils.KeyboardC +import com.dessalines.thumbkey.utils.KeyboardMode +import com.dessalines.thumbkey.utils.SwipeDirection +import com.dessalines.thumbkey.utils.SwipeNWay + +val THUMBKEY_LT_V1_MAIN = KeyboardC( + listOf( + listOf( + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("t"), + action = KeyAction.CommitText("t"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.BOTTOM_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("d"), + action = KeyAction.CommitText("d"), + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("z"), + action = KeyAction.CommitText("z"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("n"), + action = KeyAction.CommitText("n"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.TWO_WAY_VERTICAL, + swipes = mapOf( + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.TextDisplay("g"), + action = KeyAction.CommitText("g"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("o"), + action = KeyAction.CommitText("o"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.BOTTOM_LEFT to KeyC( + display = KeyDisplay.TextDisplay("l"), + action = KeyAction.CommitText("l"), + ), + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.TextDisplay("ū"), + action = KeyAction.CommitText("ū"), + ), + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("ę"), + action = KeyAction.CommitText("ę"), + ), + ), + ), + SETTINGS_KEY_ITEM, + ), + listOf( + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("r"), + action = KeyAction.CommitText("r"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("v"), + action = KeyAction.CommitText("v"), + ), + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.TextDisplay("h"), + action = KeyAction.CommitText("h"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("u"), + action = KeyAction.CommitText("u"), + 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("c"), + action = KeyAction.CommitText("c"), + ), + SwipeDirection.TOP_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("ų"), + action = KeyAction.CommitText("ų"), + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("y"), + action = KeyAction.CommitText("y"), + ), + 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("b"), + action = KeyAction.CommitText("b"), + ), + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("š"), + action = KeyAction.CommitText("š"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("a"), + action = KeyAction.CommitText("a"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.FOUR_WAY_CROSS, + swipes = mapOf( + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("m"), + action = KeyAction.CommitText("m"), + ), + SwipeDirection.TOP to KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropUp), + action = KeyAction.ToggleShiftMode(true), + color = ColorVariant.MUTED, + ), + ), + ), + NUMERIC_KEY_ITEM, + ), + listOf( + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("s"), + action = KeyAction.CommitText("s"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.TOP_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("p"), + action = KeyAction.CommitText("p"), + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("f"), + action = KeyAction.CommitText("f"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("e"), + action = KeyAction.CommitText("e"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.TOP to KeyC( + display = KeyDisplay.TextDisplay("j"), + action = KeyAction.CommitText("j"), + ), + SwipeDirection.TOP_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("?"), + action = KeyAction.CommitText("?"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("č"), + action = KeyAction.CommitText("č"), + ), + 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, + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("i"), + action = KeyAction.CommitText("i"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.TOP_LEFT to KeyC( + display = KeyDisplay.TextDisplay("k"), + action = KeyAction.CommitText("k"), + ), + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("į"), + action = KeyAction.CommitText("į"), + ), + ), + ), + BACKSPACE_KEY_ITEM, + ), + listOf( + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM, + ), + ), +) + +val THUMBKEY_EN_V4_SHIFTED = KeyboardC( + listOf( + listOf( + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("T"), + action = KeyAction.CommitText("T"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.BOTTOM_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("D"), + action = KeyAction.CommitText("D"), + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("Z"), + action = KeyAction.CommitText("Z"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("N"), + action = KeyAction.CommitText("N"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.TWO_WAY_VERTICAL, + swipes = mapOf( + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.TextDisplay("G"), + action = KeyAction.CommitText("G"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("O"), + action = KeyAction.CommitText("O"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.BOTTOM_LEFT to KeyC( + display = KeyDisplay.TextDisplay("L"), + action = KeyAction.CommitText("L"), + ), + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.TextDisplay("Ū"), + action = KeyAction.CommitText("Ū"), + ), + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("Ę"), + action = KeyAction.CommitText("Ę"), + ), + ), + ), + SETTINGS_KEY_ITEM, + ), + listOf( + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("R"), + action = KeyAction.CommitText("R"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("V"), + action = KeyAction.CommitText("V"), + ), + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.TextDisplay("H"), + action = KeyAction.CommitText("H"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("U"), + action = KeyAction.CommitText("U"), + 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("C"), + action = KeyAction.CommitText("C"), + ), + SwipeDirection.TOP_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("Ų"), + action = KeyAction.CommitText("Ų"), + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("Y"), + action = KeyAction.CommitText("Y"), + ), + 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("B"), + action = KeyAction.CommitText("B"), + ), + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("Š"), + action = KeyAction.CommitText("Š"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("A"), + action = KeyAction.CommitText("A"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.FOUR_WAY_CROSS, + swipes = mapOf( + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("M"), + action = KeyAction.CommitText("M"), + ), + SwipeDirection.BOTTOM to KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown), + action = KeyAction.ToggleShiftMode(false), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP to KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock), + capsModeDisplay = KeyDisplay.IconDisplay(Icons.Outlined.Copyright), + action = KeyAction.ToggleCapsLock, + color = ColorVariant.MUTED, + ), + ), + ), + NUMERIC_KEY_ITEM, + ), + listOf( + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("S"), + action = KeyAction.CommitText("S"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.TOP_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("P"), + action = KeyAction.CommitText("P"), + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("F"), + action = KeyAction.CommitText("F"), + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("E"), + action = KeyAction.CommitText("E"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.TOP to KeyC( + display = KeyDisplay.TextDisplay("J"), + action = KeyAction.CommitText("J"), + ), + SwipeDirection.TOP_RIGHT to KeyC( + display = KeyDisplay.TextDisplay("?"), + action = KeyAction.CommitText("?"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to KeyC( + display = KeyDisplay.TextDisplay("Č"), + action = KeyAction.CommitText("Č"), + ), + 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, + ), + ), + ), + KeyItemC( + center = KeyC( + display = KeyDisplay.TextDisplay("I"), + action = KeyAction.CommitText("I"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = mapOf( + SwipeDirection.TOP_LEFT to KeyC( + display = KeyDisplay.TextDisplay("K"), + action = KeyAction.CommitText("K"), + ), + SwipeDirection.LEFT to KeyC( + display = KeyDisplay.TextDisplay("Į"), + action = KeyAction.CommitText("Į"), + ), + ), + ), + BACKSPACE_KEY_ITEM, + ), + listOf( + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM, + ), + ), +) + +val THUMBKEY_LT_V1_KEYBOARD_MODES: Map = mapOf( + KeyboardMode.MAIN to THUMBKEY_LT_V1_MAIN, + KeyboardMode.SHIFTED to THUMBKEY_LT_V1_SHIFTED, + KeyboardMode.NUMERIC to NUMERIC_KEYBOARD, +) From c1273b221f9f2511482c947a3608264e879ef4d9 Mon Sep 17 00:00:00 2001 From: mariustrap Date: Sun, 10 Sep 2023 16:04:38 +0300 Subject: [PATCH 2/4] lithuanian layout --- app/src/main/java/com/dessalines/thumbkey/utils/Types.kt | 1 + app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt | 2 ++ 2 files changed, 3 insertions(+) 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 6e8eedd8..0428558e 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt @@ -156,6 +156,7 @@ enum class KeyboardLayout(val title: String, val index: Int) { ThumbKeyHRv1Symbols("Thumb-Key hrvatski v1 with symbols", 58), TypeSplitFIv1("Type-Split suomi v1", 59), ThumbKeyLVLTGv1("Thumb-Key latviešu valoda v1", 60), + ThumbKeyLTv1("Thumb-Key lithuanian v1", 61), } enum class KeyboardPosition(private val stringId: Int) { diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt index 4c98c707..4c7761b1 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt @@ -74,6 +74,7 @@ import com.dessalines.thumbkey.keyboards.THUMBKEY_IT_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_JA_V1_HIRAGANA_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_JA_V1_KATAKANA_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_KA_V1_KEYBOARD_MODES +import com.dessalines.thumbkey.keyboards.THUMBKEY_LT_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_LV_LTG_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_NL_V1_KEYBOARD_MODES import com.dessalines.thumbkey.keyboards.THUMBKEY_NO_V1_KEYBOARD_MODES @@ -189,6 +190,7 @@ fun keyboardLayoutToModes(layout: KeyboardLayout): Map KeyboardLayout.ThumbKeyHRv1Symbols -> THUMBKEY_HR_V1_SYMBOLS_KEYBOARD_MODES KeyboardLayout.TypeSplitFIv1 -> TYPESPLIT_FI_V1_KEYBOARD_MODES KeyboardLayout.ThumbKeyLVLTGv1 -> THUMBKEY_LV_LTG_V1_KEYBOARD_MODES + KeyboardLayout.ThumbKeyLTv1 -> THUMBKEY_LT_V1_KEYBOARD_MODES } } From d85ae36e916518d682dd5fc1d9cc1ca686d288c5 Mon Sep 17 00:00:00 2001 From: mariustrap Date: Sun, 10 Sep 2023 17:19:44 +0300 Subject: [PATCH 3/4] =?UTF-8?q?lithuanian=20->=20lietuvi=C5=B3=20kalba?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/dessalines/thumbkey/utils/Types.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0428558e..f0235e01 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/Types.kt @@ -156,7 +156,7 @@ enum class KeyboardLayout(val title: String, val index: Int) { ThumbKeyHRv1Symbols("Thumb-Key hrvatski v1 with symbols", 58), TypeSplitFIv1("Type-Split suomi v1", 59), ThumbKeyLVLTGv1("Thumb-Key latviešu valoda v1", 60), - ThumbKeyLTv1("Thumb-Key lithuanian v1", 61), + ThumbKeyLTv1("Thumb-Key lietuvių kalba v1", 61), } enum class KeyboardPosition(private val stringId: Int) { From 376b07c3183d2c70a71a72cb1ab0670f97242121 Mon Sep 17 00:00:00 2001 From: mariustrap Date: Sun, 10 Sep 2023 17:21:48 +0300 Subject: [PATCH 4/4] fixed variable name --- .../main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt index db597f55..ae090f3c 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ThumbKeyLTv1.kt @@ -243,7 +243,7 @@ val THUMBKEY_LT_V1_MAIN = KeyboardC( ), ) -val THUMBKEY_EN_V4_SHIFTED = KeyboardC( +val THUMBKEY_LT_V1_SHIFTED = KeyboardC( listOf( listOf( KeyItemC(