Added support for calling first & last visible day

Author: alamkanak

README.md

@@ -5,8 +5,6 @@ Android Week View
 
 ![](images/screen-shot.png)
 
-> Please note that this project is still under development. I will be happy if you collaborate in this project and help it become even more polished.
-
 Features
 ------------
 
@@ -21,6 +19,7 @@ Who uses it
 ---------------
 
 * [Series Addict](https://play.google.com/store/apps/details?id=com.alamkanak.seriesaddict)
+* Using the library? Just [tweet me](https://twitter.com/alamkanak) or [send me an email](mailto:[email protected]).
 
 Usage
 ---------
@@ -32,14 +31,14 @@ Usage
     <dependency>
       <groupId>com.github.alamkanak</groupId>
       <artifactId>android-week-view</artifactId>
-      <version>1.1.4</version>
+      <version>1.1.5</version>
       <type>aar</type>
     </dependency>
     ```
   * Grab via gradle
 
     ```groovy
-    compile 'com.github.alamkanak:android-week-view:1.1.4'
+    compile 'com.github.alamkanak:android-week-view:1.1.5'
     ```
 2. Add WeekView in your xml layout.
 
@@ -133,6 +132,11 @@ To do
 Changelog
 ---------
 
+**Version 1.1.5**
+
+* A bug related to overlapping events fixed
+* You can now programmatically get first and last visible day in the week view
+
 **Version 1.1.4**
 
 * Small bug fixed

gradle.properties

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

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

@@ -94,6 +94,8 @@ public class WeekView extends View {
     private int mDayNameLength = LENGTH_LONG;
     private int mOverlappingEventGap = 0;
     private int mEventMarginVertical = 0;
+    private Calendar mFirstVisibleDay;
+    private Calendar mLastVisibleDay;
 
     // Listeners.
     private EventClickListener mEventClickListener;
@@ -357,7 +359,7 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
         // Consider scroll offset.
         if (mCurrentScrollDirection == Direction.HORIZONTAL) mCurrentOrigin.x -= mDistanceX;
         int leftDaysWithGaps = (int) -(Math.ceil(mCurrentOrigin.x / (mWidthPerDay + mColumnGap)));
-        float startFromPixel = mCurrentOrigin.x + (mWidthPerDay+mColumnGap) * leftDaysWithGaps +
+        float startFromPixel = mCurrentOrigin.x + (mWidthPerDay + mColumnGap) * leftDaysWithGaps +
                 mHeaderColumnWidth;
         float startPixel = startFromPixel;
 
@@ -379,13 +381,17 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
         }
 
         // Iterate through each day.
+        mFirstVisibleDay = (Calendar) mToday.clone();
+        mFirstVisibleDay.add(Calendar.DATE, leftDaysWithGaps);
         for (int dayNumber = leftDaysWithGaps + 1;
              dayNumber <= leftDaysWithGaps + mNumberOfVisibleDays + 1;
              dayNumber++) {
 
             // Check if the day is today.
             day = (Calendar) mToday.clone();
+            mLastVisibleDay = (Calendar) day.clone();
             day.add(Calendar.DATE, dayNumber - 1);
+            mLastVisibleDay.add(Calendar.DATE, dayNumber - 2);
             boolean sameDay = isSameDay(day, mToday);
 
             // Get more events if necessary. We want to store the events 3 months beforehand. Get
@@ -749,7 +755,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 >= end2) || (end1 <= start2));
     }
 
 
@@ -1066,6 +1072,22 @@ public void setEventMarginVertical(int eventMarginVertical) {
         invalidate();
     }
 
+    /**
+     * Returns the first visible day in the week view.
+     * @return The first visible day in the week view.
+     */
+    public Calendar getFirstVisibleDay() {
+        return mFirstVisibleDay;
+    }
+
+    /**
+     * Returns the last visible day in the week view.
+     * @return The last visible day in the week view.
+     */
+    public Calendar getLastVisibleDay() {
+        return mLastVisibleDay;
+    }
+
     /////////////////////////////////////////////////////////////////
     //
     //      Functions related to scrolling.