From 36e6c42890c937cf94ffd7ef5e4050111b115fde Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Mon, 9 Nov 2015 00:18:20 -0300
Subject: [PATCH 1/8] [#36] First version - Using MaterialDialogs

---
 Habitica/build.gradle                         |   5 +
 .../res/drawable/rounded_purple_square.xml    |  16 +++
 Habitica/res/layout/reward_item_card.xml      | 125 ++++++++++--------
 .../adapter/HabitItemRecyclerViewAdapter.java |  36 ++++-
 4 files changed, 121 insertions(+), 61 deletions(-)
 create mode 100644 Habitica/res/drawable/rounded_purple_square.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index ed5c2b96f..6746daa1a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -88,6 +88,11 @@ dependencies {
 
     // IAP Handling / Verification
     compile 'org.solovyev.android:checkout:0.7.4@aar'
+
+    //Material Dialogs
+    compile('com.github.afollestad.material-dialogs:core:0.8.5.0@aar') {
+        transitive = true
+    }
 }
 
 android {
diff --git a/Habitica/res/drawable/rounded_purple_square.xml b/Habitica/res/drawable/rounded_purple_square.xml
new file mode 100644
index 000000000..5d4390dc5
--- /dev/null
+++ b/Habitica/res/drawable/rounded_purple_square.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- view background color -->
+    <solid
+        android:color="@color/brand_100" >
+    </solid>
+
+    <!-- Here is the corner radius -->
+    <corners
+        android:radius="5dp"   >
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index d8219e54c..d0fc0e322 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -13,84 +13,95 @@
     </data>
 
     <LinearLayout
+        android:id="@+id/gearElementsLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@color/white">
+        >
         <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="match_parent"
+            android:background="@color/white"
             android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:id="@+id/btnLayout">
-                <Button
-                    android:id="@+id/btnReward"
-                    android:layout_width="120dp"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:drawableLeft="@drawable/gold"
-                    android:text='@{String.format("%.0f", reward.value)}'
-                    app:backgroundColor="@{reward.getLightTaskColor}" />
 
-                <ImageView
-                    android:id="@+id/imageView3"
-                    android:layout_width="60dp"
-                    android:padding="5dp"
-                    android:layout_height="60dp"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginStart="5dp"
-                    android:visibility='@{reward.specialTag == "item" ? View.VISIBLE : View.GONE}'
-                    bind:imageName='@{"shop_"+reward.id}'/>
-
-            </LinearLayout>
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_centerVertical="true">
-                    <TextView
-                        android:id="@+id/checkedTextView"
-                        style="@style/CardTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingBottom="5dp"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
-                        android:paddingEnd="5dp"
-                        android:paddingTop="5dp"
-                        android:text="@{reward.text}" />
+                    android:orientation="horizontal"
+                    android:layout_centerVertical="true"
+                    android:weightSum="1">
 
-                    <TextView
-                        android:id="@+id/textView6"
-                        style="@style/CardText"
-                        android:layout_width="match_parent"
+                    <ImageView
+                        android:id="@+id/imageView3"
+                        android:layout_width="60dp"
+                        android:padding="5dp"
+                        android:layout_height="60dp"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginStart="5dp"
+                        android:visibility='@{reward.specialTag == "item" ? View.VISIBLE : View.VISIBLE}'
+                        bind:imageName='@{"shop_"+reward.id}'/>
+
+                    <LinearLayout
+                        android:id="@+id/textReward"
+                        android:orientation="vertical"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{reward.notes}"
-                        android:visibility="@{reward.notes != null ? View.VISIBLE : View.GONE}"/>
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/checkedTextView"
+                            style="@style/CardTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingBottom="5dp"
+                            android:paddingLeft="5dp"
+                            android:paddingRight="5dp"
+                            android:paddingEnd="5dp"
+                            android:paddingTop="5dp"
+                            android:text="@{reward.text}" />
+
+                        <TextView
+                            android:id="@+id/textView6"
+                            style="@style/CardText"
+                            android:layout_width="wrap_content"
+                            android:layout_height="41dp"
+                            android:text="@{reward.notes}"
+                            android:visibility="@{reward.notes != null ? View.VISIBLE : View.GONE}"/>
+
+                    </LinearLayout>
+
+                    <Button
+                        android:id="@+id/btnReward"
+                        android:layout_width="50dp"
+                        android:layout_height="25dp"
+                        android:padding="3dp"
+                        android:textColor="@color/white"
+                        android:layout_gravity="center_vertical"
+                        android:textSize="15sp"
+                        android:drawableLeft="@drawable/ic_header_gold"
+                        android:text='@{String.format("%.0f", reward.value)}'
+                        android:background="@drawable/rounded_purple_square"
+                        android:layout_weight="2"
+                        android:layout_marginRight="10dp" />
+
+
                 </LinearLayout>
-                <View
-                    android:id="@+id/rightBorderView"
-                    android:layout_width="5dp"
-                    android:layout_height="match_parent"
-                    app:backgroundColor="@{reward.getLightTaskColor}"
-                    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 8add8c7e3..aad8b2ec7 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -17,6 +17,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.DailyItemCardBinding;
 import com.habitrpg.android.habitica.databinding.HabitItemCardBinding;
@@ -467,17 +469,43 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
             binding.btnReward.setClickable(true);
             binding.btnReward.setOnClickListener(this);
+            binding.imageView3.setOnClickListener(this);
+            binding.gearElementsLayout.setOnClickListener(this);
             binding.imageView3.setVisibility(View.GONE);
+
         }
 
         @Override
         public void onClick(View v) {
-            BuyRewardTappedEvent event = new BuyRewardTappedEvent();
+            final BuyRewardTappedEvent event = new BuyRewardTappedEvent();
 
-            if (v == binding.btnReward) {
-                event.Reward = Item;
+            if (v == binding.btnReward || v == binding.imageView3 || v == binding.gearElementsLayout) {
+
+                String content = binding.getReward().getNotes();
+                content += "\nPrice:" + String.format("%.0f", binding.getReward().value);
+
+                final MaterialDialog dialog = new MaterialDialog.Builder(context)
+                    .onPositive(new MaterialDialog.SingleButtonCallback() {
+                        @Override
+                        public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
+                            event.Reward = Item;
+                            EventBus.getDefault().post(event);
+                        }
+                    })
+                  .positiveColor(context.getResources().getColor(R.color.brand_200))
+                    .positiveText("Buy")
+                  .title(binding.getReward().getText())
+                    .content(content)
+                    .negativeText("Dismiss")
+                  .onNegative(new MaterialDialog.SingleButtonCallback() {
+                      @Override
+                      public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
+                          materialDialog.dismiss();
+                      }
+                  }).build();
+
+                dialog.show();
 
-                EventBus.getDefault().post(event);
             } else super.onClick(v);
         }
 

