From ba149db7094ff548d82cd4c8c3e2ab65997f223a Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Sun, 25 Feb 2024 22:57:34 +0100 Subject: [PATCH] Remove filter category * Remaining: delete database field read_it_later --- .../readrops/app/compose/timelime/TimelineItem.kt | 7 ------- .../readrops/app/compose/timelime/TimelineTab.kt | 2 -- .../app/compose/timelime/TimelineViewModel.kt | 1 - .../app/compose/timelime/drawer/TimelineDrawer.kt | 13 ------------- .../main/java/com/readrops/db/filters/FilterType.kt | 1 - .../com/readrops/db/queries/ItemsQueryBuilder.kt | 1 - 6 files changed, 25 deletions(-) diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt index 0bd45614..375d43c7 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt @@ -43,7 +43,6 @@ fun TimelineItem( itemWithFeed: ItemWithFeed, onClick: () -> Unit, onFavorite: () -> Unit, - onReadLater: () -> Unit, onShare: () -> Unit, modifier: Modifier = Modifier, compactLayout: Boolean = false, @@ -188,12 +187,6 @@ fun TimelineItem( modifier = Modifier.clickable { onFavorite() } ) - Icon( - painter = painterResource(id = R.drawable.ic_read_later), - contentDescription = null, - modifier = Modifier.clickable { onReadLater() } - ) - Icon( imageVector = Icons.Outlined.Share, contentDescription = null, diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt index faf7febf..c350f5c4 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt @@ -151,7 +151,6 @@ object TimelineTab : Tab { text = when (state.filters.filterType) { FilterType.FEED_FILTER -> state.filterFeedName FilterType.FOLDER_FILER -> state.filterFolderName - FilterType.READ_IT_LATER_FILTER -> stringResource(R.string.read_later) FilterType.STARS_FILTER -> stringResource(R.string.favorites) FilterType.NO_FILTER -> stringResource(R.string.articles) FilterType.NEW -> stringResource(R.string.new_articles) @@ -240,7 +239,6 @@ object TimelineTab : Tab { navigator.push(ItemScreen()) }, onFavorite = { viewModel.updateStarState(itemWithFeed.item) }, - onReadLater = {}, onShare = { viewModel.shareItem(itemWithFeed.item, context) }, diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt index b9945429..51ddee87 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineViewModel.kt @@ -199,7 +199,6 @@ class TimelineViewModel( currentAccount!!.id ) - FilterType.READ_IT_LATER_FILTER -> TODO() FilterType.STARS_FILTER -> repository?.setAllStarredItemsRead(currentAccount!!.id) FilterType.NO_FILTER -> repository?.setAllItemsRead(currentAccount!!.id) FilterType.NEW -> TODO() diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt index bb2c14e9..05ec7514 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt @@ -157,19 +157,6 @@ fun DrawerDefaultItems( onClick = { onClick(FilterType.STARS_FILTER) }, 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 diff --git a/db/src/main/java/com/readrops/db/filters/FilterType.kt b/db/src/main/java/com/readrops/db/filters/FilterType.kt index c8d0d62f..fb45e677 100644 --- a/db/src/main/java/com/readrops/db/filters/FilterType.kt +++ b/db/src/main/java/com/readrops/db/filters/FilterType.kt @@ -3,7 +3,6 @@ package com.readrops.db.filters; enum class FilterType { FEED_FILTER, FOLDER_FILER, - READ_IT_LATER_FILTER, STARS_FILTER, NO_FILTER, NEW diff --git a/db/src/main/java/com/readrops/db/queries/ItemsQueryBuilder.kt b/db/src/main/java/com/readrops/db/queries/ItemsQueryBuilder.kt index bab87346..56bc8522 100644 --- a/db/src/main/java/com/readrops/db/queries/ItemsQueryBuilder.kt +++ b/db/src/main/java/com/readrops/db/queries/ItemsQueryBuilder.kt @@ -65,7 +65,6 @@ object ItemsQueryBuilder { when (queryFilters.filterType) { 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.STARS_FILTER -> { if (separateState) { append("ItemState.starred = 1 And read_it_later = 0")