From 0d1bcb337ee35168ff5f07fcb623f1b660e3afa7 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 17:19:04 -0300 Subject: [PATCH 1/9] Add layout portuguese dvorak wide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based in english dvorak wide, with: à ãáâ õóô í ú ç --- .../thumbkey/keyboards/PTDvorakWide.kt | 256 ++++++++++++++++++ 1 file changed, 256 insertions(+) create mode 100644 app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt new file mode 100644 index 00000000..c99ea701 --- /dev/null +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt @@ -0,0 +1,256 @@ +@file:Suppress("ktlint:standard:no-wildcard-imports") + +package com.dessalines.thumbkey.keyboards + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.* +import com.dessalines.thumbkey.utils.* +import com.dessalines.thumbkey.utils.ColorVariant.* +import com.dessalines.thumbkey.utils.FontSizeVariant.* +import com.dessalines.thumbkey.utils.KeyAction.* +import com.dessalines.thumbkey.utils.SwipeNWay.* + +val KB_PT_DVORAK_WIDE_PUNCT_KEY = + KeyItemC( + center = KeyC("'", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + topLeft = KeyC("!", color = MUTED), + topRight = KeyC("?", color = MUTED), + bottomRight = KeyC(".", color = MUTED), + bottomLeft = KeyC(",", color = MUTED), + ) + +val KB_PT_DVORAK_WIDE_MAIN = + KeyboardC( + listOf( + listOf( + KeyItemC( + center = KeyC("a", size = LARGE), + bottomLeft = KeyC("à", color = MUTED), + bottom = KeyC("ã", color = MUTED), + bottomRight = KeyC("â", color = MUTED), + right = KeyC("á", color = MUTED), + ), + KeyItemC( + center = KeyC("y", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + bottomLeft = KeyC("p"), + ), + EMOJI_KEY_ITEM, + KeyItemC( + center = KeyC("r", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + bottomRight = KeyC("f"), + ), + KeyItemC( + center = KeyC("s", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + bottomLeft = KeyC("g"), + ), + ), + listOf( + KeyItemC( + center = KeyC("o", size = LARGE), + topRight = KeyC("ó", color = MUTED), + bottomRight = KeyC("ô", color = MUTED), + right = KeyC("q"), + ), + KeyItemC( + center = KeyC("u", size = LARGE), + swipeType = TWO_WAY_HORIZONTAL, + left = KeyC("k"), + right = KeyC("ú", color = MUTED), + ), + KB_PT_DVORAK_WIDE_PUNCT_KEY, + KeyItemC( + center = KeyC("d", size = LARGE), + swipeType = FOUR_WAY_CROSS, + left = KeyC("v"), + right = KeyC("c"), + bottom = KeyC("ç"), + ), + KeyItemC( + center = KeyC("n", size = LARGE), + swipeType = FOUR_WAY_CROSS, + left = KeyC("l"), + ), + ), + listOf( + KeyItemC( + center = KeyC("e", size = LARGE), + left = KeyC("\x1b", displayText = "⎋", color = MUTED), + topRight = KeyC("j"), + top = KeyC("õ", color = MUTED), + right = KeyC("é", color = MUTED), + bottomRight = KeyC("ê", color = MUTED), + ), + KeyItemC( + center = KeyC("i", size = LARGE), + topLeft = KeyC("x"), + right = KeyC("í", color = MUTED), + ), + NUMERIC_KEY_ITEM, + KeyItemC( + center = KeyC("h", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + topRight = KeyC("m"), + topLeft = KeyC("b"), + ), + KeyItemC( + center = KeyC("t", size = LARGE), + topLeft = KeyC("w"), + rignt = + KeyC( + display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab), + action = CommitText("\t"), + color = MUTED, + ), + bottomRight = KeyC("z"), + ), + ), + listOf( + BACKSPACE_KEY_ITEM, + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM.copy( + swipeType = TWO_WAY_VERTICAL, + top = + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropUp), + action = ToggleShiftMode(true), + swipeReturnAction = ToggleCurrentWordCapitalization(true), + color = SECONDARY, + ), + bottom = + KeyC( + ToggleShiftMode(false), + swipeReturnAction = ToggleCurrentWordCapitalization(false), + ), + ), + ), + ), + ) + +val KB_PT_DVORAK_WIDE_SHIFTED = + KeyboardC( + listOf( + listOf( + KeyItemC( + center = KeyC("A", size = LARGE), + bottomLeft = KeyC("À", color = MUTED), + bottom = KeyC("Ã", color = MUTED), + bottomRight = KeyC("Â", color = MUTED), + right = KeyC("Á", color = MUTED), + ), + KeyItemC( + center = KeyC("Y", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + bottomLeft = KeyC("P"), + ), + EMOJI_KEY_ITEM, + KeyItemC( + center = KeyC("R", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + bottomRight = KeyC("F"), + ), + KeyItemC( + center = KeyC("S", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + bottomLeft = KeyC("G"), + ), + ), + listOf( + KeyItemC( + center = KeyC("O", size = LARGE), + right = KeyC("Q"), + topRight = KeyC("Ó", color = MUTED), + bottomRight = KeyC("Ô", color = MUTED), + ), + KeyItemC( + center = KeyC("U", size = LARGE), + swipeType = TWO_WAY_HORIZONTAL, + left = KeyC("K"), + right = KeyC("Ú", color = MUTED), + ), + KB_PT_DVORAK_WIDE_PUNCT_KEY, + KeyItemC( + center = KeyC("D", size = LARGE), + swipeType = FOUR_WAY_CROSS, + left = KeyC("V"), + right = KeyC("C"), + bottom = KeyC("Ç", color = MUTED), + ), + KeyItemC( + center = KeyC("N", size = LARGE), + swipeType = FOUR_WAY_CROSS, + left = KeyC("L"), + ), + ), + listOf( + KeyItemC( + center = KeyC("E", size = LARGE), + left = KeyC("\x1b", displayText = "⎋", color = MUTED), + topRight = KeyC("J"), + top = KeyC("Õ", color = MUTED), + right = KeyC("É", color = MUTED), + bottomRight = KeyC("Ê", color = MUTED), + ), + KeyItemC( + center = KeyC("I", size = LARGE), + topLeft = KeyC("X"), + right = KeyC("Í", color = MUTED), + ), + NUMERIC_KEY_ITEM, + KeyItemC( + center = KeyC("H", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + topRight = KeyC("M"), + topLeft = KeyC("B"), + ), + KeyItemC( + center = KeyC("T", size = LARGE), + swipeType = FOUR_WAY_DIAGONAL, + topLeft = KeyC("W"), + rignt = + KeyC( + display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab), + action = CommitText("\t"), + color = MUTED, + ), + bottomRight = KeyC("Z"), + ), + ), + listOf( + BACKSPACE_KEY_ITEM, + SPACEBAR_KEY_ITEM, + RETURN_KEY_ITEM.copy( + swipeType = TWO_WAY_VERTICAL, + top = + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock), + capsModeDisplay = KeyDisplay.IconDisplay(Icons.Outlined.Copyright), + action = ToggleCapsLock, + swipeReturnAction = ToggleCurrentWordCapitalization(true), + color = SECONDARY, + ), + bottom = + KeyC( + display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown), + action = ToggleShiftMode(false), + swipeReturnAction = ToggleCurrentWordCapitalization(false), + color = SECONDARY, + ), + ), + ), + ), + ) + +val KB_PT_DVORAK_WIDE: KeyboardDefinition = + KeyboardDefinition( + title = "português dvorak wide", + modes = + KeyboardDefinitionModes( + main = KB_PT_DVORAK_WIDE_MAIN, + shifted = KB_PT_DVORAK_WIDE_SHIFTED, + numeric = WIDE_NUMERIC_KEYBOARD, + ), + ) From 14081292f6d02b010af29f277c0c880a295f941f Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 17:21:23 -0300 Subject: [PATCH 2/9] Adding PTDvorakWide in KeyboardLayout.kt --- .../main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt | 1 + 1 file changed, 1 insertion(+) 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 8dd38fcf..19a3c4e1 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -334,4 +334,5 @@ enum class KeyboardLayout( ENDvorakWideCompose(KB_EN_DVORAK_WIDE_COMPOSE), ENMessagEaseSymbolsModifiers(KB_EN_MESSAGEASE_SYMBOLS_MODIFIERS), ARThumbKeyLevant(KB_AR_THUMBKEY_LEVANT), + PTDvorakWide(KB_PT_DVORAK_WIDE), } From 4001a0b673d3e3371a55e6a46c5a666b8197be08 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 17:32:43 -0300 Subject: [PATCH 3/9] Fix typos --- .../java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt index c99ea701..8a9ce1e5 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt @@ -99,7 +99,7 @@ val KB_PT_DVORAK_WIDE_MAIN = KeyItemC( center = KeyC("t", size = LARGE), topLeft = KeyC("w"), - rignt = + right = KeyC( display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab), action = CommitText("\t"), @@ -210,7 +210,7 @@ val KB_PT_DVORAK_WIDE_SHIFTED = center = KeyC("T", size = LARGE), swipeType = FOUR_WAY_DIAGONAL, topLeft = KeyC("W"), - rignt = + right = KeyC( display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab), action = CommitText("\t"), From c1ba236abfde8edee89eab56081af4ca3086b4c1 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 17:49:14 -0300 Subject: [PATCH 4/9] Fix import AutoMirrored and Comment Esc --- .../java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt index 8a9ce1e5..1330d998 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt @@ -3,6 +3,7 @@ package com.dessalines.thumbkey.keyboards import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.outlined.* import androidx.compose.material.icons.outlined.* import com.dessalines.thumbkey.utils.* import com.dessalines.thumbkey.utils.ColorVariant.* @@ -78,7 +79,7 @@ val KB_PT_DVORAK_WIDE_MAIN = listOf( KeyItemC( center = KeyC("e", size = LARGE), - left = KeyC("\x1b", displayText = "⎋", color = MUTED), + // left = KeyC("\x1b", displayText = "⎋", color = MUTED), topRight = KeyC("j"), top = KeyC("õ", color = MUTED), right = KeyC("é", color = MUTED), @@ -188,7 +189,7 @@ val KB_PT_DVORAK_WIDE_SHIFTED = listOf( KeyItemC( center = KeyC("E", size = LARGE), - left = KeyC("\x1b", displayText = "⎋", color = MUTED), + // left = KeyC("\x1b", displayText = "⎋", color = MUTED), topRight = KeyC("J"), top = KeyC("Õ", color = MUTED), right = KeyC("É", color = MUTED), From 214d17522d39da4842627afcb456dfbfa99846d1 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 17:56:47 -0300 Subject: [PATCH 5/9] Fix lint --- .../main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d896aa59..3bd4d7fb 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -336,5 +336,5 @@ enum class KeyboardLayout( ENMessagEaseSymbolsModifiers(KB_EN_MESSAGEASE_SYMBOLS_MODIFIERS), ARThumbKeyLevant(KB_AR_THUMBKEY_LEVANT), PTDvorakWide(KB_PT_DVORAK_WIDE), - BRFRThumbKeyCompose(KB_BR_FR_THUMBKEY_COMPOSE), + BRFRThumbKeyCompose(KB_BR_FR_THUMBKEY_COMPOSE), } From e5f5b4312923d53c503f82611a5eca9d79a8f5d7 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 20:27:03 -0300 Subject: [PATCH 6/9] Fixs Imports in KeyboardLayout.kt Importing KB_PT_DVORAK_WIDE --- .../main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 3bd4d7fb..f3ec014d 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -4,7 +4,6 @@ import com.dessalines.thumbkey.keyboards.KB_AR_THUMBKEY_LEVANT import com.dessalines.thumbkey.keyboards.KB_BG_MESSAGEASE_PHONETIC_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_BG_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_BR_FR_THUMBKEY -import com.dessalines.thumbkey.keyboards.KB_BR_FR_THUMBKEY_COMPOSE import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_CA_THUMBKEY @@ -29,6 +28,7 @@ import com.dessalines.thumbkey.keyboards.KB_EN_DE_THUMBKEY_V2 import com.dessalines.thumbkey.keyboards.KB_EN_DOUBLE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_DVORAK_WIDE import com.dessalines.thumbkey.keyboards.KB_EN_DVORAK_WIDE_COMPOSE +import com.dessalines.thumbkey.keyboards.KB_PT_DVORAK_WIDE import com.dessalines.thumbkey.keyboards.KB_EN_EE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_EO_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_EO_THUMBKEY @@ -336,5 +336,4 @@ enum class KeyboardLayout( ENMessagEaseSymbolsModifiers(KB_EN_MESSAGEASE_SYMBOLS_MODIFIERS), ARThumbKeyLevant(KB_AR_THUMBKEY_LEVANT), PTDvorakWide(KB_PT_DVORAK_WIDE), - BRFRThumbKeyCompose(KB_BR_FR_THUMBKEY_COMPOSE), } From 7b78bfaf9b9f0de5d9b7931c5e98f5a779631f37 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 20:48:43 -0300 Subject: [PATCH 7/9] Fix lint --- .../main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3ec014d..d8ca7b5c 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -28,7 +28,6 @@ import com.dessalines.thumbkey.keyboards.KB_EN_DE_THUMBKEY_V2 import com.dessalines.thumbkey.keyboards.KB_EN_DOUBLE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_DVORAK_WIDE import com.dessalines.thumbkey.keyboards.KB_EN_DVORAK_WIDE_COMPOSE -import com.dessalines.thumbkey.keyboards.KB_PT_DVORAK_WIDE import com.dessalines.thumbkey.keyboards.KB_EN_EE_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_EN_EO_MESSAGEASE_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_EN_EO_THUMBKEY @@ -140,6 +139,7 @@ import com.dessalines.thumbkey.keyboards.KB_PL_TYPESPLIT_SYMBOLS_V1 import com.dessalines.thumbkey.keyboards.KB_PL_TYPESPLIT_SYMBOLS_V2 import com.dessalines.thumbkey.keyboards.KB_PL_TYPESPLIT_V1 import com.dessalines.thumbkey.keyboards.KB_PL_TYPESPLIT_V2 +import com.dessalines.thumbkey.keyboards.KB_PT_DVORAK_WIDE import com.dessalines.thumbkey.keyboards.KB_PT_EN_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_PT_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_PT_TYPESPLIT From 0f586a81f88e1a3a17591f9578f88764a22a2c45 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 21:13:31 -0300 Subject: [PATCH 8/9] Using "\u001b" escape sequence --- .../java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt index 1330d998..409af39d 100644 --- a/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt +++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/PTDvorakWide.kt @@ -79,7 +79,7 @@ val KB_PT_DVORAK_WIDE_MAIN = listOf( KeyItemC( center = KeyC("e", size = LARGE), - // left = KeyC("\x1b", displayText = "⎋", color = MUTED), + left = KeyC("\u001b", displayText = "⎋", color = MUTED), topRight = KeyC("j"), top = KeyC("õ", color = MUTED), right = KeyC("é", color = MUTED), @@ -189,7 +189,7 @@ val KB_PT_DVORAK_WIDE_SHIFTED = listOf( KeyItemC( center = KeyC("E", size = LARGE), - // left = KeyC("\x1b", displayText = "⎋", color = MUTED), + left = KeyC("\u001b", displayText = "⎋", color = MUTED), topRight = KeyC("J"), top = KeyC("Õ", color = MUTED), right = KeyC("É", color = MUTED), From ab01ac3518d2a1fc1e69e9ed6e6fca0feb669b88 Mon Sep 17 00:00:00 2001 From: lyluqo Date: Sat, 11 Jan 2025 22:02:13 -0300 Subject: [PATCH 9/9] Update KeyboardLayout.kt Undo BRFRThumbKeyCompose deletion --- .../main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt | 2 ++ 1 file changed, 2 insertions(+) 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 d8ca7b5c..425132c9 100644 --- a/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt +++ b/app/src/main/java/com/dessalines/thumbkey/utils/KeyboardLayout.kt @@ -4,6 +4,7 @@ import com.dessalines.thumbkey.keyboards.KB_AR_THUMBKEY_LEVANT import com.dessalines.thumbkey.keyboards.KB_BG_MESSAGEASE_PHONETIC_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_BG_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_BR_FR_THUMBKEY +import com.dessalines.thumbkey.keyboards.KB_BR_FR_THUMBKEY_COMPOSE import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY import com.dessalines.thumbkey.keyboards.KB_BY_THUMBKEY_SYMBOLS import com.dessalines.thumbkey.keyboards.KB_CA_THUMBKEY @@ -336,4 +337,5 @@ enum class KeyboardLayout( ENMessagEaseSymbolsModifiers(KB_EN_MESSAGEASE_SYMBOLS_MODIFIERS), ARThumbKeyLevant(KB_AR_THUMBKEY_LEVANT), PTDvorakWide(KB_PT_DVORAK_WIDE), + BRFRThumbKeyCompose(KB_BR_FR_THUMBKEY_COMPOSE), }