Improve feed empty screen. Add mark all read button - Fix #310

prof18 · Jan 4, 2025 · 9b5e32f · 9b5e32f
1 parent 81d5b33
commit 9b5e32f
Show file tree

Hide file tree

Showing 21 changed files with 381 additions and 222 deletions.
diff --git a/...rc/main/kotlin/com/prof18/feedflow/android/home/components/FeedWithContentView.android.kt b/...rc/main/kotlin/com/prof18/feedflow/android/home/components/FeedWithContentView.android.kt
@@ -40,6 +40,7 @@ internal fun FeedWithContentView(
     onCommentClick: (FeedItemUrlInfo) -> Unit,
     requestMoreItems: () -> Unit,
     onRefresh: () -> Unit,
+    markAllAsRead: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -80,6 +81,7 @@ internal fun FeedWithContentView(
                     updateReadStatus(index)
                 },
                 requestMoreItems = requestMoreItems,
+                markAllAsRead = markAllAsRead,
             )
         }
     }
@@ -100,6 +102,7 @@ private fun FeedWithContentViewPreview() {
             onCommentClick = {},
             requestMoreItems = {},
             onRefresh = {},
+            markAllAsRead = {},
         )
     }
 }
diff --git a/androidApp/src/main/kotlin/com/prof18/feedflow/android/home/components/HomeScaffold.kt b/androidApp/src/main/kotlin/com/prof18/feedflow/android/home/components/HomeScaffold.kt
@@ -121,6 +121,9 @@ internal fun HomeScaffold(
             onAddFeedClick = onAddFeedClick,
             requestMoreItems = requestNewData,
             onBackToTimelineClick = onBackToTimelineClick,
+            markAllAsRead = markAllRead,
+            onOpenDrawerClick = onDrawerMenuClick,
+            isDrawerVisible = showDrawerMenu,
         )
     }
 }

diff --git a/.../src/main/kotlin/com/prof18/feedflow/android/home/components/HomeScreenContent.android.kt b/.../src/main/kotlin/com/prof18/feedflow/android/home/components/HomeScreenContent.android.kt
@@ -30,6 +30,7 @@ internal fun HomeScreenContent(
     feedState: ImmutableList<FeedItem>,
     listState: LazyListState,
     currentFeedFilter: FeedFilter,
+    isDrawerVisible: Boolean,
     updateReadStatus: (Int) -> Unit,
     onFeedItemClick: (FeedItemUrlInfo) -> Unit,
     onBookmarkClick: (FeedItemId, Boolean) -> Unit,
@@ -38,6 +39,8 @@ internal fun HomeScreenContent(
     onAddFeedClick: () -> Unit,
     requestMoreItems: () -> Unit,
     onBackToTimelineClick: () -> Unit,
+    markAllAsRead: () -> Unit,
+    onOpenDrawerClick: () -> Unit,
     onRefresh: () -> Unit = {},
 ) {
     when {
@@ -58,6 +61,8 @@ internal fun HomeScreenContent(
                 currentFeedFilter = currentFeedFilter,
                 onReloadClick = onRefresh,
                 onBackToTimelineClick = onBackToTimelineClick,
+                onOpenDrawerClick = onOpenDrawerClick,
+                isDrawerVisible = isDrawerVisible,
             )
         }
 
@@ -75,6 +80,7 @@ internal fun HomeScreenContent(
             onReadStatusClick = onReadStatusClick,
             onCommentClick = onCommentClick,
             onRefresh = onRefresh,
+            markAllAsRead = markAllAsRead,
         )
     }
 }
@@ -92,6 +98,7 @@ private fun HomeScreeContentLoadingPreview() {
             feedState = feedItemsForPreview,
             listState = rememberLazyListState(),
             currentFeedFilter = FeedFilter.Timeline,
+            isDrawerVisible = true,
             updateReadStatus = {},
             onFeedItemClick = {},
             onAddFeedClick = {},
@@ -101,6 +108,8 @@ private fun HomeScreeContentLoadingPreview() {
             onBookmarkClick = { _, _ -> },
             onReadStatusClick = { _, _ -> },
             onBackToTimelineClick = {},
+            markAllAsRead = {},
+            onOpenDrawerClick = {},
         )
     }
 }
@@ -115,6 +124,7 @@ private fun HomeScreeContentLoadedPreview() {
             feedState = feedItemsForPreview,
             listState = rememberLazyListState(),
             currentFeedFilter = FeedFilter.Timeline,
+            isDrawerVisible = true,
             updateReadStatus = {},
             onFeedItemClick = {},
             onAddFeedClick = {},
@@ -123,6 +133,8 @@ private fun HomeScreeContentLoadedPreview() {
             onBookmarkClick = { _, _ -> },
             onReadStatusClick = { _, _ -> },
             onBackToTimelineClick = {},
+            markAllAsRead = {},
+            onOpenDrawerClick = {},
         )
     }
 }
