Keep settings bundled together on Compose

Author: prof18

androidApp/src/main/kotlin/com/prof18/feedflow/android/settings/SettingsScreen.kt

@@ -50,6 +50,7 @@ import com.prof18.feedflow.core.utils.AppConfig
 import com.prof18.feedflow.core.utils.TestingTag
 import com.prof18.feedflow.shared.domain.model.Browser
 import com.prof18.feedflow.shared.presentation.SettingsViewModel
+import com.prof18.feedflow.shared.presentation.model.SettingsState
 import com.prof18.feedflow.shared.presentation.preview.browsersForPreview
 import com.prof18.feedflow.shared.ui.preview.PreviewPhone
 import com.prof18.feedflow.shared.ui.search.FeedListFontSettings
@@ -92,15 +93,9 @@ fun SettingsScreen(
         browsers = browserListState,
         onFeedListClick = onFeedListClick,
         onAddFeedClick = onAddFeedClick,
-        isMarkReadWhenScrollingEnabled = settingState.isMarkReadWhenScrollingEnabled,
-        isShowReadItemEnabled = settingState.isShowReadItemsEnabled,
-        isReaderModeEnabled = settingState.isReaderModeEnabled,
-        isRemoveTitleFromDescriptionEnabled = settingState.isRemoveTitleFromDescriptionEnabled,
-        isHideDescriptionEnabled = settingState.isHideDescriptionEnabled,
-        isHideImagesEnabled = settingState.isHideImagesEnabled,
+        settingsState = settingState,
         showAccounts = appConfig.isDropboxSyncEnabled,
         fontSizes = fontSizesState,
-        autoDeletePeriod = settingState.autoDeletePeriod,
         onBrowserSelected = { browser ->
             browserManager.setFavouriteBrowser(browser)
         },
@@ -148,15 +143,9 @@ fun SettingsScreen(
 @Composable
 private fun SettingsScreenContent(
     browsers: ImmutableList<Browser>,
-    isMarkReadWhenScrollingEnabled: Boolean,
-    isShowReadItemEnabled: Boolean,
-    isReaderModeEnabled: Boolean,
-    isRemoveTitleFromDescriptionEnabled: Boolean,
-    isHideDescriptionEnabled: Boolean,
-    isHideImagesEnabled: Boolean,
+    settingsState: SettingsState,
     showAccounts: Boolean,
     fontSizes: FeedFontSizes,
-    autoDeletePeriod: AutoDeletePeriod,
     onFeedListClick: () -> Unit,
     onAddFeedClick: () -> Unit,
     onBrowserSelected: (Browser) -> Unit,
@@ -246,28 +235,28 @@ private fun SettingsScreenContent(
 
             item {
                 AutoDeletePeriodSelector(
-                    currentPeriod = autoDeletePeriod,
+                    currentPeriod = settingsState.autoDeletePeriod,
                     onPeriodSelected = onAutoDeletePeriodSelected,
                 )
             }
 
             item {
                 ReaderModeSwitch(
                     setReaderMode = setReaderMode,
-                    isReaderModeEnabled = isReaderModeEnabled,
+                    isReaderModeEnabled = settingsState.isReaderModeEnabled,
                 )
             }
 
             item {
                 MarkReadWhenScrollingSwitch(
                     setMarkReadWhenScrolling = setMarkReadWhenScrolling,
-                    isMarkReadWhenScrollingEnabled = isMarkReadWhenScrollingEnabled,
+                    isMarkReadWhenScrollingEnabled = settingsState.isMarkReadWhenScrollingEnabled,
                 )
             }
 
             item {
                 ShowReadItemOnTimelineSwitch(
-                    isShowReadItemEnabled = isShowReadItemEnabled,
+                    isShowReadItemEnabled = settingsState.isShowReadItemsEnabled,
                     setShowReadItem = setShowReadItem,
                 )
             }
@@ -283,8 +272,8 @@ private fun SettingsScreenContent(
 
             item {
                 FeedListFontSettings(
-                    isHideDescriptionEnabled = isHideDescriptionEnabled,
-                    isHideImagesEnabled = isHideImagesEnabled,
+                    isHideDescriptionEnabled = settingsState.isHideDescriptionEnabled,
+                    isHideImagesEnabled = settingsState.isHideImagesEnabled,
                     fontSizes = fontSizes,
                     updateFontScale = updateFontScale,
                 )
@@ -294,21 +283,21 @@ private fun SettingsScreenContent(
                 Spacer(modifier = Modifier.padding(top = Spacing.regular))
 
                 HideDescriptionSwitch(
-                    isHideDescriptionEnabled = isHideDescriptionEnabled,
+                    isHideDescriptionEnabled = settingsState.isHideDescriptionEnabled,
                     setHideDescription = setHideDescription,
                 )
             }
 
             item {
                 HideImagesSwitch(
-                    isHideImagesEnabled = isHideImagesEnabled,
+                    isHideImagesEnabled = settingsState.isHideImagesEnabled,
                     setHideImages = setHideImages,
                 )
             }
 
             item {
                 RemoveTitleFromDescSwitch(
-                    isRemoveTitleFromDescriptionEnabled = isRemoveTitleFromDescriptionEnabled,
+                    isRemoveTitleFromDescriptionEnabled = settingsState.isRemoveTitleFromDescriptionEnabled,
                     setRemoveTitleFromDescription = setRemoveTitleFromDescription,
                 )
             }
@@ -535,15 +524,8 @@ private fun SettingsScreenPreview() {
     FeedFlowTheme {
         SettingsScreenContent(
             browsers = browsersForPreview,
-            isMarkReadWhenScrollingEnabled = true,
-            isShowReadItemEnabled = false,
-            isReaderModeEnabled = false,
-            isRemoveTitleFromDescriptionEnabled = false,
-            isHideDescriptionEnabled = false,
-            isHideImagesEnabled = false,
             showAccounts = true,
             fontSizes = FeedFontSizes(),
-            autoDeletePeriod = AutoDeletePeriod.DISABLED,
             onFeedListClick = {},
             onAddFeedClick = {},
             onBrowserSelected = {},
@@ -560,6 +542,7 @@ private fun SettingsScreenPreview() {
             setHideImages = {},
             updateFontScale = {},
             onAutoDeletePeriodSelected = {},
+            settingsState = SettingsState(),
         )
     }
 }

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt

@@ -305,10 +305,7 @@ fun main() = application {
                         ) { navigator ->
                             FeedFlowMenuBar(
                                 showDebugMenu = appEnvironment.isDebug(),
-                                isMarkReadWhenScrollingEnabled = settingsState.isMarkReadWhenScrollingEnabled,
-                                isShowReadItemEnabled = settingsState.isShowReadItemsEnabled,
-                                isReaderModeEnabled = settingsState.isReaderModeEnabled,
-                                autoDeletePeriod = settingsState.autoDeletePeriod,
+                                settingsState = settingsState,
                                 feedFilter = currentFeedFilter,
                                 onRefreshClick = {
                                     scope.launch {

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/MenuBar.kt

@@ -13,16 +13,14 @@ import com.prof18.feedflow.core.model.FeedFilter
 import com.prof18.feedflow.desktop.accounts.AccountsScreen
 import com.prof18.feedflow.desktop.editfeed.EditFeedScreen
 import com.prof18.feedflow.desktop.feedsourcelist.FeedSourceListScreen
+import com.prof18.feedflow.shared.presentation.model.SettingsState
 import com.prof18.feedflow.shared.ui.utils.LocalFeedFlowStrings
 
 @Composable
 fun FrameWindowScope.FeedFlowMenuBar(
     showDebugMenu: Boolean,
-    isMarkReadWhenScrollingEnabled: Boolean,
-    isShowReadItemEnabled: Boolean,
-    isReaderModeEnabled: Boolean,
-    autoDeletePeriod: AutoDeletePeriod,
     feedFilter: FeedFilter,
+    settingsState: SettingsState,
     onRefreshClick: () -> Unit,
     onMarkAllReadClick: () -> Unit,
     onImportExportClick: () -> Unit,
@@ -115,41 +113,41 @@ fun FrameWindowScope.FeedFlowMenuBar(
         Menu(LocalFeedFlowStrings.current.settingsBehaviourTitle, mnemonic = 'B') {
             CheckboxItem(
                 text = LocalFeedFlowStrings.current.settingsReaderMode,
-                checked = isReaderModeEnabled,
+                checked = settingsState.isReaderModeEnabled,
                 onCheckedChange = setReaderMode,
             )
 
             CheckboxItem(
                 text = LocalFeedFlowStrings.current.toggleMarkReadWhenScrolling,
-                checked = isMarkReadWhenScrollingEnabled,
+                checked = settingsState.isMarkReadWhenScrollingEnabled,
                 onCheckedChange = setMarkReadWhenScrolling,
             )
 
             CheckboxItem(
                 text = LocalFeedFlowStrings.current.settingsToggleShowReadArticles,
-                checked = isShowReadItemEnabled,
+                checked = settingsState.isShowReadItemsEnabled,
                 onCheckedChange = setShowReadItem,
             )
 
             Menu(LocalFeedFlowStrings.current.settingsAutoDelete) {
                 RadioButtonItem(
                     text = LocalFeedFlowStrings.current.settingsAutoDeletePeriodDisabled,
-                    selected = autoDeletePeriod == AutoDeletePeriod.DISABLED,
+                    selected = settingsState.autoDeletePeriod == AutoDeletePeriod.DISABLED,
                     onClick = { onAutoDeletePeriodSelected(AutoDeletePeriod.DISABLED) },
                 )
                 RadioButtonItem(
                     text = LocalFeedFlowStrings.current.settingsAutoDeletePeriodOneWeek,
-                    selected = autoDeletePeriod == AutoDeletePeriod.ONE_WEEK,
+                    selected = settingsState.autoDeletePeriod == AutoDeletePeriod.ONE_WEEK,
                     onClick = { onAutoDeletePeriodSelected(AutoDeletePeriod.ONE_WEEK) },
                 )
                 RadioButtonItem(
                     text = LocalFeedFlowStrings.current.settingsAutoDeletePeriodTwoWeeks,
-                    selected = autoDeletePeriod == AutoDeletePeriod.TWO_WEEKS,
+                    selected = settingsState.autoDeletePeriod == AutoDeletePeriod.TWO_WEEKS,
                     onClick = { onAutoDeletePeriodSelected(AutoDeletePeriod.TWO_WEEKS) },
                 )
                 RadioButtonItem(
                     text = LocalFeedFlowStrings.current.settingsAutoDeletePeriodOneMonth,
-                    selected = autoDeletePeriod == AutoDeletePeriod.ONE_MONTH,
+                    selected = settingsState.autoDeletePeriod == AutoDeletePeriod.ONE_MONTH,
                     onClick = { onAutoDeletePeriodSelected(AutoDeletePeriod.ONE_MONTH) },
                 )
             }