From 7e44e5f85e16dae4cfe8f4d1d1e6da84e3199bf5 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 12 Apr 2016 16:41:15 +0200
Subject: [PATCH] better display for classless users.

---
 Habitica/res/values/strings.xml               |  3 +-
 .../habitica/ui/AvatarWithBarsViewModel.java  | 51 ++++++++++---------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index c96fa65d5..a58e0fdcf 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -312,5 +312,6 @@ To start, which parts of your life do you want to improve?</string>
     <string name="world_quest">World Quest</string>
     <string name="inn_description">Rest in the Inn to prevent your undone Dailies from hurting you overnight! (Note: does not prevent you from receiving Boss damage.)</string>
     <string name="empty_items" formatted="false">You don\'t have any %s</string>
-    <string name="user_level">LVL</string>
+    <string name="user_level" formatted="false">LVL %s</string>
+    <string name="user_level_with_class" formatted="false">LVL %1$s - %2$s</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index af0066929..100dbd9d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -96,34 +96,39 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
 
         mpBar.valueBarLayout.setVisibility((stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
 
-        lvlText.setText("Lvl " + user.getStats().getLvl() + " - " + userClass);
-        Drawable drawable;
-        switch (stats.get_class()) {
-            case warrior:
-                drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
+        if (user.getPreferences().getDisableClasses()) {
+            lvlText.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
+            lvlText.setCompoundDrawables(null, null, null, null);
+        } else {
+            lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass));
+            Drawable drawable;
+            switch (stats.get_class()) {
+                case warrior:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
 
-                break;
-            case rogue:
-                drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_rogue, null);
-                break;
-            case wizard:
-                drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_mage, null);
+                    break;
+                case rogue:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_rogue, null);
+                    break;
+                case wizard:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_mage, null);
 
-                break;
-            case healer:
-                drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_healer, null);
+                    break;
+                case healer:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_healer, null);
 
-                break;
-            case base:
-            default:
-                drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
+                    break;
+                case base:
+                default:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
 
+            }
+            if (drawable != null) {
+                drawable.setBounds(0, 0, drawable.getMinimumWidth(),
+                        drawable.getMinimumHeight());
+            }
+            lvlText.setCompoundDrawables(drawable, null, null, null);
         }
-        if (drawable != null) {
-            drawable.setBounds(0, 0, drawable.getMinimumWidth(),
-                    drawable.getMinimumHeight());
-        }
-        lvlText.setCompoundDrawables(drawable, null, null, null);
 
         goldText.setText(String.valueOf(gp));
         silverText.setText(String.valueOf(sp));