diff --git a/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/HomeScreen.desktop.kt b/desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/HomeScreen.desktop.kt
@@ -129,6 +129,9 @@ internal fun HomeScreen(
                 onDeleteFeedSourceClick = { feedSource ->
                     homeViewModel.deleteFeedSource(feedSource)
                 },
+                markAllAsRead = {
+                    homeViewModel.markAllRead()
+                },
             )
         }
 
@@ -179,6 +182,9 @@ internal fun HomeScreen(
                 onDeleteFeedSourceClick = { feedSource ->
                     homeViewModel.deleteFeedSource(feedSource)
                 },
+                markAllAsRead = {
+                    homeViewModel.markAllRead()
+                },
             )
         }
 
@@ -229,6 +235,9 @@ internal fun HomeScreen(
                 onDeleteFeedSourceClick = { feedSource ->
                     homeViewModel.deleteFeedSource(feedSource)
                 },
+                markAllAsRead = {
+                    homeViewModel.markAllRead()
+                },
             )
         }
     }

diff --git a/...c/jvmMain/kotlin/com/prof18/feedflow/desktop/home/bywindowsize/CompactHomeView.desktop.kt b/...c/jvmMain/kotlin/com/prof18/feedflow/desktop/home/bywindowsize/CompactHomeView.desktop.kt
@@ -50,6 +50,7 @@ internal fun CompactView(
     onSearchClick: () -> Unit,
     openUrl: (FeedItemUrlInfo) -> Unit,
     onDeleteFeedSourceClick: (FeedSource) -> Unit,
+    markAllAsRead: () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
@@ -113,6 +114,7 @@ internal fun CompactView(
             onReadStatusClick = onReadStatusClick,
             onBackToTimelineClick = onBackToTimelineClick,
             onSearchClick = onSearchClick,
+            markAllAsRead = markAllAsRead
         )
     }
 }
@@ -141,6 +143,7 @@ private fun CompactViewPreview() {
             onSearchClick = {},
             openUrl = {},
             onDeleteFeedSourceClick = {},
+            markAllAsRead = {},
         )
     }
 }
diff --git a/.../jvmMain/kotlin/com/prof18/feedflow/desktop/home/bywindowsize/ExpandedHomeView.desktop.kt b/.../jvmMain/kotlin/com/prof18/feedflow/desktop/home/bywindowsize/ExpandedHomeView.desktop.kt
@@ -52,6 +52,7 @@ internal fun ExpandedView(
     onSearchClick: () -> Unit,
     openUrl: (FeedItemUrlInfo) -> Unit,
     onDeleteFeedSourceClick: (FeedSource) -> Unit,
+    markAllAsRead: () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
     val navigator = LocalNavigator.currentOrThrow
@@ -107,6 +108,7 @@ internal fun ExpandedView(
             onReadStatusClick = onReadStatusClick,
             onBackToTimelineClick = onBackToTimelineClick,
             onSearchClick = onSearchClick,
+            markAllAsRead = markAllAsRead
         )
     }
 }
@@ -135,6 +137,7 @@ private fun ExpandedViewPreview() {
             onSearchClick = {},
             openUrl = {},
             onDeleteFeedSourceClick = {},
+            markAllAsRead = {},
         )
     }
 }
diff --git a/...rc/jvmMain/kotlin/com/prof18/feedflow/desktop/home/bywindowsize/MediumHomeView.desktop.kt b/...rc/jvmMain/kotlin/com/prof18/feedflow/desktop/home/bywindowsize/MediumHomeView.desktop.kt
@@ -56,6 +56,7 @@ internal fun MediumView(
     onSearchClick: () -> Unit,
     openUrl: (FeedItemUrlInfo) -> Unit,
     onDeleteFeedSourceClick: (FeedSource) -> Unit,
+    markAllAsRead: () -> Unit,
 ) {
     var isDrawerMenuFullVisible by remember {
         mutableStateOf(true)
@@ -122,6 +123,7 @@ internal fun MediumView(
             onReadStatusClick = onReadStatusClick,
             onBackToTimelineClick = onBackToTimelineClick,
             onSearchClick = onSearchClick,
+            markAllAsRead = markAllAsRead,
         )
     }
 }
@@ -150,6 +152,7 @@ private fun MediumViewPreview() {
             onSearchClick = {},
             openUrl = {},
             onDeleteFeedSourceClick = {},
+            markAllAsRead = {},
         )
     }
 }
