From 9d748a4be8dad7c559f7e75d8b562a2dfbcbf06e Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Sun, 28 Jan 2024 15:39:23 +0100 Subject: [PATCH 1/2] Add 'english dansk symbols thumb-key' --- .../thumbkey/keyboards/ENDAThumbKeySymbols.kt | 934 ++++++++++++++++++ .../thumbkey/utils/KeyboardLayout.kt | 2 + 2 files changed, 936 insertions(+) create mode 100644 app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt new file mode 100644 index 00000000..69635321 --- /dev/null +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt @@ -0,0 +1,934 @@ +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.KeyboardDefinition +import com.dessalines.thumbkey.utils.KeyboardDefinitionModes +import com.dessalines.thumbkey.utils.KeyboardDefinitionSettings +import com.dessalines.thumbkey.utils.SwipeDirection +import com.dessalines.thumbkey.utils.SwipeNWay +import com.dessalines.thumbkey.utils.autoCapitalizeI +import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe + +// Same as 'english symbols thumb-key', with additional Danish letters +val KB_ENDA_THUMBKEY_SYMBOLS_MAIN = + KeyboardC( + listOf( + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("s"), + action = KeyAction.CommitText("s"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.FOUR_WAY_DIAGONAL, + swipes = + mapOf( + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("w"), + action = KeyAction.CommitText("w"), + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("$"), + action = KeyAction.CommitText("$"), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("r"), + action = KeyAction.CommitText("r"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("g"), + action = KeyAction.CommitText("g"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("`"), + action = KeyAction.CommitText("`"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.TextDisplay("^"), + action = KeyAction.CommitText("^"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("´"), + action = KeyAction.CommitText("´"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("!"), + action = KeyAction.CommitText("!"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("+"), + action = KeyAction.CommitText("+"), + color = ColorVariant.MUTED, + ), + ), + ), + 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("u"), + action = KeyAction.CommitText("u"), + ), + SwipeDirection.LEFT 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, + ), + ), + ), + EMOJI_KEY_ITEM, + ), + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("n"), + action = KeyAction.CommitText("n"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("m"), + action = KeyAction.CommitText("m"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("{"), + action = KeyAction.CommitText("{"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("%"), + action = KeyAction.CommitText("%"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("("), + action = KeyAction.CommitText("("), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("h"), + action = KeyAction.CommitText("h"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + 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"), + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("a"), + action = KeyAction.CommitText("a"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("l"), + action = KeyAction.CommitText("l"), + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropUp), + action = KeyAction.ToggleShiftMode(true), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("|"), + action = KeyAction.CommitText("|"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("}"), + action = KeyAction.CommitText("}"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay(")"), + action = KeyAction.CommitText(")"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("å"), + action = KeyAction.CommitText("å"), + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + ), + ), + NUMERIC_KEY_ITEM, + ), + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("t"), + action = KeyAction.CommitText("t"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.FOUR_WAY_DIAGONAL, + swipes = + mapOf( + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("c"), + action = KeyAction.CommitText("c"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("~"), + action = KeyAction.CommitText("~"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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 to + KeyC( + display = KeyDisplay.TextDisplay("f"), + action = KeyAction.CommitText("f"), + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("z"), + action = KeyAction.CommitText("z"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("\""), + action = KeyAction.CommitText("\""), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("'"), + action = KeyAction.CommitText("'"), + color = ColorVariant.MUTED, + ), + 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay(","), + action = KeyAction.CommitText(","), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("e"), + action = KeyAction.CommitText("e"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("d"), + action = KeyAction.CommitText("d"), + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.TextDisplay("&"), + action = KeyAction.CommitText("&"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("°"), + action = KeyAction.CommitText("°"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("#"), + action = KeyAction.CommitText("#"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("æ"), + action = KeyAction.CommitText("æ"), + ), + ), + ), + BACKSPACE_KEY_ITEM, + ), + listOf( + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM, + ), + ), + ) + +val KB_ENDA_THUMBKEY_SYMBOLS_SHIFTED = + KeyboardC( + listOf( + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("S"), + action = KeyAction.CommitText("S"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.FOUR_WAY_DIAGONAL, + swipes = + mapOf( + SwipeDirection.BOTTOM_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("W"), + action = KeyAction.CommitText("W"), + ), + SwipeDirection.BOTTOM_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("$"), + action = KeyAction.CommitText("$"), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("R"), + action = KeyAction.CommitText("R"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("G"), + action = KeyAction.CommitText("G"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("`"), + action = KeyAction.CommitText("`"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.TextDisplay("^"), + action = KeyAction.CommitText("^"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("´"), + action = KeyAction.CommitText("´"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("!"), + action = KeyAction.CommitText("!"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("+"), + action = KeyAction.CommitText("+"), + color = ColorVariant.MUTED, + ), + ), + ), + 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("U"), + action = KeyAction.CommitText("U"), + ), + SwipeDirection.LEFT 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, + ), + ), + ), + EMOJI_KEY_ITEM, + ), + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("N"), + action = KeyAction.CommitText("N"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("M"), + action = KeyAction.CommitText("M"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("{"), + action = KeyAction.CommitText("{"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("%"), + action = KeyAction.CommitText("%"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("("), + action = KeyAction.CommitText("("), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("H"), + action = KeyAction.CommitText("H"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + 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"), + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("A"), + action = KeyAction.CommitText("A"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("L"), + action = KeyAction.CommitText("L"), + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock), + capsModeDisplay = KeyDisplay.IconDisplay(Icons.Outlined.Copyright), + action = KeyAction.ToggleCapsLock, + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown), + action = KeyAction.ToggleShiftMode(false), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("|"), + action = KeyAction.CommitText("|"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("}"), + action = KeyAction.CommitText("}"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay(")"), + action = KeyAction.CommitText(")"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM to + KeyC( + display = KeyDisplay.TextDisplay("Å"), + action = KeyAction.CommitText("Å"), + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + ), + ), + NUMERIC_KEY_ITEM, + ), + listOf( + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("T"), + action = KeyAction.CommitText("T"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipeType = SwipeNWay.FOUR_WAY_DIAGONAL, + swipes = + mapOf( + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("C"), + action = KeyAction.CommitText("C"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("~"), + action = KeyAction.CommitText("~"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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 to + KeyC( + display = KeyDisplay.TextDisplay("F"), + action = KeyAction.CommitText("F"), + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("Z"), + action = KeyAction.CommitText("Z"), + ), + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("\""), + action = KeyAction.CommitText("\""), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("'"), + action = KeyAction.CommitText("'"), + color = ColorVariant.MUTED, + ), + 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay(","), + action = KeyAction.CommitText(","), + color = ColorVariant.MUTED, + ), + ), + ), + KeyItemC( + center = + KeyC( + display = KeyDisplay.TextDisplay("E"), + action = KeyAction.CommitText("E"), + size = FontSizeVariant.LARGE, + color = ColorVariant.PRIMARY, + ), + swipes = + mapOf( + SwipeDirection.TOP_LEFT to + KeyC( + display = KeyDisplay.TextDisplay("D"), + action = KeyAction.CommitText("D"), + ), + SwipeDirection.TOP to + KeyC( + display = KeyDisplay.TextDisplay("&"), + action = KeyAction.CommitText("&"), + color = ColorVariant.MUTED, + ), + SwipeDirection.TOP_RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("°"), + action = KeyAction.CommitText("°"), + color = ColorVariant.MUTED, + ), + SwipeDirection.BOTTOM_RIGHT 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, + ), + SwipeDirection.LEFT to + KeyC( + display = KeyDisplay.TextDisplay("#"), + action = KeyAction.CommitText("#"), + color = ColorVariant.MUTED, + ), + SwipeDirection.RIGHT to + KeyC( + display = KeyDisplay.TextDisplay("Æ"), + action = KeyAction.CommitText("Æ"), + ), + ), + ), + BACKSPACE_KEY_ITEM, + ), + listOf( + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM, + ), + ), + ) + +val KB_ENDA_THUMBKEY_SYMBOLS: KeyboardDefinition = + KeyboardDefinition( + title = "english dansk symbols thumb-key", + modes = + KeyboardDefinitionModes( + main = KB_ENDA_THUMBKEY_SYMBOLS_MAIN, + shifted = KB_ENDA_THUMBKEY_SYMBOLS_SHIFTED, + numeric = NUMERIC_KEYBOARD, + ), + settings = + KeyboardDefinitionSettings( + autoCapitalizers = arrayOf(::autoCapitalizeI, ::autoCapitalizeIApostrophe), + ), + ) diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt index 354232b9..40d53965 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -10,6 +10,7 @@ import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY_MULTILINGUAL import com.dessalines.thumbkey.keyboards.KB_DE_TYPESPLIT +import com.dessalines.thumbkey.keyboards.KB_ENDA_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_ENEO_MESSAGEEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_CZ_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_DOUBLE_SYMBOLS @@ -182,4 +183,5 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini SVMessageEase(86, KB_SV_MESSAGEEASE), ENDoubleSymbols(87, KB_EN_DOUBLE_SYMBOLS), FIMessageEase(88, KB_FI_MESSAGEEASE), + ENDAThumbKeySymbols(89, KB_ENDA_THUMBKEY_SYMBOLS), } From 41214d51ca24c84e01084e780b769db91fd7d6ad Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Sun, 28 Jan 2024 17:37:44 +0100 Subject: [PATCH 2/2] Add underscore --- .../thumbkey/keyboards/ENDAThumbKeySymbols.kt | 10 +++++----- .../com/dessalines/thumbkey/utils/KeyboardLayout.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt index 69635321..3fcf8589 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENDAThumbKeySymbols.kt @@ -21,7 +21,7 @@ import com.dessalines.thumbkey.utils.autoCapitalizeI import com.dessalines.thumbkey.utils.autoCapitalizeIApostrophe // Same as 'english symbols thumb-key', with additional Danish letters -val KB_ENDA_THUMBKEY_SYMBOLS_MAIN = +val KB_EN_DA_THUMBKEY_SYMBOLS_MAIN = KeyboardC( listOf( listOf( @@ -466,7 +466,7 @@ val KB_ENDA_THUMBKEY_SYMBOLS_MAIN = ), ) -val KB_ENDA_THUMBKEY_SYMBOLS_SHIFTED = +val KB_EN_DA_THUMBKEY_SYMBOLS_SHIFTED = KeyboardC( listOf( listOf( @@ -918,13 +918,13 @@ val KB_ENDA_THUMBKEY_SYMBOLS_SHIFTED = ), ) -val KB_ENDA_THUMBKEY_SYMBOLS: KeyboardDefinition = +val KB_EN_DA_THUMBKEY_SYMBOLS: KeyboardDefinition = KeyboardDefinition( title = "english dansk symbols thumb-key", modes = KeyboardDefinitionModes( - main = KB_ENDA_THUMBKEY_SYMBOLS_MAIN, - shifted = KB_ENDA_THUMBKEY_SYMBOLS_SHIFTED, + main = KB_EN_DA_THUMBKEY_SYMBOLS_MAIN, + shifted = KB_EN_DA_THUMBKEY_SYMBOLS_SHIFTED, numeric = NUMERIC_KEYBOARD, ), settings = diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt index 40d53965..1e8f149f 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -10,9 +10,9 @@ import com.dessalines.thumbkey.keyboards.KB_DE_MESSAGEEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_DE_THUMBKEY_MULTILINGUAL import com.dessalines.thumbkey.keyboards.KB_DE_TYPESPLIT -import com.dessalines.thumbkey.keyboards.KB_ENDA_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_ENEO_MESSAGEEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_CZ_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_EN_DA_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_DOUBLE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_EE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_IT_THUMBKEY @@ -183,5 +183,5 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini SVMessageEase(86, KB_SV_MESSAGEEASE), ENDoubleSymbols(87, KB_EN_DOUBLE_SYMBOLS), FIMessageEase(88, KB_FI_MESSAGEEASE), - ENDAThumbKeySymbols(89, KB_ENDA_THUMBKEY_SYMBOLS), + ENDAThumbKeySymbols(89, KB_EN_DA_THUMBKEY_SYMBOLS), }