From c29e72b481c068c15909c3c93511ded20b17ab37 Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Tue, 10 Nov 2015 20:06:05 -0300
Subject: [PATCH 2/8] [#36] Add images in dialog

---
 Habitica/Habitica.iml                         |  8 +-
 Habitica/build.gradle                         |  4 +-
 .../adapter/HabitItemRecyclerViewAdapter.java | 95 +++++++++++++------
 3 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index ab86cce65..9f670fd68 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -79,8 +79,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.afollestad.material-dialogs/core/0.8.5.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.clans/fab/1.6.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.mmin18.layoutcast/library/1.1.4/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.mmin18.layoutcast/library/1.1.5/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.porokoro.paperboy/paperboy/2.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugcore/1.8-SNAPSHOT/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugsupport/1.8-SNAPSHOT/jars" />
@@ -123,14 +124,14 @@
     <orderEntry type="library" exported="" name="antlr4-runtime-4.5" level="project" />
     <orderEntry type="library" exported="" name="antlr4-annotations-4.5" level="project" />
     <orderEntry type="library" exported="" name="library-1.0-rc1" level="project" />
-    <orderEntry type="library" exported="" name="library-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="library-1.1.5" level="project" />
     <orderEntry type="library" exported="" name="DBFlow-2.2.1" level="project" />
     <orderEntry type="library" exported="" name="materialdrawer-4.3.8" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="checkout-0.7.4" level="project" />
-    <orderEntry type="library" exported="" name="compilerCommon-1.0-rc1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="compilerCommon-1.0-rc1" level="project" />
     <orderEntry type="library" exported="" name="compiler-1.0-rc1" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
@@ -169,6 +170,7 @@
     <orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.1.4" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-2.3.0" level="project" />
+    <orderEntry type="library" exported="" name="core-0.8.5.0" level="project" />
     <orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6746daa1a..b1e6c678e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -90,9 +90,7 @@ dependencies {
     compile 'org.solovyev.android:checkout:0.7.4@aar'
 
     //Material Dialogs
-    compile('com.github.afollestad.material-dialogs:core:0.8.5.0@aar') {
-        transitive = true
-    }
+    compile('com.github.afollestad.material-dialogs:core:0.8.5.0@aar')
 }
 
 android {
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 aad8b2ec7..5ea66c611 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -5,14 +5,17 @@ import android.content.Context;
 import android.databinding.DataBindingUtil;
 import android.databinding.ObservableArrayList;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -34,6 +37,7 @@ import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
 import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand;
 import com.habitrpg.android.habitica.helpers.TagsHelper;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.raizlabs.android.dbflow.runtime.FlowContentObserver;
@@ -55,8 +59,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         implements FlowContentObserver.OnModelStateChangedListener, IReceiveNewEntries {
 
 
-    public interface IAdditionalEntries
-    {
+    public interface IAdditionalEntries {
         void GetAdditionalEntries(IReceiveNewEntries callBack);
     }
 
@@ -116,16 +119,16 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
     }
 
-    public void onEvent(TaskUpdatedEvent evnt){
-        if(!taskType.equals(evnt.task.getType()))
+    public void onEvent(TaskUpdatedEvent evnt) {
+        if (!taskType.equals(evnt.task.getType()))
             return;
 
         this.filter();
         notifyDataSetChanged();
     }
 
-    public void onEvent(TaskCreatedEvent evnt){
-        if(!taskType.equals(evnt.task.getType()))
+    public void onEvent(TaskCreatedEvent evnt) {
+        if (!taskType.equals(evnt.task.getType()))
             return;
 
         observableContent.add(0, evnt.task);
@@ -480,35 +483,71 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             final BuyRewardTappedEvent event = new BuyRewardTappedEvent();
 
             if (v == binding.btnReward || v == binding.imageView3 || v == binding.gearElementsLayout) {
-
-                String content = binding.getReward().getNotes();
-                content += "\nPrice:" + String.format("%.0f", binding.getReward().value);
+                LinearLayout contentViewForDialog = createContentViewForDialog();
 
                 final MaterialDialog dialog = new MaterialDialog.Builder(context)
-                    .onPositive(new MaterialDialog.SingleButtonCallback() {
-                        @Override
-                        public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
-                            event.Reward = Item;
-                            EventBus.getDefault().post(event);
-                        }
-                    })
-                  .positiveColor(context.getResources().getColor(R.color.brand_200))
-                    .positiveText("Buy")
-                  .title(binding.getReward().getText())
-                    .content(content)
-                    .negativeText("Dismiss")
-                  .onNegative(new MaterialDialog.SingleButtonCallback() {
-                      @Override
-                      public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
-                          materialDialog.dismiss();
-                      }
-                  }).build();
+                        .onPositive(new MaterialDialog.SingleButtonCallback() {
+                            @Override
+                            public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
+                                event.Reward = Item;
+                                EventBus.getDefault().post(event);
+                            }
+                        })
+                        .positiveColor(context.getResources().getColor(R.color.brand_200))
+                        .positiveText("Buy")
+                        .title(binding.getReward().getText())
+                        .customView(contentViewForDialog, true)
+                        .negativeText("Dismiss")
+                        .onNegative(new MaterialDialog.SingleButtonCallback() {
+                            @Override
+                            public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
+                                materialDialog.dismiss();
+                            }
+                        }).build();
 
                 dialog.show();
 
             } else super.onClick(v);
         }
 
+        @NonNull
+        private LinearLayout createContentViewForDialog() {
+            String price = String.format("%.0f", binding.getReward().value);
+            String content = binding.getReward().getNotes();
+
+            LinearLayout l = new LinearLayout(context);
+            l.setOrientation(LinearLayout.VERTICAL);
+
+            ImageView imageView = new ImageView(context);
+            imageView.setMinimumWidth(200);
+            imageView.setMinimumHeight(200);
+
+            DataBindingUtils.loadImage(imageView, "shop_" + binding.getReward().getId());
+
+            TextView t = new TextView(context);
+            t.setText(content);
+
+            LinearLayout bottomLayout = new LinearLayout(context);
+            bottomLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+            TextView priceTextView = new TextView(context);
+            priceTextView.setText(price);
+
+            ImageView gold = new ImageView(context);
+            gold.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_header_gold));
+            gold.setMinimumHeight(50);
+            gold.setMinimumWidth(50);
+
+            bottomLayout.addView(gold);
+            bottomLayout.addView(priceTextView);
+            bottomLayout.setGravity(Gravity.RIGHT);
+
+            l.addView(imageView);
+            l.addView(t);
+            l.addView(bottomLayout);
+            return l;
+        }
+
         @Override
         public void bindHolder(Task reward, int position) {
             super.bindHolder(reward, position);
@@ -529,7 +568,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
                     .orderBy(OrderBy.columns("dateCreated").descending())
                     .queryList());
 
