Update more keys

2024-09-28 14:54:30 +01:00 · 2024-05-08 17:01:34 -05:00 · 2024-05-08 17:01:34 -05:00 · 36157909c7
commit 36157909c7
parent 0153d855b9
7 changed files with 50 additions and 32 deletions
--- a/java/res/xml/rowkeys_qwerty1_left5.xml
+++ b/java/res/xml/rowkeys_qwerty1_left5.xml
@ -24,26 +24,26 @@
    <Key
        latin:keySpec="!text/keyspec_q"
        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1"
+        latin:additionalMoreKeys="1,\\%"
        latin:moreKeys="!text/morekeys_q" />
    <Key
        latin:keySpec="!text/keyspec_w"
        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2"
+        latin:additionalMoreKeys="2,\\\\"
        latin:moreKeys="!text/morekeys_w" />
    <Key
        latin:keySpec="e"
        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
+        latin:additionalMoreKeys="3,|"
        latin:moreKeys="!text/morekeys_e" />
    <Key
        latin:keySpec="r"
        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
+        latin:additionalMoreKeys="4,="
        latin:moreKeys="!text/morekeys_r" />
    <Key
        latin:keySpec="t"
        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
+        latin:additionalMoreKeys="5,!text/keyspec_left_square_bracket"
        latin:moreKeys="!text/morekeys_t" />
 </merge>
--- a/java/res/xml/rowkeys_qwerty1_right5.xml
+++ b/java/res/xml/rowkeys_qwerty1_right5.xml
@ -24,25 +24,25 @@
    <Key
        latin:keySpec="!text/keyspec_y"
        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
+        latin:additionalMoreKeys="6,!text/keyspec_right_square_bracket"
        latin:moreKeys="!text/morekeys_y" />
    <Key
        latin:keySpec="u"
        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
+        latin:additionalMoreKeys="7,!text/keyspec_less_than"
        latin:moreKeys="!text/morekeys_u" />
    <Key
        latin:keySpec="i"
        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
+        latin:additionalMoreKeys="8,!text/keyspec_greater_than"
        latin:moreKeys="!text/morekeys_i" />
    <Key
        latin:keySpec="o"
        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
+        latin:additionalMoreKeys="9,!text/keyspec_left_curly_bracket"
        latin:moreKeys="!text/morekeys_o" />
    <Key
        latin:keySpec="p"
        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
+        latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
 </merge>
--- a/java/res/xml/rowkeys_qwerty3_right3.xml
+++ b/java/res/xml/rowkeys_qwerty3_right3.xml
@ -32,6 +32,6 @@
        latin:moreKeys="!text/morekeys_n" />
    <Key
        latin:keySpec="m"
-        latin:keyHintLabel="?"
-        latin:additionalMoreKeys="?,/" />
+        latin:keyHintLabel="\?"
+        latin:additionalMoreKeys="\?,/" />
 </merge>
--- a/java/res/xml/rowkeys_qwertz1.xml
+++ b/java/res/xml/rowkeys_qwertz1.xml
@ -22,51 +22,52 @@
    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
    <Key
-        latin:keySpec="q"
+        latin:keySpec="!text/keyspec_q"
        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
+        latin:additionalMoreKeys="1,\\%"
+        latin:moreKeys="!text/morekeys_q" />
    <Key
-        latin:keySpec="w"
+        latin:keySpec="!text/keyspec_w"
        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2"
+        latin:additionalMoreKeys="2,\\\\"
        latin:moreKeys="!text/morekeys_w" />
    <Key
        latin:keySpec="e"
        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
+        latin:additionalMoreKeys="3,|"
        latin:moreKeys="!text/morekeys_e" />
    <Key
        latin:keySpec="r"
        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
+        latin:additionalMoreKeys="4,="
        latin:moreKeys="!text/morekeys_r" />
    <Key
        latin:keySpec="t"
        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
+        latin:additionalMoreKeys="5,!text/keyspec_left_square_bracket"
        latin:moreKeys="!text/morekeys_t" />
    <Key
        latin:keySpec="z"
        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
+        latin:additionalMoreKeys="6,!text/keyspec_right_square_bracket"
        latin:moreKeys="!text/morekeys_z" />
-     <Key
+    <Key
        latin:keySpec="u"
        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
