Merge themed icon and icon pack themed icon preference

This commit is contained in:
MM20
2024-04-20 14:05:48 +02:00
parent f72ed6d086
commit b323953a75
4 changed files with 50 additions and 121 deletions
@@ -97,6 +97,7 @@ data class LauncherSettingsData internal constructor(
val iconsThemed: Boolean = false,
val iconsForceThemed: Boolean = false,
val iconsPack: String? = null,
@Deprecated("Use iconsThemed instead")
val iconsPackThemed: Boolean = false,
val easterEgg: Boolean = false,
@@ -2,7 +2,6 @@ package de.mm20.launcher2.preferences.ui
import de.mm20.launcher2.preferences.LauncherDataStore
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
data class IconSettingsData(
@@ -10,7 +9,6 @@ data class IconSettingsData(
val forceThemed: Boolean,
val adaptify: Boolean,
val iconPack: String?,
val iconPackThemed: Boolean,
)
class IconSettings internal constructor(
@@ -22,7 +20,6 @@ class IconSettings internal constructor(
forceThemed = it.iconsForceThemed,
adaptify = it.iconsAdaptify,
iconPack = it.iconsPack,
iconPackThemed = it.iconsPackThemed,
)
}
) {
@@ -58,5 +55,4 @@ class IconSettings internal constructor(
}
}