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

add realtime weekly view zooming, not just at scaleEnd

This commit is contained in:
tibbi 2020-03-24 14:56:47 +01:00
parent d283d49082
commit 68ae9ed517
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private var todayColumnIndex = -1 private var todayColumnIndex = -1
private var primaryColor = 0 private var primaryColor = 0
private var lastHash = 0 private var lastHash = 0
private var scaleAtStart = 1f
private var mWasDestroyed = false private var mWasDestroyed = false
private var isFragmentVisible = false private var isFragmentVisible = false
private var wasFragmentInit = false private var wasFragmentInit = false
@ -224,16 +225,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private fun getViewScaleDetector(): ScaleGestureDetector { private fun getViewScaleDetector(): ScaleGestureDetector {
return ScaleGestureDetector(context, object : ScaleGestureDetector.SimpleOnScaleGestureListener() { return ScaleGestureDetector(context, object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
override fun onScale(detector: ScaleGestureDetector): Boolean { override fun onScale(detector: ScaleGestureDetector): Boolean {
return super.onScale(detector) val scaleDifference = detector.scaleFactor - scaleAtStart
} scaleAtStart = detector.scaleFactor
var newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier + scaleDifference, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR)
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
scrollView.isScrollable = false
return super.onScaleBegin(detector)
}
override fun onScaleEnd(detector: ScaleGestureDetector) {
var newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier * detector.scaleFactor, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR)
val defaultHeight = resources.getDimension(R.dimen.weekly_view_row_height) val defaultHeight = resources.getDimension(R.dimen.weekly_view_row_height)
if (scrollView.height > defaultHeight * newFactor * 24) { if (scrollView.height > defaultHeight * newFactor * 24) {
newFactor = scrollView.height / 24f / defaultHeight newFactor = scrollView.height / 24f / defaultHeight
@ -242,7 +236,16 @@ class WeekFragment : Fragment(), WeeklyCalendar {
config.weeklyViewItemHeightMultiplier = newFactor config.weeklyViewItemHeightMultiplier = newFactor
updateViewScale() updateViewScale()
listener?.updateRowHeight(rowHeight.toInt()) listener?.updateRowHeight(rowHeight.toInt())
return super.onScale(detector)
}
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
scrollView.isScrollable = false
scaleAtStart = detector.scaleFactor
return super.onScaleBegin(detector)
}
override fun onScaleEnd(detector: ScaleGestureDetector) {
scrollView.isScrollable = true scrollView.isScrollable = true
super.onScaleEnd(detector) super.onScaleEnd(detector)
} }