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

Properly handle events spanning midnight

This commit is contained in:
Naveen 2022-05-25 11:23:50 +05:30
parent ac43e14999
commit 2fe3e98695
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -741,6 +741,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val firstDayIndex = startDateTimeInWeek.dayOfMonth // indices must be unique for the visible range (2 weeks)
val lastDayIndex = firstDayIndex + daysCnt
val dayIndices = firstDayIndex..lastDayIndex
val isSameDayEvent = firstDayIndex == lastDayIndex
var doesEventFit: Boolean
var wasEventHandled = false
@ -753,11 +754,13 @@ class WeekFragment : Fragment(), WeeklyCalendar {
doesEventFit = dayIndices.all { !row.contains(it) }
for (dayIndex in dayIndices) {
if (doesEventFit) {
row.add(dayIndex)
if (doesEventFit && isSameDayEvent) {
row.add(firstDayIndex)
wasEventHandled = true
} else if (index == allDayRows.lastIndex) {
} else {
// handle events spanning midnight
for (dayIndex in dayIndices) {
if (index == allDayRows.lastIndex) {
allDayRows.add(HashSet())
addNewLine()
drawAtLine++
@ -765,6 +768,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
allDayRows.last().add(dayIndex)
}
}
}
if (wasEventHandled) {
break