sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-24 14:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Starting header for other activities

Browse source
This commit is contained in:
Mickael Goubin 2015-11-01 23:01:58 +01:00
parent ee8fee9802
commit dd5da62836
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Habitica/res/layout/activity_party.xml
View file

@ -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" />

2
Habitica/src/com/habitrpg/android/habitica/PartyActivity.java
View file

@ -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) {

4
Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
View file

@ -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;