diff --git a/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java b/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java index 7a2ffa2..ba8f615 100644 --- a/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java +++ b/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java @@ -43,7 +43,7 @@ public class DaysOfWeek { sAppContext = context.getApplicationContext(); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); // TODO First day of week preference. Entries are the full days' names and values are their respective integers. - String preferredFirstDay = prefs.getString("", "1"); + String preferredFirstDay = prefs.getString("", "0"); if (sInstance == null || !preferredFirstDay.equals(sLastPreferredFirstDay)) { sLastPreferredFirstDay = preferredFirstDay; sInstance = new DaysOfWeek(Integer.parseInt(preferredFirstDay)); diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsAdapter.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsAdapter.java index 47aa48c..39ae7b0 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsAdapter.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmsAdapter.java @@ -154,14 +154,15 @@ public class AlarmsAdapter extends RecyclerView.Adapter 0) { String text; - if (numRecurringDays == NUM_DAYS+1) /*TODO: Remove +1*/ { + if (numRecurringDays == NUM_DAYS) { text = mContext.getString(R.string.every_day); } else { StringBuilder sb = new StringBuilder(); - for (int i = 0; i < NUM_DAYS; i++) { - // The day at this position in the week - int weekDay = DaysOfWeek.getInstance(mContext).weekDay(i); - if (alarm.isRecurring(weekDay)) { + for (int i = 0; // ordinal number, i.e. the position in the week, not an actual day! + i < NUM_DAYS; i++) { + if (alarm.isRecurring(i)) { // Is the i-th day in the week recurring? + // This is the actual day at the i-th position in the week. + int weekDay = DaysOfWeek.getInstance(mContext).weekDay(i); sb.append(DaysOfWeek.getLabel(weekDay)).append(", "); } } diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/dummy/DummyContent.java b/app/src/main/java/com/philliphsu/clock2/alarms/dummy/DummyContent.java index e457df2..1b47405 100644 --- a/app/src/main/java/com/philliphsu/clock2/alarms/dummy/DummyContent.java +++ b/app/src/main/java/com/philliphsu/clock2/alarms/dummy/DummyContent.java @@ -38,8 +38,8 @@ public class DummyContent { b.hour(21).minutes(0); } boolean[] recurrences = new boolean[DaysOfWeek.NUM_DAYS]; - recurrences[0] = true; - recurrences[5] = true; + recurrences[1] = true; + recurrences[3] = true; Alarm a = b.id(position).recurringDays(recurrences).build(); a.setEnabled(true); return a;