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 beb4936b9..2dee0d7f9 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.AUTOMATIC) + fun pageLayout() = flowPrefs.getInt(Keys.pageLayout, PagerConfig.PageLayout.SINGLE_PAGE) 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 0897d0e94..6dd4a1b81 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,8 +786,7 @@ class ReaderActivity : BaseRxActivity() actionReadingMode.isVisible = ReaderBottomButton.ReadingMode.isIn(enabledButtons) actionRotation.isVisible = ReaderBottomButton.Rotation.isIn(enabledButtons) - doublePage.isVisible = - viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get() + doublePage.isVisible = false // && viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get() actionCropBorders.isVisible = if (viewer is PagerViewer) { ReaderBottomButton.CropBordersPager.isIn(enabledButtons) @@ -803,7 +802,7 @@ class ReaderActivity : BaseRxActivity() ReaderBottomButton.WebView.isIn(enabledButtons) actionChapterList.isVisible = ReaderBottomButton.ViewChapters.isIn(enabledButtons) - shiftPageButton.isVisible = (viewer as? PagerViewer)?.config?.doublePages ?: false + shiftPageButton.isVisible = false // (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 196e399d0..efd8e7b54 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) = 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 3ad4a6b76..c333edae6 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 = preferences.pageLayout().get() == PageLayout.DOUBLE_PAGES && !preferences.dualPageSplitPaged().get() + var doublePages = false // 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 <-- }