From 305d6769764417c2ba8ff35be7d9182df6a46327 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 29 Jun 2015 18:24:44 +0200
Subject: [PATCH] refactor tasks layouts

---
 Habitica/res/layout/daily_item_card.xml       | 61 ++++++++-----------
 Habitica/res/layout/habit_item_card.xml       | 17 +++---
 Habitica/res/layout/todo_item_card.xml        | 60 ++++++++----------
 .../habitica/ui/SidebarHeaderViewModel.java   | 39 ------------
 4 files changed, 61 insertions(+), 116 deletions(-)
 delete mode 100644 Habitica/src/com/habitrpg/android/habitica/ui/SidebarHeaderViewModel.java

diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 7c714b89c..de4c67f20 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -26,51 +26,42 @@
             app:cardPreventCornerOverlap="false"
             app:contentPadding="0dp">
 
-            <RelativeLayout
+            <LinearLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="fill_horizontal|center_vertical|center_horizontal|fill|clip_vertical|fill_vertical|center|start|clip_horizontal|bottom|left|right|end|top">
+                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="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="false"
-                    android:layout_alignParentTop="true"
+                    android:layout_height="fill_parent"
                     android:checked="false"
-                    android:gravity="top" />
+                    android:gravity="center"/>
 
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="5dp">
+                    <CheckedTextView
+                        android:id="@+id/checkedTextView"
+                        style="@style/CardTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{daily.text}" />
 
-                <CheckedTextView
-                    android:id="@+id/checkedTextView"
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="false"
-                    android:layout_alignParentEnd="false"
-                    android:layout_alignParentLeft="false"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentStart="false"
-                    android:layout_alignParentTop="true"
-                    android:layout_toRightOf="@+id/checkBox"
-                    android:paddingBottom="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingTop="5dp"
-                    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}" />
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/textView6"
-                    style="@style/CardText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/checkedTextView"
-                    android:layout_toEndOf="@+id/checkBox"
-                    android:layout_toRightOf="@+id/checkBox"
-                    android:text="@{daily.notes}" />
-
-            </RelativeLayout>
+            </LinearLayout>
         </android.support.v7.widget.CardView>
 
     </FrameLayout>
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index b3208e293..9e5978e76 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -40,8 +40,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
-                    android:layout_toLeftOf="@+id/checkedTextView"
-                    android:layout_toStartOf="@+id/checkedTextView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
                     android:text="+" />
 
                 <Button
@@ -58,24 +58,25 @@
                 <CheckedTextView
                     android:id="@+id/checkedTextView"
                     style="@style/CardTitle"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="false"
-                    android:layout_alignParentEnd="false"
-                    android:layout_alignParentLeft="false"
+                    android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:layout_alignParentStart="false"
+                    android:layout_toRightOf="@id/btnPlus"
+                    android:layout_toEndOf="@id/btnPlus"
                     android:layout_alignParentTop="true"
                     android:paddingBottom="5dp"
                     android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:paddingTop="5dp"
                     android:text="@{habit.text}" />
 
                 <TextView
                     android:id="@+id/textView6"
                     style="@style/CardText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:layout_alignLeft="@+id/checkedTextView"
                     android:layout_alignStart="@+id/checkedTextView"
                     android:layout_below="@+id/checkedTextView"
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 626db5499..63aa07497 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -26,51 +26,43 @@
             app:cardPreventCornerOverlap="false"
             app:contentPadding="0dp">
 
-            <RelativeLayout
+            <LinearLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="fill_horizontal|center_vertical|center_horizontal|fill|clip_vertical|fill_vertical|center|start|clip_horizontal|bottom|left|right|end|top">
+                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="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="false"
-                    android:layout_alignParentTop="true"
+                    android:layout_height="fill_parent"
                     android:checked="false"
-                    android:gravity="top" />
+                    android:gravity="center"/>
 
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="5dp">
+                    <CheckedTextView
+                        android:id="@+id/checkedTextView"
+                        style="@style/CardTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{todo.text}" />
 
-                <CheckedTextView
-                    android:id="@+id/checkedTextView"
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="false"
-                    android:layout_alignParentEnd="false"
-                    android:layout_alignParentLeft="false"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentStart="false"
-                    android:layout_alignParentTop="true"
-                    android:layout_toRightOf="@+id/checkBox"
-                    android:paddingBottom="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingTop="5dp"
-                    android:text="@{todo.text}" />
+                    <TextView
+                        android:id="@+id/textView6"
+                        style="@style/CardText"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@{todo.notes}" />
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/textView6"
-                    style="@style/CardText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/checkedTextView"
-                    android:layout_toEndOf="@+id/checkBox"
-                    android:layout_toRightOf="@+id/checkBox"
-                    android:text="@{todo.notes}" />
+            </LinearLayout>
 
-            </RelativeLayout>
         </android.support.v7.widget.CardView>
 
     </FrameLayout>
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/SidebarHeaderViewModel.java b/Habitica/src/com/habitrpg/android/habitica/ui/SidebarHeaderViewModel.java
deleted file mode 100644
index 2b614570b..000000000
--- a/Habitica/src/com/habitrpg/android/habitica/ui/SidebarHeaderViewModel.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.habitrpg.android.habitica.ui;
-
-import android.view.View;
-import android.widget.TextView;
-
-import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-
-import butterknife.ButterKnife;
-import butterknife.InjectView;
-
-/**
- * Created by Negue on 15.06.2015.
- */
-public class SidebarHeaderViewModel {
-    @InjectView(R.id.userNameText)
-    TextView userName;
-
-    @InjectView(R.id.goldText)
-    TextView goldText;
-
-    @InjectView(R.id.silverText)
-    TextView silverText;
-
-    public SidebarHeaderViewModel(View v)
-    {
-        ButterKnife.inject(this, v);
-    }
-
-    public void SetData(HabitRPGUser user)
-    {
-        userName.setText(user.getProfile().getName() + " - Lv" + user.getStats().getLvl());
-
-        Double goldPoints = user.getStats().getGp();
-
-        goldText.setText(goldPoints.intValue());
-        silverText.setText((int) ((goldPoints - goldPoints.intValue()) * 100));
-    }
-}