From f9b867964bc54de53945194aa49bbc8e47df9e3c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 25 Sep 2017 12:02:11 +0200
Subject: [PATCH] show habit streak

---
 Habitica/res/layout/habit_item_card.xml       | 13 +++++++++
 .../android/habitica/models/tasks/Task.java   |  1 +
 .../ui/viewHolders/tasks/HabitViewHolder.java | 28 +++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index c6e4fb0ac..cbac8da3f 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -93,6 +93,19 @@
                     android:textColor="@color/task_secondary_text"
                     tools:text="special" />
 
+                <TextView
+                    android:id="@+id/streakTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/task_icon_size"
+                    android:layout_marginStart="@dimen/task_icon_space"
+                    android:layout_marginLeft="@dimen/task_icon_space"
+                    android:drawableStart="@drawable/task_icon_streak"
+                    android:drawableLeft="@drawable/task_icon_streak"
+                    android:textColor="@color/task_secondary_text"
+                    tools:text="10"
+                    android:gravity="center_vertical"
+                    style="@style/Caption3" />
+
                 <ImageView
                     android:id="@+id/iconviewChallenge"
                     android:layout_width="@dimen/task_icon_size"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 8fdde8dff..a77c7a65c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -54,6 +54,7 @@ public class Task extends RealmObject implements Parcelable {
     public TaskGroupPlan group;
     //Habits
     public Boolean up, down;
+    public int counterUp, counterDown;
     //todos/dailies
     public boolean completed;
     public RealmList<ChecklistItem> checklist;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
index 632b97399..552868054 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.HabitScoreEvent;
@@ -30,6 +31,9 @@ public class HabitViewHolder extends BaseTaskViewHolder {
     @BindView(R.id.btnMinus)
     Button btnMinus;
 
+    @BindView(R.id.streakTextView)
+    TextView streakTextView;
+
     public HabitViewHolder(View itemView) {
         super(itemView);
     }
@@ -69,6 +73,21 @@ public class HabitViewHolder extends BaseTaskViewHolder {
             this.btnMinus.setVisibility(View.GONE);
             this.btnMinus.setClickable(false);
         }
+
+        String streakString = "";
+        if (task.counterUp > 0 && task.counterDown > 0) {
+            streakString = streakString + "+" + String.valueOf(task.counterUp) + " | -" + String.valueOf(task.counterDown);
+        } else if (task.counterUp > 0) {
+            streakString = streakString + "+" + String.valueOf(task.counterUp);
+        } else if (task.counterUp > 0) {
+            streakString = streakString + "-" + String.valueOf(task.counterDown);
+        }
+        if (streakString.length() > 0) {
+            streakTextView.setText(streakString);
+            streakTextView.setVisibility(View.VISIBLE);
+        } else {
+            streakTextView.setVisibility(View.GONE);
+        }
     }
 
     @OnClick(R.id.btnPlus)
@@ -94,4 +113,13 @@ public class HabitViewHolder extends BaseTaskViewHolder {
         this.btnPlus.setEnabled(!taskActionsDisabled);
         this.btnMinus.setEnabled(!taskActionsDisabled);
     }
+
+    @Override
+    protected Boolean getTaskIconWrapperIsVisible() {
+        Boolean isVisible = super.getTaskIconWrapperIsVisible();
+        if (this.streakTextView.getVisibility() == View.VISIBLE) {
+            isVisible = true;
+        }
+        return isVisible;
+    }
 }