Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-09-19 08:29:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #765

Browse Source
This commit is contained in:
Jays2Kings 2021-04-23 23:19:55 -04:00
parent 6906fff121
commit ec87df7056
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper 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.data.preference.toggle
import eu.kanade.tachiyomi.databinding.ReaderActivityBinding import eu.kanade.tachiyomi.databinding.ReaderActivityBinding
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
@ -928,7 +929,7 @@ class ReaderActivity :
lastShiftDoubleState?.let { newViewer.config.shiftDoublePage = it } lastShiftDoubleState?.let { newViewer.config.shiftDoublePage = it }
} }
binding.navigationOverlay.isLTR = !(viewer is L2RPagerViewer) binding.navigationOverlay.isLTR = viewer !is L2RPagerViewer
binding.viewerContainer.setBackgroundColor( binding.viewerContainer.setBackgroundColor(
if (viewer is WebtoonViewer) { if (viewer is WebtoonViewer) {
Color.BLACK Color.BLACK
@ -1474,6 +1475,10 @@ class ReaderActivity :
updateBottomShortcuts() updateBottomShortcuts()
} }
.launchIn(scope) .launchIn(scope)
preferences.readWithTapping().asImmediateFlow(scope) {
binding?.navigationOverlay.tappingEnabled = it
}
} }
/** /**

3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
View File

@ -20,6 +20,7 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet)
private var navigation: ViewerNavigation? = null private var navigation: ViewerNavigation? = null
var isLTR = true var isLTR = true
var tappingEnabled = true
fun setNavigation(navigation: ViewerNavigation, showOnStart: Boolean) { fun setNavigation(navigation: ViewerNavigation, showOnStart: Boolean) {
if (!showOnStart && (this.navigation == null || this.navigation === navigation)) { if (!showOnStart && (this.navigation == null || this.navigation === navigation)) {
@ -37,7 +38,7 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet)
fun showNavigationAgain() { fun showNavigationAgain() {
invalidate() invalidate()
if (isVisible) return if (isVisible || !tappingEnabled) return
viewPropertyAnimator = animate() viewPropertyAnimator = animate()
.alpha(1f) .alpha(1f)