From 7b0cfb7229b5a42ffa0a8908eb0b9ba8040f5b4f Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 11 Oct 2016 17:15:29 -0500 Subject: [PATCH] Remove taskProperties from ordered list helper --- .../todoroo/astrid/gtasks/GtasksListFragment.java | 10 +++++++++- .../gtasks/OrderedMetadataListFragmentHelper.java | 12 ------------ .../subtasks/AstridOrderedListFragmentHelper.java | 6 ------ .../subtasks/OrderedListFragmentHelperInterface.java | 2 -- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index 9a3996efa..22b76f3b9 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -11,6 +11,7 @@ import android.view.MenuItem; import com.todoroo.andlib.data.Property; import com.todoroo.astrid.activity.TaskListFragment; +import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.TaskAttachmentDao; @@ -30,6 +31,9 @@ import org.tasks.preferences.Preferences; import org.tasks.themes.ThemeCache; import org.tasks.ui.CheckBoxes; +import java.util.ArrayList; +import java.util.Arrays; + import javax.inject.Inject; public class GtasksListFragment extends SubtasksListFragment { @@ -122,6 +126,10 @@ public class GtasksListFragment extends SubtasksListFragment { @Override public Property[] taskProperties() { - return helper.taskProperties(); + Property[] baseProperties = TaskAdapter.PROPERTIES; + ArrayList> properties = new ArrayList<>(Arrays.asList(baseProperties)); + properties.add(gtasksTaskListUpdater.indentProperty()); + properties.add(gtasksTaskListUpdater.orderProperty()); + return properties.toArray(new Property[properties.size()]); } } diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index 9790ec7d8..1df6c4669 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -17,7 +17,6 @@ import android.widget.ListView; import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener; -import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.activity.TaskListFragment; @@ -39,7 +38,6 @@ import org.tasks.themes.ThemeCache; import org.tasks.ui.CheckBoxes; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -112,16 +110,6 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm public void beforeSetUpTaskList(Filter filter) { } - @Override - public Property[] taskProperties() { - Property[] baseProperties = TaskAdapter.PROPERTIES; - ArrayList> properties = new ArrayList<>(Arrays.asList(baseProperties)); - properties.add(updater.indentProperty()); - properties.add(updater.orderProperty()); - return properties.toArray(new Property[properties.size()]); - } - - private final DropListener dropListener = new DropListener() { @Override public void drop(int from, int to) { diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index ba1ab66e7..e340dfefc 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -12,7 +12,6 @@ import android.widget.ListView; import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener; -import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Functions; @@ -267,11 +266,6 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen } } - @Override - public Property[] taskProperties() { - return fragment.taskProperties(); - } - public void setList(LIST list) { this.list = list; } diff --git a/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java b/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java index 46fa46836..49aab5474 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java +++ b/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java @@ -2,7 +2,6 @@ package com.todoroo.astrid.subtasks; import android.content.Context; -import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.Filter; @@ -17,6 +16,5 @@ public interface OrderedListFragmentHelperInterface { void onCreateTask(String uuid); void onDeleteTask(Task task); TaskAdapter createTaskAdapter(Context context, TodorooCursor cursor, AtomicReference queryTemplate); - Property[] taskProperties(); }