Replace "weekdays" with "days of the week" to avoid confusion

In a previous commit I wrote "weekdays" when I really meant "days of the
week".

Author: rivaldi8

app/src/main/java/org/gnucash/android/model/ScheduledAction.java

@@ -241,43 +241,43 @@ private long computeNextScheduledExecutionTimeStartingAt(long startTime) {
      * Computes the next time that this weekly scheduled action is supposed to be
      * executed starting at startTime.
      *
-     * If no weekdays have been set (GnuCash desktop allows it), it will return a
+     * If no days of the week have been set (GnuCash desktop allows it), it will return a
      * date in the future to ensure ScheduledActionService doesn't execute it.
      *
      * @param startTime LocalDateTime to use as start to compute the next schedule.
      *
-     * @return Next run time as a LocalDateTime. A date in the future, if no weekdays
+     * @return Next run time as a LocalDateTime. A date in the future, if no days of the week
      *      were set in the Recurrence.
      */
     @NonNull
     private LocalDateTime computeNextWeeklyExecutionStartingAt(LocalDateTime startTime) {
         if (mRecurrence.getByDays().isEmpty())
             return LocalDateTime.now().plusDays(1); // Just a date in the future
 
-        // Look into the week of startTime for another scheduled weekday
-        for (int weekDay : mRecurrence.getByDays() ) {
-            int jodaWeekDay = convertCalendarWeekdayToJoda(weekDay);
-            LocalDateTime candidateNextDueTime = startTime.withDayOfWeek(jodaWeekDay);
+        // Look into the week of startTime for another scheduled day of the week
+        for (int dayOfWeek : mRecurrence.getByDays() ) {
+            int jodaDayOfWeek = convertCalendarDayOfWeekToJoda(dayOfWeek);
+            LocalDateTime candidateNextDueTime = startTime.withDayOfWeek(jodaDayOfWeek);
             if (candidateNextDueTime.isAfter(startTime))
                 return candidateNextDueTime;
         }
 
-        // Return the first scheduled weekday from the next due week
-        int firstScheduledWeekday = convertCalendarWeekdayToJoda(mRecurrence.getByDays().get(0));
+        // Return the first scheduled day of the week from the next due week
+        int firstScheduledDayOfWeek = convertCalendarDayOfWeekToJoda(mRecurrence.getByDays().get(0));
         return startTime.plusWeeks(mRecurrence.getMultiplier())
-                        .withDayOfWeek(firstScheduledWeekday);
+                        .withDayOfWeek(firstScheduledDayOfWeek);
     }
 
     /**
-     * Converts a java.util.Calendar weekday constant to the
+     * Converts a java.util.Calendar day of the week constant to the
      * org.joda.time.DateTimeConstants equivalent.
      *
-     * @param calendarWeekday weekday constant from java.util.Calendar
-     * @return weekday constant equivalent from org.joda.time.DateTimeConstants
+     * @param calendarDayOfWeek day of the week constant from java.util.Calendar
+     * @return day of the week constant equivalent from org.joda.time.DateTimeConstants
      */
-    private int convertCalendarWeekdayToJoda(int calendarWeekday) {
+    private int convertCalendarDayOfWeekToJoda(int calendarDayOfWeek) {
         Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.DAY_OF_WEEK, calendarWeekday);
+        cal.set(Calendar.DAY_OF_WEEK, calendarDayOfWeek);
         return LocalDateTime.fromCalendarFields(cal).getDayOfWeek();
     }
 

app/src/test/java/org/gnucash/android/test/unit/model/ScheduledActionTest.java

@@ -136,15 +136,15 @@ public void testComputingTimeOfLastSchedule(){
     }
 
     /**
-     * Weekly actions scheduled to run on multiple weekdays should be due
+     * Weekly actions scheduled to run on multiple days of the week should be due
      * in each of them in the same week.
      *
      * For an action scheduled on Mondays and Thursdays, we test that, if
      * the last run was on Monday, the next should be due on the Thursday
      * of the same week instead of the following week.
      */
     @Test
-    public void multiWeekdayWeeklyActions_shouldBeDueOnEachWeekdaySet() {
+    public void multiDayOfWeekWeeklyActions_shouldBeDueOnEachDayOfWeekSet() {
         ScheduledAction scheduledAction = new ScheduledAction(ScheduledAction.ActionType.BACKUP);
         Recurrence recurrence = new Recurrence(PeriodType.WEEK);
         recurrence.setByDays(Arrays.asList(Calendar.MONDAY, Calendar.THURSDAY));
@@ -159,10 +159,10 @@ public void multiWeekdayWeeklyActions_shouldBeDueOnEachWeekdaySet() {
 
     /**
      * Weekly actions scheduled with multiplier should skip intermediate
-     * weeks and be due in the specified weekday.
+     * weeks and be due in the specified day of the week.
      */
     @Test
-    public void weeklyActionsWithMultiplier_shouldBeDueOnTheWeekdaySet() {
+    public void weeklyActionsWithMultiplier_shouldBeDueOnTheDayOfWeekSet() {
         ScheduledAction scheduledAction = new ScheduledAction(ScheduledAction.ActionType.BACKUP);
         Recurrence recurrence = new Recurrence(PeriodType.WEEK);
         recurrence.setMultiplier(2);
@@ -179,12 +179,12 @@ public void weeklyActionsWithMultiplier_shouldBeDueOnTheWeekdaySet() {
 
     /**
      * Weekly actions should return a date in the future when no
-     * weekdays have been set in the recurrence.
+     * days of the week have been set in the recurrence.
      *
      * See ScheduledAction.computeNextTimeBasedScheduledExecutionTime()
      */
     @Test
-    public void weeklyActionsWithoutWeekdaySet_shouldReturnDateInTheFuture() {
+    public void weeklyActionsWithoutDayOfWeekSet_shouldReturnDateInTheFuture() {
         ScheduledAction scheduledAction = new ScheduledAction(ScheduledAction.ActionType.BACKUP);
         Recurrence recurrence = new Recurrence(PeriodType.WEEK);
         recurrence.setByDays(Collections.<Integer>emptyList());