From 785239fde8aa9d5e6cb5f564861f9eaea8e5631d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 6 Jun 2014 23:47:17 -0500 Subject: [PATCH] Pass preferences to TaskAdapter --- .../astrid/activity/TaskListFragment.java | 2 +- .../todoroo/astrid/adapter/TaskAdapter.java | 18 ++++++++++-------- .../astrid/gtasks/GtasksListFragment.java | 4 +++- .../AstridOrderedListFragmentHelper.java | 12 +++++++----- .../OrderedMetadataListFragmentHelper.java | 14 ++++++++------ .../astrid/subtasks/SubtasksListFragment.java | 4 +++- .../subtasks/SubtasksTagListFragment.java | 4 +++- 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 0470ac91c..dac0fdea6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -743,7 +743,7 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { - return new TaskAdapter(taskAttachmentDao, taskService, this, getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), + return new TaskAdapter(preferences, taskAttachmentDao, taskService, this, getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), cursor, sqlQueryTemplate, new OnCompletedTaskListener() { @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 8d7dd4467..8ebebd41b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -49,7 +49,6 @@ import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Pair; -import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.TaskAction; @@ -68,6 +67,7 @@ import com.todoroo.astrid.ui.CheckableImageView; import com.todoroo.astrid.utility.Constants; import org.tasks.R; +import org.tasks.preferences.Preferences; import java.util.Collections; import java.util.HashMap; @@ -174,6 +174,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { // --- instance variables + private final Preferences preferences; private final TaskAttachmentDao taskAttachmentDao; private final TaskService taskService; @@ -209,9 +210,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable { * @param onCompletedTaskListener * task listener. can be null */ - public TaskAdapter(TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, int resource, + public TaskAdapter(Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, int resource, Cursor c, AtomicReference query, OnCompletedTaskListener onCompletedTaskListener) { super(ContextManager.getContext(), c, false); + this.preferences = preferences; this.taskAttachmentDao = taskAttachmentDao; this.taskService = taskService; this.context = ContextManager.getContext(); @@ -224,7 +226,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { inflater = (LayoutInflater) fragment.getActivity().getSystemService( Context.LAYOUT_INFLATER_SERVICE); - fontSize = Preferences.getIntegerFromString(R.string.p_fontSize, 18); + fontSize = preferences.getIntegerFromString(R.string.p_fontSize, 18); paint = new Paint(); displayMetrics = new DisplayMetrics(); fragment.getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); @@ -270,7 +272,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } private void startDetailThread() { - if (Preferences.getBoolean(R.string.p_showNotes, false) && !simpleLayout && !titleOnlyLayout) { + if (preferences.getBoolean(R.string.p_showNotes, false) && !simpleLayout && !titleOnlyLayout) { DetailLoaderThread detailLoader = new DetailLoaderThread(); detailLoader.start(); } @@ -313,8 +315,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable { viewHolder.taskActionContainer = view.findViewById(R.id.taskActionContainer); viewHolder.taskActionIcon = (ImageView)view.findViewById(R.id.taskActionIcon); - boolean showFullTaskTitle = Preferences.getBoolean(R.string.p_fullTaskTitle, false); - boolean showNotes = Preferences.getBoolean(R.string.p_showNotes, false); + boolean showFullTaskTitle = preferences.getBoolean(R.string.p_fullTaskTitle, false); + boolean showNotes = preferences.getBoolean(R.string.p_showNotes, false); if (showFullTaskTitle && !titleOnlyLayout) { viewHolder.nameView.setMaxLines(Integer.MAX_VALUE); viewHolder.nameView.setSingleLine(false); @@ -445,7 +447,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { if(TextUtils.isEmpty(details) || DETAIL_SEPARATOR.equals(details) || task.isCompleted()) { viewHolder.details1.setVisibility(View.GONE); viewHolder.details2.setVisibility(View.GONE); - } else if (Preferences.getBoolean(R.string.p_showNotes, false)) { + } else if (preferences.getBoolean(R.string.p_showNotes, false)) { viewHolder.details1.setVisibility(View.VISIBLE); if (details.startsWith(DETAIL_SEPARATOR)) { StringBuilder buffer = new StringBuilder(details); @@ -834,7 +836,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { @Override public void notifyDataSetChanged() { super.notifyDataSetChanged(); - fontSize = Preferences.getIntegerFromString(R.string.p_fontSize, 18); + fontSize = preferences.getIntegerFromString(R.string.p_fontSize, 18); } protected final View.OnClickListener completeBoxListener = new View.OnClickListener() { diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index c493510c8..d5e1d63f0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -31,6 +31,7 @@ import com.todoroo.astrid.subtasks.SubtasksListFragment; import org.tasks.R; import org.tasks.injection.ForActivity; +import org.tasks.preferences.Preferences; import org.tasks.sync.IndeterminateProgressBarSyncResultCallback; import javax.inject.Inject; @@ -47,6 +48,7 @@ public class GtasksListFragment extends SubtasksListFragment { @Inject SyncV2Service syncService; @Inject @ForActivity Context context; @Inject TaskAttachmentDao taskAttachmentDao; + @Inject Preferences preferences; private StoreObject list; @@ -61,7 +63,7 @@ public class GtasksListFragment extends SubtasksListFragment { @Override protected OrderedListFragmentHelperInterface createFragmentHelper() { - return new OrderedMetadataListFragmentHelper<>(taskAttachmentDao, taskService, metadataService, this, gtasksTaskListUpdater); + return new OrderedMetadataListFragmentHelper<>(preferences, taskAttachmentDao, taskService, metadataService, this, gtasksTaskListUpdater); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 461890f43..891c5cf9b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -18,7 +18,6 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Functions; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.adapter.TaskAdapter.OnCompletedTaskListener; @@ -30,6 +29,7 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.ui.DraggableListView; import org.tasks.R; +import org.tasks.preferences.Preferences; import java.util.ArrayList; import java.util.Collections; @@ -43,6 +43,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen private final DisplayMetrics metrics = new DisplayMetrics(); private final AstridOrderedListUpdater updater; private final TaskListFragment fragment; + private final Preferences preferences; private final TaskAttachmentDao taskAttachmentDao; private final TaskService taskService; @@ -50,7 +51,8 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen private LIST list; - public AstridOrderedListFragmentHelper(TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, AstridOrderedListUpdater updater) { + public AstridOrderedListFragmentHelper(org.tasks.preferences.Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, AstridOrderedListUpdater updater) { + this.preferences = preferences; this.taskAttachmentDao = taskAttachmentDao; this.taskService = taskService; this.fragment = fragment; @@ -167,7 +169,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen public TaskAdapter createTaskAdapter(TodorooCursor cursor, AtomicReference sqlQueryTemplate) { - taskAdapter = new DraggableTaskAdapter(fragment, TaskListFragment.getTaskRowResource(Preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), + taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), cursor, sqlQueryTemplate); getTouchListView().setItemHightNormal(taskAdapter.computeFullRowHeight()); @@ -184,9 +186,9 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen private final class DraggableTaskAdapter extends TaskAdapter { - private DraggableTaskAdapter(TaskListFragment activity, int resource, + private DraggableTaskAdapter(org.tasks.preferences.Preferences preferences, TaskListFragment activity, int resource, Cursor c, AtomicReference query) { - super(taskAttachmentDao, taskService, activity, resource, c, query, null); + super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index d72d5d2f0..08d317dac 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -20,7 +20,6 @@ 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.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.adapter.TaskAdapter.OnCompletedTaskListener; @@ -35,6 +34,7 @@ import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVis import com.todoroo.astrid.ui.DraggableListView; import org.tasks.R; +import org.tasks.preferences.Preferences; import java.util.ArrayList; import java.util.Arrays; @@ -49,6 +49,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm private final OrderedMetadataListUpdater updater; private final TaskListFragment fragment; + private final Preferences preferences; private final TaskAttachmentDao taskAttachmentDao; private final TaskService taskService; private final MetadataService metadataService; @@ -57,7 +58,8 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm private LIST list; - public OrderedMetadataListFragmentHelper(TaskAttachmentDao taskAttachmentDao, TaskService taskService, MetadataService metadataService, TaskListFragment fragment, OrderedMetadataListUpdater updater) { + public OrderedMetadataListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, MetadataService metadataService, TaskListFragment fragment, OrderedMetadataListUpdater updater) { + this.preferences = preferences; this.taskAttachmentDao = taskAttachmentDao; this.taskService = taskService; this.metadataService = metadataService; @@ -97,7 +99,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm @Override public Property[] taskProperties() { Property[] baseProperties = TaskAdapter.PROPERTIES; - if (Preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 2) { + if (preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 2) { baseProperties = TaskAdapter.BASIC_PROPERTIES; } @@ -181,7 +183,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm public TaskAdapter createTaskAdapter(TodorooCursor cursor, AtomicReference sqlQueryTemplate) { - taskAdapter = new DraggableTaskAdapter(fragment, TaskListFragment.getTaskRowResource(Preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), + taskAdapter = new DraggableTaskAdapter(preferences, fragment, TaskListFragment.getTaskRowResource(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0)), cursor, sqlQueryTemplate); taskAdapter.addOnCompletedTaskListener(new OnCompletedTaskListener() { @@ -196,9 +198,9 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm private final class DraggableTaskAdapter extends TaskAdapter { - private DraggableTaskAdapter(TaskListFragment activity, int resource, + private DraggableTaskAdapter(Preferences preferences, TaskListFragment activity, int resource, Cursor c, AtomicReference query) { - super(taskAttachmentDao, taskService, activity, resource, c, query, null); + super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java index dd1a59333..aa180080d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -18,6 +18,7 @@ import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.service.TaskService; import org.tasks.R; +import org.tasks.preferences.Preferences; import javax.inject.Inject; @@ -36,6 +37,7 @@ public class SubtasksListFragment extends TaskListFragment { @Inject TaskService taskService; @Inject SubtasksFilterUpdater subtasksFilterUpdater; @Inject TaskAttachmentDao taskAttachmentDao; + @Inject Preferences preferences; @Override public void onAttach(Activity activity) { @@ -45,7 +47,7 @@ public class SubtasksListFragment extends TaskListFragment { } protected OrderedListFragmentHelperInterface createFragmentHelper() { - return new AstridOrderedListFragmentHelper<>(taskAttachmentDao, taskService, this, subtasksFilterUpdater); + return new AstridOrderedListFragmentHelper<>(preferences, taskAttachmentDao, taskService, this, subtasksFilterUpdater); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index 4724d39d7..a7c776487 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -18,6 +18,7 @@ import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.service.TaskService; import org.tasks.R; +import org.tasks.preferences.Preferences; import javax.inject.Inject; @@ -26,6 +27,7 @@ public class SubtasksTagListFragment extends TagViewFragment { @Inject TaskService taskService; @Inject SubtasksFilterUpdater subtasksFilterUpdater; @Inject TaskAttachmentDao taskAttachmentDao; + @Inject Preferences preferences; private AstridOrderedListFragmentHelper helper; @@ -35,7 +37,7 @@ public class SubtasksTagListFragment extends TagViewFragment { public void onAttach(Activity activity) { super.onAttach(activity); - helper = new AstridOrderedListFragmentHelper<>(taskAttachmentDao, taskService, this, subtasksFilterUpdater); + helper = new AstridOrderedListFragmentHelper<>(preferences, taskAttachmentDao, taskService, this, subtasksFilterUpdater); } @Override