Louvorg/ReaderForSelfoss-multiplatform
3
2
Fork 2
Code Issues 6 Pull Requests 2 Actions Releases 84 Wiki Activity

Filters working.

Browse Source
This commit is contained in:
aminecmi
2022-12-05 22:29:06 +01:00
parent 86c50d4881
commit 748ed41096
4 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
View File

@ -23,8 +23,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
var displayedItems = ItemType.UNREAD
var tagFilter: SelfossModel.Tag? = null
var sourceFilter: SelfossModel.Source? = null
private var _tagFilter = MutableStateFlow<SelfossModel.Tag?>(null)
var tagFilter = _tagFilter.asStateFlow()
private var _sourceFilter = MutableStateFlow<SelfossModel.Source?>(null)
var sourceFilter = _sourceFilter.asStateFlow()
var searchFilter: String? = null
var offlineOverride = false
@ -47,8 +49,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
fetchedItems = api.getItems(
displayedItems.type,
offset = 0,
tagFilter?.tag,
sourceFilter?.id?.toLong(),
tagFilter.value?.tag,
sourceFilter.value?.id?.toLong(),
searchFilter,
null
)
@ -61,10 +63,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
(it.starred && displayedItems == ItemType.STARRED)
}
if (tagFilter != null) {
dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter!!.tag) }
dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value?.tag) }
}
if (sourceFilter != null) {
dbItems = dbItems.filter { it.sourcetitle == sourceFilter!!.title }
dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value?.title }
}
fetchedItems = StatusAndData.succes(
dbItems.map { it.toView() }
@ -88,8 +90,8 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
fetchedItems = api.getItems(
displayedItems.type,
offset,
tagFilter?.tag,
sourceFilter?.id?.toLong(),
tagFilter.value?.tag,
sourceFilter.value?.id?.toLong(),
searchFilter,
null
)
@ -505,4 +507,12 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
deleteDBAction(action)
}
}
fun setTagFilter(tag: SelfossModel.Tag?) {
_tagFilter.value = tag
}
fun setSourceFilter(source: SelfossModel.Source?) {
_sourceFilter.value = source
}
}