Fix theme file deserialization

2026-05-08 22:39:06 +02:00
parent 4c75f9803e
commit 2fd780d9bc
7 changed files with 151 additions and 146 deletions
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CorePaletteColorPreference.kt
@@ -45,7 +45,7 @@ fun CorePaletteColorPreference(
    title: String,
    value: Int?,
    onValueChange: (Int?) -> Unit,
-    defaultValue: Int,
+    defaultValue: Int?,
    modifier: Modifier = Modifier,
    autoGenerate: (() -> Int?)? = null,
 ) {
@@ -63,7 +63,7 @@ fun CorePaletteColorPreference(
        verticalAlignment = Alignment.CenterVertically,
    ) {
        ColorSwatch(
-            color = Color(value ?: defaultValue),
+            color = Color(value ?: defaultValue ?: 0),
            modifier = Modifier
                .padding(end = 20.dp)
                .size(48.dp),
@@ -114,7 +114,7 @@ fun CorePaletteColorPreference(
                        modifier = Modifier.padding(bottom = 24.dp)
                    )
                    val colorPickerState = rememberHctColorPickerState(
-                        initialColor = Color(value ?: defaultValue),
+                        initialColor = Color(value ?: defaultValue ?: 0),
                        onColorChanged = {
                            currentValue = it.toArgb()
                        }
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ThemeColorPreference.kt
@@ -50,7 +50,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import de.mm20.launcher2.themes.colors.ColorRef
 import de.mm20.launcher2.themes.colors.CorePaletteColor
-import de.mm20.launcher2.themes.colors.FullCorePalette
+import de.mm20.launcher2.themes.colors.CorePalette
 import de.mm20.launcher2.themes.colors.StaticColor
 import de.mm20.launcher2.themes.colors.atTone
 import de.mm20.launcher2.themes.colors.get
@@ -67,9 +67,9 @@ import de.mm20.launcher2.themes.colors.Color as ThemeColor
 fun ThemeColorPreference(
    title: String,
    value: ThemeColor?,
-    corePalette: FullCorePalette,
+    corePalette: CorePalette,
    onValueChange: (ThemeColor?) -> Unit,
-    defaultValue: ThemeColor,
+    defaultValue: ThemeColor?,
    modifier: Modifier = Modifier,
 ) {
    var showDialog by remember { mutableStateOf(false) }
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt
@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -19,7 +20,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -314,6 +314,9 @@ private fun IconPackSelectorSheet(
    onDismiss: () -> Unit,
 ) {
    DismissableBottomSheet(expanded = expanded, onDismissRequest = onDismiss) {
+        val xs = MaterialTheme.shapes.extraSmall
+        val md = MaterialTheme.shapes.medium
+
        LazyColumn(
            contentPadding = PaddingValues(
                start = 16.dp,
@@ -322,80 +325,87 @@ private fun IconPackSelectorSheet(
                bottom = 16.dp + WindowInsets.navigationBars.asPaddingValues()
                    .calculateBottomPadding(),
            ),
+            verticalArrangement = Arrangement.spacedBy(2.dp)
        ) {
            items(installedIconPacks.size) {

                val pack = installedIconPacks[it]


-                if (it > 0) {
-                    HorizontalDivider(
-                        modifier = Modifier.padding(vertical = 8.dp)
-                    )
-                }
-                Column {
-
-
-                    Column(
-                        modifier = Modifier
-                            .clip(MaterialTheme.shapes.medium)
-                            .clickable {
-                                onSelect(pack)
-                            }
-                    ) {
-                        val icons by iconPackPreviewIcons[pack.packageName]!!.collectAsState(null)
-
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.padding(horizontal = 8.dp)
-                        ) {
-                            Text(
-                                text = pack.name,
-                                style = MaterialTheme.typography.titleMedium,
-                                modifier = Modifier
-                                    .padding(end = 8.dp)
+                Column(
+                    modifier = Modifier
+                        .clip(when {
+                            it == 0 -> md.copy(
+                                bottomStart = xs.bottomStart,
+                                bottomEnd = xs.bottomEnd,
                            )
-                            if (pack.themed) {
-                                Icon(
-                                    modifier = Modifier
-                                        .size(20.dp),
-                                    painter = painterResource(R.drawable.palette_20px),
-                                    contentDescription = null,
-                                    tint = MaterialTheme.colorScheme.primary
+                            it == installedIconPacks.lastIndex -> md.copy(
+                                topStart = xs.topStart,
+                                topEnd = xs.topEnd,
+                            )
+                            installedIconPacks.size == 1 -> md
+                            else -> xs
+                        })
+                        .background(
+                            MaterialTheme.colorScheme.surfaceBright,
+                        )
+                        .clickable {
+                            onSelect(pack)
+                        }
+                ) {
+                    val icons by iconPackPreviewIcons[pack.packageName]!!.collectAsState(null)
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 16.dp, bottom = 16.dp)
+                            .height(48.dp)
+                    ) {
+                        if (icons == null) {
+                            for (i in 0 until columns) {
+                                Box(
+                                    modifier = Modifier.weight(1f),
+                                    contentAlignment = Alignment.Center,
+                                ) {
+                                    ShapedLauncherIcon(size = 48.dp, icon = { null })
+                                }
+                            }
+                        } else {
+                            for (icon in icons!!) {
+                                Box(
+                                    modifier = Modifier.weight(1f),
+                                    contentAlignment = Alignment.Center,
+                                ) {
+                                    ShapedLauncherIcon(size = 48.dp, icon = { icon })
+                                }
+                            }
+                            for (i in 0..<(columns - icons!!.size)) {
+                                Box(
+                                    modifier = Modifier.weight(1f),
                                )
                            }
                        }
+                    }

-                        Row(
+
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier.padding(16.dp)
+                    ) {
+                        Text(
+                            text = pack.name,
+                            style = MaterialTheme.typography.titleMedium,
                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(top = 16.dp, bottom = 16.dp)
-                                .height(48.dp)
-                        ) {
-                            if (icons == null) {
-                                for (i in 0 until columns) {
-                                    Box(
-                                        modifier = Modifier.weight(1f),
-                                        contentAlignment = Alignment.Center,
-                                    ) {
-                                        ShapedLauncherIcon(size = 48.dp, icon = { null })
-                                    }
-                                }
-                            } else {
-                                for (icon in icons!!) {
-                                    Box(
-                                        modifier = Modifier.weight(1f),
-                                        contentAlignment = Alignment.Center,
-                                    ) {
-                                        ShapedLauncherIcon(size = 48.dp, icon = { icon })
-                                    }
-                                }
-                                for (i in 0..<(columns - icons!!.size)) {
-                                    Box(
-                                        modifier = Modifier.weight(1f),
-                                    )
-                                }
-                            }
+                                .weight(1f)
+                                .padding(end = 8.dp)
+                        )
+                        if (pack.themed) {
+                            Icon(
+                                modifier = Modifier
+                                    .size(20.dp),
+                                painter = painterResource(R.drawable.palette_20px),
+                                contentDescription = null,
+                                tint = MaterialTheme.colorScheme.primary
+                            )
                        }
                    }
                }
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/ColorScheme.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/ColorScheme.kt
@@ -14,8 +14,7 @@ import de.mm20.launcher2.preferences.ui.UiSettings
 import de.mm20.launcher2.themes.colors.CorePalette
 import de.mm20.launcher2.themes.colors.DefaultDarkColorScheme
 import de.mm20.launcher2.themes.colors.DefaultLightColorScheme
-import de.mm20.launcher2.themes.colors.FullColorScheme
-import de.mm20.launcher2.themes.colors.PartialCorePalette
+import de.mm20.launcher2.themes.colors.ColorScheme as ThemeColorScheme
 import de.mm20.launcher2.themes.colors.Colors as ThemeColors
 import de.mm20.launcher2.themes.colors.get
 import de.mm20.launcher2.themes.colors.merge
@@ -39,7 +38,7 @@ fun darkColorSchemeOf(colors: ThemeColors): ColorScheme {
 }

@Composable
-fun colorSchemeOf(dark: Boolean, colorScheme: FullColorScheme, corePalette: PartialCorePalette): ColorScheme {
+fun colorSchemeOf(dark: Boolean, colorScheme: ThemeColorScheme, corePalette: CorePalette): ColorScheme {
    val defaultPalette = systemCorePalette(dark)
    return remember(colorScheme, corePalette, defaultPalette) {
        val mergedCorePalette = corePalette.merge(defaultPalette)
@@ -85,7 +84,7 @@ fun colorSchemeOf(dark: Boolean, colorScheme: FullColorScheme, corePalette: Part
 }

@Composable
-fun systemCorePalette(dark: Boolean): CorePalette<Int> {
+fun systemCorePalette(dark: Boolean): CorePalette {
    val uiSettings: UiSettings = koinInject()
    val compatModeColors by remember {
        uiSettings.compatModeColors