From 0a3a693f91d389e72358255c66a99d91a2ffb8c6 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 17 Aug 2015 22:06:29 +0200
Subject: [PATCH] redesign daily list

---
 Habitica/res/layout/daily_item_card.xml       | 102 +++++++++++++-----
 .../adapter/HabitItemRecyclerViewAdapter.java |   8 +-
 2 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index feb814abd..86639f3dc 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -3,61 +3,105 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
     <data>
         <import type="com.magicmicky.habitrpgwrapper.lib.models.tasks.Task" />
+        <import type="android.view.View"/>
 
         <variable
             name="daily"
             type="Task" />
     </data>
 
-    <FrameLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white">
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <CheckBox
+                android:id="@+id/checkBox"
+                android:layout_width="50dp"
                 android:layout_height="match_parent"
-                android:layout_above="@+id/textView6"
-                android:layout_alignLeft="@+id/checkedTextView"
-                android:layout_alignStart="@+id/checkedTextView">
-
-                <CheckBox
-                    android:id="@+id/checkBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:checked="@{daily.completed}"
-                    app:backgroundColor="@{daily.getLightTaskColor}"
-                    android:gravity="center"/>
-
+                android:checked="@{daily.completed}"
+                app:backgroundColor="@{daily.getLightTaskColor}"
+                android:gravity="center"
+                android:layout_gravity="center_horizontal" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:padding="5dp">
-                    <CheckedTextView
+                    android:padding="5dp"
+                    android:id="@+id/linearLayout"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_toLeftOf="@+id/checklistIndicatorWrapper"
+                    android:layout_toStartOf="@+id/checklistIndicatorWrapper">
+                    <TextView
                         android:id="@+id/checkedTextView"
                         style="@style/CardTitle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@{daily.text}" />
-
                     <TextView
                         android:id="@+id/textView6"
                         style="@style/CardText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:text="@{daily.notes}" />
+                        android:text="@{daily.notes}"
+                        android:visibility="@{daily.notes != null ? View.VISIBLE : View.GONE}"/>
                 </LinearLayout>
-                <TextView
-                    android:layout_width="wrap_content"
+                <RelativeLayout android:orientation="vertical"
+                    android:id="@+id/checklistIndicatorWrapper"
+                    android:layout_width="30dp"
                     android:layout_height="match_parent"
-                    android:text="@{String.valueOf(daily.getCompletedChecklistCount)+'/'+String.valueOf(daily.checklist.size)}"/>
+                    app:backgroundColor="@{daily.getLightTaskColor}"
+                    android:visibility="@{daily.checklist.size > 0 ? View.VISIBLE : View.GONE}"
+                    android:gravity="center"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf(daily.getCompletedChecklistCount)}"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:layout_above="@+id/checklistDivider"/>
+                    <View
+                        android:id="@+id/checklistDivider"
+                        android:layout_width="10dp"
+                        android:layout_height="0.5dp"
+                        android:background="@color/white"
+                        android:layout_centerInParent="true"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf(daily.checklist.size)}"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:layout_below="@+id/checklistDivider"/>
+                </RelativeLayout>
                 <View
                     android:id="@+id/rightBorderView"
                     android:layout_width="5dp"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     app:backgroundColor="@{daily.getLightTaskColor}"
-                    android:gravity="center"/>
-            </LinearLayout>
-    </FrameLayout>
+                    android:gravity="center"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true" />
+            </RelativeLayout>
+
+        </LinearLayout>
+        <View
+            android:id="@+id/bottomBorderView"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/cell_separator"/>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
index efcc8deeb..8732ce30b 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -217,10 +217,12 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         ViewHelper.SetBackgroundTint(view, view.getResources().getColor(color));
     }
 
-    public abstract class ViewHolder<THabitItem extends Task> extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+    @BindingAdapter("app:backgroundColor")
+    public static void setBackgroundTintColor(View view, int color) {
+        view.setBackgroundColor(view.getResources().getColor(color));
+    }
 
-        @InjectView(R.id.checkedTextView)
-        protected CheckedTextView checkedTextView;
+    public abstract class ViewHolder<THabitItem extends Task> extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
         protected android.content.res.Resources resources;