Overlapping event bug fixed

Author: alamkanak

README.md

@@ -32,14 +32,14 @@ Usage
     <dependency>
       <groupId>com.github.alamkanak</groupId>
       <artifactId>android-week-view</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <type>aar</type>
     </dependency>
     ```
   * Grab via gradle
 
     ```groovy
-    compile 'com.github.alamkanak:android-week-view:1.1.0'
+    compile 'com.github.alamkanak:android-week-view:1.1.1'
     ```
 2. Add WeekView in your xml layout.
 
@@ -128,6 +128,17 @@ To do
 * Add event touch feedback selector
 * Show events that expand multiple days properly
 
+Changelog
+-------
+
+**Version 1.1.1**
+
+* Overlapping event bug fixed
+
+**Version 1.1.0**
+
+* Added support for overlapping events
+
 License
 ----------
 

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1.1.0
+VERSION_NAME=1.1.1
 GROUP=com.github.alamkanak
 
 POM_DESCRIPTION=Dissect layout traversals on Android.

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -619,6 +619,7 @@ private void getMoreEvents(Calendar day) {
                 if (isSameDay(eventRect.event.getStartTime(), dayCounter))
                     eventRects.add(eventRect);
             }
+
             computePositionOfEvents(eventRects);
             dayCounter.add(Calendar.DATE, 1);
         }
@@ -739,7 +740,7 @@ private boolean isEventsCollide(WeekViewEvent event1, WeekViewEvent event2) {
         long end1 = event1.getEndTime().getTimeInMillis();
         long start2 = event2.getStartTime().getTimeInMillis();
         long end2 = event2.getEndTime().getTimeInMillis();
-        return (start1 > start2 && start1 < end2) || (end1 > start2 && end1 < end2);
+        return (start1 >= start2 && start1 <= end2) || (end1 >= start2 && end1 <= end2);
     }