Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2025-01-11 08:19:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix loop when using skip chapter transition

Browse Source 
With this change the transition page now goes away. after loading. I imagine those who don't want to see this page would like this change anyway
This commit is contained in:
Jays2Kings 2021-04-22 20:39:38 -04:00
parent aa8bc85acd
commit 221bb58c8c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
View File

@ -35,6 +35,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() {
private var doubledUp = viewer.config.doublePages private var doubledUp = viewer.config.doublePages
var currentChapter: ReaderChapter? = null var currentChapter: ReaderChapter? = null
var forceTransition = false
/** /**
* Updates this adapter with the given [chapters]. It handles setting a few pages of the * Updates this adapter with the given [chapters]. It handles setting a few pages of the
@ -44,6 +45,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() {
fun setChapters(chapters: ViewerChapters, forceTransition: Boolean) { fun setChapters(chapters: ViewerChapters, forceTransition: Boolean) {
val newItems = mutableListOf<Any>() val newItems = mutableListOf<Any>()
this.forceTransition = forceTransition
// Add previous chapter pages and transition. // Add previous chapter pages and transition.
if (chapters.prevChapter != null) { if (chapters.prevChapter != null) {
// We only need to add the last few pages of the previous chapter, because it'll be // We only need to add the last few pages of the previous chapter, because it'll be
@ -277,7 +279,19 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() {
useSecondPage -> (oldCurrent?.second ?: oldCurrent?.first) useSecondPage -> (oldCurrent?.second ?: oldCurrent?.first)
else -> oldCurrent?.first ?: return else -> oldCurrent?.first ?: return
} }
val index = joinedItems.indexOfFirst { it.first == newPage || it.second == newPage } var index = joinedItems.indexOfFirst { it.first == newPage || it.second == newPage }
if (newPage is ChapterTransition && index == -1 && !forceTransition) {
val newerPage = if (newPage is ChapterTransition.Next) {
joinedItems.filter {
(it.first as? ReaderPage)?.chapter == newPage.to
}.minByOrNull { (it.first as? ReaderPage)?.index ?: Int.MAX_VALUE }?.first
} else {
joinedItems.filter {
(it.first as? ReaderPage)?.chapter == newPage.to
}.maxByOrNull { (it.first as? ReaderPage)?.index ?: Int.MIN_VALUE }?.first
}
index = joinedItems.indexOfFirst { it.first == newerPage || it.second == newerPage }
}
viewer.pager.setCurrentItem(index, false) viewer.pager.setCurrentItem(index, false)
} }
} }