-            if(additionalEntries != null){
+            if (additionalEntries != null) {
                 additionalEntries.GetAdditionalEntries(this);
             }
         }

From 689d6476de2e7cc5754a9a2929ae0539db424d85 Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Tue, 10 Nov 2015 20:16:02 -0300
Subject: [PATCH 3/8] [#36] Add Padding between gold and price

---
 .../habitica/ui/adapter/HabitItemRecyclerViewAdapter.java        | 1 +
 1 file changed, 1 insertion(+)

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 5ea66c611..7ec262968 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -537,6 +537,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             gold.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_header_gold));
             gold.setMinimumHeight(50);
             gold.setMinimumWidth(50);
+            gold.setPadding(0,0,20,0);
 
             bottomLayout.addView(gold);
             bottomLayout.addView(priceTextView);

From 005a2ac66cd0e63b372ac123ba7246c67fc314c0 Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Wed, 11 Nov 2015 18:25:37 -0300
Subject: [PATCH 4/8] [#36] Add validation for no custom image

---
 .../habitica/ui/adapter/HabitItemRecyclerViewAdapter.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 7ec262968..b946dbdb1 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -537,13 +537,15 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             gold.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_header_gold));
             gold.setMinimumHeight(50);
             gold.setMinimumWidth(50);
-            gold.setPadding(0,0,20,0);
+            gold.setPadding(0, 0, 20, 0);
 
             bottomLayout.addView(gold);
             bottomLayout.addView(priceTextView);
             bottomLayout.setGravity(Gravity.RIGHT);
 
