diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 509a532..51d01d2 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java b/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java index 36c3076..106ac5c 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/dao/Task.java @@ -135,6 +135,10 @@ public class Task { return todayDate != null && todayDate.isEqual(LocalDate.now()); } + public boolean isHistory () { + return getDone() == 1 || getDeleted() == 1; + } + // Will be used by the ArrayAdapter in the ListView @NonNull @Override diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java index 2dac8c8..64140a8 100644 --- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java +++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TaskFormDialogFragment.java @@ -66,7 +66,7 @@ public class TaskFormDialogFragment extends DynamicDialogFragment { mButtonCount = args.getInt("button_count"); mPositiveButtonString = getString(R.string.new_task_save); mNegativeButtonString = getString(R.string.new_task_cancel); - mNeutralButtonString = getString(R.string.new_task_delete); + mNeutralButtonString = getString(mTask.isHistory() ? R.string.new_task_restore : R.string.new_task_delete); listId = args.getInt("list"); isToday = args.getBoolean("today"); } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 98e8cb2..d6edde6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -69,4 +69,5 @@ Rien à faire aujourd\'hui Créez-en une là Ajoutez des tâches là + Restaurer \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ef3cd8..86c69c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ Save Cancel Delete + Restore No tasks here!