FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix separateState use in ItemScreen

This commit is contained in:
Shinokuni 2024-08-08 21:54:22 +02:00
parent 0c3c3d8ddb
commit 65a49e7fc5
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/com/readrops/app/item/ItemScreenModel.kt
View File

@ -2,6 +2,7 @@ package com.readrops.app.item
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.net.Uri
@ -17,10 +18,13 @@ import com.readrops.app.util.Preferences
import com.readrops.db.Database
import com.readrops.db.entities.Item
import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType
import com.readrops.db.pojo.ItemWithFeed
import com.readrops.db.queries.ItemSelectionQueryBuilder
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import org.koin.core.component.KoinComponent
@ -29,6 +33,7 @@ import org.koin.core.parameter.parametersOf
import java.io.File
import java.io.FileOutputStream
@OptIn(ExperimentalCoroutinesApi::class)
class ItemScreenModel(
private val database: Database,
private val itemId: Int,
@ -43,8 +48,16 @@ class ItemScreenModel(
init {
screenModelScope.launch(dispatcher) {
database.accountDao().selectCurrentAccount()
.collect { account ->
.flatMapLatest { account ->
this@ItemScreenModel.account = account!!
if (account.accountType == AccountType.FEVER) {
get<SharedPreferences>().apply {
account.login = getString(account.loginKey, null)
account.password = getString(account.passwordKey, null)
}
}
repository = get { parametersOf(account) }
val query = ItemSelectionQueryBuilder.buildQuery(
@ -53,17 +66,17 @@ class ItemScreenModel(
)
database.itemDao().selectItemById(query)
.collect { itemWithFeed ->
mutableState.update {
it.copy(
itemWithFeed = itemWithFeed,
bottomBarState = BottomBarState(
isRead = itemWithFeed.item.isRead,
isStarred = itemWithFeed.item.isStarred
)
)
}
}
}
.collect { itemWithFeed ->
mutableState.update {
it.copy(
itemWithFeed = itemWithFeed,
bottomBarState = BottomBarState(
isRead = itemWithFeed.item.isRead,
isStarred = itemWithFeed.item.isStarred
)
)
}
}
}
@ -93,14 +106,12 @@ class ItemScreenModel(
}
fun setItemReadState(item: Item) {
//TODO support separateState
screenModelScope.launch(dispatcher) {
repository.setItemReadState(item)
}
}
fun setItemStarState(item: Item) {
//TODO support separateState
screenModelScope.launch(dispatcher) {
repository.setItemStarState(item)
}

12
db/src/main/java/com/readrops/db/queries/ItemSelectionQueryBuilder.kt
View File

@ -15,7 +15,6 @@ object ItemSelectionQueryBuilder {
"pub_date",
"image_link",
"author",
"Item.read",
"icon_url",
"color",
"read_time",
@ -26,8 +25,10 @@ object ItemSelectionQueryBuilder {
"Folder.name as folder_name"
)
private val SEPARATE_STATE_COLUMNS =
arrayOf("case When ItemState.starred = 1 Then 1 else 0 End starred")
private val SEPARATE_STATE_COLUMNS = arrayOf(
"case When ItemState.read = 1 Then 1 else 0 End read",
"case When ItemState.starred = 1 Then 1 else 0 End starred"
)
private const val JOIN =
"Item Inner Join Feed On Item.feed_id = Feed.id Left Join Folder on Folder.id = Feed.folder_id"
@ -42,7 +43,10 @@ object ItemSelectionQueryBuilder {
fun buildQuery(itemId: Int, separateState: Boolean): SupportSQLiteQuery {
val tables = if (separateState) JOIN + SEPARATE_STATE_JOIN else JOIN
val columns =
if (separateState) COLUMNS.plus(SEPARATE_STATE_COLUMNS) else COLUMNS.plus("starred")
if (separateState) COLUMNS.plus(SEPARATE_STATE_COLUMNS) else COLUMNS + arrayOf(
"Item.read",
"starred"
)
return SupportSQLiteQueryBuilder.builder(tables).run {
columns(columns)