sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-19 20:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix canAfford function for gems. Fixes #886

Browse source
This commit is contained in:
Phillip Thelen 2017-11-16 18:33:36 +01:00
parent 7d2162f92c
commit 3cd66b7caf
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
View file

@ -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
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -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<String, Object> 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<String> 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<String, Object> additionalData = new HashMap<>();
additionalData.put("eventLabel", step.getIdentifier() + "-android");