From 40dcbe44e6ece70cd3e53ef01169c799bdfcb922 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 4 Dec 2015 16:36:05 +0100
Subject: [PATCH 1/3] fix potential crash when loading tasks fragment

---
 .../android/habitica/ui/fragments/TasksFragment.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
index 4a81d2aeb..da12b8c34 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
@@ -322,9 +322,9 @@ public class TasksFragment extends BaseFragment implements TaskScoringCallback.O
             }
         });
 
-
-        tabLayout.setupWithViewPager(viewPager);
-
+        if (tabLayout != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
     }
 
     public void updateUserData(HabitRPGUser user) {

From f3ecc216611bdf9172ffb00970170b10e9388742 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Sat, 5 Dec 2015 15:10:11 +0100
Subject: [PATCH 2/3] Tease upcoming features in sidebar. Fixes #105

---
 Habitica/res/values/strings.xml                        |  1 +
 .../android/habitica/ui/MainDrawerBuilder.java         | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 4ef6b383b..dce067e6b 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -193,4 +193,5 @@
 
     <string name="reminder_title">Remember to check off your Dailies!</string>
     <string name="skill_progress_title">Using Skill</string>
+    <string name="coming_soon">Coming Soon</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java b/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
index 189e0fbdd..489e923d2 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
@@ -79,12 +79,12 @@ public class MainDrawerBuilder {
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tavern)).withIdentifier(SIDEBAR_TAVERN),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_party)).withIdentifier(SIDEBAR_PARTY),
                         /*new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_guilds)),
-                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)),
+                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)),*/
 
                         new SectionDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory)),
-                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)),
-                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)),
-                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)),*/
+                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)).withEnabled(false).withBadge(R.string.coming_soon),
+                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)).withEnabled(false).withBadge(R.string.coming_soon),
+                        new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)).withEnabled(false).withBadge(R.string.coming_soon),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_purchaseGems)).withIdentifier(SIDEBAR_PURCHASE),
 
                         new DividerDrawerItem(),
@@ -117,7 +117,7 @@ public class MainDrawerBuilder {
                                 fragment = new TavernFragment();
                                 break;
                             }
-                            case SIDEBAR_PURCHASE:{
+                            case SIDEBAR_PURCHASE: {
                                 fragment = new GemsPurchaseFragment();
                                 break;
                             }

From dd99bbe3ba1111aa464c8d0dedf8e011a0642711 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Sat, 5 Dec 2015 16:12:01 +0100
Subject: [PATCH 3/3] Improve reward list handling. Fixes #103

---
 Habitica/res/layout/reward_item_card.xml      | 33 +++++++++++--------
 .../adapter/HabitItemRecyclerViewAdapter.java |  6 +++-
 .../ui/fragments/PreferencesFragment.java     |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index c93ff8dd2..2070449f6 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -20,7 +20,7 @@
         android:clickable="false"
         >
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
@@ -33,30 +33,35 @@
                         android:layout_height="60dp"
                         android:layout_gravity="center_vertical"
                         android:visibility='@{reward.specialTag == "item" ? View.VISIBLE : View.GONE}'
-                        bind:imageName='@{"shop_"+reward.id}'/>
+                        bind:imageName='@{"shop_"+reward.id}'
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true" />
 
                     <LinearLayout
                         android:id="@+id/textReward"
                         android:orientation="vertical"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:paddingBottom="@dimen/task_top_bottom_padding"
                         android:paddingTop="@dimen/task_top_bottom_padding"
                         android:paddingLeft='16dp'
-                        android:paddingRight="@dimen/reward_spacing">
+                        android:paddingRight="@dimen/reward_spacing"
+                        android:layout_toLeftOf="@+id/btnReward"
+                        android:layout_toRightOf="@+id/imageView3"
+                        android:layout_toEndOf="@+id/imageView3">
 
                         <TextView
                             android:id="@+id/checkedTextView"
                             style="@style/CardTitle"
-                            android:layout_width="300dp"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@{reward.text}"/>
 
                         <TextView
                             android:id="@+id/notesTextView"
                             style="@style/CardText"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@{reward.notes}"
                             android:visibility="@{reward.notes != null ? View.VISIBLE : View.GONE}"/>
@@ -65,20 +70,22 @@
 
                     <Button
                         android:id="@+id/btnReward"
-                        android:layout_width="60dp"
-                        android:layout_height="30dp"
+                        android:layout_width="80dp"
+                        android:layout_height="45dp"
+                        android:layout_marginRight="8dp"
                         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"
-                        android:paddingLeft="6dp" />
+                        android:paddingLeft="6dp"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true" />
 
 
-                </LinearLayout>
+                </RelativeLayout>
         <View
             android:id="@+id/bottomBorderView"
             android:layout_width="match_parent"
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 bed480c00..3b82e54ea 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -511,11 +511,15 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         @Override
         public void onClick(View v) {
             if (v == btnReward) {
+                BuyRewardCommand event = new BuyRewardCommand();
+                event.Reward = Item;
+                EventBus.getDefault().post(event);
+            } else {
                 LinearLayout contentViewForDialog = createContentViewForDialog();
 
                 MaterialDialog dialog = createGearDialog(contentViewForDialog);
                 dialog.show();
-            } else super.onClick(v);
+            };
         }
 
         private MaterialDialog createGearDialog(LinearLayout contentViewForDialog) {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
index da33bda36..70a97d406 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
@@ -74,7 +74,7 @@ public class PreferencesFragment extends PreferenceFragment implements SharedPre
 
     private void scheduleNotifications() {
 
-        String timeval = getPreferenceManager().getSharedPreferences().getString("reminder_time", null);
+        String timeval = getPreferenceManager().getSharedPreferences().getString("reminder_time", "19:00");
 
         if (timeval != null) {
             String[] pieces = timeval.split(":");