From e43629101ea0c8228ff3bc7c246200a75831cc2c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 20 May 2016 18:30:04 +0200
Subject: [PATCH] improve task display

---
 .../ui/adapter/tasks/DailiesRecyclerViewHolder.java      | 1 -
 .../ui/viewHolders/tasks/ChecklistedViewHolder.java      | 9 +++++----
 .../habitica/ui/viewHolders/tasks/TodoViewHolder.java    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java
index c8d379fd6..bdd0ad47b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java
@@ -23,7 +23,6 @@ public class DailiesRecyclerViewHolder extends BaseTasksRecyclerViewAdapter<Dail
 
     @Override
     public void onBindViewHolder(DailyViewHolder holder, int position) {
-        holder.displayChecklist = false;
         super.onBindViewHolder(holder, position);
     }
 }
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 7b27843d4..490d7b327 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
@@ -125,9 +125,11 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
         } else {
             this.setDisplayChecklist(true);
         }
-        RecyclerView recyclerView = (RecyclerView)this.checklistView.getParent().getParent();
-        LinearLayoutManager layoutManager = (LinearLayoutManager)recyclerView.getLayoutManager();
-        layoutManager.scrollToPositionWithOffset(this.getAdapterPosition(), 15);
+        if (this.displayChecklist) {
+            RecyclerView recyclerView = (RecyclerView)this.checklistView.getParent().getParent();
+            LinearLayoutManager layoutManager = (LinearLayoutManager)recyclerView.getLayoutManager();
+            layoutManager.scrollToPositionWithOffset(this.getAdapterPosition(), 15);
+        }
     }
 
     public void expandCheckboxTouchArea(final View expandedView, final View checkboxView){
@@ -151,7 +153,6 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
                 EventBus.getDefault().post(event);
                 task.completed =event.completed;
                 task.save();
-
             }
         } else {
             View v = (View) buttonView.getParent();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
index edb633383..b7361732b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
@@ -26,7 +26,7 @@ public class TodoViewHolder extends ChecklistedViewHolder {
             this.checklistIndicatorWrapper.setBackgroundResource(this.task.getLightTaskColor());
         }
         if (task.duedate != null) {
-            this.duedateTextView.setText(itemView.getContext().getString(R.string.todo_due, task.streak));
+            this.duedateTextView.setText(itemView.getContext().getString(R.string.todo_due, task.duedate));
             this.duedateTextView.setVisibility(View.VISIBLE);
         } else {
             this.duedateTextView.setVisibility(View.GONE);