fix: Added the custom colors to the app draw too.

DroidWorksStudio · Apr 29, 2024 · 516eb12 · 516eb12
1 parent bc843c1
commit 516eb12
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/AppDrawerAdapter.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/AppDrawerAdapter.kt
@@ -24,6 +24,7 @@ import com.github.droidworksstudio.mlauncher.data.Constants.AppDrawerFlag
 import com.github.droidworksstudio.mlauncher.data.Prefs
 import com.github.droidworksstudio.mlauncher.databinding.AdapterAppDrawerBinding
 import com.github.droidworksstudio.mlauncher.helper.AppDetailsHelper.isSystemApp
+import com.github.droidworksstudio.mlauncher.helper.Colors
 import com.github.droidworksstudio.mlauncher.helper.dp2px
 import com.github.droidworksstudio.mlauncher.helper.getHexFontColor
 import com.github.droidworksstudio.mlauncher.helper.showKeyboard
@@ -45,6 +46,9 @@ class AppDrawerAdapter(
     var appFilteredList: MutableList<AppModel> = mutableListOf()
     private lateinit var binding: AdapterAppDrawerBinding
 
+    // Instantiate Colors object
+    private val colors = Colors()
+
     private var isBangSearch = false
 
     @RequiresApi(Build.VERSION_CODES.Q)
@@ -58,6 +62,9 @@ class AppDrawerAdapter(
         if (prefs.followAccentColors) {
             val fontColor = getHexFontColor(parent.context, prefs)
             binding.appTitle.setTextColor(fontColor)
+        } else {
+            val fontColor = colors.accents(parent.context, prefs, 4)
+            binding.appTitle.setTextColor(fontColor)
         }
         binding.appTitle.textSize = prefs.textSizeLauncher.toFloat()
         val padding: Int = prefs.textMarginSize

diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/AppDrawerFragment.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/AppDrawerFragment.kt
@@ -34,6 +34,7 @@ import com.github.droidworksstudio.mlauncher.data.Constants.AppDrawerFlag
 import com.github.droidworksstudio.mlauncher.data.Prefs
 import com.github.droidworksstudio.mlauncher.databinding.FragmentAppDrawerBinding
 import com.github.droidworksstudio.mlauncher.helper.AppDetailsHelper.isSystemApp
+import com.github.droidworksstudio.mlauncher.helper.Colors
 import com.github.droidworksstudio.mlauncher.helper.getHexFontColor
 import com.github.droidworksstudio.mlauncher.helper.getHexForOpacity
 import com.github.droidworksstudio.mlauncher.helper.hideKeyboard
@@ -51,6 +52,9 @@ class AppDrawerFragment : Fragment() {
     private var _binding: FragmentAppDrawerBinding? = null
     private val binding get() = _binding!!
 
+    // Instantiate Colors object
+    private val colors = Colors()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -134,9 +138,9 @@ class AppDrawerFragment : Fragment() {
         binding.recyclerView.addOnScrollListener(getRecyclerViewOnScrollListener())
 
         if (flag == AppDrawerFlag.HiddenApps) {
-            val fontColor = getHexFontColor(requireActivity(), prefs)
             val hiddenAppsHint = getString(R.string.hidden_apps)
             if (prefs.followAccentColors) {
+                val fontColor = getHexFontColor(requireActivity(), prefs)
                 val coloredHint = SpannableString(hiddenAppsHint)
                 coloredHint.setSpan(
                     ForegroundColorSpan(fontColor),
@@ -146,13 +150,22 @@ class AppDrawerFragment : Fragment() {
                 )
 
                 binding.search.queryHint = coloredHint
-            } else
-                binding.search.queryHint = hiddenAppsHint
+            } else {
+                val fontColor = colors.accents(requireContext(), prefs, 4)
+                val coloredHint = SpannableString(hiddenAppsHint)
+                coloredHint.setSpan(
+                    ForegroundColorSpan(fontColor),
+                    0,
+                    hiddenAppsHint.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                binding.search.queryHint = coloredHint
+            }
         }
         if (flag == AppDrawerFlag.SetHomeApp) {
-            val fontColor = getHexFontColor(requireActivity(), prefs)
             val hiddenAppsHint = getString(R.string.please_select_app)
             if (prefs.followAccentColors) {
+                val fontColor = getHexFontColor(requireActivity(), prefs)
                 val coloredHint = SpannableString(hiddenAppsHint)
                 coloredHint.setSpan(
                     ForegroundColorSpan(fontColor),
@@ -162,8 +175,17 @@ class AppDrawerFragment : Fragment() {
                 )
 
                 binding.search.queryHint = coloredHint
-            } else
-                binding.search.queryHint = hiddenAppsHint
+            } else {
+                val fontColor = colors.accents(requireContext(), prefs, 4)
+                val coloredHint = SpannableString(hiddenAppsHint)
+                coloredHint.setSpan(
+                    ForegroundColorSpan(fontColor),
+                    0,
+                    hiddenAppsHint.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                binding.search.queryHint = coloredHint
+            }
         }
         if (flag == AppDrawerFlag.LaunchApp && prefs.useAllAppsText) {
             val allAppsHint = getString(R.string.show_apps)
@@ -178,8 +200,17 @@ class AppDrawerFragment : Fragment() {
                 )
 
                 binding.search.queryHint = coloredHint
-            } else
-                binding.search.queryHint = allAppsHint
+            } else {
+                val fontColor = colors.accents(requireContext(), prefs, 4)
+                val coloredHint = SpannableString(allAppsHint)
+                coloredHint.setSpan(
+                    ForegroundColorSpan(fontColor),
+                    0,
+                    allAppsHint.length,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                binding.search.queryHint = coloredHint
+            }
         }
 
         binding.search.setOnQueryTextListener(object : SearchView.OnQueryTextListener {

diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/HomeFragment.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/HomeFragment.kt
@@ -840,7 +840,8 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
                         val fontColor = getHexFontColor(requireContext(), prefs)
                         setTextColor(fontColor)
                     } else {
-                        setTextColor(colors.accents(requireContext(), prefs, 4))
+                        val fontColor = colors.accents(requireContext(), prefs, 4)
+                        setTextColor(fontColor)
                     }
                 }
                 // Add the view to the layout