Improve symbol keyboards

yuetyam · Nov 11, 2024 · 4507b87 · 4507b87
1 parent c3b34dd
commit 4507b87
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 32 deletions.
diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/CantoneseNumericKeyboard.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/CantoneseNumericKeyboard.kt
@@ -91,14 +91,15 @@ fun CantoneseNumericKeyboard(keyHeight: Dp) {
                                 .fillMaxWidth()
                 ) {
                         TransformKey(destination = KeyboardForm.Symbolic, modifier = Modifier.weight(1.3f))
-                        Spacer(modifier = Modifier.weight(0.22f))
-                        SymbolKey(symbol = "。", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "，", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "、", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "？", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "！", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = ".", modifier = Modifier.weight(1.16f))
-                        Spacer(modifier = Modifier.weight(0.22f))
+                        Spacer(modifier = Modifier.weight(0.2f))
+                        SymbolKey(symbol = "。", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "，", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "、", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "？", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "！", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = ".", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "\"", modifier = Modifier.weight(1f))
+                        Spacer(modifier = Modifier.weight(0.2f))
                         BackspaceKey(modifier = Modifier.weight(1.3f))
                 }
                 BottomKeyRow(transform = KeyboardForm.Alphabetic, height = keyHeight)

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/CantoneseSymbolicKeyboard.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/CantoneseSymbolicKeyboard.kt
@@ -91,14 +91,15 @@ fun CantoneseSymbolicKeyboard(keyHeight: Dp) {
                                 .fillMaxWidth()
                 ) {
                         TransformKey(destination = KeyboardForm.Numeric, modifier = Modifier.weight(1.3f))
-                        Spacer(modifier = Modifier.weight(0.22f))
-                        SymbolKey(symbol = "…", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "，", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "©", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "？", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "！", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "'", modifier = Modifier.weight(1.16f))
-                        Spacer(modifier = Modifier.weight(0.22f))
+                        Spacer(modifier = Modifier.weight(0.2f))
+                        SymbolKey(symbol = "…", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "©", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "®", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "℗", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "™", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "℠", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "'", modifier = Modifier.weight(1f))
+                        Spacer(modifier = Modifier.weight(0.2f))
                         BackspaceKey(modifier = Modifier.weight(1.3f))
                 }
                 BottomKeyRow(transform = KeyboardForm.Alphabetic, height = keyHeight)

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/NumericKeyboard.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/NumericKeyboard.kt
@@ -91,14 +91,15 @@ fun NumericKeyboard(keyHeight: Dp) {
                                 .fillMaxWidth()
                 ) {
                         TransformKey(destination = KeyboardForm.Symbolic, modifier = Modifier.weight(1.3f))
-                        Spacer(modifier = Modifier.weight(0.22f))
-                        SymbolKey(symbol = ".", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = ",", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "?", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "!", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "*", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "'", modifier = Modifier.weight(1.16f))
-                        Spacer(modifier = Modifier.weight(0.22f))
+                        Spacer(modifier = Modifier.weight(0.2f))
+                        SymbolKey(symbol = ".", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = ",", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "?", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "!", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "%", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "*", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "'", modifier = Modifier.weight(1f))
+                        Spacer(modifier = Modifier.weight(0.2f))
                         BackspaceKey(modifier = Modifier.weight(1.3f))
                 }
                 BottomKeyRow(transform = KeyboardForm.Alphabetic, height = keyHeight)

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/SymbolicKeyboard.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/SymbolicKeyboard.kt
@@ -91,14 +91,15 @@ fun SymbolicKeyboard(keyHeight: Dp) {
                                 .fillMaxWidth()
                 ) {
                         TransformKey(destination = KeyboardForm.Numeric, modifier = Modifier.weight(1.3f))
-                        Spacer(modifier = Modifier.weight(0.22f))
-                        SymbolKey(symbol = ".", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = ",", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "?", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "!", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "&", modifier = Modifier.weight(1.16f))
-                        SymbolKey(symbol = "'", modifier = Modifier.weight(1.16f))
-                        Spacer(modifier = Modifier.weight(0.22f))
+                        Spacer(modifier = Modifier.weight(0.2f))
+                        SymbolKey(symbol = "…", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "©", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "®", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "℗", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "™", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "℠", modifier = Modifier.weight(1f))
+                        SymbolKey(symbol = "'", modifier = Modifier.weight(1f))
+                        Spacer(modifier = Modifier.weight(0.2f))
                         BackspaceKey(modifier = Modifier.weight(1.3f))
                 }
                 BottomKeyRow(transform = KeyboardForm.Alphabetic, height = keyHeight)