sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-08 15:16:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add better feedback on skills casted

Browse source
This commit is contained in:
Sir Loading 2016-08-17 18:38:36 +02:00
parent e98c5aa77b
commit bfdb5ac72f
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
View file

@ -37,6 +37,7 @@ public class SkillCallback implements Action1<SkillResponse> {
this.user.setFlags(user.getFlags());
}
if (user.getStats() != null) {
usedSkill.gold = user.getStats().getGp() - this.user.getStats().getGp();
this.user.getStats().merge(user.getStats());
}

11
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
View file

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

3
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
View file

@ -20,5 +20,8 @@ public class Skill extends BaseModel {
@Column
public Integer mana, lvl;
@Column
public Double gold;
}