Merge branch 'BetterGoToDateAndHour' into quivr-master

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

Author: Jens Claes

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

@@ -106,12 +106,15 @@ public class WeekView extends View {
     private int mHeaderColumnBackgroundColor = Color.WHITE;
     private int mDefaultEventColor;
     private boolean mIsFirstDraw = true;
+    private boolean mAreDimensionsInvalid = true;
     @Deprecated private int mDayNameLength = LENGTH_LONG;
     private int mOverlappingEventGap = 0;
     private int mEventMarginVertical = 0;
     private float mXScrollingSpeed = 1f;
     private Calendar mFirstVisibleDay;
     private Calendar mLastVisibleDay;
+    private Calendar mScrollToDay = null;
+    private double mScrollToHour = -1;
 
     // Listeners.
     private EventClickListener mEventClickListener;
@@ -413,13 +416,22 @@ private void drawHeaderRowAndEvents(Canvas canvas) {
 
         Calendar today = today();
 
-        // If the week view is being drawn for the first time, then consider the first day of week.
-        if (mIsFirstDraw && mNumberOfVisibleDays >= 7) {
-            if (today.get(Calendar.DAY_OF_WEEK) != mFirstDayOfWeek) {
+        if (mAreDimensionsInvalid) {
+            mAreDimensionsInvalid = false;
+
+            if(mScrollToDay != null)
+                goToDate(mScrollToDay);
+            if(mScrollToHour >= 0)
+                goToHour(mScrollToHour);
+        }
+        if (mIsFirstDraw){
+            mIsFirstDraw = false;
+
+            // If the week view is being drawn for the first time, then consider the first day of the week.
+            if(mNumberOfVisibleDays >= 7 && today.get(Calendar.DAY_OF_WEEK) != mFirstDayOfWeek) {
                 int difference = 7 + (today.get(Calendar.DAY_OF_WEEK) - mFirstDayOfWeek);
                 mCurrentOrigin.x += (mWidthPerDay + mColumnGap) * difference;
             }
-            mIsFirstDraw = false;
         }
 
         // Consider scroll offset.
@@ -980,6 +992,13 @@ private void deleteFarMonths(Calendar currentDay) {
         mEventRects.addAll(newEvents);
     }
 
+    @Override
+    public void invalidate() {
+        super.invalidate();
+        mAreDimensionsInvalid = true;
+        mScrollToDay = null;
+        mScrollToHour = -1;
+    }
 
     /////////////////////////////////////////////////////////////////
     //
@@ -1441,6 +1460,11 @@ public void goToDate(Calendar date) {
         date.set(Calendar.SECOND, 0);
         date.set(Calendar.MILLISECOND, 0);
 
+        if(mAreDimensionsInvalid) {
+            mScrollToDay = date;
+            return;
+        }
+
         mRefreshEvents = true;
 
         Calendar today = Calendar.getInstance();
@@ -1450,8 +1474,7 @@ public void goToDate(Calendar date) {
         today.set(Calendar.MILLISECOND, 0);
 
         int dateDifference = (int) ((date.getTimeInMillis() - today.getTimeInMillis()) / (1000 * 60 * 60 * 24));
-        mCurrentOrigin.x = - dateDifference * (mWidthPerDay + mColumnGap);
-
+        mStickyScroller.startScroll((int) mCurrentOrigin.x, 0, (int) (-dateDifference*(mWidthPerDay + mColumnGap)-mCurrentOrigin.x), 0);
         invalidate();
     }
 
@@ -1468,14 +1491,18 @@ public void notifyDatasetChanged(){
      * @param hour The hour to scroll to in 24-hour format. Supported values are 0-24.
      */
     public void goToHour(double hour){
+        int verticalOffset = (int) (mHourHeight * hour);
         if (hour < 0)
-            throw new IllegalArgumentException("Cannot scroll to an hour of negative value.");
+            verticalOffset = 0;
         else if (hour > 24)
-            throw new IllegalArgumentException("Cannot scroll to an hour of value greater than 24.");
-        else if (hour * mHourHeight > mHourHeight * 24 - getHeight() + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom)
-            throw new IllegalArgumentException("Cannot scroll to an hour which will result the calendar to go off the screen.");
+            verticalOffset = mHourHeight * 24;
+
+        if (mAreDimensionsInvalid) {
+            mScrollToHour = hour;
+            return;
+        } else if (verticalOffset > mHourHeight * 24 - getHeight() + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom)
+            verticalOffset = (int)(mHourHeight * 24 - getHeight() + mHeaderTextHeight + mHeaderRowPadding * 2 + mHeaderMarginBottom);
 
-        int verticalOffset = (int) (mHourHeight * hour);
         mCurrentOrigin.y = -verticalOffset;
         invalidate();
     }