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

fix(merged-entry): Fix actions like URL copy or sharing for merged entries (komikku-app/anikku#55)

Browse source 
* fix(merged-entry): Fix actions like URL copy or sharing for merged entries

* Unify callback parameters

* Add titles for actions in merged manga dialog

* Iterates through the list once

(cherry picked from commit ed7bb96f409701c93bbca056728679af91f3453f)
This commit is contained in:
Cuong-Tran 2025-07-09 14:13:57 +07:00
parent 20610190da
commit 5ec780eddb
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
1 changed files with 67 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import dev.chrisbanes.haze.HazeDefaults
import dev.chrisbanes.haze.HazeState
import dev.chrisbanes.haze.HazeStyle
import dev.chrisbanes.haze.hazeEffect
import dev.icerock.moko.resources.StringResource
import eu.kanade.core.util.ifSourcesLoaded
import eu.kanade.domain.manga.model.hasCustomCover
import eu.kanade.domain.manga.model.toSManga
@ -290,20 +291,38 @@ class MangaScreen(
screenModel.source,
)
} else {
openMergedMangaWebview(
mergedMangaAction(
context,
navigator,
successState.mergedData,
// KMK -->
action = { _, nav, manga, source -> openMangaInWebView(nav, manga, source) },
titleRes = MR.strings.action_open_in_web_view,
// KMK <--
)
}
}.takeIf { isHttpSource },
// SY <--
onWebViewLongClicked = {
copyMangaUrl(
context,
screenModel.manga,
screenModel.source,
)
// KMK -->
if (successState.mergedData == null) {
// KMK <--
copyMangaUrl(
context,
screenModel.manga,
screenModel.source,
)
// KMK -->
} else {
mergedMangaAction(
context,
navigator,
successState.mergedData,
action = { ctx, _, manga, source -> copyMangaUrl(ctx, manga, source) },
titleRes = MR.strings.action_copy_link,
)
// KMK <--
}
}.takeIf { isHttpSource },
onTrackingClicked = {
if (!successState.hasLoggedInTrackers) {
@ -323,7 +342,23 @@ class MangaScreen(
},
// KMK <--
onCoverClicked = screenModel::showCoverDialog,
onShareClicked = { shareManga(context, screenModel.manga, screenModel.source) }.takeIf { isHttpSource },
onShareClicked = {
// KMK -->
if (successState.mergedData == null) {
// KMK <--
shareManga(context, screenModel.manga, screenModel.source)
// KMK -->
} else {
mergedMangaAction(
context,
navigator,
successState.mergedData,
action = { ctx, _, manga, source -> shareManga(ctx, manga, source) },
titleRes = MR.strings.action_share,
)
// KMK <--
}
}.takeIf { isHttpSource },
onDownloadActionClicked = screenModel::runDownloadAction.takeIf { !successState.source.isLocalOrStub() },
onEditCategoryClicked = screenModel::showChangeCategoryDialog.takeIf { successState.manga.favorite },
onEditFetchIntervalClicked = screenModel::showSetFetchIntervalDialog.takeIf {
@ -756,6 +791,7 @@ class MangaScreen(
context.copyToClipboard(url, url)
}
// SY -->
private fun openMetadataViewer(
navigator: Navigator,
manga: Manga,
@ -766,18 +802,36 @@ class MangaScreen(
navigator.push(MetadataViewScreen(manga.id, manga.source, seedColor?.toArgb()))
}
private fun openMergedMangaWebview(context: Context, navigator: Navigator, mergedMangaData: MergedMangaData) {
private fun mergedMangaAction(
context: Context,
navigator: Navigator,
mergedMangaData: MergedMangaData,
// KMK -->
action: (Context, Navigator, Manga, HttpSource?) -> Unit,
titleRes: StringResource,
// KMK <--
) {
val sourceManager: SourceManager = Injekt.get()
val mergedManga = mergedMangaData.manga.values.filterNot { it.source == MERGED_SOURCE_ID }
val sources = mergedManga.map { sourceManager.getOrStub(it.source) }
// KMK -->
val mergedMangaAndSources = mergedMangaData.manga.values
.filterNot { it.source == MERGED_SOURCE_ID }
.map { manga -> manga to sourceManager.getOrStub(manga.source) }
// KMK <--
MaterialAlertDialogBuilder(context)
.setTitle(MR.strings.action_open_in_web_view.getString(context))
.setTitle(titleRes.getString(context))
.setSingleChoiceItems(
Array(mergedManga.size) { index -> sources[index].toString() },
Array(mergedMangaAndSources.size) { index ->
// KMK -->
mergedMangaAndSources[index].second.toString()
// KMK <--
},
-1,
) { dialog, index ->
dialog.dismiss()
openMangaInWebView(navigator, mergedManga[index], sources[index] as? HttpSource)
// KMK -->
val (manga, source) = mergedMangaAndSources[index]
action(context, navigator, manga, source as? HttpSource)
// KMK <--
}
.setNegativeButton(MR.strings.action_cancel.getString(context), null)
.show()