Migrate icon settings

applications/src/main/java/de/mm20/launcher2/search/data/AppInstallation.kt

@@ -10,6 +10,8 @@ import android.graphics.drawable.ColorDrawable
 import androidx.core.content.ContextCompat
 import de.mm20.launcher2.applications.R
 import de.mm20.launcher2.icons.LauncherIcon
+import de.mm20.launcher2.preferences.Settings
+import de.mm20.launcher2.preferences.Settings.IconSettings.LegacyIconBackground
 
 class AppInstallation(
         val session: PackageInstaller.SessionInfo
@@ -38,7 +40,7 @@ class AppInstallation(
                 foregroundScale = 0.5f)
     }
 
-    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int, legacyIconBackground: LegacyIconBackground): LauncherIcon? {
         val icon = session.appIcon ?: return getPlaceholderIcon(context)
         val foreground = BitmapDrawable(context.resources, icon)
         foreground.colorFilter = ColorMatrixColorFilter(ColorMatrix().apply {

applications/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt

@@ -17,6 +17,8 @@ import de.mm20.launcher2.icons.LauncherIcon
 import de.mm20.launcher2.ktx.getSerialNumber
 import de.mm20.launcher2.ktx.isAtLeastApiLevel
 import de.mm20.launcher2.preferences.LauncherPreferences
+import de.mm20.launcher2.preferences.Settings
+import de.mm20.launcher2.preferences.Settings.IconSettings.LegacyIconBackground
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -68,7 +70,7 @@ class AppShortcut(
         )
     }
 
-    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int, legacyIconBackground: LegacyIconBackground): LauncherIcon? {
         val launcherApps = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
         val icon = withContext(Dispatchers.IO) {
             launcherApps.getShortcutIconDrawable(
@@ -87,7 +89,7 @@ class AppShortcut(
         return LauncherIcon(
             foreground = icon,
             foregroundScale = 1f,
-            autoGenerateBackgroundMode = LauncherPreferences.instance.legacyIconBg.toInt()
+            autoGenerateBackgroundMode = legacyIconBackground.number
         )
     }
 }

applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt

@@ -8,11 +8,16 @@ import android.content.pm.LauncherApps
 import android.content.pm.PackageManager
 import android.content.pm.ShortcutInfo
 import android.graphics.drawable.AdaptiveIconDrawable
-import android.os.*
+import android.os.Build
+import android.os.Bundle
+import android.os.Process
+import android.os.UserHandle
 import androidx.core.content.getSystemService
 import de.mm20.launcher2.icons.LauncherIcon
 import de.mm20.launcher2.ktx.getSerialNumber
 import de.mm20.launcher2.preferences.LauncherPreferences
+import de.mm20.launcher2.preferences.Settings
+import de.mm20.launcher2.preferences.Settings.IconSettings.LegacyIconBackground
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
@@ -68,29 +73,26 @@ class LauncherApp(
         return launcherActivityInfo.user
     }
 
-    override suspend fun loadIcon(context: Context, size: Int): LauncherIcon? {
+    override suspend fun loadIcon(context: Context, size: Int, legacyIconBackground: LegacyIconBackground): LauncherIcon? {
         try {
             val icon =
                 withContext(Dispatchers.IO) {
                     launcherActivityInfo.getIcon(context.resources.displayMetrics.densityDpi)
 
                 } ?: return null
-            when {
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && icon is AdaptiveIconDrawable -> {
-                    return LauncherIcon(
-                        foreground = icon.foreground ?: return null,
-                        background = icon.background,
-                        foregroundScale = 1.5f,
-                        backgroundScale = 1.5f
-                    )
-                }
-                else -> {
-                    return LauncherIcon(
-                        foreground = icon,
-                        foregroundScale = 0.7f,
-                        autoGenerateBackgroundMode = LauncherPreferences.instance.legacyIconBg.toInt()
-                    )
-                }
+            if (icon is AdaptiveIconDrawable) {
+                return LauncherIcon(
+                    foreground = icon.foreground ?: return null,
+                    background = icon.background,
+                    foregroundScale = 1.5f,
+                    backgroundScale = 1.5f
+                )
+            } else {
+                return LauncherIcon(
+                    foreground = icon,
+                    foregroundScale = 0.7f,
+                    autoGenerateBackgroundMode = legacyIconBackground.number
+                )
             }
         } catch (e: PackageManager.NameNotFoundException) {
             return null