From 72d4c8742c58ca71e58805091ea8b3e51ca6d9d3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 28 Jul 2022 13:31:07 +0200
Subject: [PATCH] nicer customization display

---
 Habitica/res/layout/customization_grid_item.xml          | 5 ++---
 Habitica/res/layout/pill_textview.xml                    | 2 +-
 .../android/habitica/models/inventory/Customization.kt   | 2 +-
 .../habitrpg/android/habitica/models/shops/ShopItem.kt   | 9 +++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index 9380199f9..31bc00cba 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -13,10 +13,9 @@
         android:layout_height="76dp">
         <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/imageView"
-            android:layout_width="60dp"
+            android:layout_width="68dp"
             android:layout_height="68dp"
-            android:layout_gravity="start"
-            android:scaleType="fitCenter" />
+            android:layout_gravity="center" />
     </FrameLayout>
         <FrameLayout
             android:id="@+id/buy_button"
diff --git a/Habitica/res/layout/pill_textview.xml b/Habitica/res/layout/pill_textview.xml
index 5da6f0492..82d70f2ce 100644
--- a/Habitica/res/layout/pill_textview.xml
+++ b/Habitica/res/layout/pill_textview.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="20dp"
+    android:layout_height="wrap_content"
     style="@style/Pill.Content"
     android:textSize="12sp"
     android:gravity="center"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
index 8c61295ad..50c9b326f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
@@ -50,7 +50,7 @@ open class Customization : RealmObject(), BaseObject {
         return if (type == "background") {
             "icon_background_$identifier"
         } else {
-            getImageName(userSize, hairColor)
+            "icon_" + getImageName(userSize, hairColor)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index 542a005f8..20319d9ad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -167,8 +167,13 @@ open class ShopItem : RealmObject(), BaseObject {
             item.path = customization.path
             item.unlockPath  = customization.unlockPath
             item.pinType = customization.type
-            item.purchaseType = if (customization.type == "background") "background" else "customization"
-            item.imageName = customization.getImageName(userSize, hairColor)
+            if (customization.type == "background") {
+                item.purchaseType = "background"
+                item.imageName = customization.getImageName(userSize, hairColor)
+            } else {
+                item.purchaseType = "customization"
+                item.imageName = customization.getIconName(userSize, hairColor)
+            }
             return item
         }