From c8a10b9d427670bec1ee57eab579a9f4e6b0f450 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Wed, 3 Apr 2024 19:04:44 +0200
Subject: [PATCH 01/15] add donation information (might be extended)

---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..4dc2c8057
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+
+liberapay: Helium314

From 77cdf4884644fc8ebd59a85ac9e1ae95c8ccccdd Mon Sep 17 00:00:00 2001
From: Zolax <87378963+Zolax9@users.noreply.github.com>
Date: Wed, 3 Apr 2024 18:43:27 +0000
Subject: [PATCH 02/15] fix markdown link in readme (#635)

---
 README.md                                            | 2 +-
 fastlane/metadata/android/en-US/full_description.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a9c0b86ee..9ea3b25bf 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Does not use internet permission, and thus is 100% offline.
   <ul>
     <li>build your own, or get them  <a href="https://codeberg.org/Helium314/aosp-dictionaries#dictionaries">here</a>, or in the <a href="https://codeberg.org/Helium314/aosp-dictionaries#experimental-dictionaries">experimental</a> section (quality may vary)</li>
     <li>additional dictionaries for emojis or scientific symbols can be used to provide suggestions (similar to "emoji search")</li>
-    <li>note that for Korean layouts, suggestions only work using [this dictionary](https://github.com/openboard-team/openboard/commit/83fca9533c03b9fecc009fc632577226bbd6301f), the tools in the dictionary repository are not able to create working dictionaries</li>
+    <li>note that for Korean layouts, suggestions only work using <a href="https://github.com/openboard-team/openboard/commit/83fca9533c03b9fecc009fc632577226bbd6301f">this dictionary</a>, the tools in the dictionary repository are not able to create working dictionaries</li>
   </ul>
   <li>Customize keyboard themes (style, colors and background image)</li>
   <ul>
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 20c4740e2..dcb0ab318 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -7,7 +7,7 @@ Features:
   <ul>
     <li>build your own, or get them  <a href="https://codeberg.org/Helium314/aosp-dictionaries#dictionaries">here</a>, or in the <a href="https://codeberg.org/Helium314/aosp-dictionaries#experimental-dictionaries">experimental</a> section (quality may vary)</li>
     <li>additional dictionaries for emojis or scientific symbols can be used to provide suggestions (similar to "emoji search")</li>
-    <li>note that for Korean layouts, suggestions only work using [this dictionary](https://github.com/openboard-team/openboard/commit/83fca9533c03b9fecc009fc632577226bbd6301f), the tools in the dictionary repository are not able to create working dictionaries</li>
+    <li>note that for Korean layouts, suggestions only work using <a href="https://github.com/openboard-team/openboard/commit/83fca9533c03b9fecc009fc632577226bbd6301f">this dictionary</a>, the tools in the dictionary repository are not able to create working dictionaries</li>
   </ul>
   <li>Customize keyboard themes (style, colors and background image)</li>
   <ul>

From beba8f1b3d21bc16464f1e42c9652732bc7fc7e1 Mon Sep 17 00:00:00 2001
From: Fahim Montasir Misbah <28981571+fahimscirex@users.noreply.github.com>
Date: Thu, 4 Apr 2024 23:11:54 +0600
Subject: [PATCH 03/15] alter fullstop and equivalent in probhat layout (#628)

---
 app/src/main/assets/layouts/bengali_probhat.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/layouts/bengali_probhat.json b/app/src/main/assets/layouts/bengali_probhat.json
index dbcda68f6..e1d88cde7 100644
--- a/app/src/main/assets/layouts/bengali_probhat.json
+++ b/app/src/main/assets/layouts/bengali_probhat.json
@@ -122,11 +122,15 @@
     },
     { "$": "shift_state_selector",
       "manualOrLocked": { "label": "ৃ" },
-      "default": { "label": "." }
+      "default": { "label": "।" }
     },
     { "$": "shift_state_selector",
       "manualOrLocked": { "label": "ঁ" },
       "default": { "label": "্" }
     }
+  ],
+  [
+    { "label": "," },
+    { "label": "." }
   ]
 ]

From 99d03db47846222ca36b2beb224f994ba18d3ab2 Mon Sep 17 00:00:00 2001
From: "Md. Rifat Hasan Jihan" <31377578+RHJihan@users.noreply.github.com>
Date: Thu, 4 Apr 2024 23:52:26 +0600
Subject: [PATCH 04/15] Update formatting of Hidden features text

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79c15a58e..55981bdb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -749,7 +749,7 @@ New dictionary:
         \t&#8226; When using debug APK, you can find Debug Settings within the Advanced Preferences,though the usefulness is limited except for dumping dictionaries into the log. &lt;br&gt; &lt;br&gt;
         \t&#8226; In the event of an application crash, you will be prompted whether you want the crash logs when you open the Settings. &lt;br&gt; &lt;br&gt;
         \t&#8226; When using multilingual typing, space bar will show an confidence value used for determining the currently used language. &lt;br&gt; &lt;br&gt;
-        \t&#8226; Suggestions will have some tiny numbers on top showing some internal score and source dictionary (can be disabled).
+        \t&#8226; Suggestions will have some tiny numbers on top showing some internal score and source dictionary (can be disabled). &lt;br&gt; &lt;br&gt;
         &#9658; For users doing manual backups with root access: Starting at Android 7, the shared preferences file is not in the default location, because the app is using %s. &lt;br&gt;
         This is necessary so the settings can be read before the device is unlocked, e.g. at boot. &lt;br&gt;
         The file is located in /data/user_de/0/package_id/shared_prefs/, though this may depend on the device and Android version.</string>

From 231ffedd90f8b0509b4a86f77180f5cae78b4d9a Mon Sep 17 00:00:00 2001
From: Zolax <87378963+Zolax9@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:57:31 +0000
Subject: [PATCH 05/15] add Russian (Student) layout (#640)

---
 .../main/assets/layouts/russian_student.txt   | 33 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  3 ++
 app/src/main/res/xml/method.xml               | 10 ++++++
 3 files changed, 46 insertions(+)
 create mode 100644 app/src/main/assets/layouts/russian_student.txt

diff --git a/app/src/main/assets/layouts/russian_student.txt b/app/src/main/assets/layouts/russian_student.txt
new file mode 100644
index 000000000..4716deaef
--- /dev/null
+++ b/app/src/main/assets/layouts/russian_student.txt
@@ -0,0 +1,33 @@
+я
+ш
+е
+р
+т
+ы
+y
+и
+о
+п
+э
+
+а
+с
+д
+ф
+г
+ч
+й
+к
+л
+ж
+щ
+
+з
+х
+ц
+в
+б
+н
+м
+ь
+ю
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55981bdb9..3d510df61 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -310,6 +310,9 @@
     <!-- Description for "LANGUAGE_NAME" (Sebeolsik Final) keyboard subtype [CHAR LIMIT=25]
          (Sebeolsik Final) can be an abbreviation to fit in the CHAR LIMIT. -->
     <string name="subtype_generic_sebeolsik_final"><xliff:g id="LANGUAGE_NAME" example="Korean">%s</xliff:g> (Sebeolsik Final)</string>
+    <!-- Description for "LANGUAGE_NAME" (Student) keyboard subtype [CHAR LIMIT=25]
+         (Student) can be an abbreviation to fit in the CHAR LIMIT. -->
+    <string name="subtype_generic_student"><xliff:g id="LANGUAGE_NAME" example="Russian">%s</xliff:g> (Student)</string>
     <!-- This string is displayed in a language list that allows to choose a language for
 suggestions in a software keyboard. This setting won't give suggestions in any particular
 language, hence "No language".
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 6b6035d8e..4dbeb77c6 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -81,6 +81,7 @@
     pt_PT: Portuguese (Portugal)/qwerty
     ro: Romanian/qwerty
     ru: Russian/russian
+    ru: Russian (Student)/russian_student
     si_LK: Sinhala (Sri Lanka)/sinhala # This is a preliminary keyboard layout.
     sk: Slovak/qwerty
     sl: Slovenian/qwerty
@@ -803,6 +804,15 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=russian,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="false"
     />
+    <subtype android:icon="@drawable/ic_ime_switcher"
+            android:label="@string/subtype_generic_student"
+            android:subtypeId="0x1bc335d0"
+            android:imeSubtypeLocale="ru"
+            android:languageTag="ru"
+            android:imeSubtypeMode="keyboard"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=russian_student,SupportTouchPositionCorrection,EmojiCapable"
+            android:isAsciiCapable="false"
+    />
     <!-- TODO: This Sinhala keyboard is a preliminary layout.
                This isn't based on the final specification. -->
     <!-- si_LK is currently disabled due to lack of combination rules. -->

From 5628cbf2b6fb3defec210573eeb027dffeef5006 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Fri, 5 Apr 2024 23:25:31 +0200
Subject: [PATCH 06/15] avoid bad interaction between symbols layout name and
 assumed locale fixes #632

---
 .../keyboard/latin/settings/AdvancedSettingsFragment.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt b/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
index 1512420ff..c12a3b76f 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
+++ b/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
@@ -459,9 +459,10 @@ class AdvancedSettingsFragment : SubScreenFragment() {
                 originalName.replace(fileName, fileName.constructLocale().toLanguageTag())
             }
             originalName.startsWith("layouts") -> {
-                // replace file name after switch to language tag
-                // but only if it's not a symbols layout
+                // replace file name after switch to language tag, but only if it's not a layout
                 val localeString = originalName.substringAfter(".").substringBefore(".")
+                if (localeString in listOf(LAYOUT_SYMBOLS, LAYOUT_SYMBOLS_SHIFTED, LAYOUT_SYMBOLS_ARABIC, LAYOUT_NUMBER, LAYOUT_NUMPAD, LAYOUT_NUMPAD_LANDSCAPE, LAYOUT_PHONE, LAYOUT_PHONE_SYMBOLS))
+                    return originalName // it's a layout!
                 val locale = localeString.constructLocale()
                 if (locale.toLanguageTag() != "und")
                     originalName.replace(localeString, locale.toLanguageTag())

From a25ce3aa8770f7fb8d2a100721499f306894e6a2 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Fri, 5 Apr 2024 23:27:47 +0200
Subject: [PATCH 07/15] display correct name when editing symbol and number
 layouts

---
 .../keyboard/latin/settings/AdvancedSettingsFragment.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt b/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
index c12a3b76f..9176b9272 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
+++ b/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
@@ -176,7 +176,7 @@ class AdvancedSettingsFragment : SubScreenFragment() {
                 requireContext().assets.list("layouts")?.firstOrNull { it.startsWith("$layout.") }
                     ?.let { requireContext().assets.open("layouts" + File.separator + it).reader().readText() }
             }
-        val displayName = layout.getStringResourceOrName("layout", requireContext())
+        val displayName = layout.getStringResourceOrName("layout_", requireContext())
         editCustomLayout(customLayoutName ?: "$CUSTOM_LAYOUT_PREFIX$layout.txt", requireContext(), originalLayout, displayName)
     }
 

From 4354b33fa46154a4722a7eadd0940c0280ba1cd1 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Fri, 5 Apr 2024 23:51:35 +0200
Subject: [PATCH 08/15] make extra currently keys work in popups

---
 .../keyboard/latin/utils/PopupKeysUtils.kt          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
index ca85a9ac9..21abb38f6 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
@@ -91,9 +91,16 @@ fun getHintLabel(popupSet: PopupSet<*>?, params: KeyboardParams, label: String):
 }
 
 private fun transformLabel(label: String, params: KeyboardParams): String =
-    if (label == "$$$") { // currency key
-        if (params.mId.passwordInput()) "$"
-        else params.mLocaleKeyboardInfos.currencyKey.first
+    if (label.startsWith("$$$")) { // currency keys, todo: handing is similar to textKeyData, could it be merged?
+        if (label == "$$$") {
+            if (params.mId.passwordInput()) "$"
+            else params.mLocaleKeyboardInfos.currencyKey.first
+        } else {
+            val index = label.substringAfter("$$$").toIntOrNull()
+            if (index != null && index in 1..5)
+                params.mLocaleKeyboardInfos.currencyKey.second[index - 1]
+            else label
+        }
     } else if (params.mId.mSubtype.isRtlSubtype) {
         label.rtlLabel(params)
     } else label

From 605c5842e972ec1f76643a2b182a507557b58f6b Mon Sep 17 00:00:00 2001
From: "Md. Rifat Hasan Jihan" <31377578+RHJihan@users.noreply.github.com>
Date: Sat, 6 Apr 2024 12:17:30 +0600
Subject: [PATCH 09/15] match COLORS_DARK default (#637)

---
 .../main/java/helium314/keyboard/latin/settings/Settings.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
index 29dc5fa91..98f67ceba 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
@@ -615,7 +615,7 @@ public static Colors getColorsForCurrentTheme(final Context context, final Share
         boolean isNight = ResourceUtils.isNight(context.getResources());
         if (ColorsSettingsFragment.Companion.getForceOppositeTheme()) isNight = !isNight;
         final String themeColors = (isNight && readDayNightPref(prefs, context.getResources()))
-                ? prefs.getString(Settings.PREF_THEME_COLORS_NIGHT, KeyboardTheme.THEME_DARKER)
+                ? prefs.getString(Settings.PREF_THEME_COLORS_NIGHT, KeyboardTheme.THEME_DARK)
                 : prefs.getString(Settings.PREF_THEME_COLORS, KeyboardTheme.THEME_LIGHT);
         final String themeStyle = prefs.getString(Settings.PREF_THEME_STYLE, KeyboardTheme.STYLE_MATERIAL);
 

From 34b9799710b8429c694e4354b92e9253ba43ddf2 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 6 Apr 2024 09:23:50 +0200
Subject: [PATCH 10/15] remove theme logging added in
 a657d0e30030697c380344b5b6e0047eb162973c wasn't necessary, everything working
 here

---
 .../main/java/helium314/keyboard/keyboard/KeyboardTheme.kt   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt b/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt
index af5413428..6594c6f65 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt
+++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt
@@ -17,7 +17,6 @@ import helium314.keyboard.latin.common.DefaultColors
 import helium314.keyboard.latin.common.DynamicColors
 import helium314.keyboard.latin.settings.Settings
 import helium314.keyboard.latin.utils.DeviceProtectedUtils
-import helium314.keyboard.latin.utils.Log
 import helium314.keyboard.latin.utils.ResourceUtils
 
 class KeyboardTheme // Note: The themeId should be aligned with "themeId" attribute of Keyboard style in values/themes-<style>.xml.
@@ -92,9 +91,7 @@ private constructor(val themeId: Int, @JvmField val mStyleId: Int) {
                 STYLE_ROUNDED -> if (borders) THEME_ID_ROUNDED_BASE_BORDER else THEME_ID_ROUNDED_BASE
                 else -> if (borders) THEME_ID_LXX_BASE_BORDER else THEME_ID_LXX_BASE
             }
-            val theme = KEYBOARD_THEMES.firstOrNull { it.themeId == matchingId } ?: KEYBOARD_THEMES[DEFAULT_THEME_ID]
-            Log.d("KeyboardTheme", "Selected theme ${theme.themeId} and style ${theme.mStyleId} from $style (borders: $borders)")
-            return theme
+            return KEYBOARD_THEMES.firstOrNull { it.themeId == matchingId } ?: KEYBOARD_THEMES[DEFAULT_THEME_ID]
         }
 
         fun getThemeActionAndEmojiKeyLabelFlags(themeId: Int): Int {

From 0ab9aeb8e66c2cbf932420c24e98cb198898493d Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 6 Apr 2024 09:54:41 +0200
Subject: [PATCH 11/15] update readme

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9ea3b25bf..f34861dc4 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@ Does not use internet permission, and thus is 100% offline.
   * __Glide typing is not working after loading a library__: Possibly the download was corrupted, or you downloaded the wrong file. If you get a "_unknown file_" confirmation popup, it is likely you are not using the correct file (or you might be using a different version of the library). In rare cases, there might be crashes when the file is not in internal storage, or some [Samsung-specific problems](https://stackoverflow.com/a/75286899). 
 * __German layout with / without umlauts__: _German (Germany)_ layout has umlauts, _German_ layout doesn't
 * __Spell checker is not checking all languages in multilingual typing__: Make sure you actually enabled HeliBoard spell checker. Usually it can be found in System Settings -> System -> Languages -> Advanced -> Spell Checker, but this may depend on Android version.
+* __Words added to Gboard dictionary are not suggested__: Gboard uses its own dictionary instead of the system's personal dictionary. See [here](https://github.com/Helium314/HeliBoard/issues/500#issuecomment-2032292161) for how to export the words.
 * __What is the _nouserlib_ version?__: The normal version (_release_) allows the user to provide a library for glide typing. Running code that isn't supplied with the app is _dynamic code loading_, which is a security risk. Android Studio warns about this:
   > Dynamically loading code from locations other than the application's library directory or the Android platform's built-in library directories is dangerous, as there is an increased risk that the code could have been tampered with. Applications should use loadLibrary when possible, which provides increased assurance that libraries are loaded from one of these safer locations. Application developers should use the features of their development environment to place application native libraries into the lib directory of their compiled APKs.
 
@@ -76,14 +77,16 @@ Features that may go unnoticed, and further potentially useful information
 * Swipe up from a suggestion to open more suggestions, and release on the suggestion to select it.
 * Long-press an entry in the clipboard history to pin it (keep it in clipboard until you unpin).
 * Swipe left in clipboard view to remove an entry (except when it's pinned)
+* Select text and press shift to switch between uppercase, lowercase and capitalize words
 * You can add dictionaries by opening the file
   * This only works with _content-uris_ and not with _file-uris_, meaning that it may not work with some file explorers.
-* _When using debug mode / debug APK_
+* _Debug mode / debug APK_
   * Long-press a suggestion in the suggestion strip twice to show the source dictionary.
-  * When using debug APK, you can find Debug Settings within the Advanced Preferences, though the usefulness is limited except for dumping dictionaries into the log.
+  * When using debug APK, you can find _Debug Settings_ within the _Advanced Preferences_, though the usefulness is limited except for dumping dictionaries into the log.
+    * For a release APK, you need to tap the version in _About_ several times, then you can find debug settings in _Advanced Preferences_.
+    * When enabling _Show suggestion infos_, suggestions will have some tiny numbers on top showing some internal score and source dictionary.
   * In the event of an application crash, you will be prompted whether you want the crash logs when you open the Settings.
   * When using multilingual typing, space bar will show an confidence value used for determining the currently used language.
-  * Suggestions will have some tiny numbers on top showing some internal score and source dictionary (can be disabled)
 * For users doing manual backups with root access: Starting at Android 7, some files and the main shared preferences file are not in the default location, because the app is using [device protected storage](https://developer.android.com/reference/android/content/Context#createDeviceProtectedStorageContext()). This is necessary so the settings and layout files can be read before the device is unlocked, e.g. at boot. The files are usually located in `/data/user_de/0/<package_id>/`, though the location may depend on the device and Android version.
 
 # Contributing ❤

From 52f567ff9e89cbbcd17300a2f4ca05cbe144d160 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 6 Apr 2024 11:17:56 +0200
Subject: [PATCH 12/15] rename reorderPopupKeysDialog to reorderDialog add icon
 to layout, should later display toolbar key

---
 .../latin/settings/LanguageSettingsDialog.kt  |  4 +-
 .../settings/PreferencesSettingsFragment.java |  7 +-
 .../keyboard/latin/utils/DialogUtils.kt       | 83 +++++++++++++++++++
 .../keyboard/latin/utils/PopupKeysUtils.kt    | 79 ------------------
 ..._list_item.xml => reorder_dialog_item.xml} |  9 +-
 5 files changed, 96 insertions(+), 86 deletions(-)
 rename app/src/main/res/layout/{popup_keys_list_item.xml => reorder_dialog_item.xml} (81%)

diff --git a/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsDialog.kt b/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsDialog.kt
index 4805f44a9..8fbab5d99 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsDialog.kt
+++ b/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsDialog.kt
@@ -375,12 +375,12 @@ class LanguageSettingsDialog(
     private fun setupPopupSettings() {
         binding.popupOrder.setOnClickListener {
             val popupKeyTypesDefault = prefs.getString(Settings.PREF_POPUP_KEYS_ORDER, POPUP_KEYS_ORDER_DEFAULT)!!
-            reorderPopupKeysDialog(context, Settings.PREF_POPUP_KEYS_ORDER + "_" + mainLocale.toLanguageTag(), popupKeyTypesDefault, R.string.popup_order)
+            reorderDialog(context, Settings.PREF_POPUP_KEYS_ORDER + "_" + mainLocale.toLanguageTag(), popupKeyTypesDefault, R.string.popup_order)
             KeyboardLayoutSet.onKeyboardThemeChanged()
         }
         binding.popupLabelPriority.setOnClickListener {
             val popupKeyTypesDefault = prefs.getString(Settings.PREF_POPUP_KEYS_LABELS_ORDER, POPUP_KEYS_LABEL_DEFAULT)!!
-            reorderPopupKeysDialog(context, Settings.PREF_POPUP_KEYS_LABELS_ORDER + "_" + mainLocale.toLanguageTag(), popupKeyTypesDefault, R.string.hint_source)
+            reorderDialog(context, Settings.PREF_POPUP_KEYS_LABELS_ORDER + "_" + mainLocale.toLanguageTag(), popupKeyTypesDefault, R.string.hint_source)
             KeyboardLayoutSet.onKeyboardThemeChanged()
         }
     }
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java b/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
index 813457652..8fdc97b4c 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
@@ -20,6 +20,7 @@
 import helium314.keyboard.latin.AudioAndHapticFeedbackManager;
 import helium314.keyboard.latin.R;
 import helium314.keyboard.latin.RichInputMethodManager;
+import helium314.keyboard.latin.utils.DialogUtilsKt;
 import helium314.keyboard.latin.utils.PopupKeysUtilsKt;
 import helium314.keyboard.latin.utils.SubtypeSettingsKt;
 import helium314.keyboard.latin.utils.SubtypeUtilsKt;
@@ -59,15 +60,15 @@ public void onCreate(final Bundle icicle) {
         setLocalizedNumberRowVisibility();
         findPreference(Settings.PREF_POPUP_KEYS_LABELS_ORDER).setVisible(getSharedPreferences().getBoolean(Settings.PREF_SHOW_HINTS, false));
         findPreference(Settings.PREF_POPUP_KEYS_ORDER).setOnPreferenceClickListener((pref) -> {
-            PopupKeysUtilsKt.reorderPopupKeysDialog(requireContext(), Settings.PREF_POPUP_KEYS_ORDER, PopupKeysUtilsKt.POPUP_KEYS_ORDER_DEFAULT, R.string.popup_order);
+            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_POPUP_KEYS_ORDER, PopupKeysUtilsKt.POPUP_KEYS_ORDER_DEFAULT, R.string.popup_order);
             return true;
         });
         findPreference(Settings.PREF_POPUP_KEYS_LABELS_ORDER).setOnPreferenceClickListener((pref) -> {
-            PopupKeysUtilsKt.reorderPopupKeysDialog(requireContext(), Settings.PREF_POPUP_KEYS_LABELS_ORDER, PopupKeysUtilsKt.POPUP_KEYS_LABEL_DEFAULT, R.string.hint_source);
+            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_POPUP_KEYS_LABELS_ORDER, PopupKeysUtilsKt.POPUP_KEYS_LABEL_DEFAULT, R.string.hint_source);
             return true;
         });
         findPreference(Settings.PREF_TOOLBAR_KEYS).setOnPreferenceClickListener((pref) -> {
-            PopupKeysUtilsKt.reorderPopupKeysDialog(requireContext(), Settings.PREF_TOOLBAR_KEYS, ToolbarUtilsKt.getDefaultToolbarPref(), R.string.toolbar_keys);
+            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_TOOLBAR_KEYS, ToolbarUtilsKt.getDefaultToolbarPref(), R.string.toolbar_keys);
             return true;
         });
     }
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt
index 536843035..1f356bd9c 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt
@@ -1,9 +1,21 @@
 package helium314.keyboard.latin.utils
 
 import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Switch
+import android.widget.TextView
+import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ContextThemeWrapper
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import helium314.keyboard.latin.R
+import java.util.Collections
 
 fun getPlatformDialogThemeContext(context: Context): Context {
     // Because {@link AlertDialog.Builder.create()} doesn't honor the specified theme with
@@ -32,3 +44,74 @@ fun infoDialog(context: Context, message: String) {
         .setNegativeButton(android.R.string.ok, null)
         .show()
 }
+
+/**
+ *  Show a dialog that allows re-ordering and dis/enabling items (currently toolbar keys and popup keys).
+ *  The items are stored in a string pref in [key]. Each item contains a name and true/false, comma-separated.
+ *  Items are semicolon-separated, see e.g. [POPUP_KEYS_LABEL_DEFAULT] for an example.
+ */
+// this should probably be a class
+fun reorderDialog(context: Context, key: String, defaultSetting: String, @StringRes dialogTitleId: Int) {
+    val prefs = DeviceProtectedUtils.getSharedPreferences(context)
+    val orderedItems = prefs.getString(key, defaultSetting)!!.split(";").mapTo(ArrayList()) {
+        val both = it.split(",")
+        both.first() to both.last().toBoolean()
+    }
+    val rv = RecyclerView(context)
+    val bgColor = ContextCompat.getColor(context, R.color.sliding_items_background)
+    val padding = ResourceUtils.toPx(8, context.resources)
+    rv.setPadding(3 * padding, padding, padding, padding)
+    rv.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+
+    val callback = object : DiffUtil.ItemCallback<Pair<String, Boolean>>() {
+        override fun areItemsTheSame(p0: Pair<String, Boolean>, p1: Pair<String, Boolean>) = p0 == p1
+        override fun areContentsTheSame(p0: Pair<String, Boolean>, p1: Pair<String, Boolean>) = p0 == p1
+    }
+
+    val adapter = object : ListAdapter<Pair<String, Boolean>, RecyclerView.ViewHolder>(callback) {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+            val b = LayoutInflater.from(context).inflate(R.layout.reorder_dialog_item, rv, false)
+            b.setBackgroundColor(bgColor)
+            return object : RecyclerView.ViewHolder(b) { }
+        }
+        override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
+            val (text, wasChecked) = orderedItems[position]
+            val displayText = text.lowercase().getStringResourceOrName("", context)
+            viewHolder.itemView.findViewById<TextView>(R.id.reorder_item_name)?.text = displayText
+            val switch = viewHolder.itemView.findViewById<Switch>(R.id.reorder_item_switch)
+            switch?.setOnCheckedChangeListener(null)
+            switch?.isChecked = wasChecked
+            switch?.setOnCheckedChangeListener { _, isChecked ->
+                val pos = orderedItems.indexOfFirst { it.first == text }
+                orderedItems[pos] = text to isChecked
+            }
+        }
+    }
+    rv.adapter = adapter
+
+    ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
+        override fun onMove(rv: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            val pos1 = viewHolder.absoluteAdapterPosition
+            val pos2 = target.absoluteAdapterPosition
+            Collections.swap(orderedItems, pos1, pos2)
+            adapter.notifyItemMoved(pos1, pos2)
+            return true
+        }
+        override fun onSwiped(rv: RecyclerView.ViewHolder, direction: Int) { }
+    }).attachToRecyclerView(rv)
+
+    adapter.submitList(orderedItems)
+
+    AlertDialog.Builder(context)
+        .setTitle(dialogTitleId)
+        .setPositiveButton(android.R.string.ok) { _, _ ->
+            val value = orderedItems.joinToString(";") { it.first + "," + it.second }
+            prefs.edit().putString(key, value).apply()
+        }
+        .setNegativeButton(android.R.string.cancel, null)
+        .setNeutralButton(R.string.button_default) { _, _ ->
+            prefs.edit().remove(key).apply()
+        }
+        .setView(rv)
+        .show()
+}
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
index 21abb38f6..e08d16995 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
@@ -1,27 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 package helium314.keyboard.latin.utils
 
-import android.content.Context
 import android.content.SharedPreferences
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.Switch
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
 import helium314.keyboard.keyboard.Key
 import helium314.keyboard.keyboard.internal.KeySpecParser
 import helium314.keyboard.keyboard.internal.KeyboardParams
 import helium314.keyboard.keyboard.internal.keyboard_parser.floris.PopupSet
 import helium314.keyboard.keyboard.internal.keyboard_parser.rtlLabel
-import helium314.keyboard.latin.R
-import helium314.keyboard.latin.settings.Settings
-import java.util.Collections
 
 const val POPUP_KEYS_NUMBER = "popup_keys_number"
 private const val POPUP_KEYS_LANGUAGE_PRIORITY = "popup_keys_language_priority"
@@ -112,67 +97,3 @@ fun getEnabledPopupKeys(prefs: SharedPreferences, key: String, defaultSetting: S
         if (split.last() == "true") split.first() else null
     } ?: emptyList()
 }
