sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better reminder formatting in form

Browse source
This commit is contained in:
Phillip Thelen 2016-08-01 14:46:39 +02:00
parent e57fc132df
commit 913ba35752
3 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
View file

@ -25,7 +25,15 @@ import java.util.UUID;
*/ */
public class RemindersManager { 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) { public RemindersItem createReminderFromDateString(String dateString) {
try { try {
@ -61,25 +69,22 @@ public class RemindersManager {
TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker); TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker);
DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker); DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker);
dialogConfirmButton.setOnClickListener(new View.OnClickListener() { dialogConfirmButton.setOnClickListener(view -> {
@Override int day = dialogDatePicker.getDayOfMonth();
public void onClick(View view) { int month = dialogDatePicker.getMonth();
int day = dialogDatePicker.getDayOfMonth(); int year = dialogDatePicker.getYear();
int month = dialogDatePicker.getMonth(); int hour1 = dialogTimePicker.getCurrentHour();
int year = dialogDatePicker.getYear(); int minute1 = dialogTimePicker.getCurrentMinute();
int hour = dialogTimePicker.getCurrentHour();
int minute = dialogTimePicker.getCurrentMinute();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.set(year, month, day, hour, minute, 0); calendar.set(year, month, day, hour1, minute1, 0);
if (reminder != null) { if (reminder != null) {
reminder.setTime(calendar.getTime()); reminder.setTime(calendar.getTime());
}
editText.setText(dateFormater.format(calendar.getTime()));
dialog.hide();
} }
editText.setText(dateFormater.format(calendar.getTime()));
dialog.hide();
}); });
dialog.show(); dialog.show();
} else { } else {

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -230,7 +230,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
return; return;
} }
remindersManager = new RemindersManager(); remindersManager = new RemindersManager(taskType);
taskAlarmManager = TaskAlarmManager.getInstance(this); taskAlarmManager = TaskAlarmManager.getInstance(this);
dueDateListener = new DateEditTextListener(dueDatePickerText); dueDateListener = new DateEditTextListener(dueDatePickerText);
@ -472,7 +472,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
reminders = task.getReminders(); reminders = task.getReminders();
} }
remindersAdapter = new RemindersAdapter(reminders); remindersAdapter = new RemindersAdapter(reminders, taskType);
LinearLayoutManager llm = new LinearLayoutManager(this); LinearLayoutManager llm = new LinearLayoutManager(this);
llm.setOrientation(LinearLayoutManager.VERTICAL); llm.setOrientation(LinearLayoutManager.VERTICAL);

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
View file

@ -39,9 +39,9 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
private final List<RemindersItem> reminders = new ArrayList<>(); private final List<RemindersItem> reminders = new ArrayList<>();
private RemindersManager remindersManager; private RemindersManager remindersManager;
public RemindersAdapter(List<RemindersItem> remindersInc) { public RemindersAdapter(List<RemindersItem> remindersInc, String taskType) {
reminders.addAll(remindersInc); reminders.addAll(remindersInc);
remindersManager = new RemindersManager(); remindersManager = new RemindersManager(taskType);
} }
@Override @Override