fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

store event colors in the day model

Browse Source
This commit is contained in:
tibbi
2017-04-22 22:34:59 +02:00
parent 67747e329a
commit 30d593649a
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
View File

@@ -88,11 +88,11 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
// it works more often than not, dont touch // it works more often than not, dont touch
private fun markDaysWithEvents(days: ArrayList<Day>) { private fun markDaysWithEvents(days: ArrayList<Day>) {
val eventCodes = ArrayList<String>()
mContext.dbHelper.getEventTypes { mContext.dbHelper.getEventTypes {
val eventTypes = SparseIntArray() val dayEvents = HashMap<String, ArrayList<Event>>()
val eventTypeColors = SparseIntArray()
it.forEach { it.forEach {
eventTypes.put(it.id, it.color) eventTypeColors.put(it.id, it.color)
} }
mEvents.forEach { mEvents.forEach {
@@ -101,15 +101,27 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
val endCode = Formatter.getDayCodeFromDateTime(endDateTime) val endCode = Formatter.getDayCodeFromDateTime(endDateTime)
var currDay = startDateTime var currDay = startDateTime
eventCodes.add(Formatter.getDayCodeFromDateTime(currDay)) var dayCode = Formatter.getDayCodeFromDateTime(currDay)
var currDayEvents = (dayEvents[dayCode] ?: ArrayList<Event>()).apply { add(it) }
dayEvents.put(dayCode, currDayEvents)
while (Formatter.getDayCodeFromDateTime(currDay) != endCode) { while (Formatter.getDayCodeFromDateTime(currDay) != endCode) {
currDay = currDay.plusDays(1) currDay = currDay.plusDays(1)
eventCodes.add(Formatter.getDayCodeFromDateTime(currDay)) dayCode = Formatter.getDayCodeFromDateTime(currDay)
currDayEvents = (dayEvents[dayCode] ?: ArrayList<Event>()).apply { add(it) }
dayEvents.put(dayCode, currDayEvents)
} }
} }
days.filter { eventCodes.contains(it.code) }.forEach { it.hasEvent = true } days.filter { dayEvents.keys.contains(it.code) }.forEach {
val day = it
day.hasEvent = true
val events = dayEvents[it.code]
events!!.forEach {
day.eventColors.add(eventTypeColors[it.eventType])
}
}
} }
} }