Skip to content

Commit 6158d4c

Browse files
authored
Add some swipeReturn actions to the french ThumbKey v2 layout (#1160)
* Add some swipeReturn actions to the french ThumbKey v2 layout In addition, I moved the æ to the top left to move @ at the same place as in the numeric layout. This is not in the relative same place than œ, but I think it’s ok. This gave me a free space to put ) on top-right of A, and a ( on top-left of R, which is usefull when typing. For the swipeReturn, I added the following : * [ ] on the added ( ) keys ; * { } on the already existing « and » ; * ; on the , and : on the . ; * \ on the numeric layer /, allowing it to be used on the main layer with the recent patch #1158 of @gitterrost4 ; * " on the numeric layer ', for the same reason as for \ ; * ± on the numeric layer +, because why not. This is working now, and will work better with the recents patch #1156 from @gitterrost4. * Fix the missing spaces around =
1 parent 8620520 commit 6158d4c

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

app/src/main/java/com/dessalines/thumbkey/keyboards/FRThumbKeyV2.kt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ val KB_FR_THUMBKEY_V2_MAIN =
1616
listOf(
1717
KeyItemC(
1818
center = KeyC("l", size = LARGE),
19-
topLeft = KeyC("«", color = MUTED),
20-
top = KeyC("»", color = MUTED),
19+
topLeft = KeyC("«", color = MUTED, swipeReturnAction = CommitText("{")),
20+
top = KeyC("»", color = MUTED, swipeReturnAction = CommitText("}")),
2121
topRight = KeyC("'", color = MUTED),
2222
right = KeyC("^", color = MUTED),
2323
bottomRight = KeyC("q"),
@@ -35,13 +35,15 @@ val KB_FR_THUMBKEY_V2_MAIN =
3535
right = KeyC("î", color = MUTED),
3636
bottomRight = KeyC("k"),
3737
bottomLeft = KeyC("y"),
38+
bottom = KeyC("x"),
3839
),
3940
EMOJI_KEY_ITEM,
4041
),
4142
listOf(
4243
KeyItemC(
4344
center = KeyC("r", size = LARGE),
4445
left = KeyC("-", color = MUTED),
46+
topLeft = KeyC("(", color = MUTED, swipeReturnAction = CommitText("[")),
4547
right = KeyC("v"),
4648
),
4749
KeyItemC(
@@ -64,16 +66,17 @@ val KB_FR_THUMBKEY_V2_MAIN =
6466
swipeReturnAction = ToggleCurrentWordCapitalization(true),
6567
color = MUTED,
6668
),
67-
topRight = KeyC("@", color = MUTED),
69+
topRight = KeyC(")", color = MUTED, swipeReturnAction = CommitText("]")),
6870
right = KeyC("â", color = MUTED),
6971
bottom =
7072
KeyC(
7173
ToggleShiftMode(false),
7274
swipeReturnAction = ToggleCurrentWordCapitalization(false),
7375
),
7476
bottomRight = KeyC("à", color = MUTED),
75-
bottomLeft = KeyC("æ", color = MUTED),
77+
bottomLeft = KeyC("@", color = MUTED),
7678
left = KeyC("d"),
79+
topLeft = KeyC("æ", color = MUTED),
7780
),
7881
NUMERIC_KEY_ITEM,
7982
),
@@ -88,8 +91,8 @@ val KB_FR_THUMBKEY_V2_MAIN =
8891
topLeft = KeyC("ç", color = MUTED),
8992
top = KeyC("c"),
9093
bottomRight = KeyC("*", color = MUTED),
91-
bottom = KeyC(".", color = MUTED),
92-
bottomLeft = KeyC(",", color = MUTED),
94+
bottom = KeyC(".", color = MUTED, swipeReturnAction = CommitText(":")),
95+
bottomLeft = KeyC(",", color = MUTED, swipeReturnAction = CommitText(";")),
9396
right = KeyC("", color = MUTED),
9497
),
9598
KeyItemC(
@@ -165,7 +168,7 @@ val KB_FR_THUMBKEY_V2_SHIFTED =
165168
swipeReturnAction = ToggleCurrentWordCapitalization(true),
166169
color = MUTED,
167170
),
168-
topRight = KeyC("@", color = MUTED),
171+
topRight = KeyC(")", color = MUTED, swipeReturnAction = CommitText("]")),
169172
right = KeyC("Â", color = MUTED),
170173
bottomRight = KeyC("À", color = MUTED),
171174
bottom =
@@ -175,8 +178,9 @@ val KB_FR_THUMBKEY_V2_SHIFTED =
175178
swipeReturnAction = ToggleCurrentWordCapitalization(false),
176179
color = MUTED,
177180
),
178-
bottomLeft = KeyC("Æ", color = MUTED),
181+
bottomLeft = KeyC("@", color = MUTED),
179182
left = KeyC("D"),
183+
topLeft = KeyC("Æ", color = MUTED),
180184
),
181185
NUMERIC_KEY_ITEM,
182186
),

app/src/main/java/com/dessalines/thumbkey/keyboards/NumericFrench.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ val FRENCH_NUMERIC_KEYBOARD =
3131
topRight = KeyC("´"),
3232
right = KeyC("!"),
3333
bottomRight = KeyC("\\"),
34-
bottomLeft = KeyC("/"),
35-
left = KeyC("+"),
34+
bottomLeft = KeyC("/", swipeReturnAction = CommitText("\\")),
35+
left = KeyC("+", swipeReturnAction = CommitText("±")),
3636
),
3737
KeyItemC(
3838
center = KeyC("3", size = LARGE),

0 commit comments

Comments
 (0)