sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 21:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix armoire display issues

Browse source
This commit is contained in:
Phillip Thelen 2025-03-10 14:50:23 +01:00
parent 417cfcc46a
commit cafbe818a6
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
View file

@ -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))

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.7.0
CODE=12411
CODE=12441