Clean AddFeed UI and move Theme to shared module

max1586ma · Jan 14, 2024 · 903a074 · 903a074
1 parent b6fa602
commit 903a074
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 204 deletions.
diff --git a/androidApp/src/main/kotlin/com/prof18/feedflow/android/addfeed/AddFeedScreen.android.kt b/androidApp/src/main/kotlin/com/prof18/feedflow/android/addfeed/AddFeedScreen.android.kt
@@ -9,7 +9,6 @@ import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
@@ -21,13 +20,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.prof18.feedflow.MR
-import com.prof18.feedflow.core.model.CategoriesState
-import com.prof18.feedflow.core.model.CategoryId
-import com.prof18.feedflow.core.model.CategoryName
 import com.prof18.feedflow.shared.domain.model.FeedAddedState
 import com.prof18.feedflow.shared.presentation.AddFeedViewModel
-import com.prof18.feedflow.shared.presentation.preview.categoriesState
-import com.prof18.feedflow.shared.ui.addfeed.AddFeedsContent
+import com.prof18.feedflow.shared.presentation.preview.categoriesExpandedState
+import com.prof18.feedflow.shared.ui.addfeed.AddFeedContent
 import com.prof18.feedflow.shared.ui.preview.FeedFlowPhonePreview
 import dev.icerock.moko.resources.compose.stringResource
 import org.koin.androidx.compose.koinViewModel
