diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavorites.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavorites.kt index 51bf29a7..6b4d4c91 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavorites.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavorites.kt @@ -12,7 +12,9 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Star import androidx.compose.material.icons.rounded.Tag +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -37,41 +39,43 @@ fun LazyListScope.SearchFavorites( item( key = "favorites", ) { - Column( - modifier = Modifier - .padding( - top = if (reverse) 8.dp else 0.dp, - bottom = if (reverse) 0.dp else 8.dp, - ) - .background( - MaterialTheme.colorScheme.surface.copy( - LocalCardStyle.current.opacity - ), - MaterialTheme.shapes.medium - ) - ) { - if (favorites.isNotEmpty()) { - SearchResultGrid(favorites) - } else { - Banner( - modifier = Modifier.padding(16.dp), - text = stringResource( - if (selectedTag == null) R.string.favorites_empty else R.string.favorites_empty_tag - ), - icon = if (selectedTag == null) Icons.Rounded.Star else Icons.Rounded.Tag, - ) - } - if (pinnedTags.isNotEmpty() || editButton) { - FavoritesTagSelector( - tags = pinnedTags, - selectedTag = selectedTag, - editButton = editButton, - reverse = false, - onSelectTag = onSelectTag, - scrollState = rememberScrollState(), - expanded = tagsExpanded, - onExpand = onExpandTags, - ) + CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurface) { + Column( + modifier = Modifier + .padding( + top = if (reverse) 8.dp else 0.dp, + bottom = if (reverse) 0.dp else 8.dp, + ) + .background( + MaterialTheme.colorScheme.surface.copy( + LocalCardStyle.current.opacity + ), + MaterialTheme.shapes.medium + ) + ) { + if (favorites.isNotEmpty()) { + SearchResultGrid(favorites) + } else { + Banner( + modifier = Modifier.padding(16.dp), + text = stringResource( + if (selectedTag == null) R.string.favorites_empty else R.string.favorites_empty_tag + ), + icon = if (selectedTag == null) Icons.Rounded.Star else Icons.Rounded.Tag, + ) + } + if (pinnedTags.isNotEmpty() || editButton) { + FavoritesTagSelector( + tags = pinnedTags, + selectedTag = selectedTag, + editButton = editButton, + reverse = false, + onSelectTag = onSelectTag, + scrollState = rememberScrollState(), + expanded = tagsExpanded, + onExpand = onExpandTags, + ) + } } } }