Clock widget: Keep settings of unselected watch faces

app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt

@@ -352,9 +352,12 @@ fun ConfigureClockWidgetSheet(
                 }
             }
 
-            if (color != null && compact != null) {
+            val availableStyles by viewModel.availableClockStyles.collectAsState()
+
+            if (color != null && compact != null && availableStyles.isNotEmpty()) {
                 ProvideClockTime {
                     WatchFaceSelector(
+                        styles = availableStyles,
                         compact = compact!!,
                         colors = color!!,
                         selected = style,

app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/WatchFaceSelector.kt

@@ -20,6 +20,7 @@ import androidx.compose.material.icons.rounded.ChevronLeft
 import androidx.compose.material.icons.rounded.ChevronRight
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material.icons.rounded.Style
+import androidx.compose.material.icons.rounded.Tune
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -55,6 +56,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun WatchFaceSelector(
+    styles: List<ClockWidgetStyle>,
     compact: Boolean,
     colors: ClockWidgetColors,
     selected: ClockWidgetStyle?,
@@ -75,17 +77,6 @@ fun WatchFaceSelector(
         Column(
             modifier = Modifier,
         ) {
-            val styles = remember {
-                listOf(
-                    ClockWidgetStyle.Digital1(),
-                    ClockWidgetStyle.Digital2,
-                    ClockWidgetStyle.Analog,
-                    ClockWidgetStyle.Orbit,
-                    ClockWidgetStyle.Segment,
-                    ClockWidgetStyle.Binary,
-                    ClockWidgetStyle.Empty,
-                )
-            }
             val pagerState = rememberPagerState(
                 initialPage = styles.indexOfFirst { it.javaClass == selected?.javaClass }.coerceAtLeast(0),
             ) {
@@ -115,23 +106,23 @@ fun WatchFaceSelector(
                         modifier = Modifier
                             .padding(4.dp)
                     ) {
-                        Icon(Icons.Rounded.Settings, null)
-                    }
-                    DropdownMenu(
-                        expanded = showStyleSettings,
-                        onDismissRequest = { showStyleSettings = false }) {
-                        if (selected is ClockWidgetStyle.Digital1) {
-                            DropdownMenuItem(
-                                text = { Text(stringResource(R.string.clock_variant_outlined)) },
-                                leadingIcon = {
-                                    if (selected.outlined) {
-                                        Icon(Icons.Rounded.Check, null)
+                        Icon(Icons.Rounded.Tune, null)
+                        DropdownMenu(
+                            expanded = showStyleSettings,
+                            onDismissRequest = { showStyleSettings = false }) {
+                            if (selected is ClockWidgetStyle.Digital1) {
+                                DropdownMenuItem(
+                                    text = { Text(stringResource(R.string.clock_variant_outlined)) },
+                                    leadingIcon = {
+                                        if (selected.outlined) {
+                                            Icon(Icons.Rounded.Check, null)
+                                        }
+                                    },
+                                    onClick = {
+                                        onSelect(selected.copy(outlined = !selected.outlined))
                                     }
-                                },
-                                onClick = {
-                                    onSelect(selected.copy(outlined = !selected.outlined))
-                                }
-                            )
+                                )
+                            }
                         }
                     }
                 }

app/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreenVM.kt

@@ -7,6 +7,7 @@ import de.mm20.launcher2.preferences.ClockWidgetColors
 import de.mm20.launcher2.preferences.ClockWidgetStyle
 import de.mm20.launcher2.preferences.ui.ClockWidgetSettings
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -19,6 +20,18 @@ class ClockWidgetSettingsScreenVM : ViewModel(), KoinComponent {
         settings.setCompact(compact)
     }
 
+    val availableClockStyles = settings.digital1.map {digital1 ->
+        listOf(
+            digital1,
+            ClockWidgetStyle.Digital2,
+            ClockWidgetStyle.Analog,
+            ClockWidgetStyle.Orbit,
+            ClockWidgetStyle.Segment,
+            ClockWidgetStyle.Binary,
+            ClockWidgetStyle.Empty,
+        )
+    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
+
     val clockStyle = settings.clockStyle
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)