From 86bd55268f5e44b46cdf4a8409489dd47665707c Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Tue, 1 Jun 2021 20:49:43 -0400
Subject: [PATCH] Revert "Temporarily disable Double Page Spread"

This reverts commit 02601aa32a7fc2bb69a376cfa47510622217a62d.
---
 .../kanade/tachiyomi/data/preference/PreferencesHelper.kt   | 2 +-
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt    | 5 +++--
 .../tachiyomi/ui/reader/setting/ReaderBottomButton.kt       | 4 ++--
 .../kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt  | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 2dee0d7f9..beb4936b9 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -496,7 +496,7 @@ class PreferencesHelper(val context: Context) {
 
     fun hideHistoryButton() = flowPrefs.getBoolean(Keys.hideHistoryButton, false)
 
-    fun pageLayout() = flowPrefs.getInt(Keys.pageLayout, PagerConfig.PageLayout.SINGLE_PAGE)
+    fun pageLayout() = flowPrefs.getInt(Keys.pageLayout, PagerConfig.PageLayout.AUTOMATIC)
 
     fun invertDoublePages() = flowPrefs.getBoolean(Keys.invertDoublePages, false)
 }
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 6dd4a1b81..0897d0e94 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
@@ -786,7 +786,8 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             actionReadingMode.isVisible = ReaderBottomButton.ReadingMode.isIn(enabledButtons)
             actionRotation.isVisible =
                 ReaderBottomButton.Rotation.isIn(enabledButtons)
-            doublePage.isVisible = false // && viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get()
+            doublePage.isVisible =
+                viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get()
             actionCropBorders.isVisible =
                 if (viewer is PagerViewer) {
                     ReaderBottomButton.CropBordersPager.isIn(enabledButtons)
@@ -802,7 +803,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                 ReaderBottomButton.WebView.isIn(enabledButtons)
             actionChapterList.isVisible =
                 ReaderBottomButton.ViewChapters.isIn(enabledButtons)
-            shiftPageButton.isVisible = false // (viewer as? PagerViewer)?.config?.doublePages ?: false
+            shiftPageButton.isVisible = (viewer as? PagerViewer)?.config?.doublePages ?: false
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt
index efd8e7b54..196e399d0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt
@@ -11,7 +11,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
     CropBordersPager("cbp", R.string.pref_crop_borders_pager),
     CropBordersContinuesVertical("cbc", R.string.pref_crop_borders_continuous_vertical),
     CropBordersWebtoon("cbw", R.string.pref_crop_borders_webtoon),
-    // PageLayout("pl", R.string.page_layout),
+    PageLayout("pl", R.string.page_layout),
     ;
 
     fun isIn(buttons: Collection<String>) = value in buttons
@@ -22,7 +22,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
             WebView,
             CropBordersPager,
             CropBordersContinuesVertical,
-            // PageLayout
+            PageLayout
         ).map { it.value }.toSet()
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
index c333edae6..3ad4a6b76 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
@@ -46,7 +46,7 @@ class PagerConfig(
 
     var shiftDoublePage = false
 
-    var doublePages = false // preferences.pageLayout().get() == PageLayout.DOUBLE_PAGES && !preferences.dualPageSplitPaged().get()
+    var doublePages = preferences.pageLayout().get() == PageLayout.DOUBLE_PAGES && !preferences.dualPageSplitPaged().get()
         set(value) {
             field = value
             if (!value) {
@@ -100,7 +100,7 @@ class PagerConfig(
         // SY -->
         preferences.pageTransitionsPager()
             .register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() })
-        /*preferences.readerTheme()
+        preferences.readerTheme()
             .register(
                 {
                     themeToColor(it)
@@ -125,7 +125,7 @@ class PagerConfig(
                     }
                     reloadChapterListener?.invoke(doublePages)
                 }
-            )*/
+            )
 
         // SY <--
     }