diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 3cce445e3..aa84b7682 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -32,7 +32,7 @@ android:value="true" /> + android:value="@string/application_ad_id"/> + You\'ve found %d quest items You find a piece of rare Equipment in the Armoire! You rummage in the Armoire and find food. What\'s that doing in here? - You wrestle with the Armoire and gain Experience. Take that! + You wrestle with the Armoire and gain %s Experience. Take that! Sell (%d Gold) Hatch with potion Hatch with egg 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 67a6e9847..e00125826 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 @@ -78,7 +78,8 @@ class ArmoireActivity: BaseActivity() { .subscribe({ configure(it.armoire["type"] ?: "", it.armoire["dropKey"] ?: "", - it.armoire["dropText"] ?: "") + it.armoire["dropText"] ?: "", + it.armoire["value"] ?: "") binding.adButton.updateForAdType(AdType.ARMOIRE, lifecycleScope) hasAnimatedChanges = false gold = null @@ -113,7 +114,7 @@ class ArmoireActivity: BaseActivity() { intent.extras?.let { val args = ArmoireActivityArgs.fromBundle(it) equipmentKey = args.key - configure(args.type, args.key, args.text) + configure(args.type, args.key, args.text, args.value) } } @@ -157,7 +158,7 @@ class ArmoireActivity: BaseActivity() { .emitWithGravity(binding.confettiAnchor, Gravity.TOP, 15, 2000) } - fun configure(type: String, key: String, text: String) { + fun configure(type: String, key: String, text: String, value: String? = "") { binding.titleView.text = text binding.equipButton.visibility = if (type == "gear") View.VISIBLE else View.GONE when (type) { @@ -170,7 +171,7 @@ class ArmoireActivity: BaseActivity() { binding.iconView.loadImage("Pet_Food_$key") } else -> { - binding.subtitleView.text = getString(R.string.armoireExp) + binding.subtitleView.text = getString(R.string.armoireExp, value) binding.iconView.setImageResource(R.drawable.armoire_experience) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt index db42164ee..c1fd18980 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt @@ -374,7 +374,8 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop if (shopItem.key == "armoire" && configManager.enableNewArmoire()) { MainNavigationController.navigate(R.id.armoireActivity, ArmoireActivityDirections.openArmoireActivity(buyResponse.armoire["type"] ?: "", buyResponse.armoire["dropText"] ?: "", - buyResponse.armoire["dropKey"] ?: "").arguments) + buyResponse.armoire["dropKey"] ?: "", + buyResponse.armoire["value"] ?: "").arguments) } buyResponse }