diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt index 8316a9804..98191e6f9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt @@ -181,6 +181,10 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter 0) { menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.use_item))) } + } else if (ownedItem?.itemType == "special") { + if ((ownedItem?.numberOwned ?: 0) > 0) { + menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.use_item))) + } } menu.setSelectionRunnable { index -> item?.let { selectedItem -> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index b654c31c0..ea8967921 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -160,12 +160,12 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL val dialog = OpenedMysteryitemDialog(activity) dialog.isCelebratory = true dialog.setTitle(R.string.mystery_item_title) - dialog.binding.iconView.loadImage("shop_${it.key}") + dialog.binding.iconView.loadImage("shop_${item.key}") dialog.binding.titleView.text = item.text dialog.binding.descriptionView.text = item.notes dialog.addButton(R.string.equip, true) { _, _ -> lifecycleScope.launchCatching { - inventoryRepository.equip("equipped", it.key) + item.key?.let { mysteryItem -> inventoryRepository.equip("equipped", mysteryItem) } } } dialog.addCloseButton()