From ec19410fea614c5154bccae2008907e12952f6d5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 22 Mar 2020 22:35:19 +0100 Subject: [PATCH] add some limits to the max and min weekly view zoom level --- .../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 67cf05d49..52ea64129 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 @@ -32,6 +32,8 @@ import java.util.* class WeekFragment : Fragment(), WeeklyCalendar { private val PLUS_FADEOUT_DELAY = 5000L + private val MIN_ZOOM_FACTOR = 0.4f + private val MAX_ZOOM_FACTOR = 4f var listener: WeekFragmentListener? = null private var weekTimestamp = 0L @@ -218,7 +220,8 @@ class WeekFragment : Fragment(), WeeklyCalendar { } override fun onScaleEnd(detector: ScaleGestureDetector) { - config.weeklyViewItemHeightMultiplier = detector.scaleFactor + val newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier * detector.scaleFactor, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR) + config.weeklyViewItemHeightMultiplier = newFactor listener?.updateRowHeight() mView.week_events_scrollview.isScrollable = true super.onScaleEnd(detector)