From b17c2f1fd9e402dde21cf84e70461ee809aa0d43 Mon Sep 17 00:00:00 2001
From: ottoptj <ottop@ottop.eu>
Date: Sat, 31 Aug 2024 13:01:52 +0300
Subject: [PATCH] Fixed an issue with disabled search showing up after renaming
 an app, adjusted text sizes and added a bigger shortcut spacing option.

---
 .../java/eu/ottop/yamlauncher/AppActionMenu.kt    | 15 +++++++++++++--
 .../java/eu/ottop/yamlauncher/utils/UIUtils.kt    |  6 +++---
 app/src/main/res/values/arrays.xml                |  6 ++++--
 app/src/main/res/xml/home_preferences.xml         |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt b/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt
index c4aaa7f..ecb4b21 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt
@@ -118,7 +118,14 @@ class AppActionMenu(private val activity: MainActivity, private val binding: Act
 
         val app = Triple(appActivity!!, userHandle, workProfile)
 
-        searchView.visibility = View.INVISIBLE
+        val searchEnabled = sharedPreferenceManager.isSearchEnabled()
+
+        if (searchEnabled) {
+            searchView.visibility = View.INVISIBLE
+        } else {
+            searchView.visibility = View.GONE
+        }
+
         editText.requestFocus()
 
         // Open keyboard
@@ -137,7 +144,11 @@ class AppActionMenu(private val activity: MainActivity, private val binding: Act
 
                 animations.fadeViewOut(editLayout)
                 animations.fadeViewIn(textView)
-                searchView.visibility = View.VISIBLE
+                if (searchEnabled) {
+                    searchView.visibility = View.VISIBLE
+                } else {
+                    searchView.visibility = View.GONE
+                }
                 activity.enableAppMenuScroll()
             }
         }
diff --git a/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt b/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt
index f22b34e..5280bfa 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/utils/UIUtils.kt
@@ -323,12 +323,12 @@ class UIUtils(private val context: Context) {
         regionText: TextView? = null
     ) {
         val size = sharedPreferenceManager.getAppSize()
-        setTextSize(textView, size, 21F, 24F, 27F, 30F, 33F, 36F)
+        setTextSize(textView, size, 20F, 24F, 28F, 32F, 36F, 40F)
         if (editText != null) {
-            setTextSize(editText, size, 21F, 24F, 27F, 30F, 33F, 36F)
+            setTextSize(editText, size, 20F, 24F, 28F, 32F, 36F, 40F)
         }
         if (regionText != null) {
-            setTextSize(regionText, size, 11F, 14F, 17F, 20F, 23F, 26F)
+            setTextSize(regionText, size, 10F, 14F, 18F, 22F, 26F, 30F)
         }
     }
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 507196e..1055c3d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -98,6 +98,7 @@
     </string-array>
 
     <string-array name="shortcut_spacing_options">
+        <item>Tiny</item>
         <item>Small</item>
         <item>Medium</item>
         <item>Large</item>
@@ -109,10 +110,11 @@
     <string-array name="shortcut_spacing_values">
         <item>0.06</item>
         <item>0.09</item>
-        <item>0.12</item>
-        <item>0.15</item>
+        <item>0.11</item>
+        <item>0.14</item>
         <item>0.18</item>
         <item>0.21</item>
+        <item>0.56</item>
     </string-array>
 
     <string-array name="app_spacing_options">
diff --git a/app/src/main/res/xml/home_preferences.xml b/app/src/main/res/xml/home_preferences.xml
index 062d120..52b2990 100644
--- a/app/src/main/res/xml/home_preferences.xml
+++ b/app/src/main/res/xml/home_preferences.xml
@@ -149,7 +149,7 @@
         <ListPreference
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:defaultValue="0.09"
+            app:defaultValue="0.11"
             app:entries="@array/shortcut_spacing_options"
             app:entryValues="@array/shortcut_spacing_values"
             app:key="shortcutWeight"