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 5b64b3640..f9e3ed1c2 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 @@ -567,6 +567,11 @@ class MangaScreen( onDismissRequest = screenModel::dismissDialog, onDeleteClick = screenModel::deleteMerge, onPositiveClick = screenModel::updateMergeSettings, + // KMK --> + onOpenEntryClick = { merge -> + merge.mangaId?.let { navigator.push(MangaScreen(it)) } + }, + // KMK <-- ) } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaAdapter.kt index 9d742fb56..f29f223b9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaAdapter.kt @@ -29,6 +29,10 @@ class EditMergedMangaAdapter( fun onDeleteClick(position: Int) fun onToggleChapterUpdatesClicked(position: Int) fun onToggleChapterDownloadsClicked(position: Int) + + // KMK --> + fun onOpenEntryClick(position: Int) + // KMK <-- } override fun onSetPrioritySort(isPriorityOrder: Boolean) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt index 1c3c2824c..d7e094ef3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt @@ -19,6 +19,11 @@ class EditMergedMangaHolder(view: View, val adapter: EditMergedMangaAdapter) : F init { setDragHandleView(binding.reorder) + // KMK --> + binding.cover.setOnClickListener { + adapter.editMergedMangaItemListener.onOpenEntryClick(bindingAdapterPosition) + } + // KMK <-- binding.remove.setOnClickListener { adapter.editMergedMangaItemListener.onDeleteClick(bindingAdapterPosition) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt index 8e4f05469..aa93313fe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt @@ -40,6 +40,9 @@ class EditMergedSettingsState( private val onDeleteClick: (MergedMangaReference) -> Unit, private val onDismissRequest: () -> Unit, private val onPositiveClick: (List) -> Unit, + // KMK --> + private val onOpenEntryClick: (MergedMangaReference) -> Unit, + // KMK <-- ) : EditMergedMangaAdapter.EditMergedMangaItemListener { var mergedMangas: List> by mutableStateOf(emptyList()) var mergeReference: MergedMangaReference? by mutableStateOf(null) @@ -105,6 +108,14 @@ class EditMergedSettingsState( } } + // KMK --> + override fun onOpenEntryClick(position: Int) { + val mergedMangaAdapter = mergedMangaAdapter ?: return + val mergeMangaReference = mergedMangaAdapter.currentItems.getOrNull(position)?.mergedMangaReference ?: return + onOpenEntryClick(mergeMangaReference) + } + // KMK <-- + override fun onDeleteClick(position: Int) { val mergedMangaAdapter = mergedMangaAdapter ?: return val mergeMangaReference = mergedMangaAdapter.currentItems.getOrNull(position)?.mergedMangaReference ?: return @@ -192,6 +203,9 @@ fun EditMergedSettingsDialog( mergedData: MergedMangaData, onDeleteClick: (MergedMangaReference) -> Unit, onPositiveClick: (List) -> Unit, + // KMK --> + onOpenEntryClick: (MergedMangaReference) -> Unit, + // KMK <-- ) { // KMK --> val colorScheme = AndroidViewColorScheme(MaterialTheme.colorScheme) @@ -199,7 +213,15 @@ fun EditMergedSettingsDialog( val context = LocalContext.current val state = remember { - EditMergedSettingsState(context, onDeleteClick, onDismissRequest, onPositiveClick) + EditMergedSettingsState( + context, + onDeleteClick, + onDismissRequest, + onPositiveClick, + // KMK --> + onOpenEntryClick, + // KMK <-- + ) } AlertDialog( onDismissRequest = onDismissRequest,