mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-06-05 21:59:17 +02:00
limit the zoom out level by the screens size
This commit is contained in:
@ -32,7 +32,7 @@ import java.util.*
|
|||||||
|
|
||||||
class WeekFragment : Fragment(), WeeklyCalendar {
|
class WeekFragment : Fragment(), WeeklyCalendar {
|
||||||
private val PLUS_FADEOUT_DELAY = 5000L
|
private val PLUS_FADEOUT_DELAY = 5000L
|
||||||
private val MIN_ZOOM_FACTOR = 0.4f
|
private val MIN_ZOOM_FACTOR = 0.3f
|
||||||
private val MAX_ZOOM_FACTOR = 4f
|
private val MAX_ZOOM_FACTOR = 4f
|
||||||
|
|
||||||
var listener: WeekFragmentListener? = null
|
var listener: WeekFragmentListener? = null
|
||||||
@ -221,7 +221,12 @@ class WeekFragment : Fragment(), WeeklyCalendar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onScaleEnd(detector: ScaleGestureDetector) {
|
override fun onScaleEnd(detector: ScaleGestureDetector) {
|
||||||
val newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier * detector.scaleFactor, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR)
|
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)
|
||||||
|
if (mView.week_events_scrollview.height > defaultHeight * newFactor * 24) {
|
||||||
|
newFactor = mView.week_events_scrollview.height / 24f / defaultHeight
|
||||||
|
}
|
||||||
|
|
||||||
config.weeklyViewItemHeightMultiplier = newFactor
|
config.weeklyViewItemHeightMultiplier = newFactor
|
||||||
updateViewScale()
|
updateViewScale()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user