From 3cd66b7cafd111113e4982ac760c40d0ff346ec1 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 16 Nov 2017 18:33:36 +0100 Subject: [PATCH] Fix canAfford function for gems. Fixes #886 --- .../com/habitrpg/android/habitica/models/shops/ShopItem.kt | 2 +- .../habitrpg/android/habitica/ui/activities/MainActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt index f44804403..ca02c4906 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt @@ -56,7 +56,7 @@ open class ShopItem : RealmObject() { fun canAfford(user: User?): Boolean = when(currency) { "gold" -> value <= user?.stats?.getGp() ?: 0.0 - "gems" -> value <= user?.balance ?: 0.0 * 4 + "gems" -> value <= user?.gemCount ?: 0 "hourglasses" -> value <= user?.purchased?.plan?.consecutive?.trinkets ?: 0 else -> false } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index 49ba39db9..f289c49f8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -789,11 +789,11 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria private void displayTutorialStep(TutorialStep step, String text, boolean canBeDeferred) { TutorialView view = new TutorialView(this, step, this); + this.activeTutorialView = view; view.setTutorialText(text); view.onReaction = this; view.setCanBeDeferred(canBeDeferred); this.overlayLayout.addView(view); - this.activeTutorialView = view; Map additionalData = new HashMap<>(); additionalData.put("eventLabel", step.getIdentifier() + "-android"); @@ -804,11 +804,11 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria private void displayTutorialStep(TutorialStep step, List texts, boolean canBeDeferred) { TutorialView view = new TutorialView(this, step, this); + this.activeTutorialView = view; view.setTutorialTexts(texts); view.onReaction = this; view.setCanBeDeferred(canBeDeferred); this.overlayLayout.addView(view); - this.activeTutorialView = view; Map additionalData = new HashMap<>(); additionalData.put("eventLabel", step.getIdentifier() + "-android");