Show hints in symbols menu by default

Author: abb128

java/src/org/futo/inputmethod/v2keyboard/LayoutEngine.kt

@@ -6,6 +6,7 @@ import androidx.compose.ui.unit.Dp
 import org.futo.inputmethod.keyboard.KeyConsts
 import org.futo.inputmethod.keyboard.internal.KeyboardLayoutElement
 import org.futo.inputmethod.keyboard.internal.KeyboardParams
+import org.futo.inputmethod.keyboard.internal.isAlphabet
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.uix.DynamicThemeProvider
@@ -499,7 +500,20 @@ data class LayoutEngine(
         }
     }
 
-    private val validNumbersForHint = "1234567890".map { params.mTextsSet.resolveTextReference("!text/keyspec_symbols_$it") ?: it }.toSet()
+    private val validNumbersForHint = "1234567890".map { it.toString() }.map { params.mTextsSet.resolveTextReference("!text/keyspec_symbols_$it") ?: it }.toSet()
+    private val englishNumbers = "1234567890".map { it.toString() }.toSet()
+    private val blacklistedHintsForNumbers = buildList {
+        // Subscripts/superscripts, fractions
+        addAll((0x2070 .. 0x208E).map { it.toChar() })
+        addAll((0x2150 .. 0x215F).map { it.toChar() })
+        add('\u00B0')
+        add('\u00B2')
+        add('\u00B3')
+        add('\u00B9')
+        add('\u00BC')
+        add('\u00BD')
+        add('\u00BE')
+    }.map { it.toString() }.toSet()
     private val showAllHintsSetting = params.mId.mLongPressKeySettings.showHints
 
     private fun computedKeyToKey(data: ComputedKeyData, x: Int, y: Int, width: Int, height: Int, leftGap: LayoutEntry.Gap?, rightGap: LayoutEntry.Gap?): org.futo.inputmethod.keyboard.Key? {
@@ -529,11 +543,21 @@ data class LayoutEngine(
             hasExplicitHint -> data.hint
 
             // If we have no explicit hint, and show hints setting is disabled,
-            // then either show a number or nothing
-            !showAllHintsSetting ->
-                data.moreKeys.mapNotNull { it.mLabel }.firstOrNull { validNumbersForHint.contains(it) } ?: ""
-
-            // If we have no explicit hint and show hints setting is enabled,
+            // then in alphabet menu, either show a number or nothing
+            !showAllHintsSetting && params.mId.mElement.kind.isAlphabet ->
+                data.moreKeys.mapNotNull { it.mLabel }.firstOrNull { validNumbersForHint.contains(it) && it != data.label } ?: ""
+
+            // In the situation that this is a number, only show a hint if it's not a tiny little
+            // superscript or subscript
+            englishNumbers.contains(data.label) && validNumbersForHint.contains(data.label)
+                ->
+                data.moreKeys.firstOrNull {
+                    it.mLabel != null
+                            && !blacklistedHintsForNumbers.contains(it.mLabel)
+                            && it.mLabel != data.label
+                }?.mLabel ?: ""
+
+            // If we have no explicit hint and show hints setting is enabled (or we are in symbols menu),
             // set this to null which will later automatically select a hint based on
             // the first element of moreKeys
             else -> null