archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add preference to disable sort groups

Browse Source
pull/1004/head
Alex Baker 6 years ago
parent 5af6c8273c
commit 4702d4e88e
14 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
app/src/androidTest/java/com/todoroo/astrid/adapter/NonRecursiveQueryTest.kt
Unescape Escape View File

@ -47,7 +47,7 @@ class NonRecursiveQueryTest : InjectingTestCase() {
override fun setUp() {
super.setUp()
preferences.clear()
preferences.setBoolean(R.string.p_disable_subtasks, true)
preferences.setBoolean(R.string.p_use_paged_queries, true)
tasks.clear()
adapter = TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager)
adapter.setDataSource(dataSource)

2
app/src/androidTest/java/org/tasks/data/ManualGoogleTaskQueryTest.kt
Unescape Escape View File

@ -89,7 +89,7 @@ class ManualGoogleTaskQueryTest : InjectingTestCase() {
@Test
fun ignoreDisableSubtasksPreference() {
preferences.setBoolean(R.string.p_disable_subtasks, true)
preferences.setBoolean(R.string.p_use_paged_queries, true)
newTask(1, 0, 0)
newTask(2, 0, 1)

2
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
Unescape Escape View File

@ -275,7 +275,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI
sortMenu.isEnabled = false
sortMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
}
if (preferences.disableSubtasks()
if (preferences.usePagedQueries()
|| !filter.supportsSubtasks()
|| taskAdapter.supportsAstridSorting()) {
menu.findItem(R.id.menu_collapse_subtasks).isVisible = false

2
app/src/main/java/org/tasks/data/TaskListQuery.kt
Unescape Escape View File

@ -37,7 +37,7 @@ object TaskListQuery {
getRecursiveQuery(filter, preferences, subtasks)
} else if (filter.supportsAstridSorting() && preferences.isAstridSort) {
getNonRecursiveQuery(filter, preferences)
} else if (filter.supportsSubtasks() && subtasks.usesSubtasks() && preferences.showSubtasks()) {
} else if (filter.supportsSubtasks() && subtasks.usesSubtasks() && !preferences.usePagedQueries()) {
getRecursiveQuery(filter, preferences, subtasks)
} else {
getNonRecursiveQuery(filter, preferences)

16
app/src/main/java/org/tasks/preferences/Preferences.java
Unescape Escape View File

@ -526,14 +526,6 @@ public class Preferences {
return getIntegerFromString(R.string.p_default_importance_key, Priority.LOW);
}
public boolean showSubtasks() {
return !disableSubtasks();
}
public boolean disableSubtasks() {
return getBoolean(R.string.p_disable_subtasks, false);
}
public int getThemeBase() {
return getInt(R.string.p_theme, ThemeBase.DEFAULT_BASE_THEME);
}
@ -549,4 +541,12 @@ public class Preferences {
public int getDefaultThemeColor() {
return getInt(R.string.p_theme_color, ColorProvider.BLUE_500);
}
public boolean usePagedQueries() {
return getBoolean(R.string.p_use_paged_queries, false);
}
public boolean showGroupHeaders() {
return !usePagedQueries() && !getBoolean(R.string.p_disable_sort_groups, false);
}
}

2
app/src/main/java/org/tasks/preferences/fragments/Advanced.kt
Unescape Escape View File

@ -47,7 +47,7 @@ class Advanced : InjectingPreferenceFragment() {
override fun getPreferenceXml() = R.xml.preferences_advanced
override fun setupPreferences(savedInstanceState: Bundle?) {
findPreference(R.string.p_disable_subtasks)
findPreference(R.string.p_use_paged_queries)
.setOnPreferenceChangeListener { _: Preference?, _: Any? ->
localBroadcastManager.broadcastRefresh()
true

8
app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
Unescape Escape View File

@ -10,6 +10,7 @@ import android.os.Bundle
import android.os.Handler
import androidx.annotation.StringRes
import androidx.preference.Preference
import androidx.preference.SwitchPreferenceCompat
import com.todoroo.astrid.api.Filter
import org.tasks.BuildConfig
import org.tasks.LocalBroadcastManager
@ -96,6 +97,13 @@ class LookAndFeel : InjectingPreferenceFragment() {
true
}
val sortGroups = findPreference(R.string.p_disable_sort_groups) as SwitchPreferenceCompat
sortGroups.isChecked = sortGroups.isChecked or preferences.usePagedQueries()
findPreference(R.string.p_use_paged_queries).setOnPreferenceChangeListener { _, value ->
sortGroups.isChecked = value as Boolean
true
}
val defaultList = findPreference(R.string.p_default_list)
val filter: Filter? = defaultFilterProvider.defaultFilter
defaultList.summary = filter?.listingTitle

1
app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
Unescape Escape View File

@ -272,6 +272,7 @@ class DragAndDropRecyclerAdapter(
init {
val filter = taskList.getFilter()
disableHeaders = !filter.supportsSorting()
|| !preferences.showGroupHeaders()
|| (filter.supportsManualSort() && preferences.isManualSort)
|| (filter.supportsAstridSorting() && preferences.isAstridSort)
itemTouchHelper = ItemTouchHelper(ItemTouchHelperCallback())

2
app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
Unescape Escape View File

@ -191,7 +191,7 @@ class TaskViewHolder internal constructor(
} else {
dueDate.setTextColor(textColorSecondary)
}
val dateValue: String? = if (sortMode == SortHelper.SORT_DUE && task.sortGroup != null && !preferences.getBoolean(R.string.p_disable_subtasks, false)) {
val dateValue: String? = if (sortMode == SortHelper.SORT_DUE && task.sortGroup != null && preferences.showGroupHeaders()) {
if (task.hasDueTime()) DateUtilities.getTimeString(context, newDateTime(task.dueDate)) else null
} else {
DateUtilities.getRelativeDateTime(context, task.dueDate, locale, FormatStyle.MEDIUM)

2
app/src/main/java/org/tasks/ui/TaskListViewModel.java
Unescape Escape View File

@ -88,7 +88,7 @@ public class TaskListViewModel extends ViewModel implements Observer<PagedList<T
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
subtasks -> {
if (manualSortFilter || preferences.showSubtasks()) {
if (manualSortFilter || !preferences.usePagedQueries()) {
performNonPagedQuery(subtasks);
} else {
performPagedListQuery();

3
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -351,7 +351,8 @@
<string name="google_tasks_position_hack">Custom order synchronization fix</string>
<string name="google_tasks_position_hack_summary">Always perform a full synchronization to workaround https://issuetracker.google.com/issues/132432317</string>
<string name="subscription_help_url">https://tasks.org/subscribe</string>
<string name="p_disable_subtasks">disable_subtasks</string>
<string name="p_use_paged_queries">disable_subtasks</string>
<string name="p_disable_sort_groups">disable_sort_groups</string>
<string name="p_wearable_notifications">wearable_notifications</string>
<string name="p_notified_oauth_error">notified_oauth_error_%1$s_%2$s</string>
<string name="p_chip_style">chip_style</string>

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -539,6 +539,7 @@ File %1$s contained %2$s.\n\n
<string name="enter_title_hint">Enter title</string>
<string name="improve_performance">Improve performance</string>
<string name="improve_performance_summary">Disable sort groups and collapsible subtasks to improve app performance</string>
<string name="disable_sort_groups">Disable sort groups</string>
<string name="enter_tag_name">Enter tag name</string>
<string name="create_new_tag">Create \"%s\"</string>
<string name="choose_synchronization_service">Select a platform</string>

2
app/src/main/res/xml/preferences_advanced.xml
Unescape Escape View File

@ -4,7 +4,7 @@
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/p_disable_subtasks"
android:key="@string/p_use_paged_queries"
android:summary="@string/improve_performance_summary"
android:title="@string/improve_performance" />

14
app/src/main/res/xml/preferences_look_and_feel.xml
Unescape Escape View File

@ -97,6 +97,20 @@
android:title="@string/EPr_temp_show_completed_tasks"
app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="false"
app:allowDividerAbove="true"
android:key="@string/p_use_paged_queries"
android:disableDependentsState="true"
android:summary="@string/improve_performance_summary"
android:title="@string/improve_performance" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="@string/p_use_paged_queries"
android:key="@string/p_disable_sort_groups"
android:title="@string/disable_sort_groups" />
<PreferenceCategory
android:title="@string/chips">

Write Preview
Loading…
Cancel
Save