From dd5da62836a9f784263913df75c0de0a99787d43 Mon Sep 17 00:00:00 2001
From: Mickael Goubin <micky0304@gmail.com>
Date: Sun, 1 Nov 2015 23:01:58 +0100
Subject: [PATCH] Starting header for other activities

---
 Habitica/res/layout/activity_party.xml                 | 10 +++++-----
 .../com/habitrpg/android/habitica/PartyActivity.java   |  2 +-
 .../com/habitrpg/android/habitica/TavernActivity.java  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/activity_party.xml b/Habitica/res/layout/activity_party.xml
index bbba686e1..ef747bfc7 100644
--- a/Habitica/res/layout/activity_party.xml
+++ b/Habitica/res/layout/activity_party.xml
@@ -26,24 +26,24 @@
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true">
+            android:fitsSystemWindows="false">
 
             <android.support.design.widget.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="210dp"
-                android:fitsSystemWindows="true"
+                android:layout_height="wrap_content"
+                android:fitsSystemWindows="false"
                 app:titleEnabled="false"
                 app:contentScrim="?attr/colorPrimary"
                 app:expandedTitleMarginEnd="?attr/actionBarSize"
-                app:expandedTitleMarginStart="48dp"
+                app:expandedTitleMarginStart="0dp"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <include
                     android:id="@+id/avatar_with_bars"
                     layout="@layout/avatar_with_bars"
                     android:layout_width="match_parent"
-                    android:layout_height="140dp"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="?attr/actionBarSize"
                     app:layout_collapseMode="parallax" />
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/PartyActivity.java b/Habitica/src/com/habitrpg/android/habitica/PartyActivity.java
index fcaa7ea73..f8bfebd87 100644
--- a/Habitica/src/com/habitrpg/android/habitica/PartyActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/PartyActivity.java
@@ -71,7 +71,7 @@ public class PartyActivity extends AvatarActivityBase implements AppBarLayout.On
                     partyInformationFragment.setGroup(group);
                 }
 
-                if (group.quest != null && !group.quest.key.isEmpty()) {
+                if (group != null && group.quest != null && !group.quest.key.isEmpty()) {
                     contentCache.GetQuestContent(group.quest.key, new ContentCache.QuestContentCallback() {
                         @Override
                         public void GotQuest(QuestContent content) {
diff --git a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
index 122a622f6..cf19ccb70 100644
--- a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
@@ -8,7 +8,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
-import android.widget.LinearLayout;
+import android.view.ViewGroup;
 
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.prefs.PrefsActivity;
@@ -30,7 +30,7 @@ public class TavernActivity extends AppCompatActivity {
     Toolbar toolbar;
 
     @InjectView(R.id.avatar)
-    LinearLayout avatarHeader;
+    ViewGroup avatarHeader;
 
     private AvatarWithBarsViewModel avatarInHeader;
     private APIHelper mAPIHelper;