From d8cb604f51872c64b9afb0317632b6b59f926ef2 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 25 Jan 2023 16:26:45 +0100 Subject: [PATCH] fix animal gear pricing --- .../CustomizationEquipmentRecyclerViewAdapter.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt index 1f6dbe145..d7c3a9f1f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt @@ -103,7 +103,12 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R } override fun onClick(v: View) { - if (equipment?.owned != true && (equipment?.value ?: 0.0) > 0.0) { + val itemValue = if (equipment?.gearSet == "animal") { + 2.0 + } else { + equipment?.value + } + if (equipment?.owned != true && (itemValue ?: 0.0) > 0.0) { val dialogContent = LinearLayout(itemView.context) DialogPurchaseCustomizationBinding.inflate(LayoutInflater.from(itemView.context), dialogContent) @@ -111,11 +116,7 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R imageView.loadImage("shop_" + this.equipment?.key) val priceLabel = dialogContent.findViewById(R.id.priceLabel) - priceLabel?.text = if (equipment?.gearSet == "animal") { - 2.0 - } else { - equipment?.value ?: 0 - }.toString() + priceLabel?.text = itemValue.toString() (dialogContent.findViewById(R.id.gem_icon) as? ImageView)?.setImageBitmap( HabiticaIconsHelper.imageOfGem()) @@ -123,7 +124,7 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R val dialog = HabiticaAlertDialog(itemView.context) dialog.addButton(R.string.purchase_button, true) { _, _ -> gemBalance?.let { - if ((equipment?.value ?: 0.0) > it) { + if ((itemValue ?: 0.0) > it) { MainNavigationController.navigate( R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false))