From e25300d8326363b9c080c41f52f5a158974bf16a Mon Sep 17 00:00:00 2001
From: Eran Leshem <1707552+eranl@users.noreply.github.com>
Date: Wed, 21 May 2025 23:48:33 +0300
Subject: [PATCH] Add comma to the repurposed comma key's popup in URL and
 email mode (#1594)

---
 .../internal/keyboard_parser/floris/TextKeyData.kt  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 38ced5992..fbf1f7921 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
@@ -132,6 +132,9 @@ sealed interface KeyData : AbstractKeyData {
                 keys.add("!icon/start_onehanded_mode_key|!code/key_toggle_onehanded")
             if (!params.mId.mDeviceLocked)
                 keys.add("!icon/settings_key|!code/key_settings")
+            if (shouldShowTldPopups(params)) {
+                keys.add(",")
+            }
             return keys
         }
 
@@ -315,6 +318,11 @@ sealed interface KeyData : AbstractKeyData {
             }
         }
 
+        private fun shouldShowTldPopups(params: KeyboardParams): Boolean =
+            (Settings.getInstance().current.mShowTldPopupKeys
+                    && params.mId.mSubtype.layouts[LayoutType.FUNCTIONAL] != "functional_keys_tablet"
+                    && params.mId.mMode in setOf(KeyboardId.MODE_URL, KeyboardId.MODE_EMAIL))
+
         // could make arrays right away, but they need to be copied anyway as popupKeys arrays are modified when creating KeyParams
         private const val POPUP_EYS_NAVIGATE_PREVIOUS = "!icon/previous_key|!code/key_action_previous,!icon/clipboard_action_key|!code/key_clipboard"
         private const val POPUP_EYS_NAVIGATE_NEXT = "!icon/clipboard_action_key|!code/key_clipboard,!icon/next_key|!code/key_action_next"
@@ -583,11 +591,6 @@ sealed interface KeyData : AbstractKeyData {
             if (shouldShowTldPopups(params)) params.mLocaleKeyboardInfos.tlds
             else getPunctuationPopupKeys(params)
         )
-
-    private fun shouldShowTldPopups(params: KeyboardParams): Boolean =
-        (Settings.getInstance().current.mShowTldPopupKeys
-                && params.mId.mSubtype.layouts[LayoutType.FUNCTIONAL] != "functional_keys_tablet"
-                && params.mId.mMode in setOf(KeyboardId.MODE_URL, KeyboardId.MODE_EMAIL))
 }
 
 /**