javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 4 Wiki Activity

Navigation settings and split invert tapping for webtoon and pager (#4233)

Browse Source
This commit is contained in:
Andreas E
2021-01-03 16:50:38 +01:00
committed by GitHub
parent cea4911c4d
commit 3bf7c74f93
10 changed files with 345 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
+70 -20
View File
@@ -137,6 +137,41 @@ class SettingsReaderController : SettingsController() {
preferenceCategory {
titleRes = R.string.pager_viewer
intListPreference {
key = Keys.navigationModePager
titleRes = R.string.pref_viewer_nav
entriesRes = arrayOf(
R.string.default_nav,
R.string.l_nav,
R.string.kindlish_nav,
R.string.edge_nav
)
entryValues = arrayOf("0", "1", "2", "3")
defaultValue = "0"
summary = "%s"
preferences.readWithTapping().asImmediateFlow { isVisible = it }.launchIn(scope)
}
listPreference {
key = Keys.pagerNavInverted
titleRes = R.string.pref_read_with_tapping_inverted
entriesRes = arrayOf(
R.string.tapping_inverted_none,
R.string.tapping_inverted_horizontal,
R.string.tapping_inverted_vertical,
R.string.tapping_inverted_both
)
entryValues = arrayOf(
TappingInvertMode.NONE.name,
TappingInvertMode.HORIZONTAL.name,
TappingInvertMode.VERTICAL.name,
TappingInvertMode.BOTH.name
)
defaultValue = TappingInvertMode.NONE.name
summary = "%s"
preferences.readWithTapping().asImmediateFlow { isVisible = it }.launchIn(scope)
}
intListPreference {
key = Keys.imageScaleType
titleRes = R.string.pref_image_scale_type
@@ -175,6 +210,41 @@ class SettingsReaderController : SettingsController() {
preferenceCategory {
titleRes = R.string.webtoon_viewer
intListPreference {
key = Keys.navigationModeWebtoon
titleRes = R.string.pref_viewer_nav
entriesRes = arrayOf(
R.string.default_nav,
R.string.l_nav,
R.string.kindlish_nav,
R.string.edge_nav
)
entryValues = arrayOf("0", "1", "2", "3")
defaultValue = "0"
summary = "%s"
preferences.readWithTapping().asImmediateFlow { isVisible = it }.launchIn(scope)
}
listPreference {
key = Keys.webtoonNavInverted
titleRes = R.string.pref_read_with_tapping_inverted
entriesRes = arrayOf(
R.string.tapping_inverted_none,
R.string.tapping_inverted_horizontal,
R.string.tapping_inverted_vertical,
R.string.tapping_inverted_both
)
entryValues = arrayOf(
TappingInvertMode.NONE.name,
TappingInvertMode.HORIZONTAL.name,
TappingInvertMode.VERTICAL.name,
TappingInvertMode.BOTH.name
)
defaultValue = TappingInvertMode.NONE.name
summary = "%s"
preferences.readWithTapping().asImmediateFlow { isVisible = it }.launchIn(scope)
}
intListPreference {
key = Keys.webtoonSidePadding
titleRes = R.string.pref_webtoon_side_padding
@@ -204,26 +274,6 @@ class SettingsReaderController : SettingsController() {
titleRes = R.string.pref_read_with_tapping
defaultValue = true
}
listPreference {
key = Keys.readWithTappingInverted
titleRes = R.string.pref_read_with_tapping_inverted
entriesRes = arrayOf(
R.string.tapping_inverted_none,
R.string.tapping_inverted_horizontal,
R.string.tapping_inverted_vertical,
R.string.tapping_inverted_both
)
entryValues = arrayOf(
TappingInvertMode.NONE.name,
TappingInvertMode.HORIZONTAL.name,
TappingInvertMode.VERTICAL.name,
TappingInvertMode.BOTH.name
)
defaultValue = TappingInvertMode.NONE.name
summary = "%s"
preferences.readWithTapping().asImmediateFlow { isVisible = it }.launchIn(scope)
}
switchPreference {
key = Keys.readWithLongTap
titleRes = R.string.pref_read_with_long_tap