From 3b090dcbc8638b67e02048934baa883d12e0406a Mon Sep 17 00:00:00 2001
From: HeCodes2Much <wayne6324@gmail.com>
Date: Mon, 27 May 2024 15:18:06 +0100
Subject: [PATCH] Refactor: Added a better icon for reorder apps.

---
 .../mlauncher/ui/ReorderHomeAppsFragment.kt              | 9 ++++++---
 app/src/main/res/drawable/ic_prefix_drawable.xml         | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_prefix_drawable.xml

diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/ReorderHomeAppsFragment.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/ReorderHomeAppsFragment.kt
index b696b3458..2053e5fea 100644
--- a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/ReorderHomeAppsFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/ReorderHomeAppsFragment.kt
@@ -5,6 +5,7 @@ import android.app.admin.DevicePolicyManager
 import android.content.ClipData
 import android.content.Context
 import android.content.Context.VIBRATOR_SERVICE
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.os.Vibrator
@@ -16,6 +17,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.children
 import androidx.core.view.size
@@ -33,7 +35,6 @@ import com.github.droidworksstudio.mlauncher.helper.showStatusBar
 class ReorderHomeAppsFragment : Fragment() {
 
     private lateinit var prefs: Prefs
-    private lateinit var prefix: String
     private lateinit var viewModel: MainViewModel
     private lateinit var deviceManager: DevicePolicyManager
     private lateinit var vibrator: Vibrator
@@ -50,7 +51,6 @@ class ReorderHomeAppsFragment : Fragment() {
 
         val view = binding.root
         prefs = Prefs(requireContext())
-        prefix = "\uEB22     "
 
         return view
     }
@@ -173,13 +173,16 @@ class ReorderHomeAppsFragment : Fragment() {
         if (diff in 1 until oldAppsNum) { // 1 <= diff <= oldNumApps
             binding.homeAppsLayout.children.drop(diff)
         } else if (diff < 0) {
+            val prefixDrawable: Drawable? = context?.let { ContextCompat.getDrawable(it, R.drawable.ic_prefix_drawable) }
             // add all missing apps to list
             for (i in oldAppsNum until newAppsNum) {
                 val view = layoutInflater.inflate(R.layout.home_app_button, null) as TextView
                 view.apply {
+                    val appLabel = prefs.getHomeAppModel(i).appLabel.ifEmpty { getString(R.string.app) }
                     textSize = prefs.appSize.toFloat()
                     id = i
-                    text = "$prefix${prefs.getHomeAppModel(i).appLabel}"
+                    text = "   $appLabel"
+                    setCompoundDrawablesWithIntrinsicBounds(prefixDrawable, null, null, null)
                     if (!prefs.extendHomeAppsArea) {
                         layoutParams = ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.WRAP_CONTENT,
diff --git a/app/src/main/res/drawable/ic_prefix_drawable.xml b/app/src/main/res/drawable/ic_prefix_drawable.xml
new file mode 100644
index 000000000..d9c148f41
--- /dev/null
+++ b/app/src/main/res/drawable/ic_prefix_drawable.xml
@@ -0,0 +1,5 @@
+<vector android:height="16dp" android:tint="@android:color/darker_gray"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
\ No newline at end of file