copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

feat(duplicate-manga): Add target manga name in duplicate dialogs (#921)

Browse source
This commit is contained in:
Cuong-Tran 2025-05-24 11:08:00 +07:00 committed by GitHub
parent 382d29e303
commit f8ef5d4cf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/browse/components/BulkFavoriteDialogs.kt
View file

@ -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) },

9
app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt
View file

@ -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,

3
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
View file

@ -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 <--
)
}

3
app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
View file

@ -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 -> {

3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
View file

@ -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 <--
)
}

1
app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt
View file

@ -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 <--
)