From ec87df70564a473ea7aa735df786bc687cea5e2f Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Fri, 23 Apr 2021 23:19:55 -0400 Subject: [PATCH] Fixed #765 --- .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 7 ++++++- .../tachiyomi/ui/reader/ReaderNavigationOverlayView.kt | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 05c4707b0d..38bd0a6f06 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -42,6 +42,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferencesHelper +import eu.kanade.tachiyomi.data.preference.asImmediateFlow import eu.kanade.tachiyomi.data.preference.toggle import eu.kanade.tachiyomi.databinding.ReaderActivityBinding import eu.kanade.tachiyomi.source.model.Page @@ -928,7 +929,7 @@ class ReaderActivity : lastShiftDoubleState?.let { newViewer.config.shiftDoublePage = it } } - binding.navigationOverlay.isLTR = !(viewer is L2RPagerViewer) + binding.navigationOverlay.isLTR = viewer !is L2RPagerViewer binding.viewerContainer.setBackgroundColor( if (viewer is WebtoonViewer) { Color.BLACK @@ -1474,6 +1475,10 @@ class ReaderActivity : updateBottomShortcuts() } .launchIn(scope) + + preferences.readWithTapping().asImmediateFlow(scope) { + binding?.navigationOverlay.tappingEnabled = it + } } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt index 26a41372f1..197d87bc79 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt @@ -20,6 +20,7 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet) private var navigation: ViewerNavigation? = null var isLTR = true + var tappingEnabled = true fun setNavigation(navigation: ViewerNavigation, showOnStart: Boolean) { if (!showOnStart && (this.navigation == null || this.navigation === navigation)) { @@ -37,7 +38,7 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet) fun showNavigationAgain() { invalidate() - if (isVisible) return + if (isVisible || !tappingEnabled) return viewPropertyAnimator = animate() .alpha(1f)