sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix feedback on joining/leaving guild. Fixes #511

Browse source
This commit is contained in:
Phillip Thelen 2016-04-21 18:12:23 +02:00
parent 30dda364c5
commit af7da65c0d
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Habitica/res/menu/guild_admin.xml
View file

@ -5,8 +5,7 @@
<item <item
android:id="@+id/menu.guild.edit" android:id="@+id/menu.guild.edit"
android:orderInCategory="1" android:orderInCategory="1"
app:showAsAction="ifRoom" app:showAsAction="never"
android:title="@string/action_edit" android:title="@string/action_edit" />
abc:showAsAction="ifRoom"/>
</menu> </menu>

22
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
View file

@ -91,9 +91,11 @@ public class GuildFragment extends BaseMainFragment implements Callback<Group> {
switch (id) { switch (id) {
case R.id.menu_guild_join: case R.id.menu_guild_join:
this.mAPIHelper.apiService.joinGroup(this.guild.id, this); this.mAPIHelper.apiService.joinGroup(this.guild.id, this);
this.isMember = true;
return true; return true;
case R.id.menu_guild_leave: case R.id.menu_guild_leave:
this.mAPIHelper.apiService.leaveGroup(this.guild.id, this); this.mAPIHelper.apiService.leaveGroup(this.guild.id, this);
this.isMember = false;
return true; return true;
case R.id.menu_guild_edit: case R.id.menu_guild_edit:
this.displayEditForm(); this.displayEditForm();
@ -236,21 +238,17 @@ public class GuildFragment extends BaseMainFragment implements Callback<Group> {
@Override @Override
public void success(Group group, Response response) { public void success(Group group, Response response) {
if (group == null) { if (group != null) {
this.tabLayout.removeAllTabs(); if (this.guildInformationFragment != null) {
return; this.guildInformationFragment.setGroup(group);
} }
this.guild = group;
if (this.guildInformationFragment != null) { if (this.chatListFragment != null) {
this.guildInformationFragment.setGroup(group); this.chatListFragment.seenGroupId = group.id;
} }
if (this.chatListFragment != null) { this.guild = group;
this.chatListFragment.seenGroupId = group.id;
} }
this.guild = group;
this.activity.supportInvalidateOptionsMenu(); this.activity.supportInvalidateOptionsMenu();
} }