From cafbe818a618603804ce53b528642cb12508ec0d Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 10 Mar 2025 14:50:23 +0100
Subject: [PATCH] fix armoire display issues

---
 .../habitica/ui/activities/ArmoireActivity.kt  | 18 ++++++++++++------
 version.properties                             |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

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 c392eb262..6272eee9c 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
@@ -43,6 +43,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+import androidx.core.view.isVisible
 
 @AndroidEntryPoint
 class ArmoireActivity : BaseActivity() {
@@ -95,7 +96,7 @@ class ArmoireActivity : BaseActivity() {
             configure(lastType ?: "", lastKey ?: "", lastText ?: "", lastValue)
         }
         if (hasUsedExtraArmoire) {
-            if (binding.adButton.visibility == View.VISIBLE) {
+            if (binding.adButton.isVisible) {
                 binding.adButton.visibility = View.INVISIBLE
             } else {
                 binding.openArmoireSubscriberWrapper.visibility = View.INVISIBLE
@@ -264,10 +265,10 @@ class ArmoireActivity : BaseActivity() {
 
         val user = userViewModel.user.value ?: return true
         val currentGold = user.stats?.gp ?: return true
-        if (binding.adButton.visibility == View.VISIBLE) {
+        if (binding.adButton.isVisible) {
             binding.adButton.state = AdButton.State.UNAVAILABLE
             binding.adButton.visibility = View.INVISIBLE
-        } else if (binding.openArmoireSubscriberWrapper.visibility == View.VISIBLE) {
+        } else if (binding.openArmoireSubscriberWrapper.isVisible) {
             binding.openArmoireSubscriberWrapper.visibility = View.INVISIBLE
         }
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
@@ -328,8 +329,13 @@ class ArmoireActivity : BaseActivity() {
         binding.titleView.alpha = 0f
         binding.subtitleView.alpha = 0f
 
-        binding.iconWrapper.post {
-            Animations.circularReveal(binding.iconWrapper, 300)
+        binding.root.post {
+            if (binding.iconWrapper.isAttachedToWindow) {
+                Animations.circularReveal(binding.iconWrapper, 300)
+            } else {
+                binding.iconView.visibility = View.VISIBLE
+                binding.iconView.alpha = 1f
+            }
         }
 
         binding.leftSparkView.startAnimating()
@@ -395,7 +401,7 @@ class ArmoireActivity : BaseActivity() {
 
             else -> {
                 @SuppressLint("SetTextI18n")
-                binding.titleView.text = "+$value ${binding.titleView.text}"
+                binding.titleView.text = "+$value ${getString(R.string.XP_default)}"
                 binding.subtitleView.text = getString(R.string.armoireExp)
                 binding.iconView.setImageResource(R.drawable.armoire_experience)
                 val layoutParams = RelativeLayout.LayoutParams(108.dpToPx(this), 122.dpToPx(this))
diff --git a/version.properties b/version.properties
index c94078bd9..8ff566b7f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.7.0
-CODE=12411
\ No newline at end of file
+CODE=12441
\ No newline at end of file