fix: consider neighbour events when calculating max slot range (#875)

* fix: consider neighbour events when calculating max slot range

Refs: #550

Author: naveensingh

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated holiday data
 
 ### Fixed
+- Fixed startup crash in weekly view ([#550])
 - Fixed incorrect weekly view start date in some cases ([#45])
 - Fixed issue with Up/Arrow button closing the app ([#870])
 - Fixed time drift when switching between views ([#590])
@@ -167,6 +168,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#394]: https://github.com/FossifyOrg/Calendar/issues/394
 [#484]: https://github.com/FossifyOrg/Calendar/issues/484
 [#486]: https://github.com/FossifyOrg/Calendar/issues/486
+[#550]: https://github.com/FossifyOrg/Calendar/issues/550
 [#551]: https://github.com/FossifyOrg/Calendar/issues/551
 [#567]: https://github.com/FossifyOrg/Calendar/issues/567
 [#574]: https://github.com/FossifyOrg/Calendar/issues/574

app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt

@@ -553,25 +553,41 @@ class WeekFragment : Fragment(), WeeklyCalendar {
 
                     if (areTouching && doHaveCommonMinutes) {
                         if (eventWeeklyViewToCheck.slot == 0) {
-                            val nextSlot = eventWeeklyView.slotMax + 1
-                            val slotRange = Array(eventWeeklyView.slotMax) { it + 1 }
-                            val collisionEventWeeklyViews = eventDayList.filter { eventWeeklyView.collisions.contains(it.key) }
+                            val collisionEventWeeklyViews = eventDayList
+                                .filter { eventWeeklyView.collisions.contains(it.key) }
+                            var currentSlotMax = max(
+                                eventWeeklyView.slotMax.coerceAtLeast(1),
+                                eventWeeklyView.slot.coerceAtLeast(1)
+                            )
+                            val maxCollisionSlot = collisionEventWeeklyViews
+                                .maxOfOrNull { it.value.slot.coerceAtLeast(1) } ?: 1
+                            currentSlotMax = max(currentSlotMax, maxCollisionSlot)
+                            val nextSlot = currentSlotMax + 1
+                            val slotRange = IntArray(currentSlotMax) { it + 1 }
                             for ((_, collisionEventWeeklyView) in collisionEventWeeklyViews) {
-                                if (collisionEventWeeklyView.range.intersects(eventWeeklyViewToCheck.range)) {
+                                if (
+                                    collisionEventWeeklyView.range.intersects(eventWeeklyViewToCheck.range)
+                                    && collisionEventWeeklyView.slot in 1..currentSlotMax
+                                ) {
                                     slotRange[collisionEventWeeklyView.slot - 1] = nextSlot
                                 }
                             }
-                            slotRange[eventWeeklyView.slot - 1] = nextSlot
-                            val slot = slotRange.minOrNull()
-                            eventWeeklyViewToCheck.slot = slot!!
+                            if (eventWeeklyView.slot in 1..currentSlotMax) {
+                                slotRange[eventWeeklyView.slot - 1] = nextSlot
+                            }
+
+                            val slot = slotRange.minOrNull() ?: nextSlot
+                            eventWeeklyViewToCheck.slot = slot
+
                             if (slot == nextSlot) {
                                 eventWeeklyViewToCheck.slotMax = nextSlot
                                 eventWeeklyView.slotMax = nextSlot
                                 for ((_, collisionEventWeeklyView) in collisionEventWeeklyViews) {
-                                    collisionEventWeeklyView.slotMax++
+                                    collisionEventWeeklyView.slotMax =
+                                        max(collisionEventWeeklyView.slotMax, nextSlot)
                                 }
                             } else {
-                                eventWeeklyViewToCheck.slotMax = eventWeeklyView.slotMax
+                                eventWeeklyViewToCheck.slotMax = currentSlotMax
                             }
                         }
                         eventWeeklyView.collisions.add(toCheckId)

app/src/main/kotlin/org/fossify/calendar/models/EventWeeklyView.kt

@@ -2,4 +2,9 @@ package org.fossify.calendar.models
 
 import android.util.Range
 
-data class EventWeeklyView(val range: Range<Int>, var slot: Int = 0, var slotMax: Int = 0, var collisions: ArrayList<Long> = ArrayList())
+data class EventWeeklyView(
+    val range: Range<Int>,
+    var slot: Int = 0,
+    var slotMax: Int = 0,
+    var collisions: ArrayList<Long> = ArrayList()
+)