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

store the default row height value in a variable

This commit is contained in:
tibbi 2020-03-24 15:04:44 +01:00
parent e83777cbc3
commit 30db5f9183
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private var primaryColor = 0 private var primaryColor = 0
private var lastHash = 0 private var lastHash = 0
private var scaleAtStart = 1f private var scaleAtStart = 1f
private var defaultRowHeight = 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
@ -67,6 +68,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
res = context!!.resources res = context!!.resources
config = context!!.config config = context!!.config
rowHeight = context!!.getWeeklyViewItemHeight() rowHeight = context!!.getWeeklyViewItemHeight()
defaultRowHeight = res.getDimension(R.dimen.weekly_view_row_height)
weekTimestamp = arguments!!.getLong(WEEK_START_TIMESTAMP) weekTimestamp = arguments!!.getLong(WEEK_START_TIMESTAMP)
dimPastEvents = config.dimPastEvents dimPastEvents = config.dimPastEvents
primaryColor = context!!.getAdjustedPrimaryColor() primaryColor = context!!.getAdjustedPrimaryColor()
@ -146,7 +148,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
// fix some glitches like at swiping from a fully zoomed out fragment will all-day events to an empty one // fix some glitches like at swiping from a fully zoomed out fragment will all-day events to an empty one
val fullFragmentHeight = (listener?.getFullFragmentHeight() ?: 0) - mView.week_top_holder.height val fullFragmentHeight = (listener?.getFullFragmentHeight() ?: 0) - mView.week_top_holder.height
if (scrollView.height < fullFragmentHeight) { if (scrollView.height < fullFragmentHeight) {
config.weeklyViewItemHeightMultiplier = fullFragmentHeight / 24 / context!!.resources.getDimension(R.dimen.weekly_view_row_height) config.weeklyViewItemHeightMultiplier = fullFragmentHeight / 24 / defaultRowHeight
updateViewScale() updateViewScale()
listener?.updateRowHeight(rowHeight.toInt()) listener?.updateRowHeight(rowHeight.toInt())
} }
@ -235,9 +237,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val scaleDifference = detector.scaleFactor - scaleAtStart val scaleDifference = detector.scaleFactor - scaleAtStart
scaleAtStart = detector.scaleFactor scaleAtStart = detector.scaleFactor
var newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier + scaleDifference, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR) var newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier + scaleDifference, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR)
val defaultHeight = resources.getDimension(R.dimen.weekly_view_row_height) if (scrollView.height > defaultRowHeight * newFactor * 24) {
if (scrollView.height > defaultHeight * newFactor * 24) { newFactor = scrollView.height / 24f / defaultRowHeight
newFactor = scrollView.height / 24f / defaultHeight
} }
config.weeklyViewItemHeightMultiplier = newFactor config.weeklyViewItemHeightMultiplier = newFactor