Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup MangaScreenModel successState usage (#9582)

Browse Source 
* Refactor updateSuccessState

- Convert to inline function
- Use when for type safety if we add other MangaScreenState types

* Replace equivalent expressions with updateSuccessState

* Replace safe cast in MangaScreen

(cherry picked from commit cf777d989339a5190966b537aa493c5984d36a93)
This commit is contained in:
Two-Ai 2023-06-09 23:11:02 -04:00 committed by Jobobby04
parent ecdb4ed01c
commit a87a35ec73
2 changed files with 21 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
View File

@ -195,7 +195,7 @@ class MangaScreen(
// SY <-- // SY <--
val onDismissRequest = { screenModel.dismissDialog() } val onDismissRequest = { screenModel.dismissDialog() }
when (val dialog = (state as? MangaScreenState.Success)?.dialog) { when (val dialog = successState.dialog) {
null -> {} null -> {}
is MangaInfoScreenModel.Dialog.ChangeCategory -> { is MangaInfoScreenModel.Dialog.ChangeCategory -> {
ChangeCategoryDialog( ChangeCategoryDialog(

72
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
View File

@ -220,8 +220,13 @@ class MangaInfoScreenModel(
/** /**
* Helper function to update the UI state only if it's currently in success state * Helper function to update the UI state only if it's currently in success state
*/ */
private fun updateSuccessState(func: (MangaScreenState.Success) -> MangaScreenState.Success) { private inline fun updateSuccessState(func: (MangaScreenState.Success) -> MangaScreenState.Success) {
mutableState.update { if (it is MangaScreenState.Success) func(it) else it } mutableState.update {
when (it) {
MangaScreenState.Loading -> it
is MangaScreenState.Success -> func(it)
}
}
} }
init { init {
@ -696,12 +701,7 @@ class MangaInfoScreenModel(
val duplicate = getDuplicateLibraryManga.await(manga.title) val duplicate = getDuplicateLibraryManga.await(manga.title)
if (duplicate != null) { if (duplicate != null) {
mutableState.update { state -> updateSuccessState { it.copy(dialog = Dialog.DuplicateManga(manga, duplicate)) }
when (state) {
MangaScreenState.Loading -> state
is MangaScreenState.Success -> state.copy(dialog = Dialog.DuplicateManga(manga, duplicate))
}
}
return@launchIO return@launchIO
} }
} }
@ -758,16 +758,13 @@ class MangaInfoScreenModel(
coroutineScope.launch { coroutineScope.launch {
val categories = getCategories() val categories = getCategories()
val selection = getMangaCategoryIds(manga) val selection = getMangaCategoryIds(manga)
mutableState.update { state -> updateSuccessState { successState ->
when (state) { successState.copy(
MangaScreenState.Loading -> state dialog = Dialog.ChangeCategory(
is MangaScreenState.Success -> state.copy( manga = manga,
dialog = Dialog.ChangeCategory( initialSelection = categories.mapAsCheckboxState { it.id in selection },
manga = manga, ),
initialSelection = categories.mapAsCheckboxState { it.id in selection }, )
),
)
}
} }
} }
} }
@ -1489,52 +1486,23 @@ class MangaInfoScreenModel(
} }
fun dismissDialog() { fun dismissDialog() {
mutableState.update { state -> updateSuccessState { it.copy(dialog = null) }
when (state) {
MangaScreenState.Loading -> state
is MangaScreenState.Success -> state.copy(dialog = null)
}
}
} }
fun showDeleteChapterDialog(chapters: List<Chapter>) { fun showDeleteChapterDialog(chapters: List<Chapter>) {
mutableState.update { state -> updateSuccessState { it.copy(dialog = Dialog.DeleteChapters(chapters)) }
when (state) {
MangaScreenState.Loading -> state
is MangaScreenState.Success -> state.copy(dialog = Dialog.DeleteChapters(chapters))
}
}
} }
fun showSettingsDialog() { fun showSettingsDialog() {
mutableState.update { state -> updateSuccessState { it.copy(dialog = Dialog.SettingsSheet) }
when (state) {
MangaScreenState.Loading -> state
is MangaScreenState.Success -> state.copy(dialog = Dialog.SettingsSheet)
}
}
} }
fun showTrackDialog() { fun showTrackDialog() {
mutableState.update { state -> updateSuccessState { it.copy(dialog = Dialog.TrackSheet) }
when (state) {
MangaScreenState.Loading -> state
is MangaScreenState.Success -> {
state.copy(dialog = Dialog.TrackSheet)
}
}
}
} }
fun showCoverDialog() { fun showCoverDialog() {
mutableState.update { state -> updateSuccessState { it.copy(dialog = Dialog.FullCover) }
when (state) {
MangaScreenState.Loading -> state
is MangaScreenState.Success -> {
state.copy(dialog = Dialog.FullCover)
}
}
}
} }
// SY --> // SY -->