From f62671742c62d74ecc87cc37f477d51a263c18d9 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 2 Mar 2025 12:21:13 -0500 Subject: [PATCH] Fix build --- .../tachiyomi/ui/history/HistoryScreenModel.kt | 7 +++---- .../kanade/tachiyomi/ui/history/HistoryTab.kt | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt index 6b166938a..36e63f83b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt @@ -43,7 +43,6 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.service.SourceManager import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import kotlin.collections.map class HistoryScreenModel( private val addTracks: AddTracks = Injekt.get(), @@ -216,11 +215,11 @@ class HistoryScreenModel( } } - fun showMigrateDialog(currentManga: Manga, duplicate: Manga) { + /*SY -->fun showMigrateDialog(currentManga: Manga, duplicate: Manga) { mutableState.update { currentState -> currentState.copy(dialog = Dialog.Migrate(newManga = currentManga, oldManga = duplicate)) } - } + } SY <--*/ fun showChangeCategoryDialog(manga: Manga) { screenModelScope.launch { @@ -252,7 +251,7 @@ class HistoryScreenModel( val manga: Manga, val initialSelection: ImmutableList>, ) : Dialog - data class Migrate(val newManga: Manga, val oldManga: Manga) : Dialog + /* SY --> data class Migrate(val newManga: Manga, val oldManga: Manga) : Dialog SY <-- */ } sealed interface Event { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt index a8cdc985a..5bbad20c9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt @@ -27,8 +27,7 @@ import eu.kanade.presentation.history.components.HistoryDeleteDialog import eu.kanade.presentation.manga.DuplicateMangaDialog import eu.kanade.presentation.util.Tab import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateDialog -import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateDialogScreenModel +import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationScreen import eu.kanade.tachiyomi.ui.category.CategoryScreen import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaScreen @@ -37,6 +36,7 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import tachiyomi.core.common.i18n.stringResource +import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.chapter.model.Chapter import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -120,7 +120,14 @@ data object HistoryTab : Tab { }, onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) }, onMigrate = { - screenModel.showMigrateDialog(dialog.manga, dialog.duplicate) + // SY --> + PreMigrationScreen.navigateToMigration( + Injekt.get().skipPreMigration().get(), + navigator, + dialog.duplicate.id, + dialog.manga.id, + ) + // SY <-- }, ) } @@ -134,7 +141,7 @@ data object HistoryTab : Tab { }, ) } - is HistoryScreenModel.Dialog.Migrate -> { + /*SY -->is HistoryScreenModel.Dialog.Migrate -> { MigrateDialog( oldManga = dialog.oldManga, newManga = dialog.newManga, @@ -143,7 +150,7 @@ data object HistoryTab : Tab { onClickTitle = { navigator.push(MangaScreen(dialog.oldManga.id)) }, onPopScreen = { navigator.replace(MangaScreen(dialog.newManga.id)) }, ) - } + } SY <--*/ null -> {} }