Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double pages not showing in default reading mode

Browse Source
This commit is contained in:
Jobobby04 2023-12-28 13:40:38 -05:00
parent 509f3bc910
commit 834bc28726
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
View File

@ -41,6 +41,7 @@ fun BottomReaderBar(
onClickCropBorder: () -> Unit, onClickCropBorder: () -> Unit,
onClickSettings: () -> Unit, onClickSettings: () -> Unit,
// SY --> // SY -->
currentReadingMode: ReadingMode,
dualPageSplitEnabled: Boolean, dualPageSplitEnabled: Boolean,
doublePages: Boolean, doublePages: Boolean,
onClickChapterList: () -> Unit, onClickChapterList: () -> Unit,
@ -104,7 +105,7 @@ fun BottomReaderBar(
} }
} }
val cropBorders = when (readingMode) { val cropBorders = when (currentReadingMode) {
ReadingMode.WEBTOON -> ReaderBottomButton.CropBordersWebtoon ReadingMode.WEBTOON -> ReaderBottomButton.CropBordersWebtoon
ReadingMode.CONTINUOUS_VERTICAL -> ReaderBottomButton.CropBordersContinuesVertical ReadingMode.CONTINUOUS_VERTICAL -> ReaderBottomButton.CropBordersContinuesVertical
else -> ReaderBottomButton.CropBordersPager else -> ReaderBottomButton.CropBordersPager
@ -123,7 +124,7 @@ fun BottomReaderBar(
if ( if (
!dualPageSplitEnabled && !dualPageSplitEnabled &&
ReaderBottomButton.PageLayout.isIn(enabledButtons) && ReaderBottomButton.PageLayout.isIn(enabledButtons) &&
ReadingMode.isPagerType(readingMode.flagValue) ReadingMode.isPagerType(currentReadingMode.flagValue)
) { ) {
IconButton(onClick = onClickPageLayout) { IconButton(onClick = onClickPageLayout) {
Icon( Icon(

2
app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
View File

@ -107,6 +107,7 @@ fun ReaderAppBars(
navBarType: NavBarType, navBarType: NavBarType,
currentPageText: String, currentPageText: String,
enabledButtons: ImmutableSet<String>, enabledButtons: ImmutableSet<String>,
currentReadingMode: ReadingMode,
dualPageSplitEnabled: Boolean, dualPageSplitEnabled: Boolean,
doublePages: Boolean, doublePages: Boolean,
onClickChapterList: () -> Unit, onClickChapterList: () -> Unit,
@ -301,6 +302,7 @@ fun ReaderAppBars(
onClickCropBorder = onClickCropBorder, onClickCropBorder = onClickCropBorder,
onClickSettings = onClickSettings, onClickSettings = onClickSettings,
// SY --> // SY -->
currentReadingMode = currentReadingMode,
dualPageSplitEnabled = dualPageSplitEnabled, dualPageSplitEnabled = dualPageSplitEnabled,
doublePages = doublePages, doublePages = doublePages,
onClickChapterList = onClickChapterList, onClickChapterList = onClickChapterList,

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

@ -478,6 +478,9 @@ class ReaderActivity : BaseActivity() {
currentPageText = state.currentPageText, currentPageText = state.currentPageText,
navBarType = navBarType, navBarType = navBarType,
enabledButtons = readerBottomButtons, enabledButtons = readerBottomButtons,
currentReadingMode = ReadingMode.fromPreference(
viewModel.getMangaReadingMode(resolveDefault = true),
),
dualPageSplitEnabled = dualPageSplitPaged, dualPageSplitEnabled = dualPageSplitPaged,
doublePages = state.doublePages, doublePages = state.doublePages,
onClickChapterList = viewModel::openChapterListDialog, onClickChapterList = viewModel::openChapterListDialog,