Enable collapse/expand all for 'My order' sorting

pull/1004/head
Alex Baker 6 years ago
parent 798bcc5c1c
commit ee52572607

@ -277,7 +277,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI
} }
if (preferences.disableSubtasks() if (preferences.disableSubtasks()
|| !filter.supportsSubtasks() || !filter.supportsSubtasks()
|| taskAdapter.supportsManualSorting()) { || taskAdapter.supportsAstridSorting()) {
menu.findItem(R.id.menu_collapse_subtasks).isVisible = false menu.findItem(R.id.menu_collapse_subtasks).isVisible = false
menu.findItem(R.id.menu_expand_subtasks).isVisible = false menu.findItem(R.id.menu_expand_subtasks).isVisible = false
} }

@ -36,7 +36,7 @@ class AstridTaskAdapter internal constructor(
return updater.getIndentForTask(previous.uuid) + 1 return updater.getIndentForTask(previous.uuid) + 1
} }
override fun supportsManualSorting() = true override fun supportsAstridSorting() = true
override fun moved(from: Int, to: Int, indent: Int) { override fun moved(from: Int, to: Int, indent: Int) {
val source = getTask(from) val source = getTask(from)

@ -13,8 +13,6 @@ class CaldavManualSortTaskAdapter internal constructor(
private val localBroadcastManager: LocalBroadcastManager) private val localBroadcastManager: LocalBroadcastManager)
: TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager) { : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager) {
override fun supportsManualSorting() = true
override fun moved(from: Int, to: Int, indent: Int) { override fun moved(from: Int, to: Int, indent: Int) {
val task = getTask(from) val task = getTask(from)
val oldParent = task.parent val oldParent = task.parent

@ -13,8 +13,6 @@ class GoogleTaskManualSortAdapter internal constructor(
private val localBroadcastManager: LocalBroadcastManager) private val localBroadcastManager: LocalBroadcastManager)
: TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager) { : TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager) {
override fun supportsManualSorting() = true
override fun moved(from: Int, to: Int, indent: Int) { override fun moved(from: Int, to: Int, indent: Int) {
val task = getTask(from) val task = getTask(from)
val googleTask = task.googleTask val googleTask = task.googleTask

@ -124,7 +124,7 @@ open class TaskAdapter(
} }
} }
open fun supportsManualSorting(): Boolean = false open fun supportsAstridSorting(): Boolean = false
open fun moved(from: Int, to: Int, indent: Int) { open fun moved(from: Int, to: Int, indent: Int) {
val task = getTask(from) val task = getTask(from)

Loading…
Cancel
Save