Added üÜ and ßẞ to DEMessagEaseNordic.kt, shifted ßẞ correctly in ger…

…man keyboards (#1028) * Added üÜ and ßẞ to DEMessagEaseNordic.kt kept both at positions from DEMessagEase.kt, moved æÆ to left of eE Fixes #1027 Fixes #1027 * changed ß (small) to ẞ (big) in shifted layers of all german keyboards yes, there is a big version of the letter https://de.wikipedia.org/wiki/Gro%C3%9Fes_%C3%9F * typo
dessalines · Aug 27, 2024 · 5458d36 · 5458d36
1 parent 88c3407
commit 5458d36
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/DEMessagEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/DEMessagEase.kt
@@ -646,8 +646,8 @@ val KB_DE_MESSAGEASE_SHIFTED =
                                 ),
                             SwipeDirection.BOTTOM to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("ß"),
-                                    action = KeyAction.CommitText("ß"),
+                                    display = KeyDisplay.TextDisplay("ẞ"),
+                                    action = KeyAction.CommitText("ẞ"),
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/DEMessagEaseNordic.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/DEMessagEaseNordic.kt
@@ -169,8 +169,8 @@ val KB_DE_NORDIC_MESSAGEASE_MAIN =
                         mapOf(
                             SwipeDirection.TOP to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("æ"),
-                                    action = KeyAction.CommitText("æ"),
+                                    display = KeyDisplay.TextDisplay("ü"),
+                                    action = KeyAction.CommitText("ü"),
                                 ),
                             SwipeDirection.TOP_LEFT to
                                 KeyC(
@@ -366,6 +366,11 @@ val KB_DE_NORDIC_MESSAGEASE_MAIN =
                                     display = KeyDisplay.TextDisplay("ø"),
                                     action = KeyAction.CommitText("ø"),
                                 ),
+                            SwipeDirection.BOTTOM to
+                                KeyC(
+                                    display = KeyDisplay.TextDisplay("ß"),
+                                    action = KeyAction.CommitText("ß"),
+                                ),
                             SwipeDirection.BOTTOM_RIGHT to
                                 KeyC(
                                     display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
@@ -395,6 +400,11 @@ val KB_DE_NORDIC_MESSAGEASE_MAIN =
                                     action = KeyAction.CommitText("\""),
                                     color = ColorVariant.MUTED,
                                 ),
+                            SwipeDirection.LEFT to
+                                KeyC(
+                                    display = KeyDisplay.TextDisplay("æ"),
+                                    action = KeyAction.CommitText("æ"),
+                                ),
                             SwipeDirection.BOTTOM_LEFT to
                                 KeyC(
                                     display = KeyDisplay.TextDisplay(","),
@@ -634,8 +644,8 @@ val KB_DE_NORDIC_MESSAGEASE_SHIFTED =
                         mapOf(
                             SwipeDirection.TOP to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("Æ"),
-                                    action = KeyAction.CommitText("Æ"),
+                                    display = KeyDisplay.TextDisplay("Ü"),
+                                    action = KeyAction.CommitText("Ü"),
                                 ),
                             SwipeDirection.TOP_LEFT to
                                 KeyC(
@@ -834,6 +844,11 @@ val KB_DE_NORDIC_MESSAGEASE_SHIFTED =
                                     display = KeyDisplay.TextDisplay("Ø"),
                                     action = KeyAction.CommitText("Ø"),
                                 ),
+                            SwipeDirection.BOTTOM to
+                                KeyC(
+                                    display = KeyDisplay.TextDisplay("ẞ"),
+                                    action = KeyAction.CommitText("ẞ"),
+                                ),
                             SwipeDirection.BOTTOM_RIGHT to
                                 KeyC(
                                     display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
@@ -863,6 +878,11 @@ val KB_DE_NORDIC_MESSAGEASE_SHIFTED =
                                     action = KeyAction.CommitText("\""),
                                     color = ColorVariant.MUTED,
                                 ),
+                            SwipeDirection.LEFT to
+                                KeyC(
+                                    display = KeyDisplay.TextDisplay("Æ"),
+                                    action = KeyAction.CommitText("Æ"),
+                                ),
                             SwipeDirection.BOTTOM_LEFT to
                                 KeyC(
                                     display = KeyDisplay.TextDisplay(","),

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/DEThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/DEThumbKey.kt
@@ -577,8 +577,8 @@ val KB_DE_THUMBKEY_SHIFTED =
                                 ),
                             SwipeDirection.LEFT to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("ß"),
-                                    action = KeyAction.CommitText("ß"),
+                                    display = KeyDisplay.TextDisplay("ẞ"),
+                                    action = KeyAction.CommitText("ẞ"),
                                 ),
                         ),
                 ),

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/DEThumbKeyMultiLingual.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/DEThumbKeyMultiLingual.kt
@@ -846,8 +846,8 @@ val KB_DE_THUMBKEY_MULTILINGUAL_SHIFTED =
                                 ),
                             SwipeDirection.LEFT to
                                 KeyC(
-                                    display = KeyDisplay.TextDisplay("ß"),
-                                    action = KeyAction.CommitText("ß"),
+                                    display = KeyDisplay.TextDisplay("ẞ"),
+                                    action = KeyAction.CommitText("ẞ"),
                                 ),
                         ),
                 ),