Some fixes for new events placement (and other things) (#78)

jhoobergs · web-flow · commit 09b93471b5a1 · 2018-02-03T20:04:12.000+01:00
* Adds support for auto-picking event textcolor based on background color * Xml support for auto textcolor * Fixes #29 where adding an event at the end of the day removes all events * Text color picking interface + example New event start time adjusted * Only adjusts the selected position when adding new events * Only adjusts the selected position when adding new events * Cloning selected time to prevent changing it in callback * Adds support for auto-picking event textcolor based on background color * Xml support for auto textcolor * Text color picking interface + example New event start time adjusted * Fix to prevent losing events when adding new event * Only adjusts the selected position when adding new events * Only adjusts the selected position when adding new events * Cloning selected time to prevent changing it in callback * Import fix * Fix for min- and maxTime when adding events * Fix some issues with NewEvent placement * remove unused attribute * reformatting * update documentation
diff --git a/README.md b/README.md
@@ -108,6 +108,7 @@ You can customize the look of the `WeekView` in xml. Use the following attribute
 - `columnGap`
 - `dayBackgroundColor`
 - `dayNameLength`
+- `dropListenerEnabled`: Whether items can be dropped on the weekview
 - `eventCornerRadius`
 - `eventMarginVertical`
 - `eventPadding`
@@ -129,6 +130,7 @@ You can customize the look of the `WeekView` in xml. Use the following attribute
 - `maxTime`
 - `minHourHeight`
 - `minTime`
+- `minOverlappingMinutes`: The minimal amount of overlap of 2 events needed to be seen as overlapping events
 - `newEventColor`
 - `newEventId`
 - `newEventIconResource`
@@ -168,6 +170,8 @@ Use the following interfaces according to your need.
 - `mWeekView.setDateTimeInterpreter()` to set your own labels for the calendar header row and header column
 - `mWeekView.setScrollListener()` to get an event every time the first visible day has changed
 - `mWeekView.setAddEventClickListener()` to get the start and end time of an event to add
+- `mWeekView.setTextColorPicker()` to change the textcolor of an event, based on the event. You can, for example, set a different text color depending on the color of the event.
+
 Sample
 ----------
 
diff --git a/library/src/main/java/com/alamkanak/weekview/TextColorPicker.java b/library/src/main/java/com/alamkanak/weekview/TextColorPicker.java
@@ -0,0 +1,10 @@
+package com.alamkanak.weekview;
+
+import android.support.annotation.ColorInt;
+
+public interface TextColorPicker {
+
+    @ColorInt
+    int getTextColor(WeekViewEvent event);
+
+}
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.java b/library/src/main/java/com/alamkanak/weekview/WeekView.java
@@ -95,6 +95,7 @@ private enum Direction {
     private Paint mNewEventBackgroundPaint;
     private float mHeaderColumnWidth;
     private List<EventRect> mEventRects;
+    private List<WeekViewEvent> mEvents;
     private TextPaint mEventTextPaint;
     private TextPaint mNewEventTextPaint;
     private Paint mHeaderColumnBackgroundPaint;
@@ -108,6 +109,7 @@ private enum Direction {
     private int mMinimumFlingVelocity = 0;
     private int mScaledTouchSlop = 0;
     private EventRect mNewEventRect;
+    private TextColorPicker textColorPicker;
 
     // Attributes and their default values.
     private int mHourHeight = 50;
@@ -171,6 +173,7 @@ private enum Direction {
     private int mMaxTime = 24;
     private boolean mAutoLimitTime = false;
     private boolean mEnableDropListener = false;
+    private int mMinOverlappingMinutes = 0;
 
     // Listeners.
     private EventClickListener mEventClickListener;
@@ -318,26 +321,41 @@ public boolean onSingleTapConfirmed(MotionEvent e) {
             // If the tap was on an empty space, then trigger the callback.
             if ((mEmptyViewClickListener != null || mAddEventClickListener != null) && e.getX() > mHeaderColumnWidth && e.getY() > (mHeaderHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom)) {
                 Calendar selectedTime = getTimeFromPoint(e.getX(), e.getY());
-                List<EventRect> tempEventRects = new ArrayList<>(mEventRects);
-                mEventRects = new ArrayList<EventRect>();
+
                 if (selectedTime != null) {
+                    List<WeekViewEvent> tempEvents = new ArrayList<>(mEvents);
                     if (mNewEventRect != null) {
-                        tempEventRects.remove(mNewEventRect);
+                        tempEvents.remove(mNewEventRect.event);
                         mNewEventRect = null;
                     }
 
                     playSoundEffect(SoundEffectConstants.CLICK);
+
                     if (mEmptyViewClickListener != null)
-                        mEmptyViewClickListener.onEmptyViewClicked(selectedTime);
+                        mEmptyViewClickListener.onEmptyViewClicked((Calendar) selectedTime.clone());
 
                     if (mAddEventClickListener != null) {
                         //round selectedTime to resolution
+                        selectedTime.add(Calendar.MINUTE, -(mNewEventLengthInMinutes / 2));
+                        //Fix selected time if before the minimum hour
+                        if (selectedTime.get(Calendar.HOUR_OF_DAY) < mMinTime) {
+                            selectedTime.set(Calendar.HOUR_OF_DAY, mMinTime);
+                            selectedTime.set(Calendar.MINUTE, 0);
+                        }
                         int unroundedMinutes = selectedTime.get(Calendar.MINUTE);
                         int mod = unroundedMinutes % mNewEventTimeResolutionInMinutes;
                         selectedTime.add(Calendar.MINUTE, mod < Math.ceil(mNewEventTimeResolutionInMinutes / 2) ? -mod : (mNewEventTimeResolutionInMinutes - mod));
 
                         Calendar endTime = (Calendar) selectedTime.clone();
-                        endTime.add(Calendar.MINUTE, Math.min(mNewEventLengthInMinutes, (24 - selectedTime.get(Calendar.HOUR_OF_DAY)) * 60 - selectedTime.get(Calendar.MINUTE)));
+
+                        //Minus one to ensure it is the same day and not midnight (next day)
+                        int maxMinutes = (mMaxTime - selectedTime.get(Calendar.HOUR_OF_DAY)) * 60 - selectedTime.get(Calendar.MINUTE) - 1;
+                        endTime.add(Calendar.MINUTE, Math.min(maxMinutes, mNewEventLengthInMinutes));
+                        //If clicked at end of the day, fix selected startTime
+                        if (maxMinutes < mNewEventLengthInMinutes) {
+                            selectedTime.add(Calendar.MINUTE, maxMinutes - mNewEventLengthInMinutes);
+                        }
+
                         WeekViewEvent newEvent = new WeekViewEvent(mNewEventIdentifier, "", null, selectedTime, endTime);
 
                         int marginTop = mHourHeight * mMinTime;
@@ -349,7 +367,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) {
                         // Calculate left and right.
                         float left = 0;
                         float right = left + mWidthPerDay;
-                        // Draw the event and the event name on top of it.
+                        // Add the new event if its bounds are valid
                         if (left < right &&
                                 left < getWidth() &&
                                 top < getHeight() &&
@@ -359,12 +377,16 @@ top < getHeight() &&
                             RectF dayRectF = new RectF(left, top, right, bottom);
                             newEvent.setColor(mNewEventColor);
                             mNewEventRect = new EventRect(newEvent, newEvent, dayRectF);
-                            tempEventRects.add(mNewEventRect);
+                            tempEvents.add(newEvent);
+                            WeekView.this.clearEvents();
+                            cacheAndSortEvents(tempEvents);
+                            computePositionOfEvents(mEventRects);
+                            invalidate();
                         }
+
                     }
                 }
-                computePositionOfEvents(tempEventRects);
-                invalidate();
+
             }
             return super.onSingleTapConfirmed(e);
         }
@@ -466,8 +488,9 @@ public WeekView(Context context, AttributeSet attrs, int defStyleAttr) {
             mAutoLimitTime = a.getBoolean(R.styleable.WeekView_autoLimitTime, mAutoLimitTime);
             mMinTime = a.getInt(R.styleable.WeekView_minTime, mMinTime);
             mMaxTime = a.getInt(R.styleable.WeekView_maxTime, mMaxTime);
-            if(a.getBoolean(R.styleable.WeekView_dropListenerEnabled, false))
+            if (a.getBoolean(R.styleable.WeekView_dropListenerEnabled, false))
                 this.enableDropListener();
+            mMinOverlappingMinutes = a.getInt(R.styleable.WeekView_minOverlappingMinutes, 0);
         } finally {
             a.recycle();
         }
@@ -1146,6 +1169,10 @@ private void drawEventTitle(WeekViewEvent event, RectF rect, Canvas canvas, floa
         int availableHeight = (int) (rect.bottom - originalTop - mEventPadding * 2);
         int availableWidth = (int) (rect.right - originalLeft - mEventPadding * 2);
 
+        // Get text color if necessary
+        if (textColorPicker != null) {
+            mEventTextPaint.setColor(textColorPicker.getTextColor(event));
+        }
         // Get text dimensions.
         StaticLayout textLayout = new StaticLayout(bob, mEventTextPaint, availableWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
         if (textLayout.getLineCount() > 0) {
@@ -1235,13 +1262,17 @@ private void getMoreEvents(Calendar day) {
 
         // Get more events if the month is changed.
         if (mEventRects == null)
-            mEventRects = new ArrayList<EventRect>();
+            mEventRects = new ArrayList<>();
+
+        if (mEvents == null)
+            mEvents = new ArrayList<>();
+
         if (mWeekViewLoader == null && !isInEditMode())
             throw new IllegalStateException("You must provide a MonthChangeListener");
 
         // If a refresh was requested then reset some variables.
         if (mRefreshEvents) {
-            mEventRects.clear();
+            this.clearEvents();
             mFetchedPeriod = -1;
         }
 
@@ -1251,7 +1282,7 @@ private void getMoreEvents(Calendar day) {
                 List<? extends WeekViewEvent> newEvents = mWeekViewLoader.onLoad(periodToFetch);
 
                 // Clear events.
-                mEventRects.clear();
+                this.clearEvents();
                 cacheAndSortEvents(newEvents);
                 calculateHeaderHeight();
 
@@ -1261,7 +1292,7 @@ private void getMoreEvents(Calendar day) {
 
         // Prepare to calculate positions of each events.
         List<EventRect> tempEvents = mEventRects;
-        mEventRects = new ArrayList<EventRect>();
+        mEventRects = new ArrayList<>();
 
         // Iterate through each day with events to calculate the position of the events.
         while (tempEvents.size() > 0) {
@@ -1286,6 +1317,11 @@ private void getMoreEvents(Calendar day) {
         }
     }
 
+    private void clearEvents() {
+        mEventRects.clear();
+        mEvents.clear();
+    }
+
     /**
      * Cache the event for smooth scrolling functionality.
      *
@@ -1298,6 +1334,7 @@ private void cacheEvent(WeekViewEvent event) {
         for (WeekViewEvent splitedEvent : splitedEvents) {
             mEventRects.add(new EventRect(splitedEvent, event, null));
         }
+        mEvents.add(event);
     }
 
     /**
@@ -1438,7 +1475,10 @@ private boolean isEventsCollide(WeekViewEvent event1, WeekViewEvent event2) {
         long end1 = event1.getEndTime().getTimeInMillis();
         long start2 = event2.getStartTime().getTimeInMillis();
         long end2 = event2.getEndTime().getTimeInMillis();
-        return !((start1 >= end2) || (end1 <= start2));
+
+        long minOverlappingMillis = mMinOverlappingMinutes * 60 * 1000;
+
+        return !((start1 + minOverlappingMillis >= end2) || (end1 <= start2 + minOverlappingMillis));
     }
 
 
@@ -1833,6 +1873,14 @@ public void setEventTextColor(int eventTextColor) {
         invalidate();
     }
 
+    public void setTextColorPicker(TextColorPicker textColorPicker) {
+        this.textColorPicker = textColorPicker;
+    }
+
+    public TextColorPicker getTextColorPicker() {
+        return textColorPicker;
+    }
+
     public int getEventPadding() {
         return mEventPadding;
     }
@@ -2426,26 +2474,34 @@ public void setNewEventIconDrawable(Drawable newEventIconDrawable) {
         this.mNewEventIconDrawable = newEventIconDrawable;
     }
 
-    public void enableDropListener(){
+    public void enableDropListener() {
         this.mEnableDropListener = true;
         //set drag and drop listener, required Honeycomb+ Api level
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             setOnDragListener(new DragListener());
         }
     }
 
-    public void disableDropListener(){
+    public void disableDropListener() {
         this.mEnableDropListener = false;
         //set drag and drop listener, required Honeycomb+ Api level
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             setOnDragListener(null);
         }
     }
 
-    public boolean isDropListenerEnabled(){
+    public boolean isDropListenerEnabled() {
         return this.mEnableDropListener;
     }
 
+    public void setMinOverlappingMinutes(int minutes) {
+        this.mMinOverlappingMinutes = minutes;
+    }
+
+    public int getMinOverlappingMinutes() {
+        return this.mMinOverlappingMinutes;
+    }
+
     /////////////////////////////////////////////////////////////////
     //
     //      Functions related to scrolling.
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekViewEvent.java b/library/src/main/java/com/alamkanak/weekview/WeekViewEvent.java
@@ -1,6 +1,7 @@
 package com.alamkanak.weekview;
 
 import android.graphics.Shader;
+import android.support.annotation.ColorInt;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -18,7 +19,9 @@ public class WeekViewEvent {
     private Calendar mEndTime;
     private String mName;
     private String mLocation;
-    private int mColor;
+    private
+    @ColorInt
+    int mColor;
     private boolean mAllDay;
     private Shader mShader;
 
@@ -233,7 +236,9 @@ public void setLocation(String location) {
         this.mLocation = location;
     }
 
-    public int getColor() {
+    public
+    @ColorInt
+    int getColor() {
         return mColor;
     }
 
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -38,6 +38,7 @@
         <attr name="maxTime" format="integer" />
         <attr name="minHourHeight" format="dimension" />
         <attr name="minTime" format="integer" />
+        <attr name="minOverlappingMinutes" format="integer" />
         <attr name="newEventColor" format="color" />
         <attr name="newEventId" format="integer" />
         <attr name="newEventIdentifier" format="string" />
diff --git a/sample/src/main/java/com/alamkanak/weekview/sample/BasicActivity.java b/sample/src/main/java/com/alamkanak/weekview/sample/BasicActivity.java
@@ -1,8 +1,10 @@
 package com.alamkanak.weekview.sample;
 
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
 
+import com.alamkanak.weekview.TextColorPicker;
 import com.alamkanak.weekview.WeekViewEvent;
 
 import java.util.ArrayList;
@@ -22,6 +24,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Typeface customTypeface = Typeface.createFromAsset(this.getAssets(), "fonts/Raleway/Raleway-Medium.ttf");
         mWeekView.setTypeface(customTypeface);
+        mWeekView.setTextColorPicker(new TextColorPicker() {
+            @Override
+            public int getTextColor(WeekViewEvent event) {
+                int color = event.getColor();
+                double a = 1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255;
+                return a < 0.2 ? Color.BLACK : Color.WHITE;
+            }
+        });
     }
 
     @Override
@@ -51,7 +61,7 @@ public List<? extends WeekViewEvent> onMonthChange(int newYear, int newMonth) {
         endTime.set(Calendar.MINUTE, 30);
         endTime.set(Calendar.MONTH, newMonth - 1);
         event = new WeekViewEvent("Second", getEventTitle(startTime), startTime, endTime);
-        event.setColor(getResources().getColor(R.color.event_color_02));
+        event.setColor(getResources().getColor(R.color.event_color_05));
         events.add(event);
 
         startTime = Calendar.getInstance();
diff --git a/sample/src/main/res/layout/activity_base.xml b/sample/src/main/res/layout/activity_base.xml
@@ -28,7 +28,8 @@
         app:todayHeaderTextColor="@color/accent"
         app:newEventTimeResolutionInMinutes="15"
         app:timeColumnResolution="60"
-        app:dropListenerEnabled="true"/>
+        app:dropListenerEnabled="true"
+        app:minOverlappingMinutes="5" />
 
     <TextView
         android:id="@+id/draggable_view"
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="event_color_02">#f57f68</color>
     <color name="event_color_03">#87d288</color>
     <color name="event_color_04">#f8b552</color>
+    <color name="event_color_05">#88f6f6</color>
     <color name="toolbar">#efefef</color>
     <color name="toolbar_text">#8f000000</color>
     <color name="accent">#2789e4</color>
