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.

Sign up for GitHub

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

Jump to bottom

fix(snackbar): apply the SparkTheme.shapes.small shape on snackbars #515

Merged
merged 3 commits into from
Jul 10, 2023
Merged

fix(snackbar): apply the SparkTheme.shapes.small shape on snackbars #515

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75f3357
fix(snackbar): apply the SparkTheme.shapes.small shape on snackbars
Jul 7, 2023
cb1c1d2
fix(snackbar): keep using extraSmall on legacy mode
GoUpNorth Jul 10, 2023
a5842eb
Merge branch 'main' into main
MarinaRomanova Jul 10, 2023
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
3 changes: 2 additions & 1 deletion spark/src/main/kotlin/com/adevinta/spark/components/snackbars/Snackbar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.adevinta.spark.InternalSparkApi
import com.adevinta.spark.LocalLegacyStyle
import com.adevinta.spark.PreviewTheme
import com.adevinta.spark.SparkTheme
import com.adevinta.spark.components.buttons.BaseSparkButton
Expand Down Expand Up @@ -93,7 +94,7 @@ public fun SparkSnackbar(
modifier = modifier
.padding(16.dp)
.sparkUsageOverlay(),
shape = SparkTheme.shapes.extraSmall,
shape = if (LocalLegacyStyle.current) SparkTheme.shapes.extraSmall else SparkTheme.shapes.small,
actionOnNewLine = actionOnNewLine,
containerColor = colors.baseColor,
contentColor = contentColor,
Expand Down
Loading