diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BulkFavoriteDialogs.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BulkFavoriteDialogs.kt index 803a11e1f..32f67138d 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BulkFavoriteDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BulkFavoriteDialogs.kt @@ -155,6 +155,7 @@ private fun AddDuplicateMangaDialog( }, onOpenManga = { navigator?.push(MangaScreen(it.id)) }, onMigrate = { showMigrateDialog(dialog.manga, it) }, + targetManga = dialog.manga, ) } @@ -206,6 +207,7 @@ private fun BulkAllowDuplicateDialog( onConfirm = { addFavorite(dialog.currentIdx + 1) }, onOpenManga = { navigator?.push(MangaScreen(it.id)) }, onMigrate = { showMigrateDialog(dialog.manga, it) }, + targetManga = dialog.manga, bulkFavoriteManga = dialog.manga, onAllowAllDuplicate = { addFavoriteDuplicate(false) }, onSkipAllDuplicate = { addFavoriteDuplicate(true) }, diff --git a/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt index ee8dac161..fc10fd56c 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt @@ -92,6 +92,7 @@ fun DuplicateMangaDialog( onMigrate: (manga: Manga) -> Unit, modifier: Modifier = Modifier, // KMK --> + targetManga: Manga, bulkFavoriteManga: Manga? = null, onAllowAllDuplicate: () -> Unit = {}, onSkipAllDuplicate: () -> Unit = {}, @@ -128,6 +129,14 @@ fun DuplicateMangaDialog( .padding(top = MaterialTheme.padding.small), ) + // KMK --> + Text( + text = targetManga.title, + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.then(horizontalPaddingModifier), + ) + // KMK <-- + Text( text = stringResource(MR.strings.possible_duplicates_summary), style = MaterialTheme.typography.bodyMedium, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt index 529357c7f..ca03ae1b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt @@ -471,6 +471,9 @@ data class BrowseSourceScreen( onConfirm = { screenModel.addFavorite(dialog.manga) }, onOpenManga = { navigator.push(MangaScreen(it.id)) }, onMigrate = { screenModel.setDialog(BrowseSourceScreenModel.Dialog.Migrate(dialog.manga, it)) }, + // KMK --> + targetManga = dialog.manga, + // KMK <-- ) } 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 103ed73b4..2b6ff25b6 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 @@ -122,6 +122,9 @@ data object HistoryTab : Tab { }, onOpenManga = { navigator.push(MangaScreen(it.id)) }, onMigrate = { screenModel.showMigrateDialog(dialog.manga, it) }, + // KMK --> + targetManga = dialog.manga, + // KMK <-- ) } is HistoryScreenModel.Dialog.ChangeCategory -> { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index 8201e2514..569a49b9e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -472,6 +472,9 @@ class MangaScreen( onConfirm = { screenModel.toggleFavorite(onRemoved = {}, checkDuplicate = false) }, onOpenManga = { navigator.push(MangaScreen(it.id)) }, onMigrate = { screenModel.showMigrateDialog(it) }, + // KMK --> + targetManga = dialog.manga, + // KMK <-- ) } diff --git a/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt b/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt index 9860c1d0d..3e71a73c9 100644 --- a/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt +++ b/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt @@ -175,6 +175,7 @@ class MangaDexFollowsScreen(private val sourceId: Long) : Screen() { onConfirm = { screenModel.addFavorite(dialog.manga) }, onOpenManga = { navigator.push(MangaScreen(it.id)) }, // KMK --> + targetManga = dialog.manga, onMigrate = { screenModel.setDialog(BrowseSourceScreenModel.Dialog.Migrate(dialog.manga, it)) }, // KMK <-- )