Merge branch 'iss54-goToNextDay' into quivr-master

Jens Claes · Jens Claes · commit 95581d60ac29 · 2015-02-04T21:41:49.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
@@ -1473,7 +1473,8 @@ public void goToDate(Calendar date) {
         today.set(Calendar.SECOND, 0);
         today.set(Calendar.MILLISECOND, 0);
 
-        int dateDifference = (int) ((date.getTimeInMillis() - today.getTimeInMillis()) / (1000 * 60 * 60 * 24));
+        long day = 1000L * 60L * 60L * 24L;
+        long dateDifference = (date.getTimeInMillis()/day) - (today.getTimeInMillis()/day);
         mStickyScroller.startScroll((int) mCurrentOrigin.x, 0, (int) (-dateDifference*(mWidthPerDay + mColumnGap)-mCurrentOrigin.x), 0);
         invalidate();
     }

Original file line number	Diff line number	Diff line change
`@@ -1473,7 +1473,8 @@ public void goToDate(Calendar date) {`
`1473`	`1473`	`today.set(Calendar.SECOND, 0);`
`1474`	`1474`	`today.set(Calendar.MILLISECOND, 0);`
`1475`	`1475`
`1476`		`- int dateDifference = (int) ((date.getTimeInMillis() - today.getTimeInMillis()) / (1000 * 60 * 60 * 24));`
	`1476`	`+ long day = 1000L * 60L * 60L * 24L;`
	`1477`	`+ long dateDifference = (date.getTimeInMillis()/day) - (today.getTimeInMillis()/day);`
`1477`	`1478`	`mStickyScroller.startScroll((int) mCurrentOrigin.x, 0, (int) (-dateDifference*(mWidthPerDay + mColumnGap)-mCurrentOrigin.x), 0);`
`1478`	`1479`	`invalidate();`
`1479`	`1480`	`}`