Skip to content

Commit 02601aa

Browse files
committed
Temporarily disable Double Page Spread
1 parent 60e520e commit 02601aa

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ class PreferencesHelper(val context: Context) {
496496

497497
fun hideHistoryButton() = flowPrefs.getBoolean(Keys.hideHistoryButton, false)
498498

499-
fun pageLayout() = flowPrefs.getInt(Keys.pageLayout, PagerConfig.PageLayout.AUTOMATIC)
499+
fun pageLayout() = flowPrefs.getInt(Keys.pageLayout, PagerConfig.PageLayout.SINGLE_PAGE)
500500

501501
fun invertDoublePages() = flowPrefs.getBoolean(Keys.invertDoublePages, false)
502502
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
786786
actionReadingMode.isVisible = ReaderBottomButton.ReadingMode.isIn(enabledButtons)
787787
actionRotation.isVisible =
788788
ReaderBottomButton.Rotation.isIn(enabledButtons)
789-
doublePage.isVisible =
790-
viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get()
789+
doublePage.isVisible = false // && viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get()
791790
actionCropBorders.isVisible =
792791
if (viewer is PagerViewer) {
793792
ReaderBottomButton.CropBordersPager.isIn(enabledButtons)
@@ -803,7 +802,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
803802
ReaderBottomButton.WebView.isIn(enabledButtons)
804803
actionChapterList.isVisible =
805804
ReaderBottomButton.ViewChapters.isIn(enabledButtons)
806-
shiftPageButton.isVisible = (viewer as? PagerViewer)?.config?.doublePages ?: false
805+
shiftPageButton.isVisible = false // (viewer as? PagerViewer)?.config?.doublePages ?: false
807806
}
808807
}
809808

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
1111
CropBordersPager("cbp", R.string.pref_crop_borders_pager),
1212
CropBordersContinuesVertical("cbc", R.string.pref_crop_borders_continuous_vertical),
1313
CropBordersWebtoon("cbw", R.string.pref_crop_borders_webtoon),
14-
PageLayout("pl", R.string.page_layout),
14+
// PageLayout("pl", R.string.page_layout),
1515
;
1616

1717
fun isIn(buttons: Collection<String>) = value in buttons
@@ -22,7 +22,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
2222
WebView,
2323
CropBordersPager,
2424
CropBordersContinuesVertical,
25-
PageLayout
25+
// PageLayout
2626
).map { it.value }.toSet()
2727
}
2828
}

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class PagerConfig(
4646

4747
var shiftDoublePage = false
4848

49-
var doublePages = preferences.pageLayout().get() == PageLayout.DOUBLE_PAGES && !preferences.dualPageSplitPaged().get()
49+
var doublePages = false // preferences.pageLayout().get() == PageLayout.DOUBLE_PAGES && !preferences.dualPageSplitPaged().get()
5050
set(value) {
5151
field = value
5252
if (!value) {
@@ -100,7 +100,7 @@ class PagerConfig(
100100
// SY -->
101101
preferences.pageTransitionsPager()
102102
.register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() })
103-
preferences.readerTheme()
103+
/*preferences.readerTheme()
104104
.register(
105105
{
106106
themeToColor(it)
@@ -125,7 +125,7 @@ class PagerConfig(
125125
}
126126
reloadChapterListener?.invoke(doublePages)
127127
}
128-
)
128+
)*/
129129

130130
// SY <--
131131
}

0 commit comments

Comments
 (0)