From d3e67052263202ae6126514196c689577bf85a7f Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 24 Mar 2020 17:21:39 +0100 Subject: [PATCH] reenable flinding the weekly view --- .../simplemobiletools/calendar/pro/fragments/WeekFragment.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt index 2fbf140a0..3268488c1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt @@ -49,6 +49,7 @@ class WeekFragment : Fragment(), WeeklyCalendar { private var wasFragmentInit = false private var wasExtraHeightAdded = false private var dimPastEvents = true + private var wasScaled = false private var selectedGrid: View? = null private var currentTimeView: ImageView? = null private var allDayHolders = ArrayList() @@ -88,8 +89,9 @@ class WeekFragment : Fragment(), WeeklyCalendar { val scaleDetector = getViewScaleDetector() scrollView.setOnTouchListener { view, motionEvent -> scaleDetector.onTouchEvent(motionEvent) - if (motionEvent.action == MotionEvent.ACTION_UP) { + if (motionEvent.action == MotionEvent.ACTION_UP && wasScaled) { scrollView.isScrollable = true + wasScaled = false true } else { false @@ -250,6 +252,7 @@ class WeekFragment : Fragment(), WeeklyCalendar { override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { scrollView.isScrollable = false scaleAtStart = detector.scaleFactor + wasScaled = true return super.onScaleBegin(detector) } })