Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Device settings search #758

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into feat/settingsSearch
Signed-off-by: Guillermo Villafuerte <gvillafu@comunidad.unam.mx>

# Conflicts:
#	app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/filters/SearchFilters.kt
#	app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt
strongville committed Apr 29, 2024

Verified

This commit was signed with the committer’s verified signature.
myii Imran Iqbal
commit 701cf45022a62c3df92dd4f22904577e6ce7ced7
Original file line number Diff line number Diff line change
@@ -204,7 +204,7 @@ fun SearchFilters(
)
FilterChip(
modifier = Modifier.padding(end = 16.dp),
selected = filters.tools && !allCategoriesEnabled,
selected = filters.tools && (!allCategoriesEnabled || settings),
onClick = {
if (settings) {
onFiltersChange(filters.copy(tools = !filters.tools))
@@ -222,9 +222,14 @@ fun SearchFilters(
label = { Text(stringResource(R.string.search_filter_tools)) }
)
FilterChip(
selected = filters.settings && !allCategoriesEnabled,
selected = filters.settings && (!allCategoriesEnabled || settings),
onClick = {
onFiltersChange(filters.toggleSettings())
if (settings) {
onFiltersChange(filters.copy(settings = !filters.settings))
}
else {
onFiltersChange(filters.toggleSettings())
}
},
leadingIcon = {
Icon(
Original file line number Diff line number Diff line change
@@ -5,23 +5,7 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.AppShortcut
import androidx.compose.material.icons.rounded.ArrowOutward
import androidx.compose.material.icons.rounded.Calculate
import androidx.compose.material.icons.rounded.Description
import androidx.compose.material.icons.rounded.FilterAlt
import androidx.compose.material.icons.rounded.Keyboard
import androidx.compose.material.icons.rounded.Loop
import androidx.compose.material.icons.rounded.Person
import androidx.compose.material.icons.rounded.Place
import androidx.compose.material.icons.rounded.Public
import androidx.compose.material.icons.rounded.Sort
import androidx.compose.material.icons.rounded.Star
import androidx.compose.material.icons.rounded.Tag
import androidx.compose.material.icons.rounded.Today
import androidx.compose.material.icons.rounded.VisibilityOff
import androidx.compose.material.icons.rounded.Warning
import androidx.compose.material.icons.rounded.Work
import androidx.compose.material.icons.rounded.*
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ import de.mm20.launcher2.preferences.search.CalculatorSearchSettings
import de.mm20.launcher2.preferences.search.CalendarSearchSettings
import de.mm20.launcher2.preferences.search.ContactSearchSettings
import de.mm20.launcher2.preferences.search.LocationSearchSettings
import de.mm20.launcher2.preferences.search.SearchFilterSettings
import de.mm20.launcher2.preferences.search.SettingsSearchSettings
import de.mm20.launcher2.preferences.search.ShortcutSearchSettings
import de.mm20.launcher2.preferences.search.UnitConverterSettings
You are viewing a condensed version of this merge commit. You can view the full changes here.