Clock widget: always display favorites part on bottom of screen if enabled

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

@@ -64,7 +64,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
-import de.mm20.launcher2.preferences.Settings
 import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockStyle
 import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetAlignment
 import de.mm20.launcher2.preferences.Settings.ClockWidgetSettings.ClockWidgetColors
@@ -107,9 +106,7 @@ fun ClockWidget(
         viewModel.updateTime(time)
     }
 
-    val partProviders by remember { viewModel.getActiveParts(context) }.collectAsStateWithLifecycle(
+    val partProvider by remember { viewModel.getActivePart(context) }.collectAsStateWithLifecycle(null)
-        emptyList()
-    )
 
     AnimatedContent(editMode, label = "ClockWidget") {
         if (it) {
@@ -154,15 +151,17 @@ fun ClockWidget(
                 }
             }
         } else {
+            Column(modifier = modifier) {
                 Box(
-                modifier = modifier,
+                    modifier = Modifier
+                        .weight(1f)
+                        .fillMaxWidth(),
                     contentAlignment = when (alignment) {
                         ClockWidgetAlignment.Center -> Alignment.Center
                         ClockWidgetAlignment.Top -> Alignment.TopCenter
                         else -> Alignment.BottomCenter
                     }
                 ) {
-
                     CompositionLocalProvider(
                         LocalContentColor provides contentColor
                     ) {
@@ -182,11 +181,11 @@ fun ClockWidget(
                                     Clock(clockStyle, ClockWidgetLayout.Vertical)
                                 }
 
-                            for (part in partProviders) {
+                                if (partProvider != null) {
                                     DynamicZone(
                                         modifier = Modifier.padding(bottom = 8.dp),
                                         layout = ClockWidgetLayout.Vertical,
-                                    provider = part,
+                                        provider = partProvider,
                                     )
                                 }
                             }
@@ -199,25 +198,11 @@ fun ClockWidget(
                                 verticalAlignment = Alignment.CenterVertically,
                                 horizontalArrangement = Arrangement.SpaceBetween
                             ) {
-                            if (partProviders.size > 1) {
+                                if (partProvider != null) {
-                                HorizontalPager(
-                                    state = rememberPagerState { 2 },
-                                    beyondBoundsPageCount = 1,
-                                    modifier = Modifier.weight(1f)
-                                ) {
-                                    partProviders.getOrNull(it)?.let {
-                                        DynamicZone(
-                                            modifier = Modifier.fillMaxWidth(),
-                                            layout = ClockWidgetLayout.Horizontal,
-                                            provider = it,
-                                        )
-                                    }
-                                }
-                            } else if (partProviders.isNotEmpty()) {
                                     DynamicZone(
                                         modifier = Modifier.weight(1f),
                                         layout = ClockWidgetLayout.Horizontal,
-                                    provider = partProviders[0],
+                                        provider = partProvider,
                                     )
                                 }
                                 Box(
@@ -244,6 +229,17 @@ fun ClockWidget(
                         }
                     }
                 }
+                val dockProvider by viewModel.dockProvider.collectAsState()
+                if (dockProvider != null) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(bottom = 16.dp)
+                    ) {
+                        dockProvider?.Component(ClockWidgetLayout.Vertical)
+                    }
+                }
+            }
         }
     }
 }

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

@@ -30,24 +30,21 @@ class ClockWidgetVM : ViewModel(), KoinComponent {
     private val partProviders = dataStore.data.map { it.clockWidget }.distinctUntilChanged().map {
         val providers = mutableListOf<PartProvider>()
         if (it.datePart) providers += DatePartProvider()
-        if (it.favoritesPart) providers += FavoritesPartProvider()
         if (it.musicPart) providers += MusicPartProvider()
         if (it.batteryPart) providers += BatteryPartProvider()
         if (it.alarmPart) providers += AlarmPartProvider()
         providers
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
 
-    fun getActiveParts(context: Context): Flow<List<PartProvider>> = channelFlow {
+    fun getActivePart(context: Context): Flow<PartProvider?> = channelFlow {
         partProviders.collectLatest { providers ->
             if (providers.isEmpty()) {
-                send(emptyList())
+                send(null)
                 return@collectLatest
             }
             val rankings = providers.map { it.getRanking(context).map { r -> r to it } }
             combine(rankings) { r ->
-                val sorted = r.sortedBy { it.first }
+                r.filter { it.first > 0 }.maxByOrNull { it.first }?.second
-                sorted.takeLast(if (sorted.last().second is FavoritesPartProvider) 2 else 1)
-                    .map { it.second }
             }.collectLatest {
                 send(it)
             }
@@ -65,6 +62,10 @@ class ClockWidgetVM : ViewModel(), KoinComponent {
     val alignment = dataStore.data.map { it.clockWidget.alignment }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
 
+    val dockProvider = dataStore.data
+        .map { if (it.clockWidget.favoritesPart) FavoritesPartProvider() else null }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+
     fun updateTime(time: Long) {
         partProviders.value.forEach { it.setTime(time) }
     }

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

@@ -59,11 +59,10 @@ class FavoritesPartProvider : PartProvider, KoinComponent {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(vertical = 8.dp)
                 .wrapContentHeight()
         ) {
             SearchResultGrid(
-                items = favorites, showLabels = false, columns = columns,
+                items = favorites, showLabels = false, columns = columns.coerceAtMost(favorites.size),
             )
         }
     }