From dc5beef190402be2b40659bcb070a20271bf2caa Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Sun, 26 Feb 2017 12:07:16 +0100
Subject: [PATCH] basic group plan support

---
 Habitica/AndroidManifest.xml                  |  4 +--
 Habitica/assets/migrations/Habitica/33.sql    |  1 +
 Habitica/res/layout/daily_item_card.xml       |  8 +++++
 Habitica/res/layout/habit_item_card.xml       |  8 +++++
 Habitica/res/layout/reward_item_card.xml      |  8 +++++
 Habitica/res/layout/todo_item_card.xml        |  8 +++++
 .../android/habitica/HabitDatabase.java       |  2 +-
 .../ui/activities/TaskFormActivity.java       | 12 ++++++++
 .../viewHolders/tasks/BaseTaskViewHolder.java | 12 ++++++++
 .../tasks/ChecklistedViewHolder.java          | 10 +++++--
 .../lib/models/tasks/Task.java                | 30 ++++++++++++++++++-
 .../lib/models/tasks/TaskGroupPlan.java       | 23 ++++++++++++++
 .../lib/utils/TaskGroupPlanDeserializer.java  | 26 ++++++++++++++++
 13 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 Habitica/assets/migrations/Habitica/33.sql
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 7e415a6bb..704d373d9 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="156"
-    android:versionName="0.0.37.1"
+    android:versionCode="158"
+    android:versionName="0.0.37.2"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
 
diff --git a/Habitica/assets/migrations/Habitica/33.sql b/Habitica/assets/migrations/Habitica/33.sql
new file mode 100644
index 000000000..693948507
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/33.sql
@@ -0,0 +1 @@
+ALTER TABLE Task ADD COLUMN group_id varchar(255);
\ No newline at end of file
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index f756829fb..e22013796 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -67,6 +67,14 @@
                     android:maxLines="3"
                     tools:text="Notes" />
 
+                <TextView
+                        android:id="@+id/approvalRequiredTextField"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/Caption4"
+                        android:text="@string/pending_approval"
+                        />
+
                 <LinearLayout
                     android:id="@+id/taskIconWrapper"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index a798f1de4..c6e4fb0ac 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -69,6 +69,14 @@
                 android:maxLines="3"
                 tools:text="Notes"/>
 
+            <TextView
+                    android:id="@+id/approvalRequiredTextField"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/Caption4"
+                    android:text="@string/pending_approval"
+                    />
+
             <LinearLayout
                 android:id="@+id/taskIconWrapper"
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index aed9555e7..5d5c9dbaa 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -47,6 +47,14 @@
                 android:layout_height="wrap_content"
                 tools:text="Notes"/>
 
+            <TextView
+                    android:id="@+id/approvalRequiredTextField"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/Caption4"
+                    android:text="@string/pending_approval"
+                    />
+
         </LinearLayout>
 
         <Button
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 683a12c75..3a0ab81e2 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -67,6 +67,14 @@
                     android:maxLines="3"
                     tools:text="Notes" />
 
+                <TextView
+                        android:id="@+id/approvalRequiredTextField"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/Caption4"
+                        android:text="@string/pending_approval"
+                        />
+
                 <LinearLayout
                     android:id="@+id/taskIconWrapper"
                     android:layout_width="match_parent"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
index 5c5ee61a4..40445240c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -7,5 +7,5 @@ public class HabitDatabase {
 
     public static final String NAME = "Habitica";
 
-    public static final int VERSION = 32;
+    public static final int VERSION = 33;
 }
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 620ae71f1..166c71564 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
@@ -421,8 +421,20 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                         throwable -> {
                         }
                 );
+
+        if (task.isGroupTask()) {
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.group_tasks_edit_title)
+                    .setMessage(R.string.group_tasks_edit_description)
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                        finish();
+                    })
+                    .show();
+        }
     }
 
