Implement custom legacy to adaptive icon transformations

icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt

@@ -5,6 +5,9 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.util.LruCache
+import de.mm20.launcher2.customattrs.AdaptifiedLegacyIcon
+import de.mm20.launcher2.customattrs.CustomAttributesRepository
+import de.mm20.launcher2.customattrs.CustomIcon
 import de.mm20.launcher2.icons.providers.*
 import de.mm20.launcher2.icons.transformations.LauncherIconTransformation
 import de.mm20.launcher2.icons.transformations.LegacyToAdaptiveTransformation
@@ -19,7 +22,8 @@ import kotlinx.coroutines.launch
 class IconRepository(
     val context: Context,
     private val iconPackManager: IconPackManager,
-    private val dataStore: LauncherDataStore
+    private val dataStore: LauncherDataStore,
+    private val customAttributesRepository: CustomAttributesRepository,
 ) {
 
     private val appReceiver = object : BroadcastReceiver() {
@@ -93,36 +97,54 @@ class IconRepository(
     fun getIcon(searchable: Searchable, size: Int): Flow<LauncherIcon> = channelFlow {
         iconProviders.collectLatest { providers ->
             transformations.collectLatest { transformations ->
-                var icon = cache.get(searchable.key)
-                if (icon != null) {
-                    send(icon)
-                    return@collectLatest
-                }
+                customAttributesRepository.getCustomIcon(searchable).collectLatest { customIcon ->
 
-                val placeholder = placeholderProvider?.getIcon(searchable, size)
-                placeholder?.let { send(it) }
+                    val transforms = getTransformations(customIcon) ?: transformations
 
-                for (provider in providers) {
-                    val ic = provider.getIcon(searchable, size)
-                    if (ic != null) {
-                        icon = ic
-                        break
+                    var icon = cache.get(searchable.key + customIcon.hashCode())
+                    if (icon != null) {
+                        send(icon)
+                        return@collectLatest
                     }
-                }
-                if (icon != null) {
-                    if (icon is StaticLauncherIcon) {
-                        for (transformation in transformations) {
-                            icon = transformation.transform(icon as StaticLauncherIcon)
+
+                    val placeholder = placeholderProvider?.getIcon(searchable, size)
+                    placeholder?.let { send(it) }
+
+                    for (provider in providers) {
+                        val ic = provider.getIcon(searchable, size)
+                        if (ic != null) {
+                            icon = ic
+                            break
                         }
                     }
+                    if (icon != null) {
+                        if (icon is StaticLauncherIcon) {
+                            for (transformation in transforms) {
+                                icon = transformation.transform(icon as StaticLauncherIcon)
+                            }
+                        }
 
-                    cache.put(searchable.key, icon)
-                    send(icon)
+                        cache.put(searchable.key + customIcon.hashCode(), icon)
+                        send(icon)
+                    }
                 }
             }
         }
     }
 
+    private fun getTransformations(customIcon: CustomIcon?): List<LauncherIconTransformation>? {
+        customIcon ?: return null
+        if (customIcon is AdaptifiedLegacyIcon) {
+            return listOf(
+                LegacyToAdaptiveTransformation(
+                    foregroundScale = customIcon.fgScale,
+                    backgroundColor = customIcon.bgColor
+                )
+            )
+        }
+        return null
+    }
+
 
     fun requestIconPackListUpdate() {
         scope.launch {

icons/src/main/java/de/mm20/launcher2/icons/Module.kt

@@ -5,5 +5,5 @@ import org.koin.dsl.module
 
 val iconsModule = module {
     single { IconPackManager(androidContext()) }
-    single { IconRepository(androidContext(), get(), get()) }
+    single { IconRepository(androidContext(), get(), get(), get()) }
 }

icons/src/main/java/de/mm20/launcher2/icons/transformations/LegacyToAdaptiveTransformation.kt

@@ -7,13 +7,16 @@ import de.mm20.launcher2.icons.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
-internal class LegacyToAdaptiveTransformation: LauncherIconTransformation {
+internal class LegacyToAdaptiveTransformation(
+    private val foregroundScale: Float = 0.7f,
+    private val backgroundColor: Int = 1,
+): LauncherIconTransformation {
     override suspend fun transform(icon: StaticLauncherIcon): StaticLauncherIcon {
         if (icon.backgroundLayer !is TransparentLayer) return icon
 
-        val bgColor = extractColor(icon.foregroundLayer)
+        val bgColor = if (backgroundColor == 1) extractColor(icon.foregroundLayer) else backgroundColor
         return StaticLauncherIcon(
-            foregroundLayer = scale(icon.foregroundLayer, 0.7f),
+            foregroundLayer = scale(icon.foregroundLayer, foregroundScale),
             backgroundLayer = ColorLayer(bgColor)
         )
     }