Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-14 16:45:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix automatic page layout not putting the current page as the first

Browse Source
This commit is contained in:
Jays2Kings 2021-04-07 22:18:07 -04:00
parent 01536221fb
commit 4ea72c8963
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -273,7 +273,7 @@ class ReaderActivity :
(viewer as? PagerViewer)?.let { pViewer -> (viewer as? PagerViewer)?.let { pViewer ->
val config = pViewer.config val config = pViewer.config
outState.putBoolean(SHIFT_DOUBLE_PAGES, config.shiftDoublePage) outState.putBoolean(SHIFT_DOUBLE_PAGES, config.shiftDoublePage)
if (config.shiftDoublePage) { if (config.shiftDoublePage && config.doublePages) {
pViewer.getShiftedPage()?.let { pViewer.getShiftedPage()?.let {
outState.putInt(SHIFTED_PAGE_INDEX, it.index) outState.putInt(SHIFTED_PAGE_INDEX, it.index)
outState.putLong(SHIFTED_CHAP_INDEX, it.chapter.chapter.id ?: 0L) outState.putLong(SHIFTED_CHAP_INDEX, it.chapter.chapter.id ?: 0L)
@ -738,7 +738,6 @@ class ReaderActivity :
setDoublePageMode(newViewer) setDoublePageMode(newViewer)
} }
lastShiftDoubleState?.let { newViewer.config.shiftDoublePage = it } lastShiftDoubleState?.let { newViewer.config.shiftDoublePage = it }
lastShiftDoubleState = null
} }
binding.navigationOverlay.isLTR = !(viewer is L2RPagerViewer) binding.navigationOverlay.isLTR = !(viewer is L2RPagerViewer)
@ -801,7 +800,17 @@ class ReaderActivity :
} }
indexChapterToShift = null indexChapterToShift = null
indexPageToShift = null indexPageToShift = null
} else if (lastShiftDoubleState != null) {
val currentChapter = viewerChapters.currChapter
(viewer as? PagerViewer)?.config?.shiftDoublePage = (
currentChapter.requestedPage +
(
currentChapter.pages?.subList(0, currentChapter.requestedPage)
?.count { it.fullPage || it.isolatedPage } ?: 0
)
) % 2 != 0
} }
lastShiftDoubleState = null
viewer?.setChapters(viewerChapters) viewer?.setChapters(viewerChapters)
intentPageNumber?.let { moveToPageIndex(it) } intentPageNumber?.let { moveToPageIndex(it) }
intentPageNumber = null intentPageNumber = null