Move taskProperties to TaskAdapter

pull/795/head
Alex Baker 7 years ago
parent ed434a3e83
commit ac9f91e719

@ -410,7 +410,7 @@ public class TaskListFragment extends InjectingFragment
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
taskListViewModel taskListViewModel
.getTasks(filter, taskProperties()) .getTasks(filter, taskAdapter.getTaskProperties())
.observe( .observe(
this, this,
list -> { list -> {
@ -515,10 +515,6 @@ public class TaskListFragment extends InjectingFragment
taskAdapter.setHelper(recyclerAdapter.getAsyncPagedListDiffer()); taskAdapter.setHelper(recyclerAdapter.getAsyncPagedListDiffer());
} }
protected Property<?>[] taskProperties() {
return TaskAdapter.PROPERTIES;
}
public Filter getFilter() { public Filter getFilter() {
return filter; return filter;
} }

@ -1,7 +1,11 @@
package com.todoroo.astrid.adapter; package com.todoroo.astrid.adapter;
import com.todoroo.andlib.data.Property;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksTaskListUpdater; import com.todoroo.astrid.gtasks.GtasksTaskListUpdater;
import java.util.ArrayList;
import java.util.Arrays;
import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskList; import org.tasks.data.GoogleTaskList;
import timber.log.Timber; import timber.log.Timber;
@ -64,4 +68,12 @@ public final class GoogleTaskAdapter extends TaskAdapter {
Timber.e(e); Timber.e(e);
} }
} }
@Override
public Property<?>[] getTaskProperties() {
ArrayList<Property<?>> properties = new ArrayList<>(Arrays.asList(TaskAdapter.PROPERTIES));
properties.add(GoogleTask.ORDER);
properties.add(GoogleTask.INDENT);
return properties.toArray(new Property<?>[properties.size()]);
}
} }

@ -129,6 +129,10 @@ public class TaskAdapter {
this.onCompletedTaskListener = newListener; this.onCompletedTaskListener = newListener;
} }
public Property<?>[] getTaskProperties() {
return PROPERTIES;
}
public interface OnCompletedTaskListener { public interface OnCompletedTaskListener {
void onCompletedTask(Task item, boolean newState); void onCompletedTask(Task item, boolean newState);

@ -8,15 +8,11 @@ package com.todoroo.astrid.gtasks;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import com.todoroo.andlib.data.Property;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import java.util.ArrayList;
import java.util.Arrays;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskList; import org.tasks.data.GoogleTaskList;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.tasklist.GtasksListFragment; import org.tasks.tasklist.GtasksListFragment;
@ -46,15 +42,6 @@ public class GtasksSubtaskListFragment extends GtasksListFragment {
helper.onDeleteTask(task); helper.onDeleteTask(task);
} }
@Override
public Property<?>[] taskProperties() {
Property<?>[] baseProperties = TaskAdapter.PROPERTIES;
ArrayList<Property<?>> properties = new ArrayList<>(Arrays.asList(baseProperties));
properties.add(GoogleTask.ORDER);
properties.add(GoogleTask.INDENT);
return properties.toArray(new Property<?>[properties.size()]);
}
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
super.onAttach(activity); super.onAttach(activity);

Loading…
Cancel
Save