Update Voyager
(cherry picked from commit 012854dd1e13eedecd92419fd6a4d1d5cc900462) # Conflicts: # app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
This commit is contained in:
@@ -4,7 +4,7 @@ import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import cafe.adriel.voyager.core.model.StateScreenModel
|
||||
import cafe.adriel.voyager.core.model.coroutineScope
|
||||
import cafe.adriel.voyager.core.model.screenModelScope
|
||||
import eu.kanade.domain.manga.interactor.GetPagePreviews
|
||||
import eu.kanade.domain.manga.model.PagePreview
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
@@ -35,7 +35,7 @@ class PagePreviewScreenModel(
|
||||
var pageDialogOpen by mutableStateOf(false)
|
||||
|
||||
init {
|
||||
coroutineScope.launchIO {
|
||||
screenModelScope.launchIO {
|
||||
val manga = getManga.await(mangaId)!!
|
||||
val chapter = getChapterByMangaId.await(mangaId).minByOrNull { it.sourceOrder }
|
||||
if (chapter == null) {
|
||||
|
||||
@@ -2,7 +2,7 @@ package exh.ui.batchadd
|
||||
|
||||
import android.content.Context
|
||||
import cafe.adriel.voyager.core.model.StateScreenModel
|
||||
import cafe.adriel.voyager.core.model.coroutineScope
|
||||
import cafe.adriel.voyager.core.model.screenModelScope
|
||||
import eu.kanade.tachiyomi.R
|
||||
import exh.GalleryAddEvent
|
||||
import exh.GalleryAdder
|
||||
@@ -62,7 +62,7 @@ class BatchAddScreenModel(
|
||||
xLogE("Batch add error", throwable)
|
||||
}
|
||||
|
||||
coroutineScope.launch(Dispatchers.IO + handler) {
|
||||
screenModelScope.launch(Dispatchers.IO + handler) {
|
||||
val succeeded = mutableListOf<String>()
|
||||
val failed = mutableListOf<String>()
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package exh.ui.metadata
|
||||
|
||||
import cafe.adriel.voyager.core.model.StateScreenModel
|
||||
import cafe.adriel.voyager.core.model.coroutineScope
|
||||
import cafe.adriel.voyager.core.model.screenModelScope
|
||||
import eu.kanade.tachiyomi.source.online.MetadataSource
|
||||
import exh.metadata.metadata.RaisedSearchMetadata
|
||||
import exh.source.getMainSource
|
||||
@@ -26,11 +26,11 @@ class MetadataViewScreenModel(
|
||||
val manga = _manga.asStateFlow()
|
||||
|
||||
init {
|
||||
coroutineScope.launchIO {
|
||||
screenModelScope.launchIO {
|
||||
_manga.value = getManga.await(mangaId)
|
||||
}
|
||||
|
||||
coroutineScope.launchIO {
|
||||
screenModelScope.launchIO {
|
||||
val metadataSource = sourceManager.get(sourceId)?.getMainSource<MetadataSource<*, *>>()
|
||||
if (metadataSource == null) {
|
||||
mutableState.value = MetadataViewState.SourceNotFound
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package exh.ui.smartsearch
|
||||
|
||||
import cafe.adriel.voyager.core.model.StateScreenModel
|
||||
import cafe.adriel.voyager.core.model.coroutineScope
|
||||
import cafe.adriel.voyager.core.model.screenModelScope
|
||||
import eu.kanade.tachiyomi.source.CatalogueSource
|
||||
import eu.kanade.tachiyomi.ui.browse.source.SourcesScreen
|
||||
import exh.smartsearch.SmartSearchEngine
|
||||
@@ -24,7 +24,7 @@ class SmartSearchScreenModel(
|
||||
val source = sourceManager.get(sourceId) as CatalogueSource
|
||||
|
||||
init {
|
||||
coroutineScope.launchIO {
|
||||
screenModelScope.launchIO {
|
||||
val result = try {
|
||||
val resultManga = smartSearchEngine.smartSearch(source, config.origTitle)
|
||||
if (resultManga != null) {
|
||||
|
||||
Reference in New Issue
Block a user