mirror of https://github.com/tasks/tasks
Remove manual sort list fragment helpers
Alex Baker
7 years ago
parent
b34694f0a4
commit
8d9972c4c3
@ -1,106 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2012 Todoroo Inc
|
||||
*
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
|
||||
package com.todoroo.astrid.gtasks;
|
||||
|
||||
import android.text.TextUtils;
|
||||
import com.todoroo.andlib.utility.DateUtilities;
|
||||
import com.todoroo.astrid.activity.TaskListFragment;
|
||||
import com.todoroo.astrid.adapter.GoogleTaskAdapter;
|
||||
import com.todoroo.astrid.adapter.TaskAdapter;
|
||||
import com.todoroo.astrid.api.Filter;
|
||||
import com.todoroo.astrid.dao.TaskDao;
|
||||
import com.todoroo.astrid.data.Task;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import javax.inject.Inject;
|
||||
import org.tasks.data.GoogleTask;
|
||||
import org.tasks.data.GoogleTaskDao;
|
||||
import org.tasks.data.GoogleTaskList;
|
||||
|
||||
class OrderedMetadataListFragmentHelper {
|
||||
|
||||
private final GtasksTaskListUpdater updater;
|
||||
private final GoogleTaskDao googleTaskDao;
|
||||
|
||||
private final TaskDao taskDao;
|
||||
private final Map<Long, ArrayList<Long>> chainedCompletions =
|
||||
Collections.synchronizedMap(new HashMap<>());
|
||||
private TaskListFragment fragment;
|
||||
private GoogleTaskList list;
|
||||
|
||||
@Inject
|
||||
OrderedMetadataListFragmentHelper(
|
||||
TaskDao taskDao, GtasksTaskListUpdater updater, GoogleTaskDao googleTaskDao) {
|
||||
this.taskDao = taskDao;
|
||||
this.updater = updater;
|
||||
this.googleTaskDao = googleTaskDao;
|
||||
}
|
||||
|
||||
void setTaskListFragment(TaskListFragment fragment) {
|
||||
this.fragment = fragment;
|
||||
}
|
||||
|
||||
void beforeSetUpTaskList(Filter filter) {
|
||||
updater.initialize(filter);
|
||||
}
|
||||
|
||||
TaskAdapter createTaskAdapter() {
|
||||
GoogleTaskAdapter taskAdapter = new GoogleTaskAdapter(list, updater);
|
||||
|
||||
taskAdapter.setOnCompletedTaskListener(this::setCompletedForItemAndSubtasks);
|
||||
|
||||
return taskAdapter;
|
||||
}
|
||||
|
||||
private void setCompletedForItemAndSubtasks(final Task item, final boolean completedState) {
|
||||
final long itemId = item.getId();
|
||||
|
||||
final long completionDate = completedState ? DateUtilities.now() : 0;
|
||||
|
||||
if (!completedState) {
|
||||
ArrayList<Long> chained = chainedCompletions.get(itemId);
|
||||
if (chained != null) {
|
||||
for (Long taskId : chained) {
|
||||
Task task = taskDao.fetch(taskId);
|
||||
task.setCompletionDate(completionDate);
|
||||
taskDao.save(task);
|
||||
}
|
||||
fragment.loadTaskListContent();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
final ArrayList<Long> chained = new ArrayList<>();
|
||||
final int parentIndent = item.getIndent();
|
||||
updater.applyToChildren(
|
||||
list,
|
||||
itemId,
|
||||
node -> {
|
||||
Task childTask = taskDao.fetch(node.taskId);
|
||||
if (!TextUtils.isEmpty(childTask.getRecurrence())) {
|
||||
GoogleTask googleTask = updater.getTaskMetadata(node.taskId);
|
||||
googleTask.setIndent(parentIndent);
|
||||
googleTaskDao.update(googleTask);
|
||||
}
|
||||
childTask.setCompletionDate(completionDate);
|
||||
taskDao.save(childTask);
|
||||
|
||||
chained.add(node.taskId);
|
||||
});
|
||||
|
||||
if (chained.size() > 0) {
|
||||
chainedCompletions.put(itemId, chained);
|
||||
fragment.loadTaskListContent();
|
||||
}
|
||||
}
|
||||
|
||||
public void setList(GoogleTaskList list) {
|
||||
this.list = list;
|
||||
}
|
||||
}
|
||||
@ -1,99 +0,0 @@
|
||||
package com.todoroo.astrid.subtasks;
|
||||
|
||||
import android.text.TextUtils;
|
||||
import com.todoroo.andlib.utility.DateUtilities;
|
||||
import com.todoroo.astrid.activity.TaskListFragment;
|
||||
import com.todoroo.astrid.adapter.AstridTaskAdapter;
|
||||
import com.todoroo.astrid.adapter.TaskAdapter;
|
||||
import com.todoroo.astrid.api.Filter;
|
||||
import com.todoroo.astrid.dao.TaskDao;
|
||||
import com.todoroo.astrid.data.Task;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import javax.inject.Inject;
|
||||
import org.tasks.data.TaskListMetadata;
|
||||
|
||||
class AstridOrderedListFragmentHelper {
|
||||
|
||||
private final SubtasksFilterUpdater updater;
|
||||
private final TaskDao taskDao;
|
||||
private final Map<String, ArrayList<String>> chainedCompletions =
|
||||
Collections.synchronizedMap(new HashMap<>());
|
||||
private TaskListFragment fragment;
|
||||
private TaskListMetadata list;
|
||||
|
||||
@Inject
|
||||
AstridOrderedListFragmentHelper(SubtasksFilterUpdater updater, TaskDao taskDao) {
|
||||
this.updater = updater;
|
||||
this.taskDao = taskDao;
|
||||
}
|
||||
|
||||
void setTaskListFragment(TaskListFragment fragment) {
|
||||
this.fragment = fragment;
|
||||
}
|
||||
|
||||
void beforeSetUpTaskList(Filter filter) {
|
||||
updater.initialize(list, filter);
|
||||
}
|
||||
|
||||
TaskAdapter createTaskAdapter() {
|
||||
AstridTaskAdapter taskAdapter = new AstridTaskAdapter(list, fragment.getFilter(), updater);
|
||||
|
||||
taskAdapter.setOnCompletedTaskListener(this::setCompletedForItemAndSubtasks);
|
||||
|
||||
return taskAdapter;
|
||||
}
|
||||
|
||||
private void setCompletedForItemAndSubtasks(final Task item, final boolean completedState) {
|
||||
final String itemId = item.getUuid();
|
||||
|
||||
final long completionDate = completedState ? DateUtilities.now() : 0;
|
||||
|
||||
if (!completedState) {
|
||||
ArrayList<String> chained = chainedCompletions.get(itemId);
|
||||
if (chained != null) {
|
||||
for (String taskId : chained) {
|
||||
taskDao.setCompletionDate(taskId, completionDate);
|
||||
}
|
||||
fragment.loadTaskListContent();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
final ArrayList<String> chained = new ArrayList<>();
|
||||
updater.applyToDescendants(
|
||||
itemId,
|
||||
node -> {
|
||||
String uuid = node.uuid;
|
||||
taskDao.setCompletionDate(uuid, completionDate);
|
||||
chained.add(node.uuid);
|
||||
});
|
||||
|
||||
if (chained.size() > 0) {
|
||||
// move recurring items to item parent
|
||||
List<Task> tasks = taskDao.getRecurringTasks(chained);
|
||||
|
||||
boolean madeChanges = false;
|
||||
for (Task t : tasks) {
|
||||
if (!TextUtils.isEmpty(t.getRecurrence())) {
|
||||
updater.moveToParentOf(t.getUuid(), itemId);
|
||||
madeChanges = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (madeChanges) {
|
||||
updater.writeSerialization(list, updater.serializeTree());
|
||||
}
|
||||
|
||||
chainedCompletions.put(itemId, chained);
|
||||
fragment.loadTaskListContent();
|
||||
}
|
||||
}
|
||||
|
||||
public void setList(TaskListMetadata list) {
|
||||
this.list = list;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue