Add dock rows setting to choose how many rows to display on the home screen (#1520)

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

@@ -38,15 +38,16 @@ class FavoritesPartProvider : PartProvider, KoinComponent {
                 it.columnCount
             }
         }.collectAsState(0)
+        val dockRows by uiSettings.dockRows.collectAsState(1)
         val excludeCalendar by remember { widgetRepository.exists(CalendarWidget.Type) }.collectAsState(
             true
         )
 
-        val favorites by remember(columns, excludeCalendar) {
+        val favorites by remember(columns, dockRows, excludeCalendar) {
             favoritesService.getFavorites(
                 excludeTypes = if (excludeCalendar) listOf("calendar", "tag") else listOf("tag"),
                 minPinnedLevel = PinnedLevel.FrequentlyUsed,
-                limit = columns
+                limit = columns * dockRows
             )
         }.collectAsState(emptyList())
 

app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt

@@ -75,6 +75,7 @@ fun HomescreenSettingsScreen() {
     val context = LocalContext.current
 
     val dock by viewModel.dock.collectAsStateWithLifecycle(null)
+    val dockRows by viewModel.dockRows.collectAsStateWithLifecycle(1)
     val fixedRotation by viewModel.fixedRotation.collectAsStateWithLifecycle(null)
     val widgetsOnHomeScreen by viewModel.widgetsOnHomeScreen.collectAsStateWithLifecycle(null)
     val editButton by viewModel.widgetEditButton.collectAsStateWithLifecycle(null)
@@ -123,6 +124,17 @@ fun HomescreenSettingsScreen() {
                         viewModel.setDock(it)
                     },
                 )
+                AnimatedVisibility(dock == true) {
+                    SliderPreference(
+                        title = stringResource(R.string.preference_clockwidget_dock_rows),
+                        value = dockRows,
+                        min = 1,
+                        max = 4,
+                        onValueChanged = {
+                            viewModel.setDockRows(it)
+                        }
+                    )
+                }
                 SwitchPreference(
                     title = stringResource(R.string.preference_widgets_on_home_screen),
                     summary = stringResource(R.string.preference_widgets_on_home_screen_summary),

app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt

@@ -131,6 +131,13 @@ class HomescreenSettingsScreenVM(
         uiSettings.setDock(dock)
     }
 
+    val dockRows = uiSettings.dockRows
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
+
+    fun setDockRows(rows: Int) {
+        uiSettings.setDockRows(rows)
+    }
+
     val fixedRotation = uiSettings.orientation.map { it != ScreenOrientation.Auto }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)