From 433bebf109534e8d87d00ee816439cc5d47c1a84 Mon Sep 17 00:00:00 2001
From: Negue <eugen.bolz@gmail.com>
Date: Mon, 21 Dec 2015 20:24:39 +0100
Subject: [PATCH] fixes #329 & fixes #162

---
 Habitica/res/layout/value_bar.xml             |  3 +-
 .../android/habitica/HabiticaApplication.java |  3 +-
 .../habitica/ui/AvatarWithBarsViewModel.java  | 40 ++++++++++++++-----
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 4a8936e29..8a869a454 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -39,7 +39,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/bar_padding"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:id="@+id/value_bar_layout">
         <ImageView
             android:id="@+id/ic_header"
             android:layout_width="wrap_content"
diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
index 3a635a134..cb425606b 100644
--- a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
+++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
@@ -95,7 +95,8 @@ public class HabiticaApplication extends Application {
 
             @Override
             public void onActivityDestroyed(Activity activity) {
-                currentActivity = null;
+                if(currentActivity == activity)
+                    currentActivity = null;
             }
         });
     }
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 65dfa6af9..9f58e9d22 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -59,10 +59,9 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         xpBar = DataBindingUtil.bind(v.findViewById(R.id.xpBar));
         mpBar = DataBindingUtil.bind(v.findViewById(R.id.mpBar));
 
-
-        setValueBar(hpBar, 50, 50, context.getString(R.string.HP_default), R.color.hpColor, R.drawable.ic_header_heart);
-        setValueBar(xpBar, 1, 1, context.getString(R.string.XP_default), R.color.xpColor, R.drawable.ic_header_exp);
-        setValueBar(mpBar, 100, 100, context.getString(R.string.MP_default), R.color.mpColor, R.drawable.ic_header_magic);
+        setHpBarData(0, 50);
+        setXpBarData(0, 1);
+        setMpBarData(0, 1);
 
         gemsText.setClickable(true);
         gemsText.setOnClickListener(this);
@@ -73,18 +72,23 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         userObject = user;
 
         Stats stats = user.getStats();
-        char classShort;
+
         String userClass = "";
         int gp = (stats.getGp().intValue());
         int sp = (int) ((stats.getGp() - gp) * 100);
-        setHpBarData(hpBar, stats, context);
-        setValueBar(xpBar, stats.getExp().floatValue(), stats.getToNextLevel(), context.getString(R.string.XP_default), context.getResources().getColor(R.color.xpColor), R.drawable.ic_header_exp);
-        setValueBar(mpBar, stats.getMp().floatValue(), stats.getMaxMP(), context.getString(R.string.MP_default), context.getResources().getColor(R.color.mpColor), R.drawable.ic_header_magic);
+
+        setHpBarData(stats);
+        setXpBarData(stats.getExp().floatValue(), stats.getToNextLevel());
+        setMpBarData(stats.getMp().floatValue(), stats.getMaxMP());
+
         new UserPicture(user, this.context).setPictureOn(image);
 
-        if (user.getStats().get_class() != null) {
-            userClass += user.getStats().getCleanedClassName();
+        if (stats.get_class() != null) {
+            userClass += stats.getCleanedClassName();
         }
+
+        mpBar.valueBarLayout.setVisibility((stats.get_class() == null || stats.getLvl() < 10) ? View.GONE : View.VISIBLE);
+
         lvlText.setText("Lvl" + user.getStats().getLvl() + " " + userClass);
         Drawable drawable;
         switch (stats.get_class()) {
@@ -130,6 +134,22 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         setValueBar(valueBar, stats.getHp().floatValue(), maxHP, ctx.getString(R.string.HP_default), ctx.getResources().getColor(R.color.hpColor), R.drawable.ic_header_heart);
     }
 
+    public void setHpBarData(Stats stats) {
+        setHpBarData(hpBar, stats, context);
+    }
+
+    public void setHpBarData(float value, int valueMax){
+        setValueBar(hpBar, value, valueMax, context.getString(R.string.HP_default), context.getResources().getColor(R.color.hpColor), R.drawable.ic_header_heart);
+    }
+
+    public void setXpBarData(float value, int valueMax){
+        setValueBar(xpBar, value, valueMax, context.getString(R.string.XP_default), context.getResources().getColor(R.color.xpColor), R.drawable.ic_header_exp);
+    }
+
+    public void setMpBarData(float value, int valueMax){
+        setValueBar(mpBar, value, valueMax, context.getString(R.string.MP_default), context.getResources().getColor(R.color.mpColor), R.drawable.ic_header_magic);
+    }
+
     // Layout_Weight don't accepts 0.7/0.3 to have 70% filled instead it shows the 30% , so I had to switch the values
     // but on a 1.0/0.0 which switches to 0.0/1.0 it shows the blank part full size...
     private static void setValueBar(ValueBarBinding valueBar, float value, float valueMax, String description, int color, int icon) {