fix problem which switching from grayscale icons back to normal

app/src/main/java/de/jrpie/android/launcher/Functions.kt

@@ -194,7 +194,7 @@ fun getApps(
             loadList.add(detailedAppInfo)
         }
     }
-    loadList.sortBy { it.getCustomLabel(context).toString() }
+    loadList.sortBy { it.getCustomLabel(context) }
 
     var end = System.currentTimeMillis()
     Log.i(LOG_TAG, "${loadList.size} apps loaded (${end - start}ms)")

app/src/main/java/de/jrpie/android/launcher/ui/Helper.kt

@@ -27,10 +27,14 @@ fun View.blink(
 }
 
 // Taken from: https://stackoverflow.com/a/30340794/12787264
-fun ImageView.transformGrayscale() {
-    this.colorFilter = ColorMatrixColorFilter(ColorMatrix().apply {
-        setSaturation(0f)
-    })
+fun ImageView.transformGrayscale(grayscale: Boolean) {
+    this.colorFilter = if (grayscale) {
+        ColorMatrixColorFilter(ColorMatrix().apply {
+            setSaturation(0f)
+        })
+    } else {
+        null
+    }
 }
 
 

app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt

@@ -47,6 +47,7 @@ class AppsRecyclerAdapter(
 
     private val apps = (activity.applicationContext as Application).apps
     private val appsListDisplayed: MutableList<AbstractDetailedAppInfo> = mutableListOf()
+    private val grayscale = LauncherPreferences.theme().monochromeIcons()
 
     // temporarily disable auto launch
     var disableAutoLaunch: Boolean = false
@@ -79,20 +80,19 @@ class AppsRecyclerAdapter(
     override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
         var appLabel = appsListDisplayed[i].getCustomLabel(activity)
 
+        val appIcon = appsListDisplayed[i].getIcon(activity)
+
+        viewHolder.img.transformGrayscale(grayscale)
+        viewHolder.img.setImageDrawable(appIcon.constantState?.newDrawable() ?: appIcon)
+
         if (layout.useBadgedText) {
             appLabel = activity.packageManager.getUserBadgedLabel(
                 appLabel,
                 appsListDisplayed[i].getUser(activity)
             ).toString()
         }
-
-        val appIcon = appsListDisplayed[i].getIcon(activity)
-
         viewHolder.textView.text = appLabel
-        viewHolder.img.setImageDrawable(appIcon)
 
-        if (LauncherPreferences.theme().monochromeIcons())
-            viewHolder.img.transformGrayscale()
 
         // decide when to show the options popup menu about
         if (intention == ListActivity.ListActivityIntention.VIEW) {

app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt

@@ -143,9 +143,7 @@ class ActionsRecyclerAdapter(val activity: Activity) :
         val description = gesture.getDescription(activity)
         viewHolder.descriptionTextView.text = description
 
-
-        if (LauncherPreferences.theme().monochromeIcons())
-            viewHolder.img.transformGrayscale()
+        viewHolder.img.transformGrayscale(LauncherPreferences.theme().monochromeIcons())
 
         updateViewHolder(gesture, viewHolder)
         viewHolder.img.setOnClickListener { chooseApp(gesture) }