From e3ed0934ca2f264dfb5d59410b9bc49f9278b033 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 5 Jan 2019 08:26:48 +0000 Subject: [PATCH] Disable hidden/completed toggle for search results --- .../astrid/activity/TaskListFragment.java | 5 +-- .../com/todoroo/astrid/api/SearchFilter.java | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/todoroo/astrid/api/SearchFilter.java diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index d9fe261ca..902a4160a 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -39,6 +39,7 @@ import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.api.CustomFilter; import com.todoroo.astrid.api.Filter; +import com.todoroo.astrid.api.SearchFilter; import com.todoroo.astrid.core.BuiltInFilterExposer; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.GtasksSubtaskListFragment; @@ -246,7 +247,7 @@ public class TaskListFragment extends InjectingFragment if (preferences.getBoolean(R.string.p_show_completed_tasks, false)) { completed.setChecked(true); } - if (taskAdapter.isManuallySorted()) { + if (taskAdapter.isManuallySorted() || filter instanceof SearchFilter) { completed.setChecked(true); completed.setEnabled(false); hidden.setChecked(true); @@ -316,7 +317,7 @@ public class TaskListFragment extends InjectingFragment private Filter createSearchFilter(String query) { String title = getString(R.string.FLA_search_filter, query); - return new Filter( + return new SearchFilter( title, new QueryTemplate() .where( diff --git a/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java b/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java new file mode 100644 index 000000000..ae2d4c62a --- /dev/null +++ b/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java @@ -0,0 +1,34 @@ +package com.todoroo.astrid.api; + +import android.os.Parcel; +import android.os.Parcelable; + +import com.todoroo.andlib.sql.QueryTemplate; + +public class SearchFilter extends Filter { + + /** Parcelable Creator Object */ + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + + /** {@inheritDoc} */ + @Override + public SearchFilter createFromParcel(Parcel source) { + SearchFilter item = new SearchFilter(); + item.readFromParcel(source); + return item; + } + + /** {@inheritDoc} */ + @Override + public SearchFilter[] newArray(int size) { + return new SearchFilter[size]; + } + }; + + private SearchFilter() {} + + public SearchFilter(String title, QueryTemplate where) { + super(title, where); + } +}