+
+
     @Override
     protected void injectActivity(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
index f5980cc17..21e9a23a4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
@@ -60,6 +60,9 @@ public abstract class BaseTaskViewHolder extends RecyclerView.ViewHolder impleme
     @BindView(R.id.taskIconWrapper)
     LinearLayout taskIconWrapper;
 
+    @BindView(R.id.approvalRequiredTextField)
+    TextView approvalRequiredTextView;
+
     boolean disabled;
 
     public BaseTaskViewHolder(View itemView) {
@@ -134,8 +137,17 @@ public abstract class BaseTaskViewHolder extends RecyclerView.ViewHolder impleme
         if (this.taskIconWrapper != null) {
             this.taskIconWrapper.setVisibility(getTaskIconWrapperIsVisible() ? View.VISIBLE : View.GONE);
         }
+
+        if (task.isPendingApproval()) {
+            approvalRequiredTextView.setVisibility(View.VISIBLE);
+        } else {
+            approvalRequiredTextView.setVisibility(View.GONE);
+        }
+
     }
 
+
+
     protected void configureSpecialTaskTextView(Task task) {
         if (this.specialTaskTextView != null) {
             this.specialTaskTextView.setVisibility(View.INVISIBLE);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
index dd6dbf9ea..3431d56c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
@@ -56,8 +56,13 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
     @Override
     public void bindHolder(Task newTask, int position) {
         super.bindHolder(newTask, position);
-        this.checkbox.setChecked(this.task.completed);
-        if (this.shouldDisplayAsActive()) {
+
+        boolean completed = this.task.completed;
+        if (task.isPendingApproval()) {
+            completed = false;
+        }
+        this.checkbox.setChecked(completed);
+        if (this.shouldDisplayAsActive() && !task.isPendingApproval()) {
             this.checkboxHolder.setBackgroundResource(this.task.getLightTaskColor());
         } else {
             this.checkboxHolder.setBackgroundColor(this.taskGray);
@@ -77,6 +82,7 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
                 this.rightBorderView.setBackgroundColor(this.taskGray);
             }
         }
+
     }
 
     abstract public Boolean shouldDisplayAsActive();
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
index e9a953c28..243514a52 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
@@ -58,6 +58,11 @@ public class Task extends BaseModel {
     public Date dateCreated;
     @Column
     public int position;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "group_id",
+            columnType = String.class,
+            foreignColumnName = "task_id")})
+    public TaskGroupPlan group;
     //Habits
     @Column
     public Boolean up, down;
@@ -439,8 +444,13 @@ public class Task extends BaseModel {
         checklist = null;
         reminders = null;
 
-        if (repeat != null)
+        if (repeat != null) {
             repeat.task_id = this.id;
+        }
+
+        if (group != null) {
+            group.task_id = this.id;
+        }
 
         super.save();
 
@@ -633,4 +643,22 @@ public class Task extends BaseModel {
         EventBus.getDefault().post(event);
         super.delete();
     }
+
+    public boolean isGroupTask() {
+        if (group != null) {
+            if (group.approvalRequired) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isPendingApproval() {
+        if (group != null) {
+            if (group.approvalRequired && group.approvalRequested && !group.approvalApproved) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java
new file mode 100644
index 000000000..0914b8e82
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskGroupPlan.java
@@ -0,0 +1,23 @@
+package com.magicmicky.habitrpgwrapper.lib.models.tasks;
+
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@ModelContainer
+@Table(databaseName = HabitDatabase.NAME)
+public class TaskGroupPlan extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String task_id;
+
+    @Column
+    public boolean approvalRequested, approvalApproved, approvalRequired;
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java
new file mode 100644
index 000000000..072922684
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskGroupPlanDeserializer.java
@@ -0,0 +1,26 @@
+package com.magicmicky.habitrpgwrapper.lib.utils;
+
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskGroupPlan;
+
+import java.lang.reflect.Type;
+
+public class TaskGroupPlanDeserializer implements JsonDeserializer<TaskGroupPlan> {
+    @Override
+    public TaskGroupPlan deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        TaskGroupPlan group = new TaskGroupPlan();
+        JsonObject object = json.getAsJsonObject();
+        JsonObject approvalObject = object.getAsJsonObject("approval");
+        group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").getAsBoolean();
+        group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").getAsBoolean();
+        group.approvalRequired = approvalObject.getAsJsonPrimitive("required").getAsBoolean();
+
+        return null;
+    }
+}