isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-09 18:48:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v1.3.3' into dev

Browse Source 
Version 1.3.3
This commit is contained in:
Alinson S. Xavier
2016-03-20 17:55:16 -04:00
parent e7148abc2e 9edc3e12c9
commit a0582b65d5
13 changed files with 996 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
View File

@@ -101,12 +101,11 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
private void updateDate()
{
baseDate = new GregorianCalendar();
baseDate.setTimeInMillis(DateHelper.getLocalTime());
baseDate = DateHelper.getStartOfTodayCalendar();
baseDate.add(Calendar.DAY_OF_YEAR, -(getDataOffset() - 1) * 7);
nDays = (nColumns - 1) * 7;
todayWeekday = new GregorianCalendar().get(Calendar.DAY_OF_WEEK) % 7;
todayWeekday = DateHelper.getStartOfTodayCalendar().get(Calendar.DAY_OF_WEEK) % 7;
baseDate.add(Calendar.DAY_OF_YEAR, -nDays);
baseDate.add(Calendar.DAY_OF_YEAR, -todayWeekday);
@@ -309,8 +308,11 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
private void drawColumnHeader(Canvas canvas, Rect location, GregorianCalendar date)
{
String month = dfMonth.format(date.getTime());
String year = dfYear.format(date.getTime());
GregorianCalendar forwardDate = (GregorianCalendar) date.clone();
forwardDate.add(Calendar.DAY_OF_YEAR, 6);
String month = dfMonth.format(forwardDate.getTime());
String year = dfYear.format(forwardDate.getTime());
String text = null;
if (!month.equals(previousMonth))