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

Remove filter category

Browse Source 
* Remaining: delete database field read_it_later
This commit is contained in:
Shinokuni 2024-02-25 22:57:34 +01:00
parent c4339acf31
commit ba149db709
6 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt
View File

@ -43,7 +43,6 @@ fun TimelineItem(
itemWithFeed: ItemWithFeed, itemWithFeed: ItemWithFeed,
onClick: () -> Unit, onClick: () -> Unit,
onFavorite: () -> Unit, onFavorite: () -> Unit,
onReadLater: () -> Unit,
onShare: () -> Unit, onShare: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
compactLayout: Boolean = false, compactLayout: Boolean = false,
@ -188,12 +187,6 @@ fun TimelineItem(
modifier = Modifier.clickable { onFavorite() } modifier = Modifier.clickable { onFavorite() }
) )
Icon(
painter = painterResource(id = R.drawable.ic_read_later),
contentDescription = null,
modifier = Modifier.clickable { onReadLater() }
)
Icon( Icon(
imageVector = Icons.Outlined.Share, imageVector = Icons.Outlined.Share,
contentDescription = null, contentDescription = null,

2
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt
View File

@ -151,7 +151,6 @@ object TimelineTab : Tab {
text = when (state.filters.filterType) { text = when (state.filters.filterType) {
FilterType.FEED_FILTER -> state.filterFeedName FilterType.FEED_FILTER -> state.filterFeedName
FilterType.FOLDER_FILER -> state.filterFolderName FilterType.FOLDER_FILER -> state.filterFolderName
FilterType.READ_IT_LATER_FILTER -> stringResource(R.string.read_later)
FilterType.STARS_FILTER -> stringResource(R.string.favorites) FilterType.STARS_FILTER -> stringResource(R.string.favorites)
FilterType.NO_FILTER -> stringResource(R.string.articles) FilterType.NO_FILTER -> stringResource(R.string.articles)
FilterType.NEW -> stringResource(R.string.new_articles) FilterType.NEW -> stringResource(R.string.new_articles)
@ -240,7 +239,6 @@ object TimelineTab : Tab {
navigator.push(ItemScreen()) navigator.push(ItemScreen())
}, },
onFavorite = { viewModel.updateStarState(itemWithFeed.item) }, onFavorite = { viewModel.updateStarState(itemWithFeed.item) },
onReadLater = {},
onShare = { onShare = {
viewModel.shareItem(itemWithFeed.item, context) viewModel.shareItem(itemWithFeed.item, context)
}, },

1
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt
View File

@ -199,7 +199,6 @@ class TimelineViewModel(
currentAccount!!.id currentAccount!!.id
) )
FilterType.READ_IT_LATER_FILTER -> TODO()
FilterType.STARS_FILTER -> repository?.setAllStarredItemsRead(currentAccount!!.id) FilterType.STARS_FILTER -> repository?.setAllStarredItemsRead(currentAccount!!.id)
FilterType.NO_FILTER -> repository?.setAllItemsRead(currentAccount!!.id) FilterType.NO_FILTER -> repository?.setAllItemsRead(currentAccount!!.id)
FilterType.NEW -> TODO() FilterType.NEW -> TODO()

13
appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt
View File

@ -157,19 +157,6 @@ fun DrawerDefaultItems(
onClick = { onClick(FilterType.STARS_FILTER) }, onClick = { onClick(FilterType.STARS_FILTER) },
modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding) modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
) )
NavigationDrawerItem(
label = { Text(text = stringResource(R.string.read_later)) },
icon = {
Icon(
painter = painterResource(id = R.drawable.ic_read_later),
contentDescription = null
)
},
selected = selectedItem == FilterType.READ_IT_LATER_FILTER,
onClick = { onClick(FilterType.READ_IT_LATER_FILTER) },
modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
)
} }
@Composable @Composable

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

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

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

@ -65,7 +65,6 @@ 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.FOLDER_FILER -> append("folder_id = ${queryFilters.filterFolderId} And read_it_later = 0")
FilterType.READ_IT_LATER_FILTER -> append("read_it_later = 1")
FilterType.STARS_FILTER -> { FilterType.STARS_FILTER -> {
if (separateState) { if (separateState) {
append("ItemState.starred = 1 And read_it_later = 0") append("ItemState.starred = 1 And read_it_later = 0")