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 a1d2ab4eb..678bc2e49 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 @@ -69,15 +69,8 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { val prevHasMissingChapters = calculateChapterGap(chapters.currChapter, chapters.prevChapter) > 0 val nextHasMissingChapters = calculateChapterGap(chapters.nextChapter, chapters.currChapter) > 0 - // Add previous chapter pages and transition. - if (chapters.prevChapter != null) { - // We only need to add the last few pages of the previous chapter, because it'll be - // selected as the current chapter when one of those pages is selected. - val prevPages = chapters.prevChapter.pages - if (prevPages != null) { - newItems.addAll(prevPages.takeLast(2)) - } - } + // Add previous chapter pages and transition + chapters.prevChapter?.pages?.let(newItems::addAll) // Skip transition page if the chapter is loaded & current page is not a transition page if (prevHasMissingChapters || forceTransition || chapters.prevChapter?.state !is ReaderChapter.State.Loaded) { @@ -119,14 +112,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { } } - if (chapters.nextChapter != null) { - // Add at most two pages, because this chapter will be selected before the user can - // swap more pages. - val nextPages = chapters.nextChapter.pages - if (nextPages != null) { - newItems.addAll(nextPages.take(2)) - } - } + chapters.nextChapter?.pages?.let(newItems::addAll) // Resets double-page splits, else insert pages get misplaced subItems.filterIsInstance().also { subItems.removeAll(it) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt index 036f767f8..29727f696 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt @@ -43,14 +43,7 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter 0 // Add previous chapter pages and transition. - if (chapters.prevChapter != null) { - // We only need to add the last few pages of the previous chapter, because it'll be - // selected as the current chapter when one of those pages is selected. - val prevPages = chapters.prevChapter.pages - if (prevPages != null) { - newItems.addAll(prevPages.takeLast(2)) - } - } + chapters.prevChapter?.pages?.let(newItems::addAll) // Skip transition page if the chapter is loaded & current page is not a transition page if (prevHasMissingChapters || forceTransition || chapters.prevChapter?.state !is ReaderChapter.State.Loaded) { @@ -70,14 +63,7 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter