Handle multiple duplicates on add duplicate dialogue

CHANGELOG.md

@@ -25,6 +25,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co
 - Display staff information on Anilist tracker search results ([@NarwhalHorns](https://github.com/NarwhalHorns)) ([#1810](https://github.com/mihonapp/mihon/pull/1810))
 - Add `id:` prefix search to library to search by internal DB ID ([@MajorTanya](https://github.com/MajorTanya)) ([#1856](https://github.com/mihonapp/mihon/pull/1856))
 - Add back option to disable unread chapter badge in library ([@AntsyLich](https://github.com/AntsyLich)) ([#1871](https://github.com/mihonapp/mihon/pull/1871))
+- Display all found duplicates in add duplicate dialogue ([@NarwhalHorns](https://github.com/NarwhalHorns)) ([#1861](https://github.com/mihonapp/mihon/pull/1861))
 
 ### Changed
 - Sliders UI ([@AntsyLich](https://github.com/AntsyLich)) ([#1840](https://github.com/mihonapp/mihon/pull/1840))

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

@@ -1,6 +1,8 @@
 package eu.kanade.presentation.manga
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -9,33 +11,65 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Brush
+import androidx.compose.material.icons.filled.PersonOutline
+import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.Book
-import androidx.compose.material.icons.outlined.SwapVert
+import androidx.compose.material.icons.outlined.AttachMoney
+import androidx.compose.material.icons.outlined.Block
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.Done
+import androidx.compose.material.icons.outlined.DoneAll
+import androidx.compose.material.icons.outlined.Pause
+import androidx.compose.material.icons.outlined.Schedule
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import coil3.request.ImageRequest
+import coil3.request.crossfade
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.components.TabbedDialogPaddings
+import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.presentation.more.settings.LocalPreferenceMinHeight
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
+import eu.kanade.tachiyomi.source.model.SManga
+import tachiyomi.domain.manga.model.Manga
+import tachiyomi.domain.source.model.StubSource
+import tachiyomi.domain.source.service.SourceManager
 import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
+import tachiyomi.presentation.core.util.secondaryItemAlpha
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 @Composable
 fun DuplicateMangaDialog(
     onDismissRequest: () -> Unit,
+    duplicateManga: List<Manga>,
     onConfirm: () -> Unit,
-    onOpenManga: () -> Unit,
-    onMigrate: () -> Unit,
+    onOpenManga: (manga: Manga) -> Unit,
+    onMigrate: (manga: Manga) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val minHeight = LocalPreferenceMinHeight.current
@@ -50,40 +84,40 @@ fun DuplicateMangaDialog(
                     vertical = TabbedDialogPaddings.Vertical,
                     horizontal = TabbedDialogPaddings.Horizontal,
                 )
+                .verticalScroll(rememberScrollState())
                 .fillMaxWidth(),
         ) {
             Text(
                 modifier = Modifier.padding(TitlePadding),
-                text = stringResource(MR.strings.are_you_sure),
+                text = stringResource(MR.strings.possible_duplicate),
                 style = MaterialTheme.typography.headlineMedium,
             )
 
             Text(
-                text = stringResource(MR.strings.confirm_add_duplicate_manga),
+                text = stringResource(MR.strings.duplicate_manga_select),
                 style = MaterialTheme.typography.bodyMedium,
             )
 
-            Spacer(Modifier.height(PaddingSize))
-
-            TextPreferenceWidget(
-                title = stringResource(MR.strings.action_show_manga),
-                icon = Icons.Outlined.Book,
-                onPreferenceClick = {
-                    onDismissRequest()
-                    onOpenManga()
-                },
-            )
+            Spacer(Modifier.height(MaterialTheme.padding.medium))
 
-            HorizontalDivider()
+            LazyRow(
+                horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
+                modifier = Modifier.height(370.dp),
+            ) {
+                items(
+                    items = duplicateManga,
+                    key = { it },
+                ) {
+                    DuplicateMangaListItem(
+                        manga = it,
+                        onMigrate = { onMigrate(it) },
+                        onDismissRequest = onDismissRequest,
+                        onOpenManga = { onOpenManga(it) },
+                    )
+                }
+            }
 
-            TextPreferenceWidget(
-                title = stringResource(MR.strings.action_migrate_duplicate),
-                icon = Icons.Outlined.SwapVert,
-                onPreferenceClick = {
-                    onDismissRequest()
-                    onMigrate()
-                },
-            )
+            Spacer(Modifier.height(MaterialTheme.padding.medium))
 
             HorizontalDivider()
 
@@ -120,7 +154,138 @@ fun DuplicateMangaDialog(
     }
 }
 
-private val PaddingSize = 16.dp
+@Composable
+private fun DuplicateMangaListItem(
+    manga: Manga,
+    onDismissRequest: () -> Unit,
+    onOpenManga: () -> Unit,
+    onMigrate: () -> Unit,
+) {
+    val shape = RoundedCornerShape(16.dp)
+    val sourceManager: SourceManager = Injekt.get()
+    val source = sourceManager.getOrStub(manga.source)
+    Column(
+        modifier = Modifier
+            .width(150.dp)
+            .clip(shape)
+            .background(MaterialTheme.colorScheme.surface)
+            .padding(MaterialTheme.padding.mediumSmall)
+            .combinedClickable(
+                onLongClick = { onOpenManga() },
+                onClick = {
+                    onDismissRequest()
+                    onMigrate()
+                },
+            ),
+    ) {
+        MangaCover.Book(
+            data = ImageRequest.Builder(LocalContext.current)
+                .data(manga)
+                .crossfade(true)
+                .build(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = MaterialTheme.padding.extraSmall),
+        )
+
+        Text(
+            text = manga.title,
+            style = MaterialTheme.typography.titleSmall,
+            overflow = TextOverflow.Ellipsis,
+            maxLines = 2,
+        )
+
+        if (!manga.author.isNullOrBlank()) {
+            MangaDetailRow(
+                text = manga.author!!,
+                iconImageVector = Icons.Filled.PersonOutline,
+                maxLines = 2,
+            )
+        }
+
+        if (!manga.artist.isNullOrBlank() && manga.author != manga.artist) {
+            MangaDetailRow(
+                text = manga.artist!!,
+                iconImageVector = Icons.Filled.Brush,
+                maxLines = 2,
+            )
+        }
+
+        MangaDetailRow(
+            text = when (manga.status) {
+                SManga.ONGOING.toLong() -> stringResource(MR.strings.ongoing)
+                SManga.COMPLETED.toLong() -> stringResource(MR.strings.completed)
+                SManga.LICENSED.toLong() -> stringResource(MR.strings.licensed)
+                SManga.PUBLISHING_FINISHED.toLong() -> stringResource(
+                    MR.strings.publishing_finished,
+                )
+                SManga.CANCELLED.toLong() -> stringResource(MR.strings.cancelled)
+                SManga.ON_HIATUS.toLong() -> stringResource(MR.strings.on_hiatus)
+                else -> stringResource(MR.strings.unknown)
+            },
+            iconImageVector = when (manga.status) {
+                SManga.ONGOING.toLong() -> Icons.Outlined.Schedule
+                SManga.COMPLETED.toLong() -> Icons.Outlined.DoneAll
+                SManga.LICENSED.toLong() -> Icons.Outlined.AttachMoney
+                SManga.PUBLISHING_FINISHED.toLong() -> Icons.Outlined.Done
+                SManga.CANCELLED.toLong() -> Icons.Outlined.Close
+                SManga.ON_HIATUS.toLong() -> Icons.Outlined.Pause
+                else -> Icons.Outlined.Block
+            },
+        )
+
+        Spacer(Modifier.weight(1f))
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = MaterialTheme.padding.extraSmall),
+            horizontalArrangement = Arrangement.Center,
+        ) {
+            if (source is StubSource) {
+                Icon(
+                    imageVector = Icons.Filled.Warning,
+                    contentDescription = null,
+                    modifier = Modifier.size(16.dp),
+                    tint = MaterialTheme.colorScheme.error,
+                )
+            }
+            Text(
+                text = source.name,
+                style = MaterialTheme.typography.labelSmall,
+                overflow = TextOverflow.Ellipsis,
+                maxLines = 1,
+            )
+        }
+    }
+}
+
+@Composable
+private fun MangaDetailRow(
+    text: String,
+    iconImageVector: ImageVector,
+    maxLines: Int = 1,
+) {
+    Row(
+        modifier = Modifier
+            .secondaryItemAlpha()
+            .padding(top = MaterialTheme.padding.extraSmall),
+        horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.extraSmall),
+        verticalAlignment = Alignment.Top,
+    ) {
+        Icon(
+            imageVector = iconImageVector,
+            contentDescription = null,
+            modifier = Modifier.size(16.dp),
+        )
+        Text(
+            text = text,
+            style = MaterialTheme.typography.bodySmall,
+            overflow = TextOverflow.Ellipsis,
+            maxLines = maxLines,
+        )
+    }
+}
 
 private val ButtonPadding = PaddingValues(top = 16.dp, bottom = 16.dp)
 private val TitlePadding = PaddingValues(bottom = 16.dp, top = 8.dp)

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

@@ -251,10 +251,9 @@ data class BrowseSourceScreen(
                 DuplicateMangaDialog(
                     onDismissRequest = onDismissRequest,
                     onConfirm = { screenModel.addFavorite(dialog.manga) },
-                    onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) },
-                    onMigrate = {
-                        screenModel.setDialog(BrowseSourceScreenModel.Dialog.Migrate(dialog.manga, dialog.duplicate))
-                    },
+                    onOpenManga = { navigator.push(MangaScreen(it.id)) },
+                    onMigrate = { screenModel.setDialog(BrowseSourceScreenModel.Dialog.Migrate(dialog.manga, it)) },
+                    duplicateManga = dialog.duplicates,
                 )
             }
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt

@@ -289,8 +289,8 @@ class BrowseSourceScreenModel(
             .orEmpty()
     }
 
-    suspend fun getDuplicateLibraryManga(manga: Manga): Manga? {
-        return getDuplicateLibraryManga.await(manga).getOrNull(0)
+    suspend fun getDuplicateLibraryManga(manga: Manga): List<Manga>? {
+        return getDuplicateLibraryManga.await(manga).takeIf { it.isNotEmpty() }
     }
 
     private fun moveMangaToCategories(manga: Manga, vararg categories: Category) {
@@ -340,7 +340,7 @@ class BrowseSourceScreenModel(
     sealed interface Dialog {
         data object Filter : Dialog
         data class RemoveManga(val manga: Manga) : Dialog
-        data class AddDuplicateManga(val manga: Manga, val duplicate: Manga) : Dialog
+        data class AddDuplicateManga(val manga: Manga, val duplicates: List<Manga>) : Dialog
         data class ChangeMangaCategory(
             val manga: Manga,
             val initialSelection: ImmutableList<CheckboxState.State<Category>>,

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(),
@@ -175,9 +174,9 @@ class HistoryScreenModel(
         screenModelScope.launchIO {
             val manga = getManga.await(mangaId) ?: return@launchIO
 
-            val duplicate = getDuplicateLibraryManga.await(manga).getOrNull(0)
-            if (duplicate != null) {
-                mutableState.update { it.copy(dialog = Dialog.DuplicateManga(manga, duplicate)) }
+            val duplicates = getDuplicateLibraryManga.await(manga).takeIf { it.isNotEmpty() }
+            if (duplicates != null) {
+                mutableState.update { it.copy(dialog = Dialog.DuplicateManga(manga, duplicates)) }
                 return@launchIO
             }
 
@@ -247,7 +246,7 @@ class HistoryScreenModel(
     sealed interface Dialog {
         data object DeleteAll : Dialog
         data class Delete(val history: HistoryWithRelations) : Dialog
-        data class DuplicateManga(val manga: Manga, val duplicate: Manga) : Dialog
+        data class DuplicateManga(val manga: Manga, val duplicates: List<Manga>) : Dialog
         data class ChangeCategory(
             val manga: Manga,
             val initialSelection: ImmutableList<CheckboxState<Category>>,

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

@@ -102,10 +102,9 @@ data object HistoryTab : Tab {
                     onConfirm = {
                         screenModel.addFavorite(dialog.manga)
                     },
-                    onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) },
-                    onMigrate = {
-                        screenModel.showMigrateDialog(dialog.manga, dialog.duplicate)
-                    },
+                    onOpenManga = { navigator.push(MangaScreen(it.id)) },
+                    onMigrate = { screenModel.showMigrateDialog(dialog.manga, it) },
+                    duplicateManga = dialog.duplicates,
                 )
             }
             is HistoryScreenModel.Dialog.ChangeCategory -> {

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

@@ -203,10 +203,9 @@ class MangaScreen(
                 DuplicateMangaDialog(
                     onDismissRequest = onDismissRequest,
                     onConfirm = { screenModel.toggleFavorite(onRemoved = {}, checkDuplicate = false) },
-                    onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) },
-                    onMigrate = {
-                        screenModel.showMigrateDialog(dialog.duplicate)
-                    },
+                    onOpenManga = { navigator.push(MangaScreen(it.id)) },
+                    onMigrate = { screenModel.showMigrateDialog(it) },
+                    duplicateManga = dialog.duplicates,
                 )
             }