fix order in history view

app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java

@@ -129,6 +129,8 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
 
         baseDate.add(Calendar.DAY_OF_YEAR, -nDays);
         baseDate.add(Calendar.DAY_OF_YEAR, -todayWeekday);
+        // ????
+        baseDate.add(Calendar.DAY_OF_YEAR, localeWeekdayList[0]);
     }
 
     @Override
@@ -286,9 +288,13 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
         drawColumnHeader(canvas, location, date);
         location.offset(0, columnWidth);
 
-        for (int j = 0; j < 7; j++)
+        int todayOfYear = DateHelper.getStartOfTodayCalendar().get(Calendar.DAY_OF_YEAR);
+
+        for (Integer dayNumber : localeWeekdayList)
         {
-            if (!(column == nColumns - 2 && getDataOffset() == 0 && j > todayWeekday))
+            int dayOfYear = date.get(Calendar.DAY_OF_YEAR);
+            int j = number2wdays.get(dayNumber);
+            if (!(column == nColumns - 2 && getDataOffset() == 0 && dayOfYear > todayOfYear))
             {
                 int checkmarkOffset = getDataOffset() * 7 + nDays - 7 * (column + 1) + todayWeekday - j;
                 drawSquare(canvas, location, date, checkmarkOffset);