-            l.addView(imageView);
+            if(imageView.getDrawable()!= null){
+                l.addView(imageView);
+            }
             l.addView(t);
             l.addView(bottomLayout);
             return l;

From c84e6f2fa2385c8d5bc1e5a02683cc4513eef727 Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Fri, 13 Nov 2015 18:47:24 -0300
Subject: [PATCH 5/8] [#36] Price gold centered and samll refactorings

---
 .../adapter/HabitItemRecyclerViewAdapter.java | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

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 b946dbdb1..50fd82303 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -485,38 +485,41 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             if (v == binding.btnReward || v == binding.imageView3 || v == binding.gearElementsLayout) {
                 LinearLayout contentViewForDialog = createContentViewForDialog();
 
-                final MaterialDialog dialog = new MaterialDialog.Builder(context)
-                        .onPositive(new MaterialDialog.SingleButtonCallback() {
-                            @Override
-                            public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
-                                event.Reward = Item;
-                                EventBus.getDefault().post(event);
-                            }
-                        })
-                        .positiveColor(context.getResources().getColor(R.color.brand_200))
-                        .positiveText("Buy")
-                        .title(binding.getReward().getText())
-                        .customView(contentViewForDialog, true)
-                        .negativeText("Dismiss")
-                        .onNegative(new MaterialDialog.SingleButtonCallback() {
-                            @Override
-                            public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
-                                materialDialog.dismiss();
-                            }
-                        }).build();
-
+                MaterialDialog dialog = createGearDialog(event, contentViewForDialog);
                 dialog.show();
 
             } else super.onClick(v);
         }
 
