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

Remove searchService from the home activity

Browse Source
This commit is contained in:
davide
2022-08-13 17:34:09 +02:00
parent 554b8df9d0
commit e6c70c66fc
7 changed files with 52 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/Repository.kt
View File

@ -8,7 +8,10 @@ interface Repository {
var items: ArrayList<SelfossModel.Item>
var baseUrl: String
var selectedType: String
var displayedItems: String
// Settings
var itemsCaching: Boolean
// API
var apiMajorVersion: Int
@ -16,6 +19,10 @@ interface Repository {
var badgeAll: Int
var badgeStarred: Int
var tagFilter: SelfossModel.Tag?
var sourceFilter: SelfossModel.Source?
var searchFilter: String?
suspend fun getNewerItems(): ArrayList<SelfossModel.Item>
suspend fun getOlderItems(): ArrayList<SelfossModel.Item>
suspend fun reloadBadges(): Boolean

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

@ -19,7 +19,7 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
override var baseUrl = apiDetails.getBaseUrl()
override var selectedType = "unread"
override var displayedItems = "unread"
set(value) {
field = when (value) {
"all" -> "all"
@ -30,9 +30,11 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
}
}
private var selectedTag: SelfossModel.Tag? = null
private var selectedSource: SelfossModel.Source? = null
private var search: String? = null
override var tagFilter: SelfossModel.Tag? = null
override var sourceFilter: SelfossModel.Source? = null
override var searchFilter: String? = null
override var itemsCaching = settings.getBoolean("items_caching", false)
override var apiMajorVersion = 0
override var badgeUnread = 0
@ -52,12 +54,12 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
override suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
// TODO: Check connectivity
val fetchedItems = api.getItems(selectedType,
val fetchedItems = api.getItems(displayedItems,
settings.getString("prefer_api_items_number", "200").toInt(),
offset = 0,
selectedTag?.tag,
selectedSource?.id?.toLong(),
search)
tagFilter?.tag,
sourceFilter?.id?.toLong(),
searchFilter)
if (fetchedItems != null) {
items = ArrayList(fetchedItems)
@ -68,12 +70,12 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
override suspend fun getOlderItems(): ArrayList<SelfossModel.Item> {
// TODO: Check connectivity
val offset = items.size
val fetchedItems = api.getItems(selectedType,
val fetchedItems = api.getItems(displayedItems,
settings.getString("prefer_api_items_number", "200").toInt(),
offset,
selectedTag?.tag,
selectedSource?.id?.toLong(),
search)
tagFilter?.tag,
sourceFilter?.id?.toLong(),
searchFilter)
if (fetchedItems != null) {
items = ArrayList(fetchedItems)
@ -98,14 +100,14 @@ class RepositoryImpl(private val api: SelfossApi, private val apiDetails: ApiDet
private fun filterSelectedItems(items: ArrayList<SelfossModel.Item>): ArrayList<SelfossModel.Item> {
val tmpItems = ArrayList(items)
if (selectedType == "unread") {
if (displayedItems == "unread") {
tmpItems.removeAll { !it.unread }
} else if (selectedType == "starred") {
} else if (displayedItems == "starred") {
tmpItems.removeAll { !it.starred }
}
if (selectedTag != null) {
tmpItems.removeAll { !it.tags.contains(selectedTag!!.tag) }
if (tagFilter != null) {
tmpItems.removeAll { !it.tags.contains(tagFilter!!.tag) }
}
return tmpItems