From af636badab7d75d8980e30e9f26206bddc809456 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Fri, 31 May 2024 09:58:35 +0200
Subject: [PATCH] add comma key popups for number layouts (for phone layouts
 it's on period because there is no comma key) fixes #823

---
 app/src/main/assets/layouts/number.json                   | 8 ++++----
 app/src/main/assets/layouts/phone.json                    | 2 +-
 app/src/main/assets/layouts/phone_symbols.json            | 2 +-
 .../internal/keyboard_parser/floris/TextKeyData.kt        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/assets/layouts/number.json b/app/src/main/assets/layouts/number.json
index bc6bae10..5ee29fca 100644
--- a/app/src/main/assets/layouts/number.json
+++ b/app/src/main/assets/layouts/number.json
@@ -19,15 +19,15 @@
   ],
   [
     { "$": "variation_selector",
-      "default": { "label": ",", "type": "numeric" },
-      "date": { "label": ".", "type": "numeric" },
-      "time": { "label": ".", "type": "numeric", "popup": { "relevant": [
+      "default": { "label": ",", "type": "numeric", "groupId": 1 },
+      "date": { "label": ".", "type": "numeric", "groupId": 1 },
+      "time": { "label": ".", "type": "numeric", "groupId": 1, "popup": { "relevant": [
         { "label": "!fixedColumnOrder!2" },
         { "label": "!hasLabels!" },
         { "label": "AM" },
         { "label": "PM" }
       ] } },
-      "datetime": { "label": ".", "type": "numeric", "popup": { "relevant": [
+      "datetime": { "label": ".", "type": "numeric", "groupId": 1, "popup": { "relevant": [
         { "label": "!fixedColumnOrder!2" },
         { "label": "!hasLabels!" },
         { "label": "AM" },
diff --git a/app/src/main/assets/layouts/phone.json b/app/src/main/assets/layouts/phone.json
index c3ffd667..b7a87cc4 100644
--- a/app/src/main/assets/layouts/phone.json
+++ b/app/src/main/assets/layouts/phone.json
@@ -20,7 +20,7 @@
   [
     { "label": "＊＃|!code/key_switch_alpha_symbol", "type": "numeric", "labelFlags": 524432 },
     { "label": "0 +|0", "type": "numeric", "popup": { "relevant": [ { "label": "!noPanelAutoPopupKey!" }, { "label": "+" } ] } },
-    { "label": ".", "type": "numeric", "labelFlags": 64 },
+    { "label": ".", "type": "numeric", "labelFlags": 64, "groupId": 1 },
     { "label": "action" }
   ]
 ]
diff --git a/app/src/main/assets/layouts/phone_symbols.json b/app/src/main/assets/layouts/phone_symbols.json
index d1dd29d1..03ed5596 100644
--- a/app/src/main/assets/layouts/phone_symbols.json
+++ b/app/src/main/assets/layouts/phone_symbols.json
@@ -20,7 +20,7 @@
   [
     { "label": "123|!code/key_switch_alpha_symbol", "type": "numeric", "labelFlags": 524432 },
     { "label": "+", "type": "numeric" },
-    { "label": ".", "type": "numeric" },
+    { "label": ".", "type": "numeric", "groupId": 1 },
     { "label": "action" }
   ]
 ]
diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/TextKeyData.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/TextKeyData.kt
index 7fab7d62..ac64c517 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/TextKeyData.kt
+++ b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/TextKeyData.kt
@@ -119,7 +119,7 @@ sealed interface KeyData : AbstractKeyData {
                 keys.add("!icon/clipboard_normal_key|!code/key_clipboard")
             if (!params.mId.mEmojiKeyEnabled && !params.mId.isNumberLayout)
                 keys.add("!icon/emoji_normal_key|!code/key_emoji")
-            if (!params.mId.mLanguageSwitchKeyEnabled)
+            if (!params.mId.mLanguageSwitchKeyEnabled && !params.mId.isNumberLayout)
                 keys.add("!icon/language_switch_key|!code/key_language_switch")
             if (!params.mId.mOneHandedModeEnabled)
                 keys.add("!icon/start_onehanded_mode_key|!code/key_start_onehanded")