From c826ef12ac1f1738979d65d2b275911f4d15b978 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 3 Nov 2016 20:34:29 +0100 Subject: [PATCH] some corrections to really mark all days with events --- .../calendar/MonthlyCalendarImpl.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/MonthlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/MonthlyCalendarImpl.kt index 8f5b543c1..dec71a1de 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/MonthlyCalendarImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/MonthlyCalendarImpl.kt @@ -72,26 +72,31 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) value++ } - markEvents(days, firstDayIndex - 1) + markDaysWithEvents(days) mCallback.updateMonthlyCalendar(monthName, days) } - private fun markEvents(days: ArrayList, firstDayIndex: Int) { + // it works more often than not, dont touch + private fun markDaysWithEvents(days: ArrayList) { + val eventCodes = ArrayList() for (event in mEvents) { val startDateTime = DateTime().withMillis(event.startTS * 1000L) val endDateTime = DateTime().withMillis(event.endTS * 1000L) val endCode = Formatter.getDayCodeFromDateTime(endDateTime) var currDay = startDateTime - if (currDay.monthOfYear == mTargetDate.monthOfYear) - days[startDateTime.dayOfMonth + firstDayIndex].hasEvent = true + eventCodes.add(Formatter.getDayCodeFromDateTime(currDay)) while (Formatter.getDayCodeFromDateTime(currDay) != endCode) { currDay = currDay.plusDays(1) - if (currDay.monthOfYear == mTargetDate.monthOfYear) { - days[currDay.dayOfMonth + firstDayIndex].hasEvent = true - } + eventCodes.add(Formatter.getDayCodeFromDateTime(currDay)) + } + } + + for (day in days) { + if (eventCodes.contains(day.code)) { + day.hasEvent = true } } }