From 071fb953f00a479c0c61b79fece3da0141076cfd Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 23 May 2024 10:55:53 +0200 Subject: [PATCH] Improve display --- .../customization/ComposeAvatarEquipmentFragment.kt | 2 +- .../habitica/ui/viewHolders/ShopItemViewHolder.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt index e7f2fd73a..ec43c511e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt @@ -269,7 +269,7 @@ private fun AvatarEquipmentView( } .background(colorResource(id = R.color.window_background)), ) { - if (item.key.isNullOrBlank() || item.key == "0" || item.key?.endsWith("_0") == true) { + if (item.key.isNullOrBlank() || item.key == "0" || item.key?.endsWith("_0") == true || item.key == "none") { Image(painterResource(R.drawable.empty_slot), contentDescription = null, contentScale = ContentScale.None, modifier = Modifier.size(68.dp)) } else { PixelArtView( diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt index fff1e246e..602c67ffa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt @@ -75,8 +75,13 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi val isLimited = item.isLimited || item.availableUntil != null if (numberOwned > 0) { binding.itemDetailIndicator.text = numberOwned.toString() - binding.itemDetailIndicator.background = - AppCompatResources.getDrawable(context, R.drawable.pill_bg_gray) + if (isLimited) { + binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.pill_bg_purple_300) + binding.itemDetailIndicator.setTextColor(ContextCompat.getColor(context, R.color.white)) + } else { + binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.pill_bg_gray) + binding.itemDetailIndicator.setTextColor(ContextCompat.getColor(context, R.color.text_quad)) + } binding.itemDetailIndicator.visibility = View.VISIBLE } else if (item.locked) { binding.itemDetailIndicator.background =