From bfdb5ac72fca359f6717fb58bb51915cebc2d35e Mon Sep 17 00:00:00 2001 From: Sir Loading Date: Wed, 17 Aug 2016 18:38:36 +0200 Subject: [PATCH] add better feedback on skills casted --- .../android/habitica/callbacks/SkillCallback.java | 1 + .../habitica/ui/fragments/skills/SkillsFragment.java | 11 ++++++++++- .../magicmicky/habitrpgwrapper/lib/models/Skill.java | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java index f7806e953..b466c9294 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java @@ -37,6 +37,7 @@ public class SkillCallback implements Action1 { this.user.setFlags(user.getFlags()); } if (user.getStats() != null) { + usedSkill.gold = user.getStats().getGp() - this.user.getStats().getGp(); this.user.getStats().merge(user.getStats()); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java index 55727e62e..5b8b56cc3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java @@ -112,7 +112,12 @@ public class SkillsFragment extends BaseMainFragment { removeProgressDialog(); Skill skill = event.usedSkill; adapter.setMana(event.newMana); - UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), activity.getString(R.string.used_skill, skill.text, skill.mana), UiUtils.SnackbarDisplayType.NORMAL); + StringBuilder message = new StringBuilder(); + message.append(activity.getString(R.string.used_skill, skill.text, skill.mana)); + if (skill.gold != 0) { + message.append(" + ").append(round(skill.gold, 2)).append(" GP"); + } + UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL); apiHelper.apiService.getUser() .compose(apiHelper.configureApiCallObserver()) .subscribe(new MergeUserCallback(activity, user), throwable -> { @@ -163,4 +168,8 @@ public class SkillsFragment extends BaseMainFragment { } } + static public Double round(Double value, int n) { + return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n)); + } + } diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java index fe115630d..8fe867459 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java @@ -20,5 +20,8 @@ public class Skill extends BaseModel { @Column public Integer mana, lvl; + @Column + public Double gold; + }