[FreshRSS] Add support to fetch user labels (#736)

* Add user label database tables

* Save label articles on refetch

* Display user labels and articles

* Add next filter handling

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

@@ -57,6 +57,7 @@ import com.jocmp.capy.ArticleStatus
 import com.jocmp.capy.Feed
 import com.jocmp.capy.Folder
 import com.jocmp.capy.MarkRead
+import com.jocmp.capy.SavedSearch
 import com.jocmp.capy.common.launchUI
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -70,6 +71,7 @@ fun ArticleLayout(
     filter: ArticleFilter,
     folders: List<Folder>,
     feeds: List<Feed>,
+    savedSearches: List<SavedSearch>,
     allFeeds: List<Feed>,
     allFolders: List<Folder>,
     articles: LazyPagingItems<Article>,
@@ -79,6 +81,7 @@ fun ArticleLayout(
     refreshInterval: RefreshInterval,
     onFeedRefresh: (completion: () -> Unit) -> Unit,
     onSelectFolder: (folderTitle: String) -> Unit,
+    onSelectSavedSearch: (savedSearchID: String) -> Unit,
     onSelectFeed: (feedID: String, folderTitle: String?) -> Unit,
     onSelectArticleFilter: () -> Unit,
     onSelectStatus: (status: ArticleStatus) -> Unit,
@@ -301,6 +304,14 @@ fun ArticleLayout(
         }
     }
 
+    fun selectSavedSearch(savedSearch: SavedSearch) {
+        if (!filter.isSavedSearchSelected(savedSearch)) {
+            openNextList { onSelectSavedSearch(savedSearch.id) }
+        } else {
+            closeDrawer()
+        }
+    }
+
     ArticleHandler {
         selectArticle(it)
     }
@@ -315,6 +326,8 @@ fun ArticleLayout(
                 onSelectFolder = ::selectFolder,
                 onSelectFeed = ::selectFeed,
                 onFeedAdded = { onFeedAdded(it) },
+                savedSearches = savedSearches,
+                onSelectSavedSearch = ::selectSavedSearch,
                 onNavigateToSettings = onNavigateToSettings,
                 onFilterSelect = ::selectFilter,
                 filter = filter,
@@ -362,7 +375,8 @@ fun ArticleLayout(
                         filter = filter,
                         currentFeed = currentFeed,
                         feeds = allFeeds,
-                        allFolders = allFolders
+                        savedSearches = savedSearches,
+                        folders = allFolders
                     )
                 },
                 snackbarHost = {

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

@@ -29,6 +29,7 @@ fun ArticleScreen(
     val allFeeds by viewModel.allFeeds.collectAsStateWithLifecycle(initialValue = emptyList())
     val allFolders by viewModel.allFolders.collectAsStateWithLifecycle(initialValue = emptyList())
     val folders by viewModel.folders.collectAsStateWithLifecycle(initialValue = emptyList())
+    val savedSearches by viewModel.savedSearches.collectAsStateWithLifecycle(initialValue = emptyList())
     val statusCount by viewModel.statusCount.collectAsStateWithLifecycle(initialValue = 0)
     val filter by viewModel.filter.collectAsStateWithLifecycle(appPreferences.filter.get())
     val searchQuery by viewModel.searchQuery.collectAsState(initial = null)
@@ -51,6 +52,7 @@ fun ArticleScreen(
         ArticleLayout(
             filter = filter,
             folders = folders,
+            savedSearches = savedSearches,
             feeds = feeds,
             allFolders = allFolders,
             allFeeds = allFeeds,
@@ -64,6 +66,7 @@ fun ArticleScreen(
             drawerState = drawerState,
             onSelectFolder = viewModel::selectFolder,
             onSelectFeed = viewModel::selectFeed,
+            onSelectSavedSearch = viewModel::selectSavedSearch,
             onSelectArticleFilter = viewModel::selectArticleFilter,
             onSelectStatus = viewModel::selectStatus,
             onSelectArticle = viewModel::selectArticle,
@@ -78,8 +81,9 @@ fun ArticleScreen(
                             drawerState.open()
                         }
                     },
-                    feeds = feeds,
+                    searches = savedSearches,
                     folders = folders,
+                    feeds = feeds,
                     range = range,
                 )
             },

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

@@ -21,6 +21,7 @@ import com.jocmp.capy.ArticleStatus
 import com.jocmp.capy.Feed
 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.buildArticlePager
@@ -92,6 +93,8 @@ class ArticleScreenViewModel(
             .withPositiveCount(filter.status)
     }
 
+    val savedSearches = account.savedSearches
+
     val allFeeds = account.allFeeds
 
     val allFolders = account.folders
@@ -106,8 +109,13 @@ class ArticleScreenViewModel(
     }
 
     private val nextFilterListener: Flow<NextFilter?> =
-        combine(feeds, folders, filter) { feeds, folders, filter ->
-            NextFilter.findSwipeDestination(filter, feeds, folders)
+        combine(savedSearches, feeds, folders, filter) { savedSearches, feeds, folders, filter ->
+            NextFilter.findSwipeDestination(
+                filter,
+                searches = savedSearches,
+                folders = folders,
+                feeds = feeds,
+            )
         }
 
     private val _nextFilter = MutableStateFlow<NextFilter?>(null)
@@ -161,6 +169,18 @@ class ArticleScreenViewModel(
         }
     }
 
+    fun selectSavedSearch(savedSearchID: String) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val savedSearch = account.findSavedSearch(savedSearchID) ?: return@launch
+            val searchFilter = ArticleFilter.SavedSearches(
+                savedSearch.id,
+                savedSearchStatus = latestFilter.status
+            )
+
+            updateFilter(searchFilter)
+        }
+    }
+
     fun selectFolder(title: String) {
         viewModelScope.launch(Dispatchers.IO) {
             val folder = account.findFolder(title) ?: return@launch
@@ -177,8 +197,9 @@ class ArticleScreenViewModel(
     fun markAllRead(
         onArticlesCleared: () -> Unit,
         range: MarkRead,
-        feeds: List<Feed>,
+        searches: List<SavedSearch>,
         folders: List<Folder>,
+        feeds: List<Feed>,
     ) {
         viewModelScope.launchIO {
             val articleIDs = account.unreadArticleIDs(
@@ -202,7 +223,7 @@ class ArticleScreenViewModel(
             if (afterReadAll.value == AfterReadAllBehavior.OPEN_DRAWER) {
                 clearArticlesOnAllRead(onArticlesCleared)
             } else if (afterReadAll.value == AfterReadAllBehavior.OPEN_NEXT_FEED) {
-                openNextFeedOnAllRead(onArticlesCleared, feeds, folders)
+                openNextFeedOnAllRead(onArticlesCleared, searches, folders, feeds)
             }
         }
     }
@@ -337,6 +358,7 @@ class ArticleScreenViewModel(
             )
 
             is NextFilter.FolderFilter -> selectFolder(title = filter.folderTitle)
+            is NextFilter.SearchFilter -> selectSavedSearch(filter.savedSearchID)
         }
     }
 
@@ -511,11 +533,13 @@ class ArticleScreenViewModel(
 
     private fun openNextFeedOnAllRead(
         onArticlesCleared: () -> Unit,
-        feeds: List<Feed>,
+        searches: List<SavedSearch>,
         folders: List<Folder>,
+        feeds: List<Feed>,
     ) {
         val nextFilter = NextFilter.findMarkReadDestination(
             latestFilter,
+            searches,
             folders,
             feeds,
         )

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

@@ -31,14 +31,17 @@ import com.jocmp.capy.ArticleFilter
 import com.jocmp.capy.ArticleStatus
 import com.jocmp.capy.Feed
 import com.jocmp.capy.Folder
+import com.jocmp.capy.SavedSearch
 
 @Composable
 fun FeedList(
     filter: ArticleFilter,
     statusCount: Long,
     folders: List<Folder> = emptyList(),
     feeds: List<Feed> = emptyList(),
+    savedSearches: List<SavedSearch> = emptyList(),
     onFilterSelect: () -> Unit,
+    onSelectSavedSearch: (search: SavedSearch) -> Unit,
     onSelectFolder: (folder: Folder) -> Unit,
     onSelectFeed: (feed: Feed, folderTitle: String?) -> Unit,
     onFeedAdded: (feedID: String) -> Unit,
@@ -105,6 +108,19 @@ fun FeedList(
                 }
             )
 
+            if (savedSearches.isNotEmpty()) {
+                FeedListDivider()
+                ListHeadline(text = stringResource(R.string.nav_headline_saved_searches))
+
+                savedSearches.forEach {
+                    SavedSearchRow(
+                        onSelect = onSelectSavedSearch,
+                        selected = filter.isSavedSearchSelected(it),
+                        savedSearch = it,
+                    )
+                }
+            }
+
             if (folders.isNotEmpty()) {
                 FeedListDivider()
                 ListHeadline(text = stringResource(R.string.nav_headline_tags))
@@ -183,6 +199,7 @@ fun FeedListPreview() {
         filter = ArticleFilter.default(),
         statusCount = 10,
         onFeedAdded = {},
-        onSelectStatus = {}
+        onSelectStatus = {},
+        onSelectSavedSearch = {}
     )
 }

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

@@ -19,12 +19,14 @@ import com.capyreader.app.ui.navigationTitle
 import com.jocmp.capy.ArticleFilter
 import com.jocmp.capy.Feed
 import com.jocmp.capy.Folder
+import com.jocmp.capy.SavedSearch
 
 @Composable
 fun FilterAppBarTitle(
     filter: ArticleFilter,
     allFeeds: List<Feed>,
     allFolders: List<Folder>,
+    allSavedSearches: List<SavedSearch>,
     onRequestJumpToTop: () -> Unit
 ) {
     val text = when (filter) {
@@ -36,6 +38,9 @@ fun FilterAppBarTitle(
         is ArticleFilter.Folders -> {
             allFolders.find { it.title == filter.folderTitle }?.title
         }
+
+        is ArticleFilter.SavedSearches ->
+            allSavedSearches.find { it.id == filter.savedSearchID }?.name
     }.orEmpty()
 
     Box(
@@ -67,6 +72,7 @@ fun FilterAppBarTitlePreview() {
                 filter = ArticleFilter.default(),
                 allFeeds = emptyList(),
                 allFolders = emptyList(),
+                allSavedSearches = emptyList(),
                 onRequestJumpToTop = {}
             )
         })

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

@@ -0,0 +1,40 @@
+package com.capyreader.app.ui.articles
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationDrawerItem
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import com.jocmp.capy.SavedSearch
+
+@Composable
+fun SavedSearchRow(
+    onSelect: (savedSearch: SavedSearch) -> Unit,
+    selected: Boolean,
+    savedSearch: SavedSearch,
+) {
+    NavigationDrawerItem(
+        label = { ListTitle(savedSearch.name) },
+        selected = selected,
+        onClick = {
+            onSelect(savedSearch)
+        }
+    )
+}
+
+@Preview
+@Composable
+fun SavedSearchRowPreview() {
+    val savedSearch = SavedSearch(
+        id = "123",
+        name = "Galaxy S25",
+        query = null,
+    )
+
+    MaterialTheme {
+        SavedSearchRow (
+            savedSearch = savedSearch,
+            onSelect = {},
+            selected = false
+        )
+    }
+}

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

@@ -37,6 +37,7 @@ import com.jocmp.capy.ArticleFilter
 import com.jocmp.capy.Feed
 import com.jocmp.capy.Folder
 import com.jocmp.capy.MarkRead
+import com.jocmp.capy.SavedSearch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -52,7 +53,8 @@ fun FeedListTopBar(
     filter: ArticleFilter,
     currentFeed: Feed?,
     feeds: List<Feed>,
-    allFolders: List<Folder>,
+    savedSearches: List<SavedSearch>,
+    folders: List<Folder>,
 ) {
     val editSuccessMessage = stringResource(R.string.feed_action_edit_success)
     val unsubscribeMessage = stringResource(R.string.feed_action_unsubscribe_success)
@@ -116,7 +118,8 @@ fun FeedListTopBar(
                 FilterAppBarTitle(
                     filter = filter,
                     allFeeds = feeds,
-                    allFolders = allFolders,
+                    allFolders = folders,
+                    allSavedSearches = savedSearches,
                     onRequestJumpToTop = onRequestJumpToTop
                 )
             }
@@ -189,6 +192,7 @@ private fun FeedListTopBarPreview() {
         filter = ArticleFilter.default(),
         currentFeed = null,
         feeds = listOf(),
-        allFolders = emptyList()
+        savedSearches = emptyList(),
+        folders = emptyList()
     )
 }

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -211,4 +211,4 @@
     <string name="settings_enable_high_contrast_dark_theme">Omogućite tamnu temu visokog kontrasta</string>
     <string name="settings_gestures_reader_tap_to_page_title">E Mastilo dodirnite za pomeranje</string>
     <string name="settings_gestures_reader_tap_to_page_subtitle">Dodirnite donje uglove da biste se kretali po sadržaju članka</string>
-</resources>
+</resources>

app/src/main/res/values-cy/strings.xml

@@ -212,4 +212,4 @@
     <string name="add_account_freshrss_signup_link_text">Dysgu mwy.</string>
     <string name="transfers_export_subscriptions">Allforio\'r tanysgrifiadau</string>
     <string name="article_view_open_externally">Agor yn allanol</string>
-</resources>
+</resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -220,4 +220,4 @@
     <string name="full_content_error_generic">Falha ao analisar artigo</string>
     <string name="settings_donate_button">Doar</string>
     <string name="after_read_all_behavior_default">Padrão</string>
-</resources>
+</resources>

app/src/main/res/values-ta/strings.xml

@@ -207,4 +207,4 @@
     <string name="settings_confirm_mark_all_read">அனைத்தையும் படித்ததாகக் குறிப்பதை உறுதிப்படுத்தவும்</string>
     <string name="settings_mark_read_on_scroll">சுருளில் படிக்க மார்க்</string>
     <string name="settings_section_browser">உலாவி</string>
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -45,6 +45,7 @@
     </plurals>
     <string name="refresh_feeds_menu_label">Refresh Feeds</string>
     <string name="nav_headline_tags">Tags</string>
+    <string name="nav_headline_saved_searches">Searches</string>
     <string name="nav_headline_feeds">Feeds</string>
     <string name="nav_add_feed">Add Feed</string>
     <string name="add_feed_feed_not_error">Couldn\'t find feed</string>