Gaps for overlapping events added

Author: alamkanak

README.md

@@ -20,7 +20,7 @@ Features
 Who uses it
 ---------------
 
-* [Series Addict](http://seriesaddict.april-shower.com) (still under development)
+* [Series Addict](https://play.google.com/store/apps/details?id=com.alamkanak.seriesaddict)
 
 Usage
 ---------
@@ -32,14 +32,14 @@ Usage
     <dependency>
       <groupId>com.github.alamkanak</groupId>
       <artifactId>android-week-view</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
       <type>aar</type>
     </dependency>
     ```
   * Grab via gradle
 
     ```groovy
-    compile 'com.github.alamkanak:android-week-view:1.1.2'
+    compile 'com.github.alamkanak:android-week-view:1.1.3'
     ```
 2. Add WeekView in your xml layout.
 
@@ -100,6 +100,7 @@ You can customize the look of the `WeekView` in xml. Use the following attribute
 - `columnGap`
 - `dayBackgroundColor`
 - `dayNameLength`
+- `eventMarginVertical`
 - `eventPadding`
 - `eventTextColor`
 - `eventTextSize`
@@ -113,6 +114,7 @@ You can customize the look of the `WeekView` in xml. Use the following attribute
 - `hourSeparatorColor`
 - `hourSeparatorHeight`
 - `noOfVisibleDays`
+- `overlappingEventGap`
 - `textSize`
 - `todayBackgroundColor`
 - `todayHeaderTextColor`
@@ -129,7 +131,11 @@ To do
 * Show events that expand multiple days properly
 
 Changelog
--------
+---------
+
+**Version 1.1.3**
+
+* Margins support added for overlapping events
 
 **Version 1.1.2**
 

gradle.properties

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

images/screen-shot.png

@@ -92,6 +92,8 @@ public class WeekView extends View {
     private int mDefaultEventColor;
     private boolean mIsFirstDraw = true;
     private int mDayNameLength = LENGTH_LONG;
+    private int mOverlappingEventGap = 0;
+    private int mEventMarginVertical = 0;
 
     // Listeners.
     private EventClickListener mEventClickListener;
@@ -216,6 +218,8 @@ public WeekView(Context context, AttributeSet attrs, int defStyleAttr) {
             mEventPadding = a.getDimensionPixelSize(R.styleable.WeekView_hourSeparatorHeight, mEventPadding);
             mHeaderColumnBackgroundColor = a.getColor(R.styleable.WeekView_headerColumnBackground, mHeaderColumnBackgroundColor);
             mDayNameLength = a.getInteger(R.styleable.WeekView_dayNameLength, mDayNameLength);
+            mOverlappingEventGap = a.getDimensionPixelSize(R.styleable.WeekView_overlappingEventGap, mOverlappingEventGap);
+            mEventMarginVertical = a.getDimensionPixelSize(R.styleable.WeekView_eventMarginVertical, mEventMarginVertical);
         } finally {
             a.recycle();
         }
@@ -450,19 +454,23 @@ private void drawEvents(Calendar date, float startFromPixel, Canvas canvas) {
                 if (isSameDay(mEventRects.get(i).event.getStartTime(), date)) {
 
                     // Calculate top.
-                    float top = mHourHeight * 24 * mEventRects.get(i).top / 1440 + mCurrentOrigin.y + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight/2;
+                    float top = mHourHeight * 24 * mEventRects.get(i).top / 1440 + mCurrentOrigin.y + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight/2 + mEventMarginVertical;
                     float originalTop = top;
                     if (top < mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight/2)
                         top = mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight/2;
 
                     // Calculate bottom.
                     float bottom = mEventRects.get(i).bottom;
-                    bottom = mHourHeight * 24 * bottom / 1440 + mCurrentOrigin.y + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight/2;
+                    bottom = mHourHeight * 24 * bottom / 1440 + mCurrentOrigin.y + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom + mTimeTextHeight/2 - mEventMarginVertical;
 
                     // Calculate left and right.
                     float left = startFromPixel + mEventRects.get(i).left * mWidthPerDay;
+                    if (left != startFromPixel)
+                        left += mOverlappingEventGap;
                     float originalLeft = left;
                     float right = left + mEventRects.get(i).width * mWidthPerDay;
+                    if (right != startFromPixel + mWidthPerDay)
+                        right -= mOverlappingEventGap;
                     if (left < mHeaderColumnWidth) left = mHeaderColumnWidth;
 
                     // Draw the event and the event name on top of it.
@@ -1031,6 +1039,33 @@ public void setDayNameLength(int length) {
         this.mDayNameLength = length;
     }
 
+    public int getOverlappingEventGap() {
+        return mOverlappingEventGap;
+    }
+
+    /**
+     * Set the gap between overlapping events.
+     * @param overlappingEventGap The gap between overlapping events.
+     */
+    public void setOverlappingEventGap(int overlappingEventGap) {
+        this.mOverlappingEventGap = overlappingEventGap;
+        invalidate();
+    }
+
+    public int getEventMarginVertical() {
+        return mEventMarginVertical;
+    }
+
+    /**
+     * Set the top and bottom margin of the event. The event will release this margin from the top
+     * and bottom edge. This margin is useful for differentiation consecutive events.
+     * @param eventMarginVertical The top and bottom margin.
+     */
+    public void setEventMarginVertical(int eventMarginVertical) {
+        this.mEventMarginVertical = eventMarginVertical;
+        invalidate();
+    }
+
     /////////////////////////////////////////////////////////////////
     //
     //      Functions related to scrolling.

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

@@ -31,6 +31,8 @@
             <enum name="length_short" value="1"/>
             <enum name="length_long" value="2"/>
         </attr>
+        <attr name="overlappingEventGap" format="dimension"/>
+        <attr name="eventMarginVertical" format="dimension"/>
 
     </declare-styleable>
 </resources>