Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-17 12:49:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Invert tapping for Webtoon and Vertical

Browse Source
This commit is contained in:
Andreas E 2020-06-23 10:58:56 +02:00
parent 7f88b56d8b
commit 0ea0eba4f0
No known key found for this signature in database
GPG Key ID: D7D48B26482380B8
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
View File

@ -32,7 +32,7 @@ abstract class ViewerConfig(preferences: PreferencesHelper) {
.register({ tappingEnabled = it }) .register({ tappingEnabled = it })
preferences.readWithTappingInverted() preferences.readWithTappingInverted()
.register({ tappingInverted = it }) .register({ tappingInverted = it })
preferences.readWithLongTap() preferences.readWithLongTap()
.register({ longTapEnabled = it }) .register({ longTapEnabled = it })

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

@ -81,17 +81,22 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
}) })
pager.tapListener = { event -> pager.tapListener = { event ->
val tappingInverted = config.tappingInverted val tappingInverted = config.tappingInverted
if (this is VerticalPagerViewer) { if (this is VerticalPagerViewer) {
val positionY = event.y val positionY = event.y
val topSideTap = positionY < pager.height * 0.33f && config.tappingEnabled
val bottomSideTap = positionY > pager.height * 0.66f && config.tappingEnabled
when { when {
positionY < pager.height * 0.33f && config.tappingEnabled -> moveLeft() topSideTap && !tappingInverted || bottomSideTap && tappingInverted -> moveLeft()
positionY > pager.height * 0.66f && config.tappingEnabled -> moveRight() bottomSideTap && !tappingInverted || topSideTap && tappingInverted -> moveRight()
else -> activity.toggleMenu() else -> activity.toggleMenu()
} }
} else { } else {
val positionX = event.x val positionX = event.x
val leftSideTap = positionX < pager.width * 0.33f && config.tappingEnabled val leftSideTap = positionX < pager.width * 0.33f && config.tappingEnabled
val rightSideTap = positionX > pager.width * 0.66f && config.tappingEnabled val rightSideTap = positionX > pager.width * 0.66f && config.tappingEnabled
when { when {
leftSideTap && !tappingInverted || rightSideTap && tappingInverted -> moveLeft() leftSideTap && !tappingInverted || rightSideTap && tappingInverted -> moveLeft()
rightSideTap && !tappingInverted || leftSideTap && tappingInverted -> moveRight() rightSideTap && !tappingInverted || leftSideTap && tappingInverted -> moveRight()

8
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
View File

@ -94,9 +94,13 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr
}) })
recycler.tapListener = { event -> recycler.tapListener = { event ->
val positionY = event.rawY val positionY = event.rawY
val tappingInverted = config.tappingInverted
val topSideTap = positionY < recycler.height * 0.33f && config.tappingEnabled
val bottomSideTap = positionY > recycler.height * 0.66f && config.tappingEnabled
when { when {
positionY < recycler.height * 0.33f && config.tappingEnabled -> scrollUp() topSideTap && !tappingInverted || bottomSideTap && tappingInverted -> scrollUp()
positionY > recycler.height * 0.66f && config.tappingEnabled -> scrollDown() bottomSideTap && !tappingInverted || topSideTap && tappingInverted -> scrollDown()
else -> activity.toggleMenu() else -> activity.toggleMenu()
} }
} }