From a6d54f1757ae9e745af48e427d458b05180e8dbd Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 8 Jun 2020 19:41:45 +0200 Subject: [PATCH] refresh the events after changing the day columns count --- .../calendar/pro/fragments/WeekFragment.kt | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt index c3ee4b783..b2a4007ac 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt @@ -106,14 +106,7 @@ class WeekFragment : Fragment(), WeeklyCalendar { } } - mView.week_events_columns_holder.removeAllViews() - (0 until context!!.config.weeklyViewDays).forEach { - val column = inflater.inflate(R.layout.weekly_view_day_column, mView.week_events_columns_holder, false) as RelativeLayout - column.tag = Formatter.getDayCodeFromTS(weekTimestamp + it * DAY_SECONDS) - mView.week_events_columns_holder.addView(column) - dayColumns.add(column) - } - + addDayColumns() scrollView.setOnScrollviewListener(object : MyScrollView.ScrollViewListener { override fun onScrollChanged(scrollView: MyScrollView, x: Int, y: Int, oldx: Int, oldy: Int) { checkScrollLimits(y) @@ -179,13 +172,8 @@ class WeekFragment : Fragment(), WeeklyCalendar { } fun updateVisibleDaysCount(count: Int) { - mView.week_events_columns_holder.removeAllViews() dayColumns.clear() - (0 until context!!.config.weeklyViewDays).forEach { - val column = inflater.inflate(R.layout.weekly_view_day_column, mView.week_events_columns_holder, false) as RelativeLayout - mView.week_events_columns_holder.addView(column) - dayColumns.add(column) - } + addDayColumns() mView.week_horizontal_grid_holder.apply { daysCount = count @@ -195,6 +183,16 @@ class WeekFragment : Fragment(), WeeklyCalendar { addEvents(currEvents) } + private fun addDayColumns() { + mView.week_events_columns_holder.removeAllViews() + (0 until context!!.config.weeklyViewDays).forEach { + val column = inflater.inflate(R.layout.weekly_view_day_column, mView.week_events_columns_holder, false) as RelativeLayout + column.tag = Formatter.getDayCodeFromTS(weekTimestamp + it * DAY_SECONDS) + mView.week_events_columns_holder.addView(column) + dayColumns.add(column) + } + } + private fun setupDayLabels() { var curDay = Formatter.getDateTimeFromTS(weekTimestamp) val textColor = config.textColor