@@ -68,7 +64,7 @@ fun AddFeedScreen(
 
     val categoriesState by viewModel.categoriesState.collectAsStateWithLifecycle()
 
-    AddFeedScreenContent(
+    AddFeedContent(
         feedUrl = feedUrl,
         showError = showError,
         errorMessage = errorMessage,
@@ -80,7 +76,6 @@ fun AddFeedScreen(
         addFeed = {
             viewModel.addFeed()
         },
-        navigateBack = navigateBack,
         onExpandClick = {
             viewModel.onExpandCategoryClick()
         },
@@ -90,26 +85,7 @@ fun AddFeedScreen(
         onDeleteCategoryClick = { categoryId ->
             viewModel.deleteCategory(categoryId.value)
         },
-    )
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Suppress("LongParameterList")
-@Composable
-private fun AddFeedScreenContent(
-    feedUrl: String,
-    showError: Boolean,
-    errorMessage: String,
-    categoriesState: CategoriesState,
-    onFeedUrlUpdated: (String) -> Unit,
-    addFeed: () -> Unit,
-    navigateBack: () -> Unit,
-    onExpandClick: () -> Unit,
-    onAddCategoryClick: (CategoryName) -> Unit,
-    onDeleteCategoryClick: (CategoryId) -> Unit,
-) {
-    Scaffold(
-        topBar = {
+        topAppBar = {
             TopAppBar(
                 title = {
                     Text(stringResource(resource = MR.strings.add_feed))
@@ -128,56 +104,40 @@ private fun AddFeedScreenContent(
                 },
             )
         },
-    ) { paddingValues ->
-        AddFeedsContent(
-            paddingValues = paddingValues,
-            feedUrl = feedUrl,
-            showError = showError,
-            errorMessage = errorMessage,
-            categoriesState = categoriesState,
-            onFeedUrlUpdated = onFeedUrlUpdated,
-            addFeed = addFeed,
-            onExpandClick = onExpandClick,
-            onAddCategoryClick = onAddCategoryClick,
-            onDeleteCategoryClick = onDeleteCategoryClick,
-        )
-    }
+    )
 }
 
 @FeedFlowPhonePreview
 @Composable
 private fun AddScreenContentPreview() {
     FeedFlowTheme {
-        AddFeedScreenContent(
+        AddFeedContent(
             feedUrl = "https://www.ablog.com/feed",
             showError = false,
             errorMessage = "",
-            categoriesState = categoriesState,
-            onFeedUrlUpdated = {},
-            addFeed = { },
-            navigateBack = {},
-            onExpandClick = {},
-            onAddCategoryClick = {},
-            onDeleteCategoryClick = {},
-        )
-    }
-}
-
-@FeedFlowPhonePreview
-@Composable
-private fun AddScreenContentInvalidUrlPreview() {
-    FeedFlowTheme {
-        AddFeedScreenContent(
-            feedUrl = "https://www.ablog.com/feed",
-            showError = true,
-            errorMessage = "The link you provided is not a valid RSS feed",
-            categoriesState = categoriesState,
+            categoriesState = categoriesExpandedState,
             onFeedUrlUpdated = {},
             addFeed = { },
-            navigateBack = {},
             onExpandClick = {},
             onAddCategoryClick = {},
             onDeleteCategoryClick = {},
+            topAppBar = {
+                TopAppBar(
+                    title = {
+                        Text(stringResource(resource = MR.strings.add_feed))
+                    },
+                    navigationIcon = {
+                        IconButton(
+                            onClick = {},
+                        ) {
+                            Icon(
+                                imageVector = Icons.Default.ArrowBack,
+                                contentDescription = null,
+                            )
+                        }
+                    },
+                )
+            },
         )
     }
 }
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -127,7 +127,7 @@ complexity:
     active: true
     threshold: 600
   LongMethod:
-    active: true
+    active: false
     threshold: 60
   LongParameterList:
     active: true

diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -29,7 +29,6 @@ kotlin {
                 implementation(libs.kotlinx.coroutines.core)
                 implementation(libs.decompose)
                 implementation(libs.decompose.compose.jetbrains)
-                implementation(libs.jsystem.theme.detector)
                 implementation(libs.compose.image.loader)
                 implementation(libs.moko.resourcesCompose)
                 implementation(libs.bundles.about.libraries)

diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/Main.kt
@@ -50,13 +50,13 @@ import com.prof18.feedflow.desktop.navigation.ChildStack
 import com.prof18.feedflow.desktop.navigation.ProvideComponentContext
 import com.prof18.feedflow.desktop.navigation.Screen
 import com.prof18.feedflow.desktop.ui.components.NewVersionBanner
-import com.prof18.feedflow.desktop.ui.style.FeedFlowTheme
-import com.prof18.feedflow.desktop.ui.style.rememberDesktopDarkTheme
 import com.prof18.feedflow.desktop.utils.initSentry
 import com.prof18.feedflow.desktop.versionchecker.NewVersionChecker
 import com.prof18.feedflow.desktop.versionchecker.NewVersionState
 import com.prof18.feedflow.shared.presentation.HomeViewModel
 import com.prof18.feedflow.shared.presentation.SettingsViewModel
+import com.prof18.feedflow.shared.ui.theme.FeedFlowTheme
+import com.prof18.feedflow.shared.ui.theme.rememberDesktopDarkTheme
 import com.prof18.feedflow.shared.utils.UserFeedbackReporter
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch

diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/about/AboutContent.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/about/AboutContent.kt
@@ -31,11 +31,11 @@ import com.prof18.feedflow.core.utils.Websites.FEED_FLOW_WEBSITE
 import com.prof18.feedflow.core.utils.Websites.MG_WEBSITE
 import com.prof18.feedflow.desktop.openInBrowser
 import com.prof18.feedflow.desktop.scrollbarStyle
-import com.prof18.feedflow.desktop.ui.style.FeedFlowTheme
 import com.prof18.feedflow.shared.ui.about.AboutButtonItem
 import com.prof18.feedflow.shared.ui.about.AboutTextItem
 import com.prof18.feedflow.shared.ui.about.AuthorText
 import com.prof18.feedflow.shared.ui.style.Spacing
+import com.prof18.feedflow.shared.ui.theme.FeedFlowTheme
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable

diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/addfeed/AddFeedScreen.desktop.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/addfeed/AddFeedScreen.desktop.kt
@@ -1,7 +1,6 @@
 package com.prof18.feedflow.desktop.addfeed
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
@@ -12,16 +11,13 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import com.prof18.feedflow.core.model.CategoriesState
-import com.prof18.feedflow.core.model.CategoryId
-import com.prof18.feedflow.core.model.CategoryName
 import com.prof18.feedflow.desktop.desktopViewModel
 import com.prof18.feedflow.desktop.di.DI
-import com.prof18.feedflow.desktop.ui.style.FeedFlowTheme
 import com.prof18.feedflow.shared.domain.model.FeedAddedState
 import com.prof18.feedflow.shared.presentation.AddFeedViewModel
-import com.prof18.feedflow.shared.presentation.preview.categoriesState
-import com.prof18.feedflow.shared.ui.addfeed.AddFeedsContent
+import com.prof18.feedflow.shared.presentation.preview.categoriesExpandedState
+import com.prof18.feedflow.shared.ui.addfeed.AddFeedContent
+import com.prof18.feedflow.shared.ui.theme.FeedFlowTheme
 
 @Composable
 fun AddFeedScreen(
@@ -65,11 +61,10 @@ fun AddFeedScreen(
 
     val categoriesState by viewModel.categoriesState.collectAsState()
 
-    AddFeedScreenContent(
+    AddFeedContent(
         feedUrl = feedUrl,
-        isInvalidUrl = showError,
+        showError = showError,
         errorMessage = errorMessage,
-        snackbarHostState = snackbarHostState,
         onFeedUrlUpdated = { url ->
             feedUrl = url
             viewModel.updateFeedUrlTextFieldValue(url)
@@ -87,91 +82,20 @@ fun AddFeedScreen(
         onDeleteCategoryClick = { categoryId ->
             viewModel.deleteCategory(categoryId.value)
         },
-    )
-}
-
-@Suppress("LongParameterList")
-@Composable
-private fun AddFeedScreenContent(
-    feedUrl: String,
-    isInvalidUrl: Boolean,
-    errorMessage: String,
-    snackbarHostState: SnackbarHostState,
-    categoriesState: CategoriesState,
-    onFeedUrlUpdated: (String) -> Unit,
-    addFeed: () -> Unit,
-    onExpandClick: () -> Unit,
-    onAddCategoryClick: (CategoryName) -> Unit,
-    onDeleteCategoryClick: (CategoryId) -> Unit,
-) {
-    Scaffold(
         snackbarHost = { SnackbarHost(snackbarHostState) },
-    ) { paddingValues ->
-        AddFeedsContent(
-            paddingValues = paddingValues,
-            feedUrl = feedUrl,
-            showError = isInvalidUrl,
-            errorMessage = errorMessage,
-            categoriesState = categoriesState,
-            onFeedUrlUpdated = onFeedUrlUpdated,
-            addFeed = addFeed,
-            onExpandClick = onExpandClick,
-            onAddCategoryClick = onAddCategoryClick,
-            onDeleteCategoryClick = onDeleteCategoryClick,
-        )
-    }
+    )
 }
 
 @Preview
 @Composable
 private fun AddScreenContentPreview() {
     FeedFlowTheme {
-        AddFeedScreenContent(
-            feedUrl = "https://www.ablog.com/feed",
-            isInvalidUrl = false,
-            errorMessage = "",
-            snackbarHostState = SnackbarHostState(),
-            categoriesState = categoriesState,
-            onFeedUrlUpdated = {},
-            addFeed = { },
-            onExpandClick = {},
-            onAddCategoryClick = {},
-            onDeleteCategoryClick = {},
-        )
-    }
-}
-
-@Preview
-@Composable
-private fun AddScreenContentDarkPreview() {
-    FeedFlowTheme(
-        darkTheme = true,
-    ) {
-        AddFeedScreenContent(
+        AddFeedContent(
             feedUrl = "https://www.ablog.com/feed",
-            isInvalidUrl = false,
+            showError = false,
             errorMessage = "",
-            snackbarHostState = SnackbarHostState(),
-            categoriesState = categoriesState,
-            onFeedUrlUpdated = {},
-            addFeed = { },
-            onExpandClick = {},
-            onAddCategoryClick = {},
-            onDeleteCategoryClick = {},
-        )
-    }
-}
-
-@Preview
-@Composable
-private fun AddScreenContentInvalidUrlPreview() {
-    FeedFlowTheme {
-        AddFeedScreenContent(
-            feedUrl = "https://www.ablog.com/feed",
-            isInvalidUrl = true,
-            errorMessage = "The link you provided is not a valid RSS feed",
-            snackbarHostState = SnackbarHostState(),
-            categoriesState = categoriesState,
+            snackbarHost = { SnackbarHost(SnackbarHostState()) },
+            categoriesState = categoriesExpandedState,
             onFeedUrlUpdated = {},
             addFeed = { },
             onExpandClick = {},

diff --git a/...jvmMain/kotlin/com/prof18/feedflow/desktop/feedsourcelist/FeedSourceListScreen.desktop.kt b/...jvmMain/kotlin/com/prof18/feedflow/desktop/feedsourcelist/FeedSourceListScreen.desktop.kt
@@ -21,12 +21,12 @@ import com.prof18.feedflow.desktop.addfeed.AddFeedScreen
 import com.prof18.feedflow.desktop.desktopViewModel
 import com.prof18.feedflow.desktop.di.DI
 import com.prof18.feedflow.desktop.ui.components.FeedSourceLogoImage
-import com.prof18.feedflow.desktop.ui.style.FeedFlowTheme
 import com.prof18.feedflow.shared.presentation.FeedSourceListViewModel
 import com.prof18.feedflow.shared.presentation.preview.feedSourcesState
 import com.prof18.feedflow.shared.ui.feedsourcelist.FeedSourceNavBar
 import com.prof18.feedflow.shared.ui.feedsourcelist.FeedSourcesWithCategoryList
 import com.prof18.feedflow.shared.ui.feedsourcelist.NoFeedSourcesView
+import com.prof18.feedflow.shared.ui.theme.FeedFlowTheme
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable

diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/ui/components/NewVersionBanner.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/ui/components/NewVersionBanner.kt
@@ -23,10 +23,10 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import com.prof18.feedflow.MR
-import com.prof18.feedflow.desktop.ui.style.FeedFlowTheme
 import com.prof18.feedflow.desktop.utils.WindowWidthSizeClass
 import com.prof18.feedflow.desktop.utils.calculateWindowSizeClass
 import com.prof18.feedflow.shared.ui.style.Spacing
+import com.prof18.feedflow.shared.ui.theme.FeedFlowTheme
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable

diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/preview/PreviewItems.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/presentation/preview/PreviewItems.kt
@@ -188,7 +188,7 @@ val importExportStates = listOf(
     ),
 )
 
-val categoriesState = CategoriesState(
+val categoriesExpandedState = CategoriesState(
     isExpanded = true,
     header = "No category selected",
     categories = listOf(
@@ -213,6 +213,31 @@ val categoriesState = CategoriesState(
     ),
 )
 
+val categoriesCollapsedState = CategoriesState(
+    isExpanded = false,
+    header = "Android",
+    categories = listOf(
+        CategoryItem(
+            id = 0,
+            name = "Android",
+            isSelected = true,
+            onClick = {},
+        ),
+        CategoryItem(
+            id = 0,
+            name = "Apple",
+            isSelected = false,
+            onClick = {},
+        ),
+        CategoryItem(
+            id = 0,
+            name = "Tech",
+            isSelected = false,
+            onClick = {},
+        ),
+    ),
+)
+
 val feedSourcesState = listOf(
     FeedSourceState(
         categoryId = CategoryId(1),