diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml index b8b6ff785..13ad32f13 100644 --- a/Habitica/res/layout/dialog_purchase_content_gear.xml +++ b/Habitica/res/layout/dialog_purchase_content_gear.xml @@ -11,7 +11,8 @@ + android:layout_height="@dimen/shopitem_image_size" + android:layout_marginTop="@dimen/spacing_medium" /> diff --git a/Habitica/res/layout/dialog_purchase_content_item.xml b/Habitica/res/layout/dialog_purchase_content_item.xml index 7c23899e5..6690e0e83 100644 --- a/Habitica/res/layout/dialog_purchase_content_item.xml +++ b/Habitica/res/layout/dialog_purchase_content_item.xml @@ -14,7 +14,8 @@ + android:layout_height="@dimen/shopitem_image_size" + android:layout_marginTop="@dimen/spacing_medium" /> + android:layout_height="@dimen/shopitem_image_size" + android:layout_marginTop="@dimen/spacing_medium" /> + android:layout_height="@dimen/shopitem_image_size" + android:layout_marginTop="@dimen/spacing_medium" /> You own all of these items You can try them on by customizing your avatar. Be sure to check back later for next month’s options! You can try them on by customizing your avatar. Be sure to check back later for next season’s options! - "You can try them on by customizing your avatar. " - "You can try them on by Equipment. Be sure to check back later for next month’s options! " + You can try them on by customizing your avatar. + You can try them on from Equipment. New stock comes in at the beginning of each month! Healers Rogues Warriors diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt index 5b28b16ff..605be2322 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt @@ -108,7 +108,7 @@ fun LoadingButton( when (state) { LoadingButtonState.FAILED -> HabiticaTheme.colors.errorBackground LoadingButtonState.SUCCESS -> Color.Transparent - else -> if (state != LoadingButtonState.DISABLED) colorStyle.disabledContainerColor else colorStyle.containerColor + else -> if (state != LoadingButtonState.DISABLED) colorStyle.containerColor else colorStyle.disabledContainerColor }, animationSpec = colorSpec, ) @@ -118,7 +118,7 @@ fun LoadingButton( when (state) { LoadingButtonState.FAILED -> Color.White LoadingButtonState.SUCCESS -> if (type == LoadingButtonType.DESTRUCTIVE) HabiticaTheme.colors.errorColor else HabiticaTheme.colors.successColor - else -> if (state != LoadingButtonState.DISABLED) colorStyle.disabledContentColor else colorStyle.disabledContainerColor + else -> if (state != LoadingButtonState.DISABLED) colorStyle.contentColor else colorStyle.disabledContentColor }, animationSpec = colorSpec, ) @@ -289,5 +289,11 @@ private fun Preview() { }, content = { Text("Do something") }) + LoadingButton(LoadingButtonState.CONTENT, {}, content = { + Text("Do something") + }) + LoadingButton(LoadingButtonState.DISABLED, {}, content = { + Text("Disabled Button") + }) } } 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 18fb86465..d0e1500b9 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 @@ -124,9 +124,13 @@ class PurchaseDialog( } shopItem.isTypeGear -> { contentView = PurchaseDialogGearContent(context) - lifecycleScope.launchCatching { - inventoryRepository.getEquipment(shopItem.key).firstOrNull() - ?.let { contentView.setEquipment(it) } + if (shopItem.purchaseType == "mystery_set") { + lifecycleScope.launchCatching { + inventoryRepository.getEquipment(shopItem.key).firstOrNull() + ?.let { contentView.setEquipment(it) } + } + } else { + contentView.hideStatsTable() } checkGearClass() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt index 193481127..e9d187508 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt @@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.views.shops import android.content.Context import android.widget.TextView import androidx.core.content.ContextCompat +import androidx.core.view.isVisible import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.DialogPurchaseContentGearBinding import com.habitrpg.android.habitica.models.inventory.Equipment @@ -23,19 +24,20 @@ internal class PurchaseDialogGearContent(context: Context) : PurchaseDialogConte } fun setEquipment(equipment: Equipment) { - if (equipment.isValid) { + if (equipment.isValid && equipment.type != "mystery") { configureFieldsForValue(binding.strLabel, binding.strValue, equipment.str) configureFieldsForValue(binding.perLabel, binding.perValue, equipment.per) configureFieldsForValue(binding.conLabel, binding.conValue, equipment.con) configureFieldsForValue(binding.intLabel, binding.intValue, equipment.intelligence) } else { - configureFieldsForValue(binding.strLabel, binding.strValue, 0) - configureFieldsForValue(binding.perLabel, binding.perValue, 0) - configureFieldsForValue(binding.conLabel, binding.conValue, 0) - configureFieldsForValue(binding.intLabel, binding.intValue, 0) + hideStatsTable() } } + fun hideStatsTable() { + binding.statsTable.isVisible = false + } + private fun configureFieldsForValue( labelView: TextView?, valueTextView: TextView?,