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

Merge pull request #1902 from Hafizzle/Fiz/mystery_item_fixes

Browse source 
Mystery Item Sprite fixes
This commit is contained in:
Phillip Thelen 2023-01-11 10:42:38 +01:00 committed by GitHub
commit 062303de1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
View file

@ -181,6 +181,10 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<OwnedI
if ((ownedItem?.numberOwned ?: 0) > 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 ->

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
View file

@ -160,12 +160,12 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), 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()