fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improving the way weekly zooming works a bit, needs some cleanup

This commit is contained in:
tibbi 2020-03-25 14:51:07 +01:00
parent 24b524bbe2
commit d8c59f1700
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,10 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private var primaryColor = 0 private var primaryColor = 0
private var lastHash = 0 private var lastHash = 0
private var prevScaleSpanY = 0f private var prevScaleSpanY = 0f
private var scaleCenterPercent = 0f
private var defaultRowHeight = 0f private var defaultRowHeight = 0f
private var screenHeight = 0 private var screenHeight = 0
private var rowHeightsAtScale = 0f
private var mWasDestroyed = false private var mWasDestroyed = false
private var isFragmentVisible = false private var isFragmentVisible = false
private var wasFragmentInit = false private var wasFragmentInit = false
@ -250,10 +252,22 @@ class WeekFragment : Fragment(), WeeklyCalendar {
config.weeklyViewItemHeightMultiplier = newFactor config.weeklyViewItemHeightMultiplier = newFactor
updateViewScale() updateViewScale()
listener?.updateRowHeight(rowHeight.toInt()) listener?.updateRowHeight(rowHeight.toInt())
val fullContentHeight = rowHeight * 24
val visibleRatio = scrollView.height / fullContentHeight
val visibleHeight = fullContentHeight * visibleRatio
val targetY = rowHeightsAtScale * rowHeight - scaleCenterPercent * visibleHeight
scrollView.scrollTo(0, targetY.toInt())
return super.onScale(detector) return super.onScale(detector)
} }
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
val fullContentHeight = rowHeight * 24
val visibleRatio = scrollView.height / fullContentHeight
val visibleHeight = fullContentHeight * visibleRatio
scaleCenterPercent = detector.focusY / scrollView.height
rowHeightsAtScale = (scrollView.scrollY + scaleCenterPercent * visibleHeight) / rowHeight
scrollView.isScrollable = false scrollView.isScrollable = false
prevScaleSpanY = detector.currentSpanY prevScaleSpanY = detector.currentSpanY
wasScaled = true wasScaled = true