From 913ba357520fa161934a75ba400f32fa287cc372 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 1 Aug 2016 14:46:39 +0200
Subject: [PATCH] better reminder formatting in form

---
 .../habitica/helpers/RemindersManager.java    | 39 +++++++++++--------
 .../ui/activities/TaskFormActivity.java       |  4 +-
 .../ui/adapter/tasks/RemindersAdapter.java    |  4 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
index 0db3124d5..19c709f1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
@@ -25,7 +25,15 @@ import java.util.UUID;
  */
 public class RemindersManager {
 
-    DateFormat dateFormater = new SimpleDateFormat("dd MMMM yyyy HH:mm:ss");
+    DateFormat dateFormater;
+
+    public RemindersManager(String taskType) {
+        if (taskType.equals("todo")) {
+            dateFormater = DateFormat.getDateTimeInstance();
+        } else {
+            dateFormater = DateFormat.getTimeInstance();
+        }
+    }
 
     public RemindersItem createReminderFromDateString(String dateString) {
         try {
@@ -61,25 +69,22 @@ public class RemindersManager {
             TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker);
             DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker);
 
-            dialogConfirmButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    int day = dialogDatePicker.getDayOfMonth();
-                    int month = dialogDatePicker.getMonth();
-                    int year =  dialogDatePicker.getYear();
-                    int hour = dialogTimePicker.getCurrentHour();
-                    int minute = dialogTimePicker.getCurrentMinute();
+            dialogConfirmButton.setOnClickListener(view -> {
+                int day = dialogDatePicker.getDayOfMonth();
+                int month = dialogDatePicker.getMonth();
+                int year =  dialogDatePicker.getYear();
+                int hour1 = dialogTimePicker.getCurrentHour();
+                int minute1 = dialogTimePicker.getCurrentMinute();
 
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.set(year, month, day, hour, minute, 0);
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(year, month, day, hour1, minute1, 0);
 
-                    if (reminder != null) {
-                        reminder.setTime(calendar.getTime());
-                    }
-
-                    editText.setText(dateFormater.format(calendar.getTime()));
-                    dialog.hide();
+                if (reminder != null) {
+                    reminder.setTime(calendar.getTime());
                 }
+
+                editText.setText(dateFormater.format(calendar.getTime()));
+                dialog.hide();
             });
             dialog.show();
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index d993387f9..bc85040d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -230,7 +230,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             return;
         }
 
-        remindersManager = new RemindersManager();
+        remindersManager = new RemindersManager(taskType);
         taskAlarmManager = TaskAlarmManager.getInstance(this);
 
         dueDateListener = new DateEditTextListener(dueDatePickerText);
@@ -472,7 +472,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             reminders = task.getReminders();
         }
 
-        remindersAdapter = new RemindersAdapter(reminders);
+        remindersAdapter = new RemindersAdapter(reminders, taskType);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
         llm.setOrientation(LinearLayoutManager.VERTICAL);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index e21665243..55f844a6b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -39,9 +39,9 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
     private final List<RemindersItem> reminders = new ArrayList<>();
     private RemindersManager remindersManager;
 
-    public RemindersAdapter(List<RemindersItem> remindersInc) {
+    public RemindersAdapter(List<RemindersItem> remindersInc, String taskType) {
         reminders.addAll(remindersInc);
-        remindersManager = new RemindersManager();
+        remindersManager = new RemindersManager(taskType);
     }
 
     @Override