Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-10 20:15:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes to the reader nav

Browse Source
This commit is contained in:
Jays2Kings 2021-03-31 02:12:37 -04:00
parent a6a2ef6399
commit 23702bfd66
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import android.widget.SeekBar
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import androidx.core.graphics.ColorUtils import androidx.core.graphics.ColorUtils
import androidx.core.view.GestureDetectorCompat import androidx.core.view.GestureDetectorCompat
import androidx.core.view.isVisible
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
@ -220,6 +221,9 @@ class ReaderActivity :
if (savedInstanceState != null) { if (savedInstanceState != null) {
menuVisible = savedInstanceState.getBoolean(::menuVisible.name) menuVisible = savedInstanceState.getBoolean(::menuVisible.name)
binding.readerNav.root.isVisible = menuVisible
} else {
binding.readerNav.root.gone()
} }
binding.chaptersSheet.chaptersBottomSheet.setup(this) binding.chaptersSheet.chaptersBottomSheet.setup(this)
@ -399,7 +403,7 @@ class ReaderActivity :
return@setOnTouchListener false return@setOnTouchListener false
} }
if (it == pageSeekbar) { if (it == pageSeekbar) {
readerNavGestureDetector.lockVertical readerNavGestureDetector.lockVertical || !readerNavGestureDetector.hasScrollHorizontal
} else { } else {
result result
} }

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

@ -36,7 +36,7 @@ class ReaderNavGestureDetector(private val activity: ReaderActivity) : GestureDe
val newDistanceX = (e1?.rawX ?: 0f) - (e2?.rawX ?: 0f) val newDistanceX = (e1?.rawX ?: 0f) - (e2?.rawX ?: 0f)
val newDistanceY = (e1?.rawY ?: 0f) - (e2?.rawY ?: 0f) val newDistanceY = (e1?.rawY ?: 0f) - (e2?.rawY ?: 0f)
if ((!hasScrollHorizontal || lockVertical) && e2 != null) { if ((!hasScrollHorizontal || lockVertical) && e2 != null) {
hasScrollHorizontal = abs(newDistanceX) > abs(newDistanceY) && abs(newDistanceX) > 80 hasScrollHorizontal = abs(newDistanceX) > abs(newDistanceY) && abs(newDistanceX) > 60
val modE = MotionEvent.obtain(e2) val modE = MotionEvent.obtain(e2)
modE.setLocation( modE.setLocation(