-
-/**
- *  show a dialog that allows re-ordering and dis/enabling the popup keys list for the pref [key]
- *  see e.g. [POPUP_KEYS_LABEL_DEFAULT] for the internally used format
- */
-fun reorderPopupKeysDialog(context: Context, key: String, defaultSetting: String, title: Int) {
-    val prefs = DeviceProtectedUtils.getSharedPreferences(context)
-    val orderedItems = prefs.getString(key, defaultSetting)!!.split(";").mapTo(ArrayList()) {
-        val both = it.split(",")
-        both.first() to both.last().toBoolean()
-    }
-    val rv = RecyclerView(context)
-    val padding = ResourceUtils.toPx(8, context.resources)
-    rv.setPadding(3 * padding, padding, padding, padding)
-    rv.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-    val callback = object : DiffUtil.ItemCallback<Pair<String, Boolean>>() {
-        override fun areItemsTheSame(p0: Pair<String, Boolean>, p1: Pair<String, Boolean>) = p0 == p1
-        override fun areContentsTheSame(p0: Pair<String, Boolean>, p1: Pair<String, Boolean>) = p0 == p1
-    }
-    val bgColor = ContextCompat.getColor(context, R.color.sliding_items_background)
-    val adapter = object : ListAdapter<Pair<String, Boolean>, RecyclerView.ViewHolder>(callback) {
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-            val b = LayoutInflater.from(context).inflate(R.layout.popup_keys_list_item, rv, false)
-            b.setBackgroundColor(bgColor)
-            return object : RecyclerView.ViewHolder(b) { }
-        }
-        override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
-            val (text, wasChecked) = orderedItems[position]
-            val displayText = text.lowercase().getStringResourceOrName("", context)
-            viewHolder.itemView.findViewById<TextView>(R.id.popup_keys_type)?.text = displayText
-            val switch = viewHolder.itemView.findViewById<Switch>(R.id.popup_keys_switch)
-            switch?.setOnCheckedChangeListener(null)
-            switch?.isChecked = wasChecked
-            switch?.setOnCheckedChangeListener { _, isChecked ->
-                val pos = orderedItems.indexOfFirst { it.first == text }
-                orderedItems[pos] = text to isChecked
-            }
-        }
-    }
-    rv.adapter = adapter
-    ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
-        override fun onMove(rv: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-            val pos1 = viewHolder.absoluteAdapterPosition
-            val pos2 = target.absoluteAdapterPosition
-            Collections.swap(orderedItems, pos1, pos2)
-            adapter.notifyItemMoved(pos1, pos2)
-            return true
-        }
-        override fun onSwiped(rv: RecyclerView.ViewHolder, direction: Int) { }
-    }).attachToRecyclerView(rv)
-    adapter.submitList(orderedItems)
-    AlertDialog.Builder(context)
-        .setTitle(title)
-        .setPositiveButton(android.R.string.ok) { _, _ ->
-            val value = orderedItems.joinToString(";") { it.first + "," + it.second }
-            prefs.edit().putString(key, value).apply()
-        }
-        .setNegativeButton(android.R.string.cancel, null)
-        .setNeutralButton(R.string.button_default) { _, _ ->
-            prefs.edit().remove(key).apply()
-        }
-        .setView(rv)
-        .show()
-}
diff --git a/app/src/main/res/layout/popup_keys_list_item.xml b/app/src/main/res/layout/reorder_dialog_item.xml
similarity index 81%
rename from app/src/main/res/layout/popup_keys_list_item.xml
rename to app/src/main/res/layout/reorder_dialog_item.xml
index 311fe9ed7..7ba6d7f9e 100644
--- a/app/src/main/res/layout/popup_keys_list_item.xml
+++ b/app/src/main/res/layout/reorder_dialog_item.xml
@@ -11,15 +11,20 @@
     android:minHeight="48dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
