sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better feedback when using skills

Browse source
This commit is contained in:
Phillip Thelen 2015-12-02 16:56:13 +01:00
parent 50f03b14b3
commit e1c96f69d5
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/res/values/strings.xml
View file

@ -191,4 +191,5 @@
<string name="add_checklist_item">Add</string>
<string name="reminder_title">Remember to check off your Dailies!</string>
<string name="skill_progress_title">Using Skill</string>
</resources>

19
Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
View file

@ -1,6 +1,7 @@
package com.habitrpg.android.habitica.ui.fragments;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
@ -35,6 +36,8 @@ public class SkillsFragment extends BaseFragment {
private View view;
private Skill selectedSkill;
private ProgressDialog progressDialog;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -80,11 +83,13 @@ public class SkillsFragment extends BaseFragment {
Intent intent = new Intent(activity, SkillTasksActivity.class);
startActivityForResult(intent, TASK_SELECTION_ACTIVITY);
} else {
displayProgressDialog();
mAPIHelper.apiService.useSkill(skill.key, skill.target, new SkillCallback(activity, skill));
}
}
public void onEvent(SkillUsedEvent event) {
removeProgressDialog();
Skill skill = event.usedSkill;
adapter.setMana(event.newMana);
activity.showSnackbar(activity.getString(R.string.used_skill, skill.text, skill.mana));
@ -96,10 +101,24 @@ public class SkillsFragment extends BaseFragment {
switch(requestCode) {
case (TASK_SELECTION_ACTIVITY) : {
if (resultCode == Activity.RESULT_OK) {
displayProgressDialog();
mAPIHelper.apiService.useSkill(selectedSkill.key, selectedSkill.target, data.getStringExtra("task_id"), new SkillCallback(activity, selectedSkill));
}
break;
}
}
}
private void displayProgressDialog() {
if (progressDialog != null) {
progressDialog.dismiss();
}
progressDialog = ProgressDialog.show(activity, activity.getString(R.string.skill_progress_title), null, true);
}
private void removeProgressDialog() {
if (progressDialog != null) {
progressDialog.dismiss();
}
}
}