fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-17 04:10:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle repeating and overlapping events

Browse Source
This commit is contained in:
Naveen 2022-05-31 23:04:33 +05:30
parent 479a756fec
commit 69ddc43d99
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt
View File

@ -116,16 +116,24 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
private fun groupAllEvents() { private fun groupAllEvents() {
days.forEach { day -> days.forEach { day ->
val dayIndexOnMonthView = day.indexOnMonthView
day.dayEvents.forEach { event -> day.dayEvents.forEach { event ->
// make sure we properly handle events lasting multiple days and repeating ones // make sure we properly handle events lasting multiple days and repeating ones
val lastEvent = allEvents.lastOrNull { it.id == event.id }
val daysCnt = getEventLastingDaysCount(event)
val validDayEvent = isDayValid(event, day.code) val validDayEvent = isDayValid(event, day.code)
val lastEvent = allEvents.lastOrNull { it.id == event.id }
val notYetAddedOrIsRepeatingEvent = lastEvent == null || lastEvent.endTS <= event.startTS
// handle overlapping repeating events e.g. an event that lasts 3 days, but repeats every 2 days has a one day overlap
val canOverlap = event.endTS - event.startTS > event.repeatInterval
val shouldAddEvent = notYetAddedOrIsRepeatingEvent || canOverlap && (lastEvent!!.startTS < event.startTS)
if (shouldAddEvent && !validDayEvent) {
val daysCnt = getEventLastingDaysCount(event)
if ((lastEvent == null || lastEvent.startDayIndex + daysCnt <= findLastDay(event).indexOnMonthView) && !validDayEvent) {
val monthViewEvent = MonthViewEvent( val monthViewEvent = MonthViewEvent(
event.id!!, event.title, event.startTS, event.endTS, event.color, day.indexOnMonthView, event.id!!, event.title, event.startTS, event.endTS, event.color, dayIndexOnMonthView,
daysCnt, day.indexOnMonthView, event.getIsAllDay(), event.isPastEvent, event.isTask(), event.isTaskCompleted() daysCnt, dayIndexOnMonthView, event.getIsAllDay(), event.isPastEvent, event.isTask(), event.isTaskCompleted()
) )
allEvents.add(monthViewEvent) allEvents.add(monthViewEvent)
} }
@ -429,12 +437,6 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
return event.startTS != event.endTS && Formatter.getDateTimeFromTS(event.endTS) == Formatter.getDateTimeFromTS(date.seconds()).withTimeAtStartOfDay() return event.startTS != event.endTS && Formatter.getDateTimeFromTS(event.endTS) == Formatter.getDateTimeFromTS(date.seconds()).withTimeAtStartOfDay()
} }
private fun findLastDay(event: Event): DayMonthly {
return days.last { day ->
day.dayEvents.find { it.id == event.id } != null
}
}
fun togglePrintMode() { fun togglePrintMode() {
isPrintVersion = !isPrintVersion isPrintVersion = !isPrintVersion
textColor = if (isPrintVersion) { textColor = if (isPrintVersion) {