lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix card opacity

Browse Source
This commit is contained in:
MM20 2024-05-16 23:07:18 +02:00
parent 0c81ac7596
commit 417c2e2972
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt
View File

@ -12,13 +12,16 @@ import androidx.compose.material3.Tab
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import de.mm20.launcher2.search.Application import de.mm20.launcher2.search.Application
import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.ktx.animateCorners import de.mm20.launcher2.ui.ktx.animateCorners
import de.mm20.launcher2.ui.ktx.withCorners
import de.mm20.launcher2.ui.launcher.search.common.grid.GridItem import de.mm20.launcher2.ui.launcher.search.common.grid.GridItem
import de.mm20.launcher2.ui.launcher.search.common.grid.GridResults import de.mm20.launcher2.ui.launcher.search.common.grid.GridResults
import de.mm20.launcher2.ui.layout.BottomReversed import de.mm20.launcher2.ui.layout.BottomReversed
import de.mm20.launcher2.ui.locals.LocalCardStyle
import de.mm20.launcher2.ui.locals.LocalGridSettings import de.mm20.launcher2.ui.locals.LocalGridSettings
fun LazyListScope.AppResults( fun LazyListScope.AppResults(
@ -51,7 +54,7 @@ fun LazyListScope.AppResults(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clip( .clip(
MaterialTheme.shapes.medium.animateCorners( MaterialTheme.shapes.medium.withCorners(
topStart = !reverse, topStart = !reverse,
topEnd = !reverse, topEnd = !reverse,
bottomEnd = reverse, bottomEnd = reverse,
@ -59,6 +62,7 @@ fun LazyListScope.AppResults(
) )
), ),
divider = {}, divider = {},
containerColor = Color.Transparent
) { ) {
Tab( Tab(
selected = selectedTab == 0, selected = selectedTab == 0,

17
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavorites.kt
View File

@ -4,29 +4,21 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.grid.GridItemSpan
import androidx.compose.foundation.lazy.grid.LazyGridScope
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Star import androidx.compose.material.icons.rounded.Star
import androidx.compose.material.icons.rounded.Tag import androidx.compose.material.icons.rounded.Tag
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import de.mm20.launcher2.search.SavableSearchable import de.mm20.launcher2.search.SavableSearchable
import de.mm20.launcher2.search.data.Tag import de.mm20.launcher2.search.data.Tag
import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.common.FavoritesTagSelector import de.mm20.launcher2.ui.common.FavoritesTagSelector
import de.mm20.launcher2.ui.component.Banner import de.mm20.launcher2.ui.component.Banner
import de.mm20.launcher2.ui.launcher.search.common.grid.SearchResultGrid import de.mm20.launcher2.ui.launcher.search.common.grid.SearchResultGrid
import de.mm20.launcher2.ui.launcher.widgets.favorites.FavoritesWidgetVM import de.mm20.launcher2.ui.locals.LocalCardStyle
fun LazyListScope.SearchFavorites( fun LazyListScope.SearchFavorites(
favorites: List<SavableSearchable>, favorites: List<SavableSearchable>,
@ -47,7 +39,12 @@ fun LazyListScope.SearchFavorites(
top = if (reverse) 8.dp else 0.dp, top = if (reverse) 8.dp else 0.dp,
bottom = if (reverse) 0.dp else 8.dp, bottom = if (reverse) 0.dp else 8.dp,
) )
.background(MaterialTheme.colorScheme.surface, MaterialTheme.shapes.medium) .background(
MaterialTheme.colorScheme.surface.copy(
LocalCardStyle.current.opacity
),
MaterialTheme.shapes.medium
)
) { ) {
if (favorites.isNotEmpty()) { if (favorites.isNotEmpty()) {
SearchResultGrid(favorites) SearchResultGrid(favorites)