diff --git a/...jvmMain/kotlin/com/prof18/feedflow/desktop/home/components/FeedWithContentView.desktop.kt b/...jvmMain/kotlin/com/prof18/feedflow/desktop/home/components/FeedWithContentView.desktop.kt
@@ -44,6 +44,7 @@ internal fun FeedWithContentView(
     onReadStatusClick: (FeedItemId, Boolean) -> Unit,
     onCommentClick: (FeedItemUrlInfo) -> Unit,
     requestMoreItems: () -> Unit,
+    markAllAsRead: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -68,6 +69,7 @@ internal fun FeedWithContentView(
                 updateReadStatus = { index ->
                     updateReadStatus(index)
                 },
+                markAllAsRead = markAllAsRead,
             )
 
             VerticalScrollbar(
@@ -112,6 +114,7 @@ private fun FeedWithContentViewPreview() {
             onCommentClick = { },
             requestMoreItems = { },
             paddingValues = PaddingValues(),
+            markAllAsRead = { },
         )
     }
 }
diff --git a/...c/jvmMain/kotlin/com/prof18/feedflow/desktop/home/components/HomeScreenContent.desktop.kt b/...c/jvmMain/kotlin/com/prof18/feedflow/desktop/home/components/HomeScreenContent.desktop.kt
@@ -37,6 +37,7 @@ internal fun HomeScreenContent(
     requestMoreItems: () -> Unit,
     onBackToTimelineClick: () -> Unit,
     onSearchClick: () -> Unit,
+    markAllAsRead: () -> Unit,
     modifier: Modifier = Modifier,
     showDrawerMenu: Boolean = false,
     isDrawerMenuOpen: Boolean = false,
@@ -65,6 +66,8 @@ internal fun HomeScreenContent(
                 currentFeedFilter = currentFeedFilter,
                 onReloadClick = onRefresh,
                 onBackToTimelineClick = onBackToTimelineClick,
+                onOpenDrawerClick = onDrawerMenuClick,
+                isDrawerVisible = showDrawerMenu,
             )
 
             else -> FeedWithContentView(
@@ -78,6 +81,7 @@ internal fun HomeScreenContent(
                 onReadStatusClick = onReadStatusClick,
                 onCommentClick = onCommentClick,
                 requestMoreItems = requestMoreItems,
+                markAllAsRead = markAllAsRead,
             )
         }
     }
@@ -104,6 +108,7 @@ private fun HomeScreenContentPreview() {
             onCommentClick = {},
             onBackToTimelineClick = {},
             onSearchClick = {},
+            markAllAsRead = {},
         )
     }
 }
diff --git a/i18n/src/commonMain/kotlin/com/prof18/feedflow/i18n/Locales.kt b/i18n/src/commonMain/kotlin/com/prof18/feedflow/i18n/Locales.kt
@@ -34,4 +34,4 @@ expect fun String.format(vararg args: Any): String
 
 @Suppress("UnusedPrivateProperty")
 // This is a trick to be sure that KSP re-generates the strings when there's no code updates
-private const val StringsVersion = 59
+private const val StringsVersion = 60
diff --git a/i18n/src/commonMain/resources/locale/values/strings.xml b/i18n/src/commonMain/resources/locale/values/strings.xml
@@ -122,4 +122,5 @@
     <string name="edit_feed">Edit feed</string>
     <string name="feed_name">Feed name</string>
     <string name="feed_edited_message">Feed "%s" updated</string>
+    <string name="open_another_feed">Open another feed</string>
 </resources>
diff --git a/iosApp/Source/App/CompactView.swift b/iosApp/Source/App/CompactView.swift
@@ -100,7 +100,11 @@ struct CompactView: View {
             toggleListScroll: $scrollUpTrigger,
             showSettings: .constant(false),
             selectedDrawerItem: $selectedDrawerItem,
-            homeViewModel: homeViewModel
+            columnVisibility: .constant(.automatic),
+            homeViewModel: homeViewModel,
+            openDrawer: {
+              // Handle by the view for the compact view
+            }
           )
           .environment(indexHolder)
         }

diff --git a/iosApp/Source/App/RegularView.swift b/iosApp/Source/App/RegularView.swift
@@ -48,8 +48,10 @@ struct RegularView: View {
   @State private var showEditFeedSheet = false
   @State private var feedSourceToEdit: FeedSource?
 
+  @State private var columnVisibility: NavigationSplitViewVisibility = .automatic
+
   var body: some View {
-    NavigationSplitView {
+    NavigationSplitView(columnVisibility: $columnVisibility) {
       SidebarDrawer(
         selectedDrawerItem: $selectedDrawerItem,
         navDrawerState: navDrawerState,
@@ -93,7 +95,11 @@ struct RegularView: View {
           toggleListScroll: $scrollUpTrigger,
           showSettings: $showSettings,
           selectedDrawerItem: $selectedDrawerItem,
-          homeViewModel: homeViewModel
+          columnVisibility: $columnVisibility,
+          homeViewModel: homeViewModel,
+          openDrawer: {
+            columnVisibility = .all
+          }
         )
         .environment(indexHolder)
       }