fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

reenable flinding the weekly view

Browse Source
This commit is contained in:
tibbi
2020-03-24 17:21:39 +01:00
parent 51b1a8c71a
commit d3e6705226
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
View File

@@ -49,6 +49,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private var wasFragmentInit = false private var wasFragmentInit = false
private var wasExtraHeightAdded = false private var wasExtraHeightAdded = false
private var dimPastEvents = true private var dimPastEvents = true
private var wasScaled = false
private var selectedGrid: View? = null private var selectedGrid: View? = null
private var currentTimeView: ImageView? = null private var currentTimeView: ImageView? = null
private var allDayHolders = ArrayList<RelativeLayout>() private var allDayHolders = ArrayList<RelativeLayout>()
@@ -88,8 +89,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val scaleDetector = getViewScaleDetector() val scaleDetector = getViewScaleDetector()
scrollView.setOnTouchListener { view, motionEvent -> scrollView.setOnTouchListener { view, motionEvent ->
scaleDetector.onTouchEvent(motionEvent) scaleDetector.onTouchEvent(motionEvent)
if (motionEvent.action == MotionEvent.ACTION_UP) { if (motionEvent.action == MotionEvent.ACTION_UP && wasScaled) {
scrollView.isScrollable = true scrollView.isScrollable = true
wasScaled = false
true true
} else { } else {
false false
@@ -250,6 +252,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
scrollView.isScrollable = false scrollView.isScrollable = false
scaleAtStart = detector.scaleFactor scaleAtStart = detector.scaleFactor
wasScaled = true
return super.onScaleBegin(detector) return super.onScaleBegin(detector)
} }
}) })