Match setting group headings in settings search (#4044)
Closes #4044 Fixes #3098 Co-authored-by: Jammo <8018115+kaosjammo@users.noreply.github.com>
This commit is contained in:
@@ -54,7 +54,10 @@ fun PreferenceScreen(
|
|||||||
|
|
||||||
item {
|
item {
|
||||||
Column {
|
Column {
|
||||||
PreferenceGroupHeader(title = preference.title)
|
PreferenceGroupHeader(
|
||||||
|
title = preference.title,
|
||||||
|
highlighted = preference.title == highlightKey,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
items(preference.preferenceItems) { item ->
|
items(preference.preferenceItems) { item ->
|
||||||
@@ -86,7 +89,7 @@ private fun List<Preference>.findHighlightedIndex(highlightKey: String): Int {
|
|||||||
return flatMap {
|
return flatMap {
|
||||||
if (it is Preference.PreferenceGroup) {
|
if (it is Preference.PreferenceGroup) {
|
||||||
buildList<String?> {
|
buildList<String?> {
|
||||||
add(null) // Header
|
add(it.title) // Header
|
||||||
addAll(it.preferenceItems.map { groupItem -> groupItem.title })
|
addAll(it.preferenceItems.map { groupItem -> groupItem.title })
|
||||||
add(null) // Spacer
|
add(null) // Spacer
|
||||||
}
|
}
|
||||||
|
|||||||
+29
-27
@@ -168,45 +168,47 @@ private fun SearchResult(
|
|||||||
val result by produceState<List<SearchResultItem>?>(initialValue = null, searchKey) {
|
val result by produceState<List<SearchResultItem>?>(initialValue = null, searchKey) {
|
||||||
value = index.asSequence()
|
value = index.asSequence()
|
||||||
.flatMap { settingsData ->
|
.flatMap { settingsData ->
|
||||||
|
fun result(title: String, categoryTitle: String?) = SearchResultItem(
|
||||||
|
route = settingsData.route,
|
||||||
|
title = title,
|
||||||
|
breadcrumbs = getLocalizedBreadcrumb(
|
||||||
|
path = settingsData.title,
|
||||||
|
node = categoryTitle,
|
||||||
|
isLtr = isLtr,
|
||||||
|
),
|
||||||
|
highlightKey = title,
|
||||||
|
)
|
||||||
|
|
||||||
|
fun Preference.PreferenceItem<*, *>.matches(): Boolean {
|
||||||
|
// Don't show info preference
|
||||||
|
if (this is Preference.PreferenceItem.InfoPreference) return false
|
||||||
|
val inTitle = title.contains(searchKey, true)
|
||||||
|
val inSummary = subtitle?.contains(searchKey, true) ?: false
|
||||||
|
return inTitle || inSummary
|
||||||
|
}
|
||||||
|
|
||||||
settingsData.contents.asSequence()
|
settingsData.contents.asSequence()
|
||||||
// Only search from enabled prefs and one with valid title
|
// Only search from enabled prefs and one with valid title
|
||||||
.filter { it.visible && it.title.isNotBlank() }
|
.filter { it.visible && it.title.isNotBlank() }
|
||||||
// Flatten items contained inside *enabled* PreferenceGroup
|
|
||||||
.flatMap { p ->
|
.flatMap { p ->
|
||||||
when (p) {
|
when (p) {
|
||||||
is Preference.PreferenceGroup -> {
|
is Preference.PreferenceGroup -> {
|
||||||
if (p.visible) {
|
// A matching heading leads to the group itself, not to one of its items
|
||||||
p.preferenceItems.asSequence()
|
val heading = if (p.title.contains(searchKey, true)) {
|
||||||
.filter { it.visible && it.title.isNotBlank() }
|
sequenceOf(result(p.title, null))
|
||||||
.map { p.title to it }
|
|
||||||
} else {
|
} else {
|
||||||
emptySequence()
|
emptySequence()
|
||||||
}
|
}
|
||||||
|
val items = p.preferenceItems.asSequence()
|
||||||
|
.filter { it.visible && it.title.isNotBlank() && it.matches() }
|
||||||
|
.map { result(it.title, p.title) }
|
||||||
|
heading + items
|
||||||
|
}
|
||||||
|
is Preference.PreferenceItem<*, *> -> {
|
||||||
|
if (p.matches()) sequenceOf(result(p.title, null)) else emptySequence()
|
||||||
}
|
}
|
||||||
is Preference.PreferenceItem<*, *> -> sequenceOf(null to p)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Don't show info preference
|
|
||||||
.filterNot { it.second is Preference.PreferenceItem.InfoPreference }
|
|
||||||
// Filter by search query
|
|
||||||
.filter { (_, p) ->
|
|
||||||
val inTitle = p.title.contains(searchKey, true)
|
|
||||||
val inSummary = p.subtitle?.contains(searchKey, true) ?: false
|
|
||||||
inTitle || inSummary
|
|
||||||
}
|
|
||||||
// Map result data
|
|
||||||
.map { (categoryTitle, p) ->
|
|
||||||
SearchResultItem(
|
|
||||||
route = settingsData.route,
|
|
||||||
title = p.title,
|
|
||||||
breadcrumbs = getLocalizedBreadcrumb(
|
|
||||||
path = settingsData.title,
|
|
||||||
node = categoryTitle,
|
|
||||||
isLtr = isLtr,
|
|
||||||
),
|
|
||||||
highlightKey = p.title,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.take(10) // Just take top 10 result for quicker result
|
.take(10) // Just take top 10 result for quicker result
|
||||||
.toList()
|
.toList()
|
||||||
|
|||||||
+2
-1
@@ -11,11 +11,12 @@ import androidx.compose.ui.Modifier
|
|||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun PreferenceGroupHeader(title: String) {
|
fun PreferenceGroupHeader(title: String, highlighted: Boolean = false) {
|
||||||
Box(
|
Box(
|
||||||
contentAlignment = Alignment.CenterStart,
|
contentAlignment = Alignment.CenterStart,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
|
.highlightBackground(highlighted)
|
||||||
.padding(bottom = 8.dp, top = 14.dp),
|
.padding(bottom = 8.dp, top = 14.dp),
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
|
|||||||
Reference in New Issue
Block a user