+        private MaterialDialog createGearDialog(final BuyRewardTappedEvent event, LinearLayout contentViewForDialog) {
+            return new MaterialDialog.Builder(context)
+                    .onPositive(new MaterialDialog.SingleButtonCallback() {
+                        @Override
+                        public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
+                            event.Reward = Item;
+                            EventBus.getDefault().post(event);
+                        }
+                    })
+                    .positiveColor(context.getResources().getColor(R.color.brand_200))
+                    .positiveText("Buy")
+                    .title(binding.getReward().getText())
+                    .customView(contentViewForDialog, true)
+                    .negativeText("Dismiss")
+                    .onNegative(new MaterialDialog.SingleButtonCallback() {
+                        @Override
+                        public void onClick(MaterialDialog materialDialog, DialogAction dialogAction) {
+                            materialDialog.dismiss();
+                        }
+                    }).build();
+        }
+
         @NonNull
         private LinearLayout createContentViewForDialog() {
             String price = String.format("%.0f", binding.getReward().value);
             String content = binding.getReward().getNotes();
 
-            LinearLayout l = new LinearLayout(context);
-            l.setOrientation(LinearLayout.VERTICAL);
+            LinearLayout contentViewLayout = new LinearLayout(context);
+            contentViewLayout.setOrientation(LinearLayout.VERTICAL);
 
             ImageView imageView = new ImageView(context);
             imageView.setMinimumWidth(200);
@@ -524,11 +527,11 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
             DataBindingUtils.loadImage(imageView, "shop_" + binding.getReward().getId());
 
-            TextView t = new TextView(context);
-            t.setText(content);
+            TextView contentTextView = new TextView(context, null);
+            contentTextView.setText(content);
 
-            LinearLayout bottomLayout = new LinearLayout(context);
-            bottomLayout.setOrientation(LinearLayout.HORIZONTAL);
+            LinearLayout goldPriceLayout = new LinearLayout(context);
+            goldPriceLayout.setOrientation(LinearLayout.HORIZONTAL);
 
             TextView priceTextView = new TextView(context);
             priceTextView.setText(price);
@@ -539,16 +542,16 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             gold.setMinimumWidth(50);
             gold.setPadding(0, 0, 20, 0);
 
-            bottomLayout.addView(gold);
-            bottomLayout.addView(priceTextView);
-            bottomLayout.setGravity(Gravity.RIGHT);
+            goldPriceLayout.addView(gold);
+            goldPriceLayout.addView(priceTextView);
+            goldPriceLayout.setGravity(Gravity.CENTER);
 
             if(imageView.getDrawable()!= null){
-                l.addView(imageView);
+                contentViewLayout.addView(imageView);
             }
-            l.addView(t);
-            l.addView(bottomLayout);
-            return l;
+            contentViewLayout.addView(goldPriceLayout);
+            contentViewLayout.addView(contentTextView);
+            return contentViewLayout;
         }
 
         @Override

From eae09bb222e55bc469ca4183efab6b2e53614044 Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Fri, 13 Nov 2015 20:02:00 -0300
Subject: [PATCH 6/8] [#36] Add margin bottom in goldprice layout and decrease
 space between gold image and price

---
 .../ui/adapter/HabitItemRecyclerViewAdapter.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 50fd82303..90807ff80 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -530,8 +530,16 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             TextView contentTextView = new TextView(context, null);
             contentTextView.setText(content);
 
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            layoutParams.bottomMargin = 20;
+            layoutParams.gravity = Gravity.CENTER;
+
+
             LinearLayout goldPriceLayout = new LinearLayout(context);
             goldPriceLayout.setOrientation(LinearLayout.HORIZONTAL);
+            goldPriceLayout.setLayoutParams(layoutParams);
+
 
             TextView priceTextView = new TextView(context);
             priceTextView.setText(price);
@@ -540,11 +548,10 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             gold.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_header_gold));
             gold.setMinimumHeight(50);
             gold.setMinimumWidth(50);
-            gold.setPadding(0, 0, 20, 0);
+            gold.setPadding(0, 0, 10, 0);
 
             goldPriceLayout.addView(gold);
             goldPriceLayout.addView(priceTextView);
-            goldPriceLayout.setGravity(Gravity.CENTER);
 
             if(imageView.getDrawable()!= null){
                 contentViewLayout.addView(imageView);

From 29a8d965a955eefe67c837867b90be042d5b1770 Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Fri, 13 Nov 2015 20:29:57 -0300
Subject: [PATCH 7/8] [#36] Decrease padding between gold image and price

---
 .../habitica/ui/adapter/HabitItemRecyclerViewAdapter.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 90807ff80..2a11e53be 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -548,7 +548,7 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
             gold.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_header_gold));
             gold.setMinimumHeight(50);
             gold.setMinimumWidth(50);
-            gold.setPadding(0, 0, 10, 0);
+            gold.setPadding(0, 0, 5, 0);
 
             goldPriceLayout.addView(gold);
             goldPriceLayout.addView(priceTextView);

From 6090995d281fe311e7f2408d5bb72f3d547cf86f Mon Sep 17 00:00:00 2001
From: Franze Jr <franzejr@gmail.com>
Date: Sat, 14 Nov 2015 10:06:22 -0300
Subject: [PATCH 8/8] [#36] Small refactorign proposed by @negue

---
 .../habitica/ui/adapter/HabitItemRecyclerViewAdapter.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 2a11e53be..12801fdd5 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -480,9 +480,8 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
         @Override
         public void onClick(View v) {
-            final BuyRewardTappedEvent event = new BuyRewardTappedEvent();
-
             if (v == binding.btnReward || v == binding.imageView3 || v == binding.gearElementsLayout) {
+                BuyRewardTappedEvent event = new BuyRewardTappedEvent();
                 LinearLayout contentViewForDialog = createContentViewForDialog();
 
                 MaterialDialog dialog = createGearDialog(event, contentViewForDialog);