Use pointers instead of recalc'ing next filter

Author: jocmp

app/src/main/java/com/capyreader/app/preferences/ArticleListVerticalSwipe.kt

@@ -4,12 +4,14 @@ import com.capyreader.app.R
 
 enum class ArticleListVerticalSwipe {
     DISABLED,
-    NEXT_FEED;
+    NEXT_FEED,
+    MARK_ALL_READ;
 
     val translationKey: Int
         get() = when (this) {
             DISABLED -> R.string.article_list_swipe_disabled
             NEXT_FEED -> R.string.article_list_swipe_next_feed
+            MARK_ALL_READ -> R.string.article_list_swipe_mark_all_read
         }
 
     companion object {

app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt

@@ -27,7 +27,7 @@ import com.jocmp.capy.Folder
 import com.jocmp.capy.MarkRead
 import com.jocmp.capy.SavedSearch
 import com.jocmp.capy.articles.ArticleContent
-import com.jocmp.capy.articles.NextFilter
+import com.jocmp.capy.articles.SidebarItem
 import com.jocmp.capy.common.UnauthorizedError
 import com.jocmp.capy.common.launchIO
 import com.jocmp.capy.common.launchUI
@@ -61,7 +61,7 @@ class ArticleScreenViewModel(
     val hideReadArticles =
         appPreferences.articleListOptions.hideReadArticles.stateIn(viewModelScope)
 
-    private val listSwipeBottom =
+    val listSwipeBottom =
         appPreferences.articleListOptions.swipeBottom.stateIn(viewModelScope)
 
     private val _searchQuery = MutableStateFlow("")
@@ -148,28 +148,35 @@ class ArticleScreenViewModel(
             ?.takeIf { it.count > 0 || filter.status != ArticleStatus.UNREAD }
     }
 
-    private val nextFilterListener: Flow<NextFilter?> =
+    private val sidebar: Flow<List<SidebarItem>> = combine(
+        readLaterFeed,
+        savedSearches,
+        folders,
+        topLevelFeeds,
+    ) { readLater, searches, fldrs, fds ->
+        SidebarItem.buildList(
+            readLaterFeed = readLater,
+            savedSearches = searches,
+            folders = fldrs,
+            feeds = fds,
+        )
+    }
+
+    private val _nextItem = MutableStateFlow<SidebarItem?>(null)
+
+    private val nextItemListener: Flow<SidebarItem?> =
         combine(
             listSwipeBottom,
-            savedSearches,
-            topLevelFeeds,
-            folders,
-            filter
-        ) { swipeBottom, savedSearches, feeds, folders, filter ->
+            sidebar,
+            filter,
+        ) { swipeBottom, sidebar, filter ->
             if (swipeBottom == ArticleListVerticalSwipe.DISABLED) {
                 return@combine null
             }
 
-            NextFilter.findSwipeDestination(
-                filter,
-                searches = savedSearches,
-                folders = folders,
-                feeds = feeds,
-            )
+            sidebar.find { it.isSelected(filter) }?.next
         }
 
-    private val _nextFilter = MutableStateFlow<NextFilter?>(null)
-
     val statusCount: Flow<Long> = filter.flatMapLatest { latestFilter ->
         account.countAllByStatus(countableStatus(latestFilter))
     }
@@ -202,13 +209,13 @@ class ArticleScreenViewModel(
     val searchState: Flow<SearchState>
         get() = _searchState
 
-    val nextFilter: Flow<NextFilter?>
-        get() = _nextFilter
+    val nextFilter: Flow<SidebarItem?>
+        get() = _nextItem
 
     init {
         viewModelScope.launch {
-            nextFilterListener.collect {
-                _nextFilter.value = it
+            nextItemListener.collect {
+                _nextItem.value = it
             }
         }
     }
@@ -268,9 +275,6 @@ class ArticleScreenViewModel(
     fun markAllRead(
         onArticlesCleared: () -> Unit,
         range: MarkRead,
-        searches: List<SavedSearch>,
-        folders: List<Folder>,
-        feeds: List<Feed>,
     ) {
         viewModelScope.launchIO {
             val articleIDs = account.unreadArticleIDs(
@@ -295,7 +299,7 @@ class ArticleScreenViewModel(
             if (afterReadAll.value == AfterReadAllBehavior.OPEN_DRAWER) {
                 onArticlesCleared()
             } else if (afterReadAll.value == AfterReadAllBehavior.OPEN_NEXT_FEED) {
-                openNextFeedOnAllRead(onArticlesCleared, searches, folders, feeds)
+                openNextFeedOnAllRead(onArticlesCleared)
             }
         }
     }
@@ -491,19 +495,12 @@ class ArticleScreenViewModel(
     }
 
     fun requestNextFeed() {
-        _nextFilter.value?.let(::selectNextFilter)
+        _nextItem.value?.let(::selectSidebarItem)
     }
 
-    private fun selectNextFilter(filter: NextFilter) {
-        when (filter) {
-            is NextFilter.FeedFilter -> selectFeed(
-                feedID = filter.feedID,
-                folderTitle = filter.folderTitle
-            )
-
-            is NextFilter.FolderFilter -> selectFolder(title = filter.folderTitle)
-            is NextFilter.SearchFilter -> selectSavedSearch(filter.savedSearchID)
-        }
+    private fun selectSidebarItem(item: SidebarItem) {
+        val filter = item.toFilter(currentStatus)
+        updateFilter(filter)
     }
 
     private fun addStar(articleID: String) {
@@ -681,19 +678,11 @@ class ArticleScreenViewModel(
 
     private fun openNextFeedOnAllRead(
         onArticlesCleared: () -> Unit,
-        searches: List<SavedSearch>,
-        folders: List<Folder>,
-        feeds: List<Feed>,
     ) {
-        val nextFilter = NextFilter.findMarkReadDestination(
-            latestFilter,
-            searches,
-            folders,
-            feeds,
-        )
+        val nextItem = _nextItem.value
 
-        if (nextFilter != null) {
-            selectNextFilter(nextFilter)
+        if (nextItem != null) {
+            selectSidebarItem(nextItem)
         } else {
             if (latestFilter.status == UNREAD) {
                 selectArticleFilter()

app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt

@@ -24,7 +24,6 @@ import com.jocmp.capy.Feed
 @Composable
 fun FilterActionMenu(
     filter: ArticleFilter,
-    onMarkAllRead: () -> Unit,
     onRequestSearch: () -> Unit,
     hideSearchIcon: Boolean,
     hideReadArticles: Boolean = false,
@@ -64,11 +63,7 @@ fun FilterActionMenu(
         }
 
         if (markReadPosition == MarkReadPosition.TOOLBAR) {
-            MarkAllReadButton(
-                onMarkAllRead = {
-                    onMarkAllRead()
-                },
-            )
+            MarkAllReadButton()
         }
     }
 }
@@ -78,7 +73,6 @@ fun FilterActionMenu(
 fun FeedActionsPreview(@PreviewParameter(FeedSample::class) feed: Feed) {
     PreviewKoinApplication {
         FilterActionMenu(
-            onMarkAllRead = {},
             onRequestSearch = {},
             filter = ArticleFilter.Feeds(
                 feedID = feed.id,
@@ -96,7 +90,6 @@ fun FeedActionsPreview(@PreviewParameter(FeedSample::class) feed: Feed) {
 fun FeedActionsPreviewFilterOff(@PreviewParameter(FeedSample::class) feed: Feed) {
     PreviewKoinApplication {
         FilterActionMenu(
-            onMarkAllRead = {},
             onRequestSearch = {},
             filter = ArticleFilter.Feeds(
                 feedID = feed.id,

app/src/main/java/com/capyreader/app/ui/articles/FilterActionMenu.kt

@@ -43,7 +43,6 @@ fun ArticleListTopBar(
     onRequestJumpToTop: () -> Unit,
     onNavigateToDrawer: () -> Unit,
     scrollBehavior: TopAppBarScrollBehavior,
-    onMarkAllRead: () -> Unit,
     search: ArticleSearch,
     filter: ArticleFilter,
     feeds: List<Feed>,
@@ -139,7 +138,6 @@ fun ArticleListTopBar(
             FilterActionMenu(
                 filter = filter,
                 onRequestSearch = { search.start() },
-                onMarkAllRead = { onMarkAllRead() },
                 hideSearchIcon = enableSearch,
                 hideReadArticles = hideReadArticles,
                 onToggleHideReadArticles = onToggleHideReadArticles,
@@ -157,7 +155,6 @@ private fun FeedListTopBarPreview() {
         onRequestJumpToTop = { },
         onNavigateToDrawer = { },
         scrollBehavior = scrollBehavior,
-        onMarkAllRead = {},
         search = ArticleSearch(),
         filter = ArticleFilter.default(),
         feeds = listOf(),

app/src/main/java/com/capyreader/app/ui/articles/list/ArticleListTopBar.kt

@@ -0,0 +1,5 @@
+package com.capyreader.app.ui.articles.list
+
+import androidx.compose.runtime.compositionLocalOf
+
+val LocalMarkAllRead = compositionLocalOf<() -> Unit> { {} }

app/src/main/java/com/capyreader/app/ui/articles/list/LocalMarkAllRead.kt

@@ -11,37 +11,17 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import com.capyreader.app.R
 import com.capyreader.app.ui.LocalUnreadCount
 import com.capyreader.app.ui.articles.MarkReadPosition
 
 @Composable
 fun MarkAllReadButton(
-    onMarkAllRead: () -> Unit,
     position: MarkReadPosition = MarkReadPosition.TOOLBAR,
 ) {
     val unreadCount = LocalUnreadCount.current
-    val confirmationEnabled by rememberMarkAllReadState()
-
-    val (isDialogOpen, setDialogOpen) = remember {
-        mutableStateOf(false)
-    }
-
-    val closeDialog = {
-        setDialogOpen(false)
-    }
-
-    val onClick = {
-        if (confirmationEnabled) {
-            setDialogOpen(true)
-        } else {
-            onMarkAllRead()
-        }
-    }
+    val requestMarkAllRead = LocalMarkAllRead.current
 
     if (position == MarkReadPosition.FLOATING_ACTION_BUTTON) {
         AnimatedVisibility(
@@ -52,9 +32,7 @@ fun MarkAllReadButton(
             FloatingActionButton(
                 containerColor = MaterialTheme.colorScheme.primary,
                 shape = CircleShape,
-                onClick = {
-                    onClick()
-                }
+                onClick = { requestMarkAllRead() }
             ) {
                 Icon(
                     imageVector = Icons.Filled.CheckCircle,
@@ -65,24 +43,12 @@ fun MarkAllReadButton(
     } else {
         IconButton(
             enabled = unreadCount > 0,
-            onClick = {
-                onClick()
-            }
+            onClick = { requestMarkAllRead() }
         ) {
             Icon(
                 imageVector = Icons.Filled.CheckCircle,
                 contentDescription = stringResource(R.string.action_mark_all_read)
             )
         }
     }
-
-    if (isDialogOpen) {
-        MarkAllReadDialog(
-            onConfirm = {
-                closeDialog()
-                onMarkAllRead()
-            },
-            onDismissRequest = { closeDialog() }
-        )
-    }
 }

app/src/main/java/com/capyreader/app/ui/articles/list/MarkAllReadButton.kt

@@ -10,7 +10,7 @@ import androidx.compose.ui.platform.LocalHapticFeedback
 import com.capyreader.app.ui.components.pullrefresh.SwipeRefresh
 
 @Composable
-fun PullToNextFeedBox(
+fun SwipeUpActionBox(
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     onRequestNext: () -> Unit,

app/src/main/java/com/capyreader/app/ui/articles/list/MarkAllReadState.kt

@@ -256,6 +256,7 @@
     <string name="article_list_row_swipe_toggle_read">Toggle Read</string>
     <string name="article_list_row_swipe_toggle_starred">Toggle Starred</string>
     <string name="article_list_swipe_next_feed">Go to next feed</string>
+    <string name="article_list_swipe_mark_all_read">Mark all as read</string>
     <string name="article_list_swipe_disabled">Disabled</string>
     <string name="article_list_sort_title">Article Sort</string>
     <string name="article_list_sort_newest_first">Newest First</string>