Merge branch 'iss54-goToNextDay' into quivr-master

Jens Claes · Jens Claes · commit 4df29ef34842 · 2015-02-28T21:24:12.000+01:00
Conflicts:
	library/src/main/java/com/alamkanak/weekview/WeekView.java
diff --git a/library/src/main/java/com/alamkanak/weekview/WeekView.java b/library/src/main/java/com/alamkanak/weekview/WeekView.java
@@ -523,7 +523,7 @@ else if(mNewHourHeight > mMaxHourHeight)
         // Iterate through each day.
         Calendar oldFirstVisibleDay = mFirstVisibleDay;
         mFirstVisibleDay = (Calendar) today.clone();
-        mFirstVisibleDay.add(Calendar.DATE, leftDaysWithGaps);
+        mFirstVisibleDay.add(Calendar.DATE, -(Math.round(mCurrentOrigin.x / (mWidthPerDay + mColumnGap))));
         if(!mFirstVisibleDay.equals(oldFirstVisibleDay) && mScrolledListener != null){
             mScrolledListener.onFirstVisibleDayChanged(mFirstVisibleDay, oldFirstVisibleDay);
         }

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ else if(mNewHourHeight > mMaxHourHeight)`
`523`	`523`	`// Iterate through each day.`
`524`	`524`	`Calendar oldFirstVisibleDay = mFirstVisibleDay;`
`525`	`525`	`mFirstVisibleDay = (Calendar) today.clone();`
`526`		`- mFirstVisibleDay.add(Calendar.DATE, leftDaysWithGaps);`
	`526`	`+ mFirstVisibleDay.add(Calendar.DATE, -(Math.round(mCurrentOrigin.x / (mWidthPerDay + mColumnGap))));`
`527`	`527`	`if(!mFirstVisibleDay.equals(oldFirstVisibleDay) && mScrolledListener != null){`
`528`	`528`	`mScrolledListener.onFirstVisibleDayChanged(mFirstVisibleDay, oldFirstVisibleDay);`
`529`	`529`	`}`