From 4e45a337dab08a0fedd3a4b8a5482c221a95956f Mon Sep 17 00:00:00 2001 From: Jay Date: Wed, 20 May 2020 21:56:02 -0400 Subject: [PATCH] Fixed #435 --- .../tachiyomi/ui/reader/viewer/pager/PagerViewer.kt | 4 ++-- .../tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt index bd92de341f..2121a5861c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt @@ -82,8 +82,8 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { pager.tapListener = { event -> val positionX = event.x when { - positionX < pager.width * 0.33f -> if (config.tappingEnabled) moveLeft() else activity.toggleMenu() - positionX > pager.width * 0.66f -> if (config.tappingEnabled) moveRight() else activity.toggleMenu() + positionX < pager.width * 0.33f && config.tappingEnabled -> moveLeft() + positionX > pager.width * 0.66f && config.tappingEnabled -> moveRight() else -> activity.toggleMenu() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt index 0ac5826b85..391d2f8793 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt @@ -97,10 +97,10 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr val positionX = event.rawX val positionY = event.rawY when { - positionY < recycler.height * 0.25 -> if (config.tappingEnabled) scrollUp() - positionY > recycler.height * 0.75 -> if (config.tappingEnabled) scrollDown() - positionX < recycler.width * 0.33 -> if (config.tappingEnabled) scrollUp() - positionX > recycler.width * 0.66 -> if (config.tappingEnabled) scrollDown() + positionY < recycler.height * 0.25 && config.tappingEnabled -> scrollUp() + positionY > recycler.height * 0.75 && config.tappingEnabled -> scrollDown() + positionX < recycler.width * 0.33 && config.tappingEnabled -> scrollUp() + positionX > recycler.width * 0.66 && config.tappingEnabled -> scrollDown() else -> activity.toggleMenu() } }