From df241feea09b537fe3fbda0ad42d956ee8eaa525 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 14 Feb 2019 16:28:26 +0100
Subject: [PATCH] improving some weekly view overlapping

---
 .../calendar/pro/extensions/Range.kt          |  5 ++++
 .../calendar/pro/fragments/WeekFragment.kt    | 27 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Range.kt

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Range.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Range.kt
new file mode 100644
index 000000000..8638fd446
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Range.kt
@@ -0,0 +1,5 @@
+package com.simplemobiletools.calendar.pro.extensions
+
+import android.util.Range
+
+fun Range<Int>.touch(other: Range<Int>) = (upper > other.lower && lower < other.upper) || (other.upper > lower && other.lower < upper)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
index 18580d34e..e23cb1e8c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
@@ -20,6 +20,7 @@ import com.simplemobiletools.calendar.pro.activities.EventActivity
 import com.simplemobiletools.calendar.pro.extensions.config
 import com.simplemobiletools.calendar.pro.extensions.eventsHelper
 import com.simplemobiletools.calendar.pro.extensions.seconds
+import com.simplemobiletools.calendar.pro.extensions.touch
 import com.simplemobiletools.calendar.pro.helpers.*
 import com.simplemobiletools.calendar.pro.helpers.Formatter
 import com.simplemobiletools.calendar.pro.interfaces.WeekFragmentListener
@@ -70,10 +71,6 @@ class WeekFragment : Fragment(), WeeklyCalendar {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        context!!.eventsHelper.getEventTypes(activity!!, false) {
-            it.map { eventTypeColors.put(it.id!!, it.color) }
-        }
-
         mRes = context!!.resources
         mConfig = context!!.config
         mRowHeight = mRes.getDimension(R.dimen.weekly_view_row_height)
@@ -106,6 +103,10 @@ class WeekFragment : Fragment(), WeeklyCalendar {
 
     override fun onResume() {
         super.onResume()
+        context!!.eventsHelper.getEventTypes(activity!!, false) {
+            it.map { eventTypeColors.put(it.id!!, it.color) }
+        }
+
         setupDayLabels()
         updateCalendar()
 
@@ -294,13 +295,19 @@ class WeekFragment : Fragment(), WeeklyCalendar {
                 val dayCode = Formatter.getDayCodeFromDateTime(startDateTime)
                 var overlappingEvents = 0
                 var currentEventOverlapIndex = 0
-                eventTimeRanges[dayCode]!!.forEachIndexed { index, eventWeeklyView ->
-                    if (eventWeeklyView.range.contains(range)) {
-                        overlappingEvents++
-                    }
+                var foundCurrentEvent = false
 
-                    if (eventWeeklyView.id == event.id) {
-                        currentEventOverlapIndex = index
+                eventTimeRanges[dayCode]!!.forEachIndexed { index, eventWeeklyView ->
+                    if (eventWeeklyView.range.touch(range)) {
+                        overlappingEvents++
+
+                        if (eventWeeklyView.id == event.id) {
+                            foundCurrentEvent = true
+                        }
+
+                        if (!foundCurrentEvent) {
+                            currentEventOverlapIndex++
+                        }
                     }
                 }