FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a new folder filter

Browse Source
This commit is contained in:
Shinokuni 2021-07-11 18:55:38 +02:00
parent bd333afbf2
commit 38bd3e3ae5
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/readrops/app/itemslist/MainViewModel.java
View File

@ -115,6 +115,10 @@ public class MainViewModel extends ViewModel {
queryFilters.setFilterFeedId(filterFeedId); queryFilters.setFilterFeedId(filterFeedId);
} }
public void setFilerFolderId(int folderId) {
queryFilters.setFilterFolderId(folderId);
}
public MediatorLiveData<PagedList<ItemWithFeed>> getItemsWithFeed() { public MediatorLiveData<PagedList<ItemWithFeed>> getItemsWithFeed() {
return itemsWithFeed; return itemsWithFeed;
} }

1
db/src/main/java/com/readrops/db/filters/FilterType.java
View File

@ -2,6 +2,7 @@ package com.readrops.db.filters;
public enum FilterType { public enum FilterType {
FEED_FILTER, FEED_FILTER,
FOLDER_FILER,
READ_IT_LATER_FILTER, READ_IT_LATER_FILTER,
STARS_FILTER, STARS_FILTER,
NO_FILTER NO_FILTER

2
db/src/main/java/com/readrops/db/queries/ItemsQueryBuilder.kt
View File

@ -64,6 +64,7 @@ object ItemsQueryBuilder {
when (queryFilters.filterType) { when (queryFilters.filterType) {
FilterType.FEED_FILTER -> append("feed_id = ${queryFilters.filterFeedId} And read_it_later = 0") FilterType.FEED_FILTER -> append("feed_id = ${queryFilters.filterFeedId} And read_it_later = 0")
FilterType.FOLDER_FILER -> append("folder_id = ${queryFilters.filterFolderId} And read_it_later = 0")
FilterType.READ_IT_LATER_FILTER -> append("read_it_later = 1") FilterType.READ_IT_LATER_FILTER -> append("read_it_later = 1")
FilterType.STARS_FILTER -> { FilterType.STARS_FILTER -> {
if (separateState) { if (separateState) {
@ -83,6 +84,7 @@ object ItemsQueryBuilder {
class QueryFilters( class QueryFilters(
var showReadItems: Boolean = true, var showReadItems: Boolean = true,
var filterFeedId: Int = 0, var filterFeedId: Int = 0,
var filterFolderId: Int = 0,
var accountId: Int = 0, var accountId: Int = 0,
var filterType: FilterType = FilterType.NO_FILTER, var filterType: FilterType = FilterType.NO_FILTER,
var sortType: ListSortType = ListSortType.NEWEST_TO_OLDEST, var sortType: ListSortType = ListSortType.NEWEST_TO_OLDEST,