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

Fix build

Browse Source
This commit is contained in:
Jobobby04 2025-03-02 12:21:13 -05:00
parent 58be872bef
commit f62671742c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt
View File

@ -43,7 +43,6 @@ import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.source.service.SourceManager import tachiyomi.domain.source.service.SourceManager
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import kotlin.collections.map
class HistoryScreenModel( class HistoryScreenModel(
private val addTracks: AddTracks = Injekt.get(), 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 -> mutableState.update { currentState ->
currentState.copy(dialog = Dialog.Migrate(newManga = currentManga, oldManga = duplicate)) currentState.copy(dialog = Dialog.Migrate(newManga = currentManga, oldManga = duplicate))
} }
} } SY <--*/
fun showChangeCategoryDialog(manga: Manga) { fun showChangeCategoryDialog(manga: Manga) {
screenModelScope.launch { screenModelScope.launch {
@ -252,7 +251,7 @@ class HistoryScreenModel(
val manga: Manga, val manga: Manga,
val initialSelection: ImmutableList<CheckboxState<Category>>, val initialSelection: ImmutableList<CheckboxState<Category>>,
) : Dialog ) : 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 { sealed interface Event {

17
app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
View File

@ -27,8 +27,7 @@ import eu.kanade.presentation.history.components.HistoryDeleteDialog
import eu.kanade.presentation.manga.DuplicateMangaDialog import eu.kanade.presentation.manga.DuplicateMangaDialog
import eu.kanade.presentation.util.Tab import eu.kanade.presentation.util.Tab
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateDialog import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationScreen
import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateDialogScreenModel
import eu.kanade.tachiyomi.ui.category.CategoryScreen import eu.kanade.tachiyomi.ui.category.CategoryScreen
import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaScreen 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.collectLatest
import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.receiveAsFlow
import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.i18n.stringResource
import tachiyomi.domain.UnsortedPreferences
import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.Chapter
import tachiyomi.i18n.MR import tachiyomi.i18n.MR
import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.i18n.stringResource
@ -120,7 +120,14 @@ data object HistoryTab : Tab {
}, },
onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) }, onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) },
onMigrate = { onMigrate = {
screenModel.showMigrateDialog(dialog.manga, dialog.duplicate) // SY -->
PreMigrationScreen.navigateToMigration(
Injekt.get<UnsortedPreferences>().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( MigrateDialog(
oldManga = dialog.oldManga, oldManga = dialog.oldManga,
newManga = dialog.newManga, newManga = dialog.newManga,
@ -143,7 +150,7 @@ data object HistoryTab : Tab {
onClickTitle = { navigator.push(MangaScreen(dialog.oldManga.id)) }, onClickTitle = { navigator.push(MangaScreen(dialog.oldManga.id)) },
onPopScreen = { navigator.replace(MangaScreen(dialog.newManga.id)) }, onPopScreen = { navigator.replace(MangaScreen(dialog.newManga.id)) },
) )
} } SY <--*/
null -> {} null -> {}
} }