From 834bc287264d7cc37cbbd1c9aad38d02db31c3e0 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Thu, 28 Dec 2023 13:40:38 -0500
Subject: [PATCH] Fix double pages not showing in default reading mode

---
 .../eu/kanade/presentation/reader/appbars/BottomReaderBar.kt | 5 +++--
 .../eu/kanade/presentation/reader/appbars/ReaderAppBars.kt   | 2 ++
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt     | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
index a2bdcc116..03b1fca41 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
@@ -41,6 +41,7 @@ fun BottomReaderBar(
     onClickCropBorder: () -> Unit,
     onClickSettings: () -> Unit,
     // SY -->
+    currentReadingMode: ReadingMode,
     dualPageSplitEnabled: Boolean,
     doublePages: Boolean,
     onClickChapterList: () -> Unit,
@@ -104,7 +105,7 @@ fun BottomReaderBar(
             }
         }
 
-        val cropBorders = when (readingMode) {
+        val cropBorders = when (currentReadingMode) {
             ReadingMode.WEBTOON -> ReaderBottomButton.CropBordersWebtoon
             ReadingMode.CONTINUOUS_VERTICAL -> ReaderBottomButton.CropBordersContinuesVertical
             else -> ReaderBottomButton.CropBordersPager
@@ -123,7 +124,7 @@ fun BottomReaderBar(
         if (
             !dualPageSplitEnabled &&
             ReaderBottomButton.PageLayout.isIn(enabledButtons) &&
-            ReadingMode.isPagerType(readingMode.flagValue)
+            ReadingMode.isPagerType(currentReadingMode.flagValue)
         ) {
             IconButton(onClick = onClickPageLayout) {
                 Icon(
diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
index 4df1526c5..ede6c0c88 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
@@ -107,6 +107,7 @@ fun ReaderAppBars(
     navBarType: NavBarType,
     currentPageText: String,
     enabledButtons: ImmutableSet<String>,
+    currentReadingMode: ReadingMode,
     dualPageSplitEnabled: Boolean,
     doublePages: Boolean,
     onClickChapterList: () -> Unit,
@@ -301,6 +302,7 @@ fun ReaderAppBars(
                         onClickCropBorder = onClickCropBorder,
                         onClickSettings = onClickSettings,
                         // SY -->
+                        currentReadingMode = currentReadingMode,
                         dualPageSplitEnabled = dualPageSplitEnabled,
                         doublePages = doublePages,
                         onClickChapterList = onClickChapterList,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 34265701b..a17c7879a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -478,6 +478,9 @@ class ReaderActivity : BaseActivity() {
                 currentPageText = state.currentPageText,
                 navBarType = navBarType,
                 enabledButtons = readerBottomButtons,
+                currentReadingMode = ReadingMode.fromPreference(
+                    viewModel.getMangaReadingMode(resolveDefault = true),
+                ),
                 dualPageSplitEnabled = dualPageSplitPaged,
                 doublePages = state.doublePages,
                 onClickChapterList = viewModel::openChapterListDialog,