From 092ebf84f69db7f4deb1326be012f0e323d83cda Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Mon, 5 Aug 2024 09:27:42 +0700 Subject: [PATCH] chore: Disable image split for animated images It's duplicating instead of splitting --- .../main/java/eu/kanade/tachiyomi/ui/reader/model/SplitPage.kt | 2 +- .../kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt | 3 +++ .../tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/SplitPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/SplitPage.kt index 9459e9d560..196693aa9f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/SplitPage.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/SplitPage.kt @@ -3,4 +3,4 @@ package eu.kanade.tachiyomi.ui.reader.model /** * Used as placeholder for split page's second page */ -class SplitPage : ReaderItem +data object SplitPage : ReaderItem diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 226fd914b3..28c7b10eee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -594,11 +594,14 @@ class PagerPageHolder( private suspend fun mergeOrSplitPages(imageSource: BufferedSource, imageSource2: BufferedSource?): BufferedSource { if (ImageUtil.isAnimatedAndSupported(imageSource)) { + // FIXME: Animated images is duplicating instead of being split if (page.longPage == null) { page.longPage = true + /* if (viewer.config.splitPages || imageSource2 != null) { splitDoublePages() } + */ } scope.launchUI { progressIndicator.completeAndFadeOut() } return imageSource diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt index bbc84177f8..3760cc76f1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt @@ -210,7 +210,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { this.joinedItems = pagedItems.map { Pair( it, - if ((it as? ReaderPage)?.fullPage == true && it.firstHalf == true) SplitPage() else null, + if ((it as? ReaderPage)?.fullPage == true && it.firstHalf == true) SplitPage else null, ) }.toMutableList() } else {