From 52a5f0baf4fc27b3facc38a517f5a51a96b1a846 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 20 May 2022 15:05:25 +0200
Subject: [PATCH] Armoire tweaks

---
 Habitica/build.gradle                                      | 2 +-
 Habitica/res/layout/activity_armoire.xml                   | 6 ++++--
 Habitica/res/values/strings.xml                            | 2 +-
 .../android/habitica/ui/activities/ArmoireActivity.kt      | 7 +++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index a083d52e2..a36f9381f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -167,7 +167,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs 'en', 'bg', 'de', 'en-rGB', 'es', 'fr', 'hr-rHR', 'in', 'it', 'iw', 'ja', 'ko', 'lt', 'nl', 'pl', 'pt-rBR', 'pt-rPT', 'ru', 'tr', 'zh', 'zh-rTW'
 
-        versionCode 3506
+        versionCode 3508
         versionName "3.6"
 
         targetSdkVersion 32
diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml
index 3d697fe81..148227aab 100644
--- a/Habitica/res/layout/activity_armoire.xml
+++ b/Habitica/res/layout/activity_armoire.xml
@@ -135,16 +135,18 @@
                 android:id="@+id/equip_button"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:layout_height="60dp"
+                android:layout_height="69dp"
                 android:text="@string/equip"
                 android:textStyle="bold"
                 style="@style/HabiticaButton.White"
+                android:padding="0dp"
+
                 android:layout_marginEnd="12dp"/>
             <Button
                 android:id="@+id/close_button"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:layout_height="60dp"
+                android:layout_height="69dp"
                 android:text="@string/close"
                 android:textStyle="bold"
                 style="@style/HabiticaButton.White"/>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 970c1cb5e..21e038c76 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -278,7 +278,7 @@
     <string name="quest_items_found">You\'ve found %d quest items</string>
     <string name="armoireEquipment_new">You find a piece of rare Equipment in the Armoire!</string>
     <string name="armoireFood_new">You rummage in the Armoire and find food. What\'s that doing in here?</string>
-    <string name="armoireExp_new">You wrestle with the Armoire and gain %s Experience. Take that!</string>
+    <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
     <string name="sell">Sell (%d Gold)</string>
     <string name="hatch_with_potion">Hatch with potion</string>
     <string name="hatch_egg">Hatch with egg</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index 00066ae10..9ff8d6f9a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
@@ -25,9 +26,9 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
 import com.plattysoft.leonids.ParticleSystem
+import kotlinx.coroutines.launch
 import java.util.Locale
 import javax.inject.Inject
-import kotlinx.coroutines.launch
 
 class ArmoireActivity : BaseActivity() {
 
@@ -207,7 +208,9 @@ class ArmoireActivity : BaseActivity() {
                 binding.iconView.loadImage("Pet_Food_$key")
             }
             else -> {
-                binding.subtitleView.text = getString(R.string.armoireExp_new, value)
+                @SuppressLint("SetTextI18n")
+                binding.titleView.text = "+${value} ${binding.titleView.text}"
+                binding.subtitleView.text = getString(R.string.armoireExp)
                 binding.iconView.setImageResource(R.drawable.armoire_experience)
                 val layoutParams = RelativeLayout.LayoutParams(108.dpToPx(this), 122.dpToPx(this))
                 layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT)