From 0497bf4702d8c48c43088be217d60eee02b337b9 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 23 Sep 2023 13:02:56 +0200
Subject: [PATCH] make popup hint optional for both styles

---
 .../dslul/openboard/inputmethod/keyboard/KeyboardView.java | 5 +++--
 .../openboard/inputmethod/latin/settings/Settings.java     | 1 +
 .../inputmethod/latin/settings/SettingsValues.java         | 2 ++
 app/src/main/res/values/strings.xml                        | 4 ++++
 app/src/main/res/values/themes-lxx.xml                     | 4 ++--
 app/src/main/res/xml/prefs_screen_preferences.xml          | 7 +++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
index ad049d4f4..b536eb003 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
@@ -161,8 +161,9 @@ public class KeyboardView extends View {
                 R.styleable.KeyboardView_spacebarIconWidthRatio, 1.0f);
         mKeyHintLetterPadding = keyboardViewAttr.getDimension(
                 R.styleable.KeyboardView_keyHintLetterPadding, 0.0f);
-        mKeyPopupHintLetter = keyboardViewAttr.getString(
-                R.styleable.KeyboardView_keyPopupHintLetter);
+        mKeyPopupHintLetter = Settings.getInstance().getCurrent().mShowsPopupHints
+                ? keyboardViewAttr.getString(R.styleable.KeyboardView_keyPopupHintLetter)
+                : "";
         mKeyPopupHintLetterPadding = keyboardViewAttr.getDimension(
                 R.styleable.KeyboardView_keyPopupHintLetterPadding, 0.0f);
         mKeyShiftedLetterHintPadding = keyboardViewAttr.getDimension(
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
index 7f4c9b316..d77cf82c2 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
@@ -115,6 +115,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final String PREF_SHOW_NUMBER_ROW = "pref_show_number_row";
 
     public static final String PREF_SHOW_HINTS = "pref_show_hints";
+    public static final String PREF_SHOW_POPUP_HINTS = "pref_show_popup_hints";
 
     public static final String PREF_SPACE_TO_CHANGE_LANG = "prefs_long_press_keyboard_to_change_lang";
     public static final String PREF_SPACE_LANGUAGE_SLIDE = "pref_space_language_slide";
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
index f9255595d..b1c7e9267 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
@@ -74,6 +74,7 @@ public class SettingsValues {
     public final boolean mLanguageSwitchKeyToOtherSubtypes;
     public final boolean mShowsNumberRow;
     public final boolean mShowsHints;
+    public final boolean mShowsPopupHints;
     public final boolean mSpaceForLangChange;
     public final boolean mSpaceLanguageSlide;
     public final boolean mShowsEmojiKey;
@@ -156,6 +157,7 @@ public class SettingsValues {
         mLanguageSwitchKeyToOtherSubtypes = languagePref.equals("internal") || languagePref.equals("both");
         mShowsNumberRow = prefs.getBoolean(Settings.PREF_SHOW_NUMBER_ROW, false);
         mShowsHints = prefs.getBoolean(Settings.PREF_SHOW_HINTS, true);
+        mShowsPopupHints = prefs.getBoolean(Settings.PREF_SHOW_POPUP_HINTS, false);
         mSpaceForLangChange = prefs.getBoolean(Settings.PREF_SPACE_TO_CHANGE_LANG, true);
         mSpaceLanguageSlide = prefs.getBoolean(Settings.PREF_SPACE_LANGUAGE_SLIDE, false);
         mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, false);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3fbb1e48c..8826b7bff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -228,6 +228,10 @@
     <string name="show_hints">Show key hints</string>
     <!-- Description of the settings to show hints -->
     <string name="show_hints_summary">Show long-press hints</string>
+    <!-- Title of the settings to show "..." as hints for more functionality on long-press -->
+    <string name="show_popup_hints">Show functional hints</string>
+    <!-- Description of the show_popup_hints setting -->
+    <string name="show_popup_hints_summary">Show hints if long-pressing a key triggers additional functionality</string>
     <!-- Title of the settings enabling long press on space key to change IME -->
     <string name="prefs_long_press_keyboard_to_change_lang">Change input method with space key</string>
     <!-- Description of the settings to change IME indicating long press triggers change. -->
diff --git a/app/src/main/res/values/themes-lxx.xml b/app/src/main/res/values/themes-lxx.xml
index 167aeaf2e..dc0729793 100644
--- a/app/src/main/res/values/themes-lxx.xml
+++ b/app/src/main/res/values/themes-lxx.xml
@@ -39,7 +39,7 @@
         <item name="keyHintLabelOffCenterRatio">300%</item>
         <item name="keyLabelFlags">alignHintLabelToBottom</item>
         <item name="spacebarIconWidthRatio">0.9</item>
-        <!-- No popup hint letter -->
-        <item name="keyPopupHintLetter"></item>
+        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+        <item name="keyPopupHintLetter">&#x2026;</item>
     </style>
 </resources>
diff --git a/app/src/main/res/xml/prefs_screen_preferences.xml b/app/src/main/res/xml/prefs_screen_preferences.xml
index 29b075ae1..8a6136e1c 100644
--- a/app/src/main/res/xml/prefs_screen_preferences.xml
+++ b/app/src/main/res/xml/prefs_screen_preferences.xml
@@ -27,6 +27,13 @@
             android:defaultValue="true"
             android:persistent="true" />
 
+        <SwitchPreferenceCompat
+            android:key="pref_show_popup_hints"
+            android:title="@string/show_popup_hints"
+            android:summary="@string/show_popup_hints_summary"
+            android:defaultValue="false"
+            android:persistent="true" />
+
         <SwitchPreferenceCompat
             android:key="vibrate_on"
             android:title="@string/vibrate_on_keypress"