Reminder start date

app/src/main/java/com/futsch1/medtimer/WeekendModePreferencesFragment.java

@@ -43,12 +43,12 @@ private void setupTimePicker() {
         Preference preference = getPreferenceScreen().findPreference(WEEKEND_TIME);
         if (preference != null) {
             SharedPreferences defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext());
-            preference.setSummary(TimeHelper.minutesToTime(defaultSharedPreferences.getInt(WEEKEND_TIME, 540)));
+            preference.setSummary(TimeHelper.minutesToTimeString(defaultSharedPreferences.getInt(WEEKEND_TIME, 540)));
             preference.setOnPreferenceClickListener(preference1 -> {
                 int weekendTime = defaultSharedPreferences.getInt(WEEKEND_TIME, 540);
                 new TimeHelper.TimePickerWrapper(getActivity()).show(weekendTime / 60, weekendTime % 60, minutes -> {
                     defaultSharedPreferences.edit().putInt(WEEKEND_TIME, minutes).apply();
-                    preference1.setSummary(TimeHelper.minutesToTime(minutes));
+                    preference1.setSummary(TimeHelper.minutesToTimeString(minutes));
                     requestReschedule();
                 });
                 return true;

app/src/main/java/com/futsch1/medtimer/database/Reminder.java

@@ -37,8 +37,10 @@ public class Reminder {
     @Expose
     public List<Boolean> days;
 
+    public static final int DEFAULT_TIME = 480;
+
     public Reminder(int medicineRelId) {
-        timeInMinutes = 480;
+        timeInMinutes = DEFAULT_TIME;
         amount = "?";
         consecutiveDays = 1;
         pauseDays = 0;

app/src/main/java/com/futsch1/medtimer/helpers/TimeHelper.java

@@ -7,9 +7,12 @@
 import com.google.android.material.timepicker.MaterialTimePicker;
 import com.google.android.material.timepicker.TimeFormat;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.time.format.FormatStyle;
 
 public class TimeHelper {
@@ -18,14 +21,30 @@ private TimeHelper() {
         // Intentionally empty
     }
 
-    public static String minutesToTime(long minutes) {
+    public static String minutesToTimeString(long minutes) {
         return DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(LocalTime.of((int) (minutes / 60), (int) (minutes % 60)));
     }
 
-    public static String daysSinceEpochToDate(long daysSinceEpoch) {
+    public static int timeStringToMinutes(String timeString) {
+        try {
+            return LocalTime.parse(timeString, DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)).toSecondOfDay() / 60;
+        } catch (DateTimeParseException e) {
+            return -1;
+        }
+    }
+
+    public static String daysSinceEpochToDateString(long daysSinceEpoch) {
         return DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).format(LocalDate.ofEpochDay(daysSinceEpoch));
     }
 
+    public static @Nullable LocalDate dateStringToDate(String date) {
+        try {
+            return LocalDate.parse(date, DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT));
+        } catch (DateTimeParseException e) {
+            return null;
+        }
+    }
+
     public interface TimePickerResult {
         void onTimeSelected(int minutes);
     }

app/src/main/java/com/futsch1/medtimer/medicine/AdvancedReminderSettingsFragment.java

@@ -13,6 +13,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -139,17 +140,17 @@ private void setupRemindOnDays() {
     }
 
     private void setupCycleStartDate() {
-        setCycleStartDate();
+        setCycleStartDate(reminder.cycleStartDay);
         editCycleStartDate.setOnFocusChangeListener((v, hasFocus) -> {
             if (hasFocus) {
-                LocalDate startDate = LocalDate.ofEpochDay(reminder.cycleStartDay);
+                LocalDate startDate = getCycleStartDate();
+                if (startDate == null ) {
+                    startDate = LocalDate.now();
+                }
                 MaterialDatePicker<Long> datePickerDialog = MaterialDatePicker.Builder.datePicker()
                         .setSelection(startDate.toEpochDay() * DateUtils.DAY_IN_MILLIS)
                         .build();
-                datePickerDialog.addOnPositiveButtonClickListener(selectedDate -> {
-                    reminder.cycleStartDay = selectedDate / DateUtils.DAY_IN_MILLIS;
-                    setCycleStartDate();
-                });
+                datePickerDialog.addOnPositiveButtonClickListener(selectedDate -> setCycleStartDate(selectedDate / DateUtils.DAY_IN_MILLIS));
                 datePickerDialog.show(getParentFragmentManager(), "date_picker");
             }
         });
@@ -171,15 +172,42 @@ private void setDaysText() {
 
     }
 
-    private void setCycleStartDate() {
-        editCycleStartDate.setText(TimeHelper.daysSinceEpochToDate(reminder.cycleStartDay));
+    private void setCycleStartDate(long daysSinceEpoch) {
+        editCycleStartDate.setText(TimeHelper.daysSinceEpochToDateString(daysSinceEpoch));
+    }
+
+    private @Nullable LocalDate getCycleStartDate() {
+        return TimeHelper.dateStringToDate(editCycleStartDate.getText().toString());
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
 
         reminder.instructions = editInstructions.getText() != null ? editInstructions.getText().toString() : "";
+        putConsecutiveDaysIntoReminder();
+        putPauseDaysIntoReminder();
+        putStartDateIntoReminder();
+
+        medicineViewModel.updateReminder(reminder);
+    }
+
+    private void putStartDateIntoReminder() {
+        LocalDate startDate = getCycleStartDate();
+        if (startDate != null) {
+            reminder.cycleStartDay = startDate.toEpochDay();
+        }
+    }
+
+    private void putPauseDaysIntoReminder() {
+        try {
+            reminder.pauseDays = Integer.parseInt(editPauseDays.getText().toString());
+        } catch (NumberFormatException e) {
+            reminder.pauseDays = 0;
+        }
+    }
+
+    private void putConsecutiveDaysIntoReminder() {
         try {
             reminder.consecutiveDays = Integer.parseInt(editConsecutiveDays.getText().toString());
             if (reminder.consecutiveDays <= 0) {
@@ -188,13 +216,6 @@ public void onDestroy() {
         } catch (NumberFormatException e) {
             reminder.consecutiveDays = 1;
         }
-        try {
-            reminder.pauseDays = Integer.parseInt(editPauseDays.getText().toString());
-        } catch (NumberFormatException e) {
-            reminder.pauseDays = 0;
-        }
-
-        medicineViewModel.updateReminder(reminder);
     }
 
 }

app/src/main/java/com/futsch1/medtimer/medicine/MedicineViewHolder.java

@@ -82,7 +82,7 @@ private String getRemindersSummary(MedicineWithReminders medicineWithReminders)
         ArrayList<String> reminderTimes = new ArrayList<>();
         int[] timesInMinutes = medicineWithReminders.reminders.stream().mapToInt(r -> r.timeInMinutes).sorted().toArray();
         for (int minute : timesInMinutes) {
-            reminderTimes.add(TimeHelper.minutesToTime(minute));
+            reminderTimes.add(TimeHelper.minutesToTimeString(minute));
         }
         int len = medicineWithReminders.reminders.size();
         return remindersSummaryView.getResources().getQuantityString(R.plurals.sum_reminders, len, len, String.join(", ", reminderTimes));

app/src/main/java/com/futsch1/medtimer/medicine/ReminderViewHolder.java

@@ -1,6 +1,7 @@
 package com.futsch1.medtimer.medicine;
 
-import static com.futsch1.medtimer.helpers.TimeHelper.minutesToTime;
+import static com.futsch1.medtimer.helpers.TimeHelper.minutesToTimeString;
+import static com.futsch1.medtimer.helpers.TimeHelper.timeStringToMinutes;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -57,8 +58,7 @@ static ReminderViewHolder create(ViewGroup parent, FragmentActivity fragmentActi
     public void bind(Reminder reminder, String medicineName, DeleteCallback deleteCallback) {
         this.reminder = reminder;
 
-        editTime.setText(minutesToTime(reminder.timeInMinutes));
-
+        editTime.setText(minutesToTimeString(reminder.timeInMinutes));
         editTime.setOnFocusChangeListener((v, hasFocus) -> onFocusEditTime(reminder, hasFocus));
 
         advancedSettings.setOnClickListener(v -> onClickAdvancedSettings(reminder, medicineName));
@@ -97,8 +97,12 @@ private String getAdvancedSettingsSummary(Reminder reminder) {
 
     private void onFocusEditTime(Reminder reminder, boolean hasFocus) {
         if (hasFocus) {
-            new TimeHelper.TimePickerWrapper(fragmentActivity).show(reminder.timeInMinutes / 60, reminder.timeInMinutes % 60, minutes -> {
-                String selectedTime = minutesToTime(minutes);
+            int startMinutes = timeStringToMinutes(editTime.getText().toString());
+            if (startMinutes < 0) {
+                startMinutes = Reminder.DEFAULT_TIME;
+            }
+            new TimeHelper.TimePickerWrapper(fragmentActivity).show(startMinutes / 60, startMinutes % 60, minutes -> {
+                String selectedTime = minutesToTimeString(minutes);
                 editTime.setText(selectedTime);
                 reminder.timeInMinutes = minutes;
             });
@@ -136,6 +140,10 @@ private boolean onLongClick(DeleteCallback deleteCallback) {
 
     public Reminder getReminder() {
         reminder.amount = editAmount.getText().toString();
+        int minutes = timeStringToMinutes(editTime.getText().toString());
+        if (minutes >= 0) {
+            reminder.timeInMinutes = minutes;
+        }
         return reminder;
     }
 

app/src/main/java/com/futsch1/medtimer/reminders/ReminderWork.java

@@ -3,7 +3,7 @@
 import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static com.futsch1.medtimer.ActivityCodes.EXTRA_REMINDER_EVENT_ID;
 import static com.futsch1.medtimer.ActivityCodes.EXTRA_REMINDER_ID;
-import static com.futsch1.medtimer.helpers.TimeHelper.minutesToTime;
+import static com.futsch1.medtimer.helpers.TimeHelper.minutesToTimeString;
 
 import android.app.Application;
 import android.content.Context;
@@ -101,7 +101,7 @@ private void showNotification(Medicine medicine, ReminderEvent reminderEvent, Re
         if (canShowNotifications()) {
             Color color = medicine.useColor ? Color.valueOf(medicine.color) : null;
             Notifications notifications = new Notifications(context);
-            reminderEvent.notificationId = notifications.showNotification(minutesToTime(reminder.timeInMinutes), reminderEvent.medicineName, reminder.amount, reminder.instructions, reminder.reminderId, reminderEvent.reminderEventId, color);
+            reminderEvent.notificationId = notifications.showNotification(minutesToTimeString(reminder.timeInMinutes), reminderEvent.medicineName, reminder.amount, reminder.instructions, reminder.reminderId, reminderEvent.reminderEventId, color);
             medicineRepository.updateReminderEvent(reminderEvent);
         }
     }