+        latin:additionalMoreKeys="7,!text/keyspec_less_than"
        latin:moreKeys="!text/morekeys_u" />
    <Key
        latin:keySpec="i"
        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
+        latin:additionalMoreKeys="8,!text/keyspec_greater_than"
        latin:moreKeys="!text/morekeys_i" />
    <Key
        latin:keySpec="o"
        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
+        latin:additionalMoreKeys="9,!text/keyspec_left_curly_bracket"
        latin:moreKeys="!text/morekeys_o" />
    <Key
        latin:keySpec="p"
        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
+        latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
 </merge>
--- a/java/res/xml/rowkeys_qwertz3.xml
+++ b/java/res/xml/rowkeys_qwertz3.xml
@ -23,20 +23,35 @@
 >
    <Key
        latin:keySpec="y"
+        latin:keyHintLabel="*"
+        latin:additionalMoreKeys="*"
        latin:moreKeys="!text/morekeys_y" />
    <Key
-        latin:keySpec="x" />
+        latin:keySpec="x"
+        latin:keyHintLabel="&quot;"
+        latin:additionalMoreKeys="&quot;"
+        latin:moreKeys="!text/morekeys_x" />
    <Key
        latin:keySpec="c"
+        latin:keyHintLabel="'"
+        latin:additionalMoreKeys="'"
        latin:moreKeys="!text/morekeys_c" />
    <Key
        latin:keySpec="v"
+        latin:keyHintLabel=":"
+        latin:additionalMoreKeys=":"
        latin:moreKeys="!text/morekeys_v" />
    <Key
-        latin:keySpec="b" />
+        latin:keySpec="b"
+        latin:keyHintLabel=";"
+        latin:additionalMoreKeys=";" />
    <Key
        latin:keySpec="n"
+        latin:keyHintLabel="!"
+        latin:additionalMoreKeys="!"
        latin:moreKeys="!text/morekeys_n" />
    <Key
-        latin:keySpec="m" />
+        latin:keySpec="m"
+        latin:keyHintLabel="\?"
+        latin:additionalMoreKeys="\?,/" />
 </merge>
--- a/java/src/org/futo/inputmethod/keyboard/Key.java
+++ b/java/src/org/futo/inputmethod/keyboard/Key.java
@ -376,7 +376,9 @@ public class Key implements Comparable<Key> {
            }

            if(moreKeys != null && moreKeys.length > 0) {
-                final String hintLabelCandidate = moreKeys[0];
+                String hintLabelCandidate = moreKeys[0];
+                if(hintLabelCandidate.startsWith("\\")) hintLabelCandidate = hintLabelCandidate.substring(1);
+
                if(hintLabelCandidate.length() == 1) {
                    hintLabel = hintLabelCandidate;
                }
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
@ -302,7 +302,7 @@ public final class KeyboardTextsTable {
        /* ~ additional_morekeys_symbols_0 */
        /* morekeys_tablet_period */ "!text/morekeys_tablet_punctuation",
        /* morekeys_nordic_row2_11 */ EMPTY,
-        /* morekeys_punctuation */ "_,\\\\,|,=",
+        /* morekeys_punctuation */ "?,!,\u203d,\u2026,_,\\\\,|,=",
        /* keyspec_tablet_comma */ ",",
        // Period key
        /* keyspec_period */ ".",
@ -342,7 +342,7 @@ public final class KeyboardTextsTable {
        /* morekeys_tablet_comma */ EMPTY,
        /* keyhintlabel_period */ EMPTY,
        // U+00BF: "¿" INVERTED QUESTION MARK
-        /* morekeys_question */ "\u00BF",
+        /* morekeys_question */ "\u00BF,\u203d",
        /* morekeys_h ~ */
        EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
        /* ~ keyspec_south_slavic_row3_8 */
@ -395,7 +395,7 @@ public final class KeyboardTextsTable {
        /* morekeys_less_than */ "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote",
        /* morekeys_greater_than */ "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote",
        // U+00A1: "¡" INVERTED EXCLAMATION MARK
-        /* morekeys_exclamation */ "\u00A1",
+        /* morekeys_exclamation */ "\u00A1,\u203d",
        /* morekeys_currency_generic */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
        // U+00B9: "¹" SUPERSCRIPT ONE
        // U+00BD: "½" VULGAR FRACTION ONE HALF