+    <ImageView
+        android:id="@+id/reorder_item_icon"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent" />
     <TextView
-        android:id="@+id/popup_keys_type"
+        android:id="@+id/reorder_item_name"
         style="@style/PreferenceTitleText"
         android:layout_gravity="center_vertical"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content" />
     <Switch
-        android:id="@+id/popup_keys_switch"
+        android:id="@+id/reorder_item_switch"
         android:padding="6dp"
         android:layout_gravity="center_vertical"
         android:layout_width="wrap_content"

From 4ee01527a2ccd14167d0f576c4047f201efbd17d Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sat, 6 Apr 2024 12:22:14 +0200
Subject: [PATCH 13/15] show toolbar icons in toolbar key dialog

---
 .../settings/PreferencesSettingsFragment.java    |  9 ++++++---
 .../keyboard/latin/utils/DialogUtils.kt          | 16 +++++++++++++++-
 .../keyboard/latin/utils/ToolbarUtils.kt         | 12 ++++++++++++
 app/src/main/res/layout/reorder_dialog_item.xml  |  3 ++-
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java b/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
index 8fdc97b4c..528e06f18 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/PreferencesSettingsFragment.java
@@ -60,15 +60,18 @@ public void onCreate(final Bundle icicle) {
         setLocalizedNumberRowVisibility();
         findPreference(Settings.PREF_POPUP_KEYS_LABELS_ORDER).setVisible(getSharedPreferences().getBoolean(Settings.PREF_SHOW_HINTS, false));
         findPreference(Settings.PREF_POPUP_KEYS_ORDER).setOnPreferenceClickListener((pref) -> {
-            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_POPUP_KEYS_ORDER, PopupKeysUtilsKt.POPUP_KEYS_ORDER_DEFAULT, R.string.popup_order);
+            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_POPUP_KEYS_ORDER,
+                    PopupKeysUtilsKt.POPUP_KEYS_ORDER_DEFAULT, R.string.popup_order, (x) -> null);
             return true;
         });
         findPreference(Settings.PREF_POPUP_KEYS_LABELS_ORDER).setOnPreferenceClickListener((pref) -> {
-            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_POPUP_KEYS_LABELS_ORDER, PopupKeysUtilsKt.POPUP_KEYS_LABEL_DEFAULT, R.string.hint_source);
+            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_POPUP_KEYS_LABELS_ORDER,
+                    PopupKeysUtilsKt.POPUP_KEYS_LABEL_DEFAULT, R.string.hint_source, (x) -> null);
             return true;
         });
         findPreference(Settings.PREF_TOOLBAR_KEYS).setOnPreferenceClickListener((pref) -> {
-            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_TOOLBAR_KEYS, ToolbarUtilsKt.getDefaultToolbarPref(), R.string.toolbar_keys);
+            DialogUtilsKt.reorderDialog(requireContext(), Settings.PREF_TOOLBAR_KEYS, ToolbarUtilsKt.getDefaultToolbarPref(),
+                    R.string.toolbar_keys, (name) -> ToolbarUtilsKt.getToolbarIconByName(name, requireContext()));
             return true;
         });
     }
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt
index 1f356bd9c..4f58d176e 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/DialogUtils.kt
@@ -1,8 +1,11 @@
 package helium314.keyboard.latin.utils
 
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.Switch
 import android.widget.TextView
 import androidx.annotation.StringRes
@@ -51,7 +54,13 @@ fun infoDialog(context: Context, message: String) {
  *  Items are semicolon-separated, see e.g. [POPUP_KEYS_LABEL_DEFAULT] for an example.
  */
 // this should probably be a class
-fun reorderDialog(context: Context, key: String, defaultSetting: String, @StringRes dialogTitleId: Int) {
+fun reorderDialog(
+    context: Context,
+    key: String,
+    defaultSetting: String,
+    @StringRes dialogTitleId: Int,
+    getIcon: (String) -> Drawable? = { null }
+) {
     val prefs = DeviceProtectedUtils.getSharedPreferences(context)
     val orderedItems = prefs.getString(key, defaultSetting)!!.split(";").mapTo(ArrayList()) {
         val both = it.split(",")
@@ -85,6 +94,11 @@ fun reorderDialog(context: Context, key: String, defaultSetting: String, @String
                 val pos = orderedItems.indexOfFirst { it.first == text }
                 orderedItems[pos] = text to isChecked
             }
+            val icon = getIcon(text)
+            viewHolder.itemView.findViewById<ImageView>(R.id.reorder_item_icon)?.let {
+                it.visibility = if (icon == null) View.GONE else View.VISIBLE
+                it.setImageDrawable(icon)
+            }
         }
     }
     rv.adapter = adapter
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
index b5b578f6a..ce13e2a96 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
@@ -4,9 +4,12 @@ package helium314.keyboard.latin.utils
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.TypedArray
+import android.graphics.drawable.Drawable
 import android.widget.ImageButton
 import android.widget.ImageView
+import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.edit
+import helium314.keyboard.keyboard.KeyboardTheme
 import helium314.keyboard.keyboard.internal.keyboard_parser.floris.KeyCode
 import helium314.keyboard.latin.R
 import helium314.keyboard.latin.settings.Settings
@@ -76,6 +79,15 @@ private fun getStyleableIconId(key: ToolbarKey) = when (key) {
     SELECT_WORD -> R.styleable.Keyboard_iconSelectWord
 }
 
+fun getToolbarIconByName(name: String, context: Context): Drawable? {
+    val key = entries.firstOrNull { it.name == name } ?: return null
+    val themeContext = ContextThemeWrapper(context, KeyboardTheme.getKeyboardTheme(context).mStyleId)
+    val attrs = themeContext.obtainStyledAttributes(null, R.styleable.Keyboard)
+    val icon = attrs.getDrawable(getStyleableIconId(key))?.mutate()
+    attrs.recycle()
+    return icon
+}
+
 // names need to be aligned with resources strings (using lowercase of key.name)
 enum class ToolbarKey {
     VOICE, CLIPBOARD, UNDO, REDO, SETTINGS, SELECT_ALL, SELECT_WORD, COPY, ONE_HANDED, LEFT, RIGHT, UP, DOWN,
diff --git a/app/src/main/res/layout/reorder_dialog_item.xml b/app/src/main/res/layout/reorder_dialog_item.xml
index 7ba6d7f9e..bd6ecc78b 100644
--- a/app/src/main/res/layout/reorder_dialog_item.xml
+++ b/app/src/main/res/layout/reorder_dialog_item.xml
@@ -14,7 +14,8 @@
     <ImageView
         android:id="@+id/reorder_item_icon"
         android:visibility="gone"
-        android:layout_width="wrap_content"
+        android:paddingEnd="4dp"
+        android:layout_width="30dp"
         android:layout_height="match_parent" />
     <TextView
         android:id="@+id/reorder_item_name"

From dcddcccf099c5452bc63df1a26dcd92d0ebb0e1f Mon Sep 17 00:00:00 2001
From: codokie <151087174+codokie@users.noreply.github.com>
Date: Sat, 6 Apr 2024 13:47:37 +0300
Subject: [PATCH 14/15] improve auto correct & select all icons (#651)

---
 .../helium314/keyboard/latin/utils/ToolbarUtils.kt   |  2 +-
 app/src/main/res/drawable/ic_autocorrect.xml         | 12 ++++++++++++
 app/src/main/res/drawable/ic_autocorrect_rounded.xml | 12 ++++++++++++
 app/src/main/res/drawable/ic_select_all.xml          |  2 +-
 app/src/main/res/values/attrs.xml                    |  1 +
 app/src/main/res/values/keyboard-icons-holo.xml      |  1 +
 app/src/main/res/values/keyboard-icons-lxx-light.xml |  1 +
 app/src/main/res/values/keyboard-icons-rounded.xml   |  1 +
 8 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_autocorrect.xml
 create mode 100644 app/src/main/res/drawable/ic_autocorrect_rounded.xml

diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
index ce13e2a96..57ea19bd9 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
@@ -72,7 +72,7 @@ private fun getStyleableIconId(key: ToolbarKey) = when (key) {
     UNDO -> R.styleable.Keyboard_iconUndo
     REDO -> R.styleable.Keyboard_iconRedo
     INCOGNITO -> R.styleable.Keyboard_iconIncognitoKey
-    AUTOCORRECT -> R.styleable.Keyboard_iconLanguageSwitchKey
+    AUTOCORRECT -> R.styleable.Keyboard_iconAutoCorrect
     CLEAR_CLIPBOARD -> R.styleable.Keyboard_iconClearClipboardKey
     FULL_LEFT -> R.styleable.Keyboard_iconFullLeft
     FULL_RIGHT -> R.styleable.Keyboard_iconFullRight
diff --git a/app/src/main/res/drawable/ic_autocorrect.xml b/app/src/main/res/drawable/ic_autocorrect.xml
new file mode 100644
index 000000000..c0adb1e6d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_autocorrect.xml
@@ -0,0 +1,12 @@
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24" >
+    <path android:fillColor="#FFF"
+        android:pathData="M5,17v2h14v-2L5,17zM9.5,12.8h5l0.9,2.2h2.1L12.75,4h-1.5L6.5,15h2.1l0.9,-2.2zM12,5.98L13.87,11h-3.74L12,5.98z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_autocorrect_rounded.xml b/app/src/main/res/drawable/ic_autocorrect_rounded.xml
new file mode 100644
index 000000000..b00ae2796
--- /dev/null
+++ b/app/src/main/res/drawable/ic_autocorrect_rounded.xml
@@ -0,0 +1,12 @@
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path android:fillColor="#FFF"
+        android:pathData="M200,760v-80h560v80L200,760ZM276,600 L440,160h80l164,440h-76l-38,-112L392,488l-40,112h-76ZM414,424h132l-64,-182h-4l-64,182Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
index 6ef55fa61..a7f666286 100644
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ b/app/src/main/res/drawable/ic_select_all.xml
@@ -8,5 +8,5 @@
     android:viewportHeight="24"
     android:viewportWidth="24" >
     <path android:fillColor="#FFF"
-        android:pathData="M2,20h20v4H2V20zM5.49,17h2.42l1.27,-3.58h5.65L16.09,17h2.42L13.25,3h-2.5L5.49,17zM9.91,11.39l2.03,-5.79h0.12l2.03,5.79H9.91z"/>
+        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
 </vector>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index eed6dbb86..1897a200a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -251,6 +251,7 @@
         <attr name="iconShiftKeyShifted" format="reference" />
         <attr name="iconShortcutKeyDisabled" format="reference" />
         <attr name="iconLanguageSwitchKey" format="reference" />
+        <attr name="iconAutoCorrect" format="reference" />
         <attr name="iconZwnjKey" format="reference" />
         <attr name="iconZwjKey" format="reference" />
         <attr name="iconImeKey" format="reference" />
diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml
index d21ac0302..ba5d6ab40 100644
--- a/app/src/main/res/values/keyboard-icons-holo.xml
+++ b/app/src/main/res/values/keyboard-icons-holo.xml
@@ -21,6 +21,7 @@
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item>
         <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item>
         <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item>
+        <item name="iconAutoCorrect">@drawable/ic_autocorrect</item>
         <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item>
         <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item>
         <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_holo</item>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml
index 09e145ab2..7bd0d40ff 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml
@@ -26,6 +26,7 @@
         <item name="iconIncognitoKey">@drawable/sym_keyboard_incognito_lxx</item>
         <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_lxx</item>
         <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx</item>
+        <item name="iconAutoCorrect">@drawable/ic_autocorrect</item>
         <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_lxx</item>
         <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx</item>
         <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_lxx</item>
diff --git a/app/src/main/res/values/keyboard-icons-rounded.xml b/app/src/main/res/values/keyboard-icons-rounded.xml
index 55f05cf3f..987037377 100644
--- a/app/src/main/res/values/keyboard-icons-rounded.xml
+++ b/app/src/main/res/values/keyboard-icons-rounded.xml
@@ -25,6 +25,7 @@
         <item name="iconIncognitoKey">@drawable/sym_keyboard_incognito_lxx</item>
         <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_rounded</item>
         <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx</item>
+        <item name="iconAutoCorrect">@drawable/ic_autocorrect_rounded</item>
         <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_lxx</item>
         <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx</item>
         <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_rounded</item>

From 38126d2840b8335c98a95193ed4cb6e3dc3ea6ce Mon Sep 17 00:00:00 2001
From: codokie <151087174+codokie@users.noreply.github.com>
Date: Sat, 6 Apr 2024 19:11:28 +0300
Subject: [PATCH 15/15] add close history view toolbar button (#649)

---
 .../keyboard/clipboard/ClipboardHistoryView.kt       |  2 +-
 .../helium314/keyboard/latin/utils/ToolbarUtils.kt   |  6 ++++--
 app/src/main/res/drawable/ic_close_view.xml          | 12 ++++++++++++
 app/src/main/res/drawable/ic_close_view_rounded.xml  | 12 ++++++++++++
 app/src/main/res/values/attrs.xml                    |  1 +
 app/src/main/res/values/keyboard-icons-holo.xml      |  1 +
 app/src/main/res/values/keyboard-icons-lxx-light.xml |  1 +
 app/src/main/res/values/keyboard-icons-rounded.xml   |  1 +
 8 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_close_view.xml
 create mode 100644 app/src/main/res/drawable/ic_close_view_rounded.xml

diff --git a/app/src/main/java/helium314/keyboard/keyboard/clipboard/ClipboardHistoryView.kt b/app/src/main/java/helium314/keyboard/keyboard/clipboard/ClipboardHistoryView.kt
index b958d7ae6..bb733a474 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/clipboard/ClipboardHistoryView.kt
+++ b/app/src/main/java/helium314/keyboard/keyboard/clipboard/ClipboardHistoryView.kt
@@ -69,7 +69,7 @@ class ClipboardHistoryView @JvmOverloads constructor(
         //  even when state is activated, the not activated color is set
         //   in suggestionStripView the same thing works correctly, wtf?
         //  need to properly fix it (and maybe undo the inverted isActivated) when adding a toggle key
-        listOf(ToolbarKey.LEFT, ToolbarKey.RIGHT, ToolbarKey.COPY, ToolbarKey.CLEAR_CLIPBOARD, ToolbarKey.SELECT_WORD, ToolbarKey.SELECT_ALL)
+        listOf(ToolbarKey.LEFT, ToolbarKey.RIGHT, ToolbarKey.COPY, ToolbarKey.CLEAR_CLIPBOARD, ToolbarKey.SELECT_WORD, ToolbarKey.SELECT_ALL, ToolbarKey.CLOSE_HISTORY)
             .forEach { toolbarKeys.add(createToolbarKey(context, keyboardAttr, it)) }
         keyboardAttr.recycle()
     }
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
index 57ea19bd9..58ca8d318 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
@@ -56,6 +56,7 @@ fun getCodeForToolbarKey(key: ToolbarKey) = when (key) {
     FULL_RIGHT -> KeyCode.MOVE_END_OF_LINE
     SELECT_WORD -> KeyCode.CLIPBOARD_SELECT_WORD
     CLEAR_CLIPBOARD -> null // not managed via code input
+    CLOSE_HISTORY -> KeyCode.ALPHA
 }
 
 private fun getStyleableIconId(key: ToolbarKey) = when (key) {
@@ -77,6 +78,7 @@ private fun getStyleableIconId(key: ToolbarKey) = when (key) {
     FULL_LEFT -> R.styleable.Keyboard_iconFullLeft
     FULL_RIGHT -> R.styleable.Keyboard_iconFullRight
     SELECT_WORD -> R.styleable.Keyboard_iconSelectWord
+    CLOSE_HISTORY -> R.styleable.Keyboard_iconCloseView
 }
 
 fun getToolbarIconByName(name: String, context: Context): Drawable? {
@@ -91,12 +93,12 @@ fun getToolbarIconByName(name: String, context: Context): Drawable? {
 // names need to be aligned with resources strings (using lowercase of key.name)
 enum class ToolbarKey {
     VOICE, CLIPBOARD, UNDO, REDO, SETTINGS, SELECT_ALL, SELECT_WORD, COPY, ONE_HANDED, LEFT, RIGHT, UP, DOWN,
-    FULL_LEFT, FULL_RIGHT, INCOGNITO, AUTOCORRECT, CLEAR_CLIPBOARD
+    FULL_LEFT, FULL_RIGHT, INCOGNITO, AUTOCORRECT, CLEAR_CLIPBOARD, CLOSE_HISTORY
 }
 
 fun toToolbarKeyString(keys: Collection<ToolbarKey>) = keys.joinToString(";") { it.name }
 
-val defaultToolbarPref = entries.filterNot { it == CLEAR_CLIPBOARD }.joinToString(";") {
+val defaultToolbarPref = entries.filterNot { it == CLEAR_CLIPBOARD || it == CLOSE_HISTORY }.joinToString(";") {
     when (it) {
         INCOGNITO, AUTOCORRECT, UP, DOWN, ONE_HANDED, FULL_LEFT, FULL_RIGHT -> "${it.name},false"
         else -> "${it.name},true"
diff --git a/app/src/main/res/drawable/ic_close_view.xml b/app/src/main/res/drawable/ic_close_view.xml
new file mode 100644
index 000000000..9233cb0c3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_view.xml
@@ -0,0 +1,12 @@
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"  >
+    <path android:fillColor="#FFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close_view_rounded.xml b/app/src/main/res/drawable/ic_close_view_rounded.xml
new file mode 100644
index 000000000..5dfc36d10
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_view_rounded.xml
@@ -0,0 +1,12 @@
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"  >
+    <path android:fillColor="#FFF"
+        android:pathData="m256,760 l-56,-56 224,-224 -224,-224 56,-56 224,224 224,-224 56,56 -224,224 224,224 -56,56 -224,-224 -224,224Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1897a200a..d9d3668f5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -278,6 +278,7 @@
         <attr name="iconBin" format="reference" />
         <attr name="iconUndo" format="reference" />
         <attr name="iconRedo" format="reference" />
+        <attr name="iconCloseView" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="Keyboard_Key">
diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml
index ba5d6ab40..c7781265d 100644
--- a/app/src/main/res/values/keyboard-icons-holo.xml
+++ b/app/src/main/res/values/keyboard-icons-holo.xml
@@ -47,5 +47,6 @@
         <item name="iconFullLeft">@drawable/ic_to_start</item>
         <item name="iconFullRight">@drawable/ic_to_end</item>
         <item name="iconSelectWord">@drawable/ic_select</item>
+        <item name="iconCloseView">@drawable/ic_close_view</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml
index 7bd0d40ff..bb6bf19f9 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml
@@ -52,5 +52,6 @@
         <item name="iconFullLeft">@drawable/ic_to_start</item>
         <item name="iconFullRight">@drawable/ic_to_end</item>
         <item name="iconSelectWord">@drawable/ic_select</item>
+        <item name="iconCloseView">@drawable/ic_close_view</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/keyboard-icons-rounded.xml b/app/src/main/res/values/keyboard-icons-rounded.xml
index 987037377..a7dce0946 100644
--- a/app/src/main/res/values/keyboard-icons-rounded.xml
+++ b/app/src/main/res/values/keyboard-icons-rounded.xml
@@ -51,5 +51,6 @@
         <item name="iconFullLeft">@drawable/ic_to_start_rounded</item>
         <item name="iconFullRight">@drawable/ic_to_end_rounded</item>
         <item name="iconSelectWord">@drawable/ic_select_rounded</item>
+        <item name="iconCloseView">@drawable/ic_close_view_rounded</item>
     </style>
 </resources>
\ No newline at end of file