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

move the extra height calculation in a separate function

This commit is contained in:
tibbi 2017-05-23 22:12:00 +02:00
parent 41369041cf
commit c6ca96437c
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,22 +379,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
width = getColumnWithId(Math.min(firstDayIndex + daysCnt, 6)).right - leftMargin - 1 width = getColumnWithId(Math.min(firstDayIndex + daysCnt, 6)).right - leftMargin - 1
} }
mView.week_top_holder.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { calculateExtraHeight()
override fun onGlobalLayout() {
if (activity == null)
return
mView.week_top_holder.viewTreeObserver.removeOnGlobalLayoutListener(this)
if (isFragmentVisible) {
(activity as MainActivity).updateHoursTopMargin(mView.week_top_holder.height)
}
if (!wasExtraHeightAdded) {
maxScrollY += mView.week_all_day_holder.height
wasExtraHeightAdded = true
}
}
})
setOnClickListener { setOnClickListener {
Intent(activity.applicationContext, EventActivity::class.java).apply { Intent(activity.applicationContext, EventActivity::class.java).apply {
putExtra(EVENT_ID, event.id) putExtra(EVENT_ID, event.id)
@ -404,6 +390,25 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} }
} }
private fun calculateExtraHeight() {
mView.week_top_holder.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
override fun onGlobalLayout() {
if (activity == null)
return
mView.week_top_holder.viewTreeObserver.removeOnGlobalLayoutListener(this)
if (isFragmentVisible) {
(activity as MainActivity).updateHoursTopMargin(mView.week_top_holder.height)
}
if (!wasExtraHeightAdded) {
maxScrollY += mView.week_all_day_holder.height
wasExtraHeightAdded = true
}
}
})
}
override fun onDestroyView() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
mWasDestroyed = true mWasDestroyed = true