From 6099c2c0802c66104df9719c56aa99aa3a83af01 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 3 Feb 2016 13:56:43 +0100
Subject: [PATCH] minor fixes

---
 Habitica/AndroidManifest.xml                                  | 2 +-
 Habitica/res/layout/activity_intro.xml                        | 4 ++--
 Habitica/res/layout/reward_item_card.xml                      | 3 +++
 .../inventory/customization/AvatarCustomizationFragment.java  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index b4af3e1ea..d6c1c6e08 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="35"
+    android:versionCode="36"
     android:versionName="0.0.26"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index c7079a133..07d8b9aa0 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -27,7 +27,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="6dp"
         android:textColor="@android:color/white"
-        android:backgroundTint="@color/brand_100" />
+        android:background="@drawable/rounded_purple_square" />
 
     <Button
         android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
         android:layout_marginRight="6dp"
         android:layout_marginEnd="6dp"
         android:layout_marginBottom="6dp"
-        android:backgroundTint="@color/brand_50"
+        android:background="@drawable/rounded_purple_square"
         android:textColor="@android:color/white"
         android:visibility="gone" />
 </RelativeLayout>
\ 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 2070449f6..531eba7f5 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -73,13 +73,16 @@
                         android:layout_width="80dp"
                         android:layout_height="45dp"
                         android:layout_marginRight="8dp"
+                        android:layout_marginEnd="8dp"
                         android:textColor="@color/white"
                         android:layout_gravity="center_vertical"
                         android:textSize="15sp"
                         android:drawableLeft="@drawable/ic_header_gold"
+                        android:drawableStart="@drawable/ic_header_gold"
                         android:text='@{String.format("%.0f", reward.value)}'
                         android:background="@drawable/rounded_purple_square"
                         android:paddingLeft="6dp"
+                        android:paddingStart="6dp"
                         android:layout_centerVertical="true"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true" />
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index 16a9f16d6..d33e56351 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -109,7 +109,7 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
 
     private void setGridSpanCount(int width) {
         float itemWidth;
-        if (this.type.equals("background")) {
+        if (this.type != null && this.type.equals("background")) {
             itemWidth = getContext().getResources().getDimension(R.dimen.avatar_width);
         } else {
             itemWidth = getContext().getResources().getDimension(R.dimen.customization_width);