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

Only hide tags and places in navigation menu

Browse Source
pull/1835/head
Alex Baker 2 years ago
parent 500cc3e6c2
commit 6e695b144e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File

28
app/src/main/java/org/tasks/filters/FilterProvider.kt
Unescape Escape View File

@ -48,7 +48,7 @@ class FilterProvider @Inject constructor(
googleTaskFilters(false).plus(caldavFilters(false)) googleTaskFilters(false).plus(caldavFilters(false))
suspend fun navDrawerItems(): List<FilterListItem> = suspend fun navDrawerItems(): List<FilterListItem> =
getAllFilters().plus(navDrawerFooter) getAllFilters(hideUnused = true).plus(navDrawerFooter)
suspend fun filterPickerItems(): List<FilterListItem> = suspend fun filterPickerItems(): List<FilterListItem> =
getAllFilters(showCreate = false) getAllFilters(showCreate = false)
@ -104,7 +104,7 @@ class FilterProvider @Inject constructor(
.plus(filterDao.getFilters().map(::CustomFilter).sort()) .plus(filterDao.getFilters().map(::CustomFilter).sort())
} }
private suspend fun addTags(showCreate: Boolean): List<FilterListItem> = private suspend fun addTags(showCreate: Boolean, hideUnused: Boolean): List<FilterListItem> =
if (!preferences.getBoolean(R.string.p_tags_enabled, true)) { if (!preferences.getBoolean(R.string.p_tags_enabled, true)) {
emptyList() emptyList()
} else { } else {
@ -124,14 +124,14 @@ class FilterProvider @Inject constructor(
})) }))
.apply { if (collapsed) return this } .apply { if (collapsed) return this }
.plus(tagDataDao.getTagFilters() .plus(tagDataDao.getTagFilters()
.filterIf(preferences.getBoolean(R.string.p_tags_hide_unused, false)) { .filterIf(hideUnused && preferences.getBoolean(R.string.p_tags_hide_unused, false)) {
it.count > 0 it.count > 0
} }
.map(TagFilters::toTagFilter) .map(TagFilters::toTagFilter)
.sort()) .sort())
} }
private suspend fun addPlaces(showCreate: Boolean): List<FilterListItem> = private suspend fun addPlaces(showCreate: Boolean, hideUnused: Boolean): List<FilterListItem> =
if (!preferences.getBoolean(R.string.p_places_enabled, true)) { if (!preferences.getBoolean(R.string.p_places_enabled, true)) {
emptyList() emptyList()
} else { } else {
@ -151,14 +151,18 @@ class FilterProvider @Inject constructor(
})) }))
.apply { if (collapsed) return this } .apply { if (collapsed) return this }
.plus(locationDao.getPlaceFilters() .plus(locationDao.getPlaceFilters()
.filterIf(preferences.getBoolean(R.string.p_places_hide_unused, false)) { .filterIf(hideUnused && preferences.getBoolean(R.string.p_places_hide_unused, false)) {
it.count > 0 it.count > 0
} }
.map(LocationFilters::toLocationFilter) .map(LocationFilters::toLocationFilter)
.sort()) .sort())
} }
private suspend fun getAllFilters(showCreate: Boolean = true, showBuiltIn: Boolean = true): List<FilterListItem> = private suspend fun getAllFilters(
showCreate: Boolean = true,
showBuiltIn: Boolean = true,
hideUnused: Boolean = false,
): List<FilterListItem> =
if (showBuiltIn) { if (showBuiltIn) {
arrayListOf(builtInFilterExposer.myTasksFilter) arrayListOf(builtInFilterExposer.myTasksFilter)
} else { } else {
@ -166,8 +170,8 @@ class FilterProvider @Inject constructor(
} }
.asSequence() .asSequence()
.plus(addFilters(showCreate, showBuiltIn)) .plus(addFilters(showCreate, showBuiltIn))
.plus(addTags(showCreate)) .plus(addTags(showCreate, hideUnused))
.plus(addPlaces(showCreate)) .plus(addPlaces(showCreate, hideUnused))
.plus(googleTaskFilters(showCreate)) .plus(googleTaskFilters(showCreate))
.plus(caldavFilters(showCreate)) .plus(caldavFilters(showCreate))
.toList() .toList()
@ -288,10 +292,10 @@ class FilterProvider @Inject constructor(
private suspend fun <T> Collection<T>.plusAllIf(predicate: Boolean, item: suspend () -> Iterable<T>): List<T> = private suspend fun <T> Collection<T>.plusAllIf(predicate: Boolean, item: suspend () -> Iterable<T>): List<T> =
plus(if (predicate) item() else emptyList()) plus(if (predicate) item() else emptyList())
private fun <T> Iterable<T>.plusIf(predicate: Boolean, item: () -> T): List<T> = private fun <T> Iterable<T>.plusIf(predicate: Boolean, item: () -> T): Iterable<T> =
if (predicate) plus(item()) else toList() if (predicate) plus(item()) else this
private fun <T> Iterable<T>.filterIf(predicate: Boolean, predicate2: (T) -> Boolean): List<T> = private fun <T> Iterable<T>.filterIf(predicate: Boolean, predicate2: (T) -> Boolean): Iterable<T> =
if (predicate) filter(predicate2) else toList() if (predicate) filter(predicate2) else this
} }
} }

Write Preview
Loading…
Cancel
Save