Move onTaskCreated to TaskAdapter

pull/795/head
Alex Baker 7 years ago
parent e4534d053a
commit cbcb699a21

@ -526,7 +526,10 @@ public class TaskListFragment extends InjectingFragment
syncAdapters.syncNow(); syncAdapters.syncNow();
} }
public void onTaskCreated(String uuid) {} void onTaskCreated(String uuid) {
taskAdapter.onTaskCreated(uuid);
loadTaskListContent();
}
/* /*
* ====================================================================== * ======================================================================

@ -12,7 +12,8 @@ public final class AstridTaskAdapter extends TaskAdapter {
private final Filter filter; private final Filter filter;
private final SubtasksFilterUpdater updater; private final SubtasksFilterUpdater updater;
public AstridTaskAdapter(TaskListMetadata list, Filter filter, SubtasksFilterUpdater updater) { public AstridTaskAdapter(
TaskListMetadata list, Filter filter, SubtasksFilterUpdater updater) {
this.list = list; this.list = list;
this.filter = filter; this.filter = filter;
this.updater = updater; this.updater = updater;
@ -68,4 +69,9 @@ public final class AstridTaskAdapter extends TaskAdapter {
Timber.e(e); Timber.e(e);
} }
} }
@Override
public void onTaskCreated(String uuid) {
updater.onCreateTask(list, filter, uuid);
}
} }

@ -39,7 +39,7 @@ public class TaskAdapter {
private static final LongProperty FILE_ID_PROPERTY = private static final LongProperty FILE_ID_PROPERTY =
TaskAttachment.ID.cloneAs(TaskListFragment.FILE_METADATA_JOIN, "fileId"); TaskAttachment.ID.cloneAs(TaskListFragment.FILE_METADATA_JOIN, "fileId");
public static final Property<?>[] PROPERTIES = static final Property<?>[] PROPERTIES =
ObjectArrays.concat( ObjectArrays.concat(
Task.PROPERTIES, Task.PROPERTIES,
new Property<?>[] { new Property<?>[] {
@ -115,7 +115,7 @@ public class TaskAdapter {
return helper.getItem(position); return helper.getItem(position);
} }
protected String getItemUuid(int position) { String getItemUuid(int position) {
return getTask(position).getUuid(); return getTask(position).getUuid();
} }
@ -133,6 +133,10 @@ public class TaskAdapter {
return PROPERTIES; return PROPERTIES;
} }
public void onTaskCreated(String uuid) {
}
public interface OnCompletedTaskListener { public interface OnCompletedTaskListener {
void onCompletedTask(Task item, boolean newState); void onCompletedTask(Task item, boolean newState);

@ -97,11 +97,6 @@ class AstridOrderedListFragmentHelper {
this.list = list; this.list = list;
} }
void onCreateTask(String uuid) {
updater.onCreateTask(list, fragment.getFilter(), uuid);
fragment.loadTaskListContent();
}
void onDeleteTask(Task task) { void onDeleteTask(Task task) {
updater.onDeleteTask(list, fragment.getFilter(), task.getUuid()); updater.onDeleteTask(list, fragment.getFilter(), task.getUuid());
fragment.loadTaskListContent(); fragment.loadTaskListContent();

@ -413,7 +413,7 @@ public class SubtasksFilterUpdater {
applyToFilter(filter); applyToFilter(filter);
} }
void onCreateTask(TaskListMetadata list, Filter filter, String uuid) { public void onCreateTask(TaskListMetadata list, Filter filter, String uuid) {
if (idToNode.containsKey(uuid) || !Task.isValidUuid(uuid)) { if (idToNode.containsKey(uuid) || !Task.isValidUuid(uuid)) {
return; return;
} }

@ -84,11 +84,6 @@ public class SubtasksListFragment extends TaskListFragment {
return taskListMetadata; return taskListMetadata;
} }
@Override
public void onTaskCreated(String uuid) {
helper.onCreateTask(uuid);
}
@Override @Override
protected void onTaskDelete(Task task) { protected void onTaskDelete(Task task) {
super.onTaskDelete(task); super.onTaskDelete(task);

@ -53,11 +53,6 @@ public class SubtasksTagListFragment extends TagListFragment {
super.setTaskAdapter(); super.setTaskAdapter();
} }
@Override
public void onTaskCreated(String uuid) {
helper.onCreateTask(uuid);
}
@Override @Override
protected void onTaskDelete(Task task) { protected void onTaskDelete(Task task) {
super.onTaskDelete(task); super.onTaskDelete(task);

Loading…
Cancel
Save