Skip to content

Commit c27552d

Browse files
KnockoffFelineKnockoffFeline
authored
Fix hungarian layout (#525)
Starting over with another PR this time, since a couple of things have changed since I last seen the code. I have made the following changes: * Added missing Í letter * Reordered the swipe maps to (hopefully) partially fix certain characters not being able to be entered (I still won't be able to type É) * Kind of nitpicky but I removed the word "language" from the title, changing it to "HU Thumb-Key hungarian" to match other languages
1 parent 9c9f79d commit c27552d

1 file changed

Lines changed: 56 additions & 48 deletions

File tree

‎app/src/main/java/com/dessalines/thumbkey/keyboards/HUThumbKey.kt‎

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,6 @@ val KB_HU_THUMBKEY_MAIN = KeyboardC(
5959
),
6060
swipeType = SwipeNWay.FOUR_WAY_DIAGONAL,
6161
swipes = mapOf(
62-
SwipeDirection.BOTTOM_LEFT to KeyC(
63-
display = KeyDisplay.TextDisplay("u"),
64-
action = KeyAction.CommitText("u"),
65-
),
66-
SwipeDirection.BOTTOM to KeyC(
67-
display = KeyDisplay.TextDisplay("ú"),
68-
action = KeyAction.CommitText("ú"),
69-
),
70-
SwipeDirection.BOTTOM_RIGHT to KeyC(
71-
display = KeyDisplay.TextDisplay("ü"),
72-
action = KeyAction.CommitText("ü"),
73-
),
74-
SwipeDirection.RIGHT to KeyC(
75-
display = KeyDisplay.TextDisplay("ű"),
76-
action = KeyAction.CommitText("ű"),
77-
),
7862
SwipeDirection.TOP to KeyC(
7963
display = KeyDisplay.TextDisplay("ó"),
8064
action = KeyAction.CommitText("ó"),
@@ -87,6 +71,22 @@ val KB_HU_THUMBKEY_MAIN = KeyboardC(
8771
display = KeyDisplay.TextDisplay("ő"),
8872
action = KeyAction.CommitText("ő"),
8973
),
74+
SwipeDirection.RIGHT to KeyC(
75+
display = KeyDisplay.TextDisplay("ű"),
76+
action = KeyAction.CommitText("ű"),
77+
),
78+
SwipeDirection.BOTTOM_LEFT to KeyC(
79+
display = KeyDisplay.TextDisplay("u"),
80+
action = KeyAction.CommitText("u"),
81+
),
82+
SwipeDirection.BOTTOM to KeyC(
83+
display = KeyDisplay.TextDisplay("ú"),
84+
action = KeyAction.CommitText("ú"),
85+
),
86+
SwipeDirection.BOTTOM_RIGHT to KeyC(
87+
display = KeyDisplay.TextDisplay("ü"),
88+
action = KeyAction.CommitText("ü"),
89+
),
9090
),
9191
),
9292
EMOJI_KEY_ITEM,
@@ -158,10 +158,6 @@ val KB_HU_THUMBKEY_MAIN = KeyboardC(
158158
),
159159
swipeType = SwipeNWay.FOUR_WAY_CROSS,
160160
swipes = mapOf(
161-
SwipeDirection.LEFT to KeyC(
162-
display = KeyDisplay.TextDisplay("l"),
163-
action = KeyAction.CommitText("l"),
164-
),
165161
SwipeDirection.TOP to KeyC(
166162
display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropUp),
167163
action = KeyAction.ToggleShiftMode(true),
@@ -171,6 +167,10 @@ val KB_HU_THUMBKEY_MAIN = KeyboardC(
171167
display = KeyDisplay.TextDisplay("á"),
172168
action = KeyAction.CommitText("á"),
173169
),
170+
SwipeDirection.LEFT to KeyC(
171+
display = KeyDisplay.TextDisplay("l"),
172+
action = KeyAction.CommitText("l"),
173+
),
174174
),
175175
),
176176
NUMERIC_KEY_ITEM,
@@ -200,10 +200,14 @@ val KB_HU_THUMBKEY_MAIN = KeyboardC(
200200
),
201201
swipes = mapOf(
202202
SwipeDirection.TOP to KeyC(
203+
display = KeyDisplay.TextDisplay("í"),
204+
action = KeyAction.CommitText("í"),
205+
),
206+
SwipeDirection.TOP_RIGHT to KeyC(
203207
display = KeyDisplay.TextDisplay("f"),
204208
action = KeyAction.CommitText("f"),
205209
),
206-
SwipeDirection.TOP_RIGHT to KeyC(
210+
SwipeDirection.LEFT to KeyC(
207211
display = KeyDisplay.TextDisplay("'"),
208212
action = KeyAction.CommitText("'"),
209213
color = ColorVariant.MUTED,
@@ -299,22 +303,6 @@ val KB_HU_THUMBKEY_SHIFTED = KeyboardC(
299303
),
300304
swipeType = SwipeNWay.FOUR_WAY_DIAGONAL,
301305
swipes = mapOf(
302-
SwipeDirection.BOTTOM_LEFT to KeyC(
303-
display = KeyDisplay.TextDisplay("U"),
304-
action = KeyAction.CommitText("U"),
305-
),
306-
SwipeDirection.BOTTOM to KeyC(
307-
display = KeyDisplay.TextDisplay("Ú"),
308-
action = KeyAction.CommitText("Ú"),
309-
),
310-
SwipeDirection.BOTTOM_RIGHT to KeyC(
311-
display = KeyDisplay.TextDisplay("Ü"),
312-
action = KeyAction.CommitText("Ü"),
313-
),
314-
SwipeDirection.RIGHT to KeyC(
315-
display = KeyDisplay.TextDisplay("Ű"),
316-
action = KeyAction.CommitText("Ű"),
317-
),
318306
SwipeDirection.TOP to KeyC(
319307
display = KeyDisplay.TextDisplay("Ó"),
320308
action = KeyAction.CommitText("Ó"),
@@ -327,6 +315,22 @@ val KB_HU_THUMBKEY_SHIFTED = KeyboardC(
327315
display = KeyDisplay.TextDisplay("Ő"),
328316
action = KeyAction.CommitText("Ő"),
329317
),
318+
SwipeDirection.RIGHT to KeyC(
319+
display = KeyDisplay.TextDisplay("Ű"),
320+
action = KeyAction.CommitText("Ű"),
321+
),
322+
SwipeDirection.BOTTOM_LEFT to KeyC(
323+
display = KeyDisplay.TextDisplay("U"),
324+
action = KeyAction.CommitText("U"),
325+
),
326+
SwipeDirection.BOTTOM to KeyC(
327+
display = KeyDisplay.TextDisplay("Ú"),
328+
action = KeyAction.CommitText("Ú"),
329+
),
330+
SwipeDirection.BOTTOM_RIGHT to KeyC(
331+
display = KeyDisplay.TextDisplay("Ü"),
332+
action = KeyAction.CommitText("Ü"),
333+
),
330334
),
331335
),
332336
EMOJI_KEY_ITEM,
@@ -398,15 +402,6 @@ val KB_HU_THUMBKEY_SHIFTED = KeyboardC(
398402
),
399403
swipeType = SwipeNWay.FOUR_WAY_CROSS,
400404
swipes = mapOf(
401-
SwipeDirection.LEFT to KeyC(
402-
display = KeyDisplay.TextDisplay("L"),
403-
action = KeyAction.CommitText("L"),
404-
),
405-
SwipeDirection.BOTTOM to KeyC(
406-
display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
407-
action = KeyAction.ToggleShiftMode(false),
408-
color = ColorVariant.MUTED,
409-
),
410405
SwipeDirection.TOP to KeyC(
411406
display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardCapslock),
412407
capsModeDisplay = KeyDisplay.IconDisplay(Icons.Outlined.Copyright),
@@ -417,6 +412,15 @@ val KB_HU_THUMBKEY_SHIFTED = KeyboardC(
417412
display = KeyDisplay.TextDisplay("Á"),
418413
action = KeyAction.CommitText("Á"),
419414
),
415+
SwipeDirection.LEFT to KeyC(
416+
display = KeyDisplay.TextDisplay("L"),
417+
action = KeyAction.CommitText("L"),
418+
),
419+
SwipeDirection.BOTTOM to KeyC(
420+
display = KeyDisplay.IconDisplay(Icons.Outlined.ArrowDropDown),
421+
action = KeyAction.ToggleShiftMode(false),
422+
color = ColorVariant.MUTED,
423+
),
420424
),
421425
),
422426
NUMERIC_KEY_ITEM,
@@ -446,10 +450,14 @@ val KB_HU_THUMBKEY_SHIFTED = KeyboardC(
446450
),
447451
swipes = mapOf(
448452
SwipeDirection.TOP to KeyC(
453+
display = KeyDisplay.TextDisplay("Í"),
454+
action = KeyAction.CommitText("Í"),
455+
),
456+
SwipeDirection.TOP_RIGHT to KeyC(
449457
display = KeyDisplay.TextDisplay("F"),
450458
action = KeyAction.CommitText("F"),
451459
),
452-
SwipeDirection.TOP_RIGHT to KeyC(
460+
SwipeDirection.LEFT to KeyC(
453461
display = KeyDisplay.TextDisplay("'"),
454462
action = KeyAction.CommitText("'"),
455463
color = ColorVariant.MUTED,
@@ -504,7 +512,7 @@ val KB_HU_THUMBKEY_SHIFTED = KeyboardC(
504512
)
505513

506514
val KB_HU_THUMBKEY: KeyboardDefinition = KeyboardDefinition(
507-
title = "HU Thumb-Key magyar nyelv",
515+
title = "HU Thumb-Key magyar",
508516
modes = KeyboardDefinitionModes(
509517
main = KB_HU_THUMBKEY_MAIN,
510518
shifted = KB_HU_THUMBKEY_SHIFTED,

0 commit comments

Comments
 (0)