From 48336c96aca2b8f20cecd62835c0b210fe66b306 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 20 Jan 2016 15:44:40 +0100
Subject: [PATCH] Fix avatar size in dialogs

---
 .../{faint_dialog.xml => dialog_faint.xml}    |  6 +++---
 ...{levelup_dialog.xml => dialog_levelup.xml} |  4 ++--
 .../habitica/ui/activities/MainActivity.java  | 19 ++++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)
 rename Habitica/res/layout/{faint_dialog.xml => dialog_faint.xml} (86%)
 rename Habitica/res/layout/{levelup_dialog.xml => dialog_levelup.xml} (86%)

diff --git a/Habitica/res/layout/faint_dialog.xml b/Habitica/res/layout/dialog_faint.xml
similarity index 86%
rename from Habitica/res/layout/faint_dialog.xml
rename to Habitica/res/layout/dialog_faint.xml
index db8c47452..4afaaabcb 100644
--- a/Habitica/res/layout/faint_dialog.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -12,8 +12,8 @@
         android:layout_margin="8dp" />
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/avatar_small_width"
+        android:layout_height="@dimen/avatar_small_height"
         android:id="@+id/avatarView"
         android:layout_gravity="center_horizontal" />
 
@@ -23,7 +23,7 @@
         android:id="@+id/textView4"
         android:text="@string/faint_subtitle"
         android:textStyle="bold"
-        android:textSize="16dp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/levelup_dialog.xml b/Habitica/res/layout/dialog_levelup.xml
similarity index 86%
rename from Habitica/res/layout/levelup_dialog.xml
rename to Habitica/res/layout/dialog_levelup.xml
index 76d9a9a3b..aff6f5478 100644
--- a/Habitica/res/layout/levelup_dialog.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -3,8 +3,8 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/avatar_small_width"
+        android:layout_height="@dimen/avatar_small_height"
         android:id="@+id/avatarView"
         android:layout_gravity="center_horizontal" />
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index a9bc4639c..a65c779b4 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -112,6 +112,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
     private MaterialDialog faintDialog;
 
     private UserPicture sideUserPicture;
+    private UserPicture dialogUserPicture;
 
     @Override
     protected int getLayoutResId() {
@@ -151,7 +152,9 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
         drawer = MainDrawerBuilder.CreateDefaultBuilderSettings(this, toolbar, accountHeader)
                 .build();
         drawer.setSelectionAtPosition(1);
-        this.sideUserPicture =   new UserPicture(this, true, false);
+        this.sideUserPicture = new UserPicture(this, true, false);
+        this.dialogUserPicture = new UserPicture(this, false, false);
+
 
         setupCheckout();
         EventBus.getDefault().register(this);
@@ -656,7 +659,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
         if (this.faintDialog == null) {
             this.faintDialog = new MaterialDialog.Builder(this)
                     .title(R.string.faint_header)
-                    .customView(R.layout.faint_dialog, true)
+                    .customView(R.layout.dialog_faint, true)
                     .positiveText(R.string.faint_button)
                     .positiveColorRes(R.color.worse_100)
                     .dismissListener(new DialogInterface.OnDismissListener() {
@@ -683,9 +686,8 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
                 AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), this);
 
                 ImageView avatarView = (ImageView) customView.findViewById(R.id.avatarView);
-                UserPicture userPicture = new UserPicture(this, false, false);
-                userPicture.setUser(this.user);
-                userPicture.setPictureOn(avatarView);
+                this.dialogUserPicture.setUser(this.user);
+                this.dialogUserPicture.setPictureOn(avatarView);
             }
 
             this.faintDialog.show();
@@ -702,7 +704,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
 
         MaterialDialog dialog = new MaterialDialog.Builder(this)
                 .title(R.string.levelup_header)
-                .customView(R.layout.levelup_dialog, true)
+                .customView(R.layout.dialog_levelup, true)
                 .positiveText(R.string.levelup_button)
                 .positiveColorRes(R.color.brand_100)
                 .build();
@@ -712,9 +714,8 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
             TextView detailView = (TextView) customView.findViewById(R.id.levelupDetail);
             detailView.setText(this.getString(R.string.levelup_detail, level));
             ImageView avatarView = (ImageView) customView.findViewById(R.id.avatarView);
-            UserPicture userPicture = new UserPicture(this, false, false);
-            userPicture.setUser(this.user);
-            userPicture.setPictureOn(avatarView);
+            this.dialogUserPicture.setUser(this.user);
+            this.dialogUserPicture.setPictureOn(avatarView);
         }
 
         dialog.show();