From b05f711f027c3055016498e4ad8be0c90dbc921b Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Tue, 13 Nov 2018 12:05:03 +0100
Subject: [PATCH] Prepare for Restore button

---
 .idea/caches/build_file_checksums.ser           | Bin 535 -> 535 bytes
 .../com/wismna/geoffroy/donext/dao/Task.java    |   4 ++++
 .../fragments/TaskFormDialogFragment.java       |   2 +-
 app/src/main/res/values-fr/strings.xml          |   1 +
 app/src/main/res/values/strings.xml             |   1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 509a532e3134686ce7d464407885b7392a0713a5..51d01d2de8308bc15b3f0f7c41b31c85f9cad0eb 100644
GIT binary patch
delta 16
YcmbQvGM#0@bk=l^UyPX>=TtKS05SLl{{R30

delta 16
YcmbQvGM#0@bk?-*54hzw&Z%Yu05^LElK=n!

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 @@
     <string name="today_no_tasks">Rien à faire aujourd\'hui</string>
     <string name="create_tasks">Créez-en une là</string>
     <string name="today_create_tasks">Ajoutez des tâches là</string>
+    <string name="new_task_restore">Restaurer</string>
 </resources>
\ 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 @@
     <string name="new_task_save">Save</string>
     <string name="new_task_cancel">Cancel</string>
     <string name="new_task_delete">Delete</string>
+    <string name="new_task_restore">Restore</string>
 
     <!-- Strings related to task details activity -->
     <string name="task_no_tasks">No tasks here!</string>