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

Temporarily disable Double Page Spread

Browse Source
This commit is contained in:
Jobobby04 2021-06-01 18:40:42 -04:00
parent 60e520e37e
commit 02601aa32a
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,7 +496,7 @@ class PreferencesHelper(val context: Context) {
fun hideHistoryButton() = flowPrefs.getBoolean(Keys.hideHistoryButton, false) 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) fun invertDoublePages() = flowPrefs.getBoolean(Keys.invertDoublePages, false)
} }

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

@ -786,8 +786,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
actionReadingMode.isVisible = ReaderBottomButton.ReadingMode.isIn(enabledButtons) actionReadingMode.isVisible = ReaderBottomButton.ReadingMode.isIn(enabledButtons)
actionRotation.isVisible = actionRotation.isVisible =
ReaderBottomButton.Rotation.isIn(enabledButtons) ReaderBottomButton.Rotation.isIn(enabledButtons)
doublePage.isVisible = doublePage.isVisible = false // && viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get()
viewer is PagerViewer && ReaderBottomButton.PageLayout.isIn(enabledButtons) && !preferences.dualPageSplitPaged().get()
actionCropBorders.isVisible = actionCropBorders.isVisible =
if (viewer is PagerViewer) { if (viewer is PagerViewer) {
ReaderBottomButton.CropBordersPager.isIn(enabledButtons) ReaderBottomButton.CropBordersPager.isIn(enabledButtons)
@ -803,7 +802,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
ReaderBottomButton.WebView.isIn(enabledButtons) ReaderBottomButton.WebView.isIn(enabledButtons)
actionChapterList.isVisible = actionChapterList.isVisible =
ReaderBottomButton.ViewChapters.isIn(enabledButtons) ReaderBottomButton.ViewChapters.isIn(enabledButtons)
shiftPageButton.isVisible = (viewer as? PagerViewer)?.config?.doublePages ?: false shiftPageButton.isVisible = false // (viewer as? PagerViewer)?.config?.doublePages ?: false
} }
} }

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

@ -11,7 +11,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
CropBordersPager("cbp", R.string.pref_crop_borders_pager), CropBordersPager("cbp", R.string.pref_crop_borders_pager),
CropBordersContinuesVertical("cbc", R.string.pref_crop_borders_continuous_vertical), CropBordersContinuesVertical("cbc", R.string.pref_crop_borders_continuous_vertical),
CropBordersWebtoon("cbw", R.string.pref_crop_borders_webtoon), 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 fun isIn(buttons: Collection<String>) = value in buttons
@ -22,7 +22,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
WebView, WebView,
CropBordersPager, CropBordersPager,
CropBordersContinuesVertical, CropBordersContinuesVertical,
PageLayout // PageLayout
).map { it.value }.toSet() ).map { it.value }.toSet()
} }
} }

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

@ -46,7 +46,7 @@ class PagerConfig(
var shiftDoublePage = false 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) { set(value) {
field = value field = value
if (!value) { if (!value) {
@ -100,7 +100,7 @@ class PagerConfig(
// SY --> // SY -->
preferences.pageTransitionsPager() preferences.pageTransitionsPager()
.register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() }) .register({ usePageTransitions = it }, { imagePropertyChangedListener?.invoke() })
preferences.readerTheme() /*preferences.readerTheme()
.register( .register(
{ {
themeToColor(it) themeToColor(it)
@ -125,7 +125,7 @@ class PagerConfig(
} }
reloadChapterListener?.invoke(doublePages) reloadChapterListener?.invoke(doublePages)
} }
) )*/
// SY <-- // SY <--
} }