Replace StateViewModel with explicit backing fields (#3763)

Assisted-by: Claude:claude-opus-5
This commit is contained in:
AntsyLich
2026-08-15 01:53:06 +06:00
committed by GitHub
parent d00efa4bfc
commit b1efee47f5
21 changed files with 184 additions and 127 deletions
@@ -30,6 +30,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastMap
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel
import cafe.adriel.voyager.navigator.LocalNavigator
@@ -39,9 +40,10 @@ import eu.kanade.presentation.components.AppBar
import eu.kanade.presentation.components.AppBarActions
import eu.kanade.presentation.util.Screen
import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.update
import mihon.core.viewmodel.StateViewModel
import tachiyomi.core.common.util.lang.launchIO
import tachiyomi.core.common.util.lang.launchUI
import tachiyomi.core.common.util.lang.toLong
@@ -220,7 +222,11 @@ class ClearDatabaseScreen : Screen() {
}
}
class ClearDatabaseViewModel : StateViewModel<ClearDatabaseViewModel.State>(State.Loading) {
class ClearDatabaseViewModel : ViewModel() {
val state: StateFlow<ClearDatabaseViewModel.State>
field = MutableStateFlow<ClearDatabaseViewModel.State>(State.Loading)
private val getSourcesWithNonLibraryManga: GetSourcesWithNonLibraryManga = Injekt.get()
private val database: Database = Injekt.get()
@@ -228,7 +234,7 @@ class ClearDatabaseViewModel : StateViewModel<ClearDatabaseViewModel.State>(Stat
viewModelScope.launchIO {
getSourcesWithNonLibraryManga.subscribe()
.collectLatest { list ->
mutableState.update { old ->
state.update { old ->
val items = list.sortedBy { it.name }
when (old) {
State.Loading -> State.Ready(items)
@@ -245,7 +251,7 @@ class ClearDatabaseViewModel : StateViewModel<ClearDatabaseViewModel.State>(Stat
database.historyQueries.removeResettedHistory()
}
fun toggleSelection(source: Source) = mutableState.update { state ->
fun toggleSelection(source: Source) = state.update { state ->
if (state !is State.Ready) return@update state
val mutableList = state.selection.toMutableList()
if (mutableList.contains(source.id)) {
@@ -256,17 +262,17 @@ class ClearDatabaseViewModel : StateViewModel<ClearDatabaseViewModel.State>(Stat
state.copy(selection = mutableList)
}
fun clearSelection() = mutableState.update { state ->
fun clearSelection() = state.update { state ->
if (state !is State.Ready) return@update state
state.copy(selection = emptyList())
}
fun selectAll() = mutableState.update { state ->
fun selectAll() = state.update { state ->
if (state !is State.Ready) return@update state
state.copy(selection = state.items.fastMap { it.id })
}
fun invertSelection() = mutableState.update { state ->
fun invertSelection() = state.update { state ->
if (state !is State.Ready) return@update state
state.copy(
selection = state.items
@@ -275,12 +281,12 @@ class ClearDatabaseViewModel : StateViewModel<ClearDatabaseViewModel.State>(Stat
)
}
fun showConfirmation() = mutableState.update { state ->
fun showConfirmation() = state.update { state ->
if (state !is State.Ready) return@update state
state.copy(showConfirmation = true)
}
fun hideConfirmation() = mutableState.update { state ->
fun hideConfirmation() = state.update { state ->
if (state !is State.Ready) return@update state
state.copy(showConfirmation = false)
}
@@ -11,6 +11,7 @@ import androidx.compose.runtime.Immutable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewmodel.compose.viewModel
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
@@ -22,8 +23,9 @@ import eu.kanade.tachiyomi.data.backup.create.BackupCreator
import eu.kanade.tachiyomi.data.backup.create.BackupOptions
import eu.kanade.tachiyomi.util.system.DeviceUtil
import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
import mihon.core.viewmodel.StateViewModel
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.LabeledCheckbox
import tachiyomi.presentation.core.components.LazyColumnWithAction
@@ -119,10 +121,13 @@ class CreateBackupScreen : Screen() {
}
}
class CreateBackupViewModel : StateViewModel<CreateBackupViewModel.State>(State()) {
class CreateBackupViewModel : ViewModel() {
val state: StateFlow<CreateBackupViewModel.State>
field = MutableStateFlow<CreateBackupViewModel.State>(State())
fun toggle(setter: (BackupOptions, Boolean) -> BackupOptions, enabled: Boolean) {
mutableState.update {
state.update {
it.copy(
options = setter(it.options, enabled),
)
@@ -20,6 +20,7 @@ import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.core.net.toUri
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.lifecycle.viewmodel.initializer
@@ -33,8 +34,9 @@ import eu.kanade.tachiyomi.data.backup.BackupFileValidator
import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
import eu.kanade.tachiyomi.data.backup.restore.RestoreOptions
import eu.kanade.tachiyomi.util.system.DeviceUtil
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
import mihon.core.viewmodel.StateViewModel
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.LabeledCheckbox
import tachiyomi.presentation.core.components.LazyColumnWithAction
@@ -176,7 +178,10 @@ class RestoreBackupScreen(
class RestoreBackupViewModel(
private val context: Context,
private val uri: String,
) : StateViewModel<RestoreBackupViewModel.State>(State()) {
) : ViewModel() {
val state: StateFlow<RestoreBackupViewModel.State>
field = MutableStateFlow<RestoreBackupViewModel.State>(State())
companion object {
val URI_KEY = CreationExtras.Key<String>()
@@ -196,7 +201,7 @@ class RestoreBackupViewModel(
}
fun toggle(setter: (RestoreOptions, Boolean) -> RestoreOptions, enabled: Boolean) {
mutableState.update {
state.update {
it.copy(
options = setter(it.options, enabled),
)
@@ -234,7 +239,7 @@ class RestoreBackupViewModel(
}
private fun setError(error: Any?, canRestore: Boolean) {
mutableState.update {
state.update {
it.copy(
error = error,
canRestore = canRestore,