Remove card border
This commit is contained in:
parent
e179ef9a31
commit
01daecec40
@ -26,11 +26,6 @@ fun ProvideSettings(
|
|||||||
val settings: UiSettings = koinInject()
|
val settings: UiSettings = koinInject()
|
||||||
val widgetRepository: WidgetRepository = koinInject()
|
val widgetRepository: WidgetRepository = koinInject()
|
||||||
|
|
||||||
val cardStyle by remember {
|
|
||||||
settings.cardStyle.distinctUntilChanged()
|
|
||||||
}.collectAsState(
|
|
||||||
CardStyle()
|
|
||||||
)
|
|
||||||
val iconShape by remember {
|
val iconShape by remember {
|
||||||
settings.iconShape.distinctUntilChanged()
|
settings.iconShape.distinctUntilChanged()
|
||||||
}.collectAsState(IconShape.Circle)
|
}.collectAsState(IconShape.Circle)
|
||||||
@ -47,7 +42,6 @@ fun ProvideSettings(
|
|||||||
}.collectAsState(GridSettings())
|
}.collectAsState(GridSettings())
|
||||||
|
|
||||||
CompositionLocalProvider(
|
CompositionLocalProvider(
|
||||||
LocalCardStyle provides cardStyle,
|
|
||||||
LocalFavoritesEnabled provides favoritesEnabled,
|
LocalFavoritesEnabled provides favoritesEnabled,
|
||||||
LocalGridSettings provides gridSettings,
|
LocalGridSettings provides gridSettings,
|
||||||
) {
|
) {
|
||||||
|
|||||||
@ -24,14 +24,11 @@ fun LauncherCard(
|
|||||||
1f
|
1f
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
border: BorderStroke? = LocalCardStyle.current.borderWidth.takeIf { it > 0 }
|
|
||||||
?.let { BorderStroke(it.dp, MaterialTheme.colorScheme.surface) },
|
|
||||||
content: @Composable () -> Unit = {}
|
content: @Composable () -> Unit = {}
|
||||||
) {
|
) {
|
||||||
Surface(
|
Surface(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
shape = shape,
|
shape = shape,
|
||||||
border = border,
|
|
||||||
content = content,
|
content = content,
|
||||||
contentColor = MaterialTheme.colorScheme.onSurface,
|
contentColor = MaterialTheme.colorScheme.onSurface,
|
||||||
color = color,
|
color = color,
|
||||||
|
|||||||
@ -102,14 +102,6 @@ fun AppearanceSettingsScreen() {
|
|||||||
},
|
},
|
||||||
icon = Icons.Rounded.Opacity,
|
icon = Icons.Rounded.Opacity,
|
||||||
)
|
)
|
||||||
|
|
||||||
Preference(
|
|
||||||
title = stringResource(R.string.preference_cards),
|
|
||||||
summary = stringResource(R.string.preference_cards_summary),
|
|
||||||
onClick = {
|
|
||||||
navController?.navigate("settings/appearance/cards")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user