From 411fe3c794a05972930f620ff7f1e1ae111bdc6f Mon Sep 17 00:00:00 2001 From: Name Date: Fri, 20 Oct 2017 16:25:53 +0300 Subject: [PATCH] made Saturday week first day --- .../isoron/uhabits/activities/common/views/HistoryChart.java | 1 + .../src/main/java/org/isoron/uhabits/core/utils/DateUtils.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java index 9c6bde1d3..e8e3308fd 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java @@ -459,6 +459,7 @@ public class HistoryChart extends ScrollableChart private void updateDate() { baseDate = DateUtils.getStartOfTodayCalendar(); + baseDate.setFirstDayOfWeek(Calendar.SATURDAY); baseDate.add(Calendar.DAY_OF_YEAR, -(getDataOffset() - 1) * 7); nDays = (nColumns - 1) * 7; diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java index a03a6da43..5ae6764ee 100644 --- a/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java +++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java @@ -108,6 +108,7 @@ public abstract class DateUtils String[] days = new String[7]; Calendar calendar = new GregorianCalendar(); + calendar.setFirstDayOfWeek(SATURDAY); calendar.set(DAY_OF_WEEK, calendar.getFirstDayOfWeek()); for (int i = 0; i < days.length; i++) { @@ -127,6 +128,7 @@ public abstract class DateUtils { Integer[] dayNumbers = new Integer[7]; Calendar calendar = new GregorianCalendar(); + calendar.setFirstDayOfWeek(SATURDAY); calendar.set(DAY_OF_WEEK, calendar.getFirstDayOfWeek()); for (int i = 0; i < dayNumbers.length; i++) {