sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-31 11:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve party loading

Browse source
This commit is contained in:
Phillip Thelen 2016-05-19 14:00:54 +02:00
parent 41605386f3
commit 31af112e48
2 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
View file

@ -112,7 +112,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
Intent intent = new Intent(getActivity(), ClassSelectionActivity.class);
intent.putExtras(bundle);
if (user.getFlags().getClassSelected()) {
if (user.getFlags().getClassSelected() && user.getPreferences().getDisableClasses()) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setTitle(getString(R.string.change_class_confirmation))
.setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {

50
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
View file

@ -55,31 +55,35 @@ public class PartyFragment extends BaseMainFragment {
contentCache = new ContentCache(apiHelper.apiService);
// Get the full group data
apiHelper.apiService.getGroup("party")
.compose(this.apiHelper.configureApiCallObserver())
.subscribe(group -> {
if (group == null) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setMessage(activity.getString(R.string.no_party_message))
.setNeutralButton(android.R.string.ok, (dialog, which) -> {
activity.getSupportFragmentManager().popBackStackImmediate();
});
builder.show();
tabLayout.removeAllTabs();
return;
}
PartyFragment.this.group = group;
if (this.user.getParty() != null && this.user.getParty().id != null) {
apiHelper.apiService.getGroup("party")
.compose(this.apiHelper.configureApiCallObserver())
.subscribe(group -> {
if (group == null) {
return;
}
PartyFragment.this.group = group;
updateGroupUI();
updateGroupUI();
apiHelper.apiService.getGroupMembers(group.id, true)
.compose(apiHelper.configureApiCallObserver())
.subscribe(members -> {
PartyFragment.this.group.members = members;
updateGroupUI();
},
throwable -> {});
}, throwable -> {});
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setMessage(activity.getString(R.string.no_party_message))
.setNeutralButton(android.R.string.ok, (dialog, which) -> {
activity.getSupportFragmentManager().popBackStackImmediate();
});
builder.show();
tabLayout.removeAllTabs();
}
apiHelper.apiService.getGroupMembers(group.id, true)
.compose(apiHelper.configureApiCallObserver())
.subscribe(members -> {
PartyFragment.this.group.members = members;
updateGroupUI();
},
throwable -> {});
}, throwable -> {});
setViewPagerAdapter();
this.tutorialStepIdentifier = "party";