FreshRSS/Readrops
1
0
Fork 0
mirror of https://github.com/readrops/Readrops.git synced 2025-02-09 00:18:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add some filters in TimelineTab

Browse Source
This commit is contained in:
Shinokuni 2024-02-22 21:44:03 +01:00
parent adb56cdacf
commit 1cdb98eedb
5 changed files with 159 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
appcompose/src/main/java/com/readrops/app/compose/timelime/FilterBottomSheet.kt Normal file
View File

@ -0,0 +1,93 @@
package com.readrops.app.compose.timelime
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Checkbox
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.readrops.app.compose.R
import com.readrops.app.compose.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.spacing
import com.readrops.db.filters.ListSortType
import com.readrops.db.queries.QueryFilters
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun FilterBottomSheet(
viewModel: TimelineViewModel,
filters: QueryFilters,
onDismiss: () -> Unit,
) {
ModalBottomSheet(
onDismissRequest = onDismiss
) {
Column(
modifier = Modifier.padding(MaterialTheme.spacing.mediumSpacing)
) {
Text(
text = stringResource(R.string.filters)
)
ShortSpacer()
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.clickable { viewModel.setShowReadItemsState(!filters.showReadItems) }
) {
Checkbox(
checked = filters.showReadItems,
onCheckedChange = { viewModel.setShowReadItemsState(!filters.showReadItems) }
)
ShortSpacer()
Text(
text = stringResource(R.string.show_read_articles)
)
}
ShortSpacer()
fun setSortTypeState() {
viewModel.setSortTypeState(
if (filters.sortType == ListSortType.NEWEST_TO_OLDEST)
ListSortType.OLDEST_TO_NEWEST
else
ListSortType.NEWEST_TO_OLDEST
)
}
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.clickable { setSortTypeState() }
) {
Checkbox(
checked = filters.sortType == ListSortType.OLDEST_TO_NEWEST,
onCheckedChange = { setSortTypeState() }
)
ShortSpacer()
Text(
text = "Show oldest items first"
)
}
LargeSpacer()
}
}
}

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

@ -97,19 +97,33 @@ object TimelineTab : Tab {
}
}
if (state.confirmDialog) {
TwoChoicesDialog(
title = "Mark all items as read",
text = "Do you really want to mark all items as read?",
icon = painterResource(id = R.drawable.ic_rss_feed_grey),
confirmText = "Validate",
dismissText = "Cancel",
onDismiss = { viewModel.closeConfirmDialog() },
onConfirm = {
viewModel.closeConfirmDialog()
viewModel.setAllItemsRead()
}
)
when (state.dialog) {
DialogState.ConfirmDialog -> {
TwoChoicesDialog(
title = "Mark all items as read",
text = "Do you really want to mark all items as read?",
icon = painterResource(id = R.drawable.ic_rss_feed_grey),
confirmText = "Validate",
dismissText = "Cancel",
onDismiss = { viewModel.closeDialog() },
onConfirm = {
viewModel.closeDialog()
viewModel.setAllItemsRead()
}
)
}
DialogState.FilterSheet -> {
FilterBottomSheet(
viewModel = viewModel,
filters = state.filters,
onDismiss = {
viewModel.closeDialog()
}
)
}
null -> {}
}
ModalNavigationDrawer(
@ -155,7 +169,9 @@ object TimelineTab : Tab {
}
},
actions = {
IconButton(onClick = { }) {
IconButton(
onClick = { viewModel.openDialog(DialogState.FilterSheet) }
) {
Icon(
painter = painterResource(id = R.drawable.ic_filter_list),
contentDescription = null
@ -177,7 +193,7 @@ object TimelineTab : Tab {
FloatingActionButton(
onClick = {
if (state.filters.filterType == FilterType.NO_FILTER) {
viewModel.openConfirmDialog()
viewModel.openDialog(DialogState.ConfirmDialog)
} else {
viewModel.setAllItemsRead()
}

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

@ -15,6 +15,7 @@ import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder
import com.readrops.db.entities.Item
import com.readrops.db.filters.FilterType
import com.readrops.db.filters.ListSortType
import com.readrops.db.pojo.ItemWithFeed
import com.readrops.db.queries.ItemsQueryBuilder
import com.readrops.db.queries.QueryFilters
@ -197,6 +198,7 @@ class TimelineViewModel(
_timelineState.value.filters.filterFolderId,
currentAccount!!.id
)
FilterType.READ_IT_LATER_FILTER -> TODO()
FilterType.STARS_FILTER -> repository?.setAllStarredItemsRead(currentAccount!!.id)
FilterType.NO_FILTER -> repository?.setAllItemsRead(currentAccount!!.id)
@ -205,16 +207,32 @@ class TimelineViewModel(
}
}
fun openConfirmDialog() {
_timelineState.value = _timelineState.value.copy(
confirmDialog = true
)
fun openDialog(dialog: DialogState) = _timelineState.update { it.copy(dialog = dialog) }
fun closeDialog() = _timelineState.update { it.copy(dialog = null) }
fun setShowReadItemsState(showReadItems: Boolean) {
_timelineState.update {
it.copy(
filters = updateFilters {
it.filters.copy(
showReadItems = showReadItems
)
}
)
}
}
fun closeConfirmDialog() {
_timelineState.value = _timelineState.value.copy(
confirmDialog = false
)
fun setSortTypeState(sortType: ListSortType) {
_timelineState.update {
it.copy(
filters = updateFilters {
it.filters.copy(
sortType = sortType
)
}
)
}
}
}
@ -228,5 +246,10 @@ data class TimelineState(
val filterFolderName: String = "",
val foldersAndFeeds: Map<Folder?, List<Feed>> = emptyMap(),
val itemState: Flow<PagingData<ItemWithFeed>> = emptyFlow(),
val confirmDialog: Boolean = false
val dialog: DialogState? = null
)
sealed interface DialogState {
object ConfirmDialog : DialogState
object FilterSheet : DialogState
}

2
appcompose/src/main/res/values-fr/strings.xml
View File

@ -73,6 +73,7 @@
<string name="filter_oldest">Du plus ancien au plus récent</string>
<string name="login_failed">La connexion a échoué. Veuillez vérifier vos identifiants</string>
<string name="new_account">Nouveau compte</string>
<string name="new_articles">Nouveaux articles</string>
<string name="app_licence">Appli distribuée sous la licence GPLv3</string>
<string name="number_items_to_parse">Nombre maximum d\'articles par flux</string>
<string name="unlimited">Illimité</string>
@ -140,5 +141,6 @@
<string name="system">Thème du système</string>
<string name="hide_feeds">Cacher les flux sans nouveaux items</string>
<string name="mark_items_read">Marquer les items comme lus pendant le défilement</string>
<string name="filters">Filtres</string>
</resources>

1
appcompose/src/main/res/values/strings.xml
View File

@ -147,4 +147,5 @@
<string name="hide_feeds">Hide feeds without new items</string>
<string name="mark_items_read">Mark items read on scroll</string>
<string name="new_articles">New articles</string>
<string name="filters">Filters</string>
</resources>