sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-24 06:35:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix deleted tags still being used to filter. Also fix TaskForm checkboxes not synchronizing with edited/deleted tags

Browse source
This commit is contained in:
jjbillings 2016-08-19 14:28:38 -05:00
parent 1a246610f2
commit ed97d8f502
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshUserCommand.java Normal file
View file

@ -0,0 +1,8 @@
package com.habitrpg.android.habitica.events.commands;
/**
* Created by jbillz on 8/19/16.
*/
public class RefreshUserCommand {
}

17
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
View file

@ -20,6 +20,7 @@ import com.habitrpg.android.habitica.events.commands.CreateTagCommand;
import com.habitrpg.android.habitica.events.commands.DeleteTagCommand;
import com.habitrpg.android.habitica.events.commands.EditTagCommand;
import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand;
import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
import com.habitrpg.android.habitica.events.commands.UpdateTagCommand;
import com.habitrpg.android.habitica.helpers.TagsHelper;
@ -344,7 +345,10 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
apiHelper.apiService.deleteTag(t.getId())
.compose(apiHelper.configureApiCallObserver())
.subscribe(tag -> {
tagFilterMap.remove(t.getId());
filterChangedHandler.hit();
removeTagFilterDrawerItem(t);
EventBus.getDefault().post(new RefreshUserCommand());
}, throwable -> {
UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), "Error: " + throwable.getMessage(), UiUtils.SnackbarDisplayType.FAILURE);
});
@ -366,12 +370,25 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
.subscribe(tag -> {
UiUtils.dismissKeyboard(this.activity);
updateTagFilterDrawerItem(tag);
EventBus.getDefault().post(new RefreshUserCommand());
}, throwable -> {
UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), "Error: " + throwable.getMessage(), UiUtils.SnackbarDisplayType.FAILURE);
});
}
}
@Subscribe
public void onEvent(RefreshUserCommand event) {
if (apiHelper != null) {
apiHelper.retrieveUser(true)
.compose(apiHelper.configureApiCallObserver())
.subscribe(
new HabitRPGUserCallback(activity),
throwable -> stopAnimatingRefreshItem()
);
}
}
@Subscribe
public void onEvent(TaskTappedEvent event) {
if (this.displayingTaskForm) {