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

fix: Balloon shape on Android API 29/30 #177

Merged
merged 1 commit into from
Oct 24, 2024
+7 −10
Merged

fix: Balloon shape on Android API 29/30 #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 7 additions & 10 deletions reveal-shapes/src/commonMain/kotlin/com/svenjacobs/reveal/shapes/balloon/Balloon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp

Expand Down Expand Up @@ -84,17 +86,12 @@ private fun Balloon(
backgroundModifier: Modifier = Modifier,
content: @Composable BoxScope.() -> Unit,
) {
val shape = BalloonShape(arrow, cornerRadius, LocalDensity.current)

Box(
modifier = modifier
.graphicsLayer {
shadowElevation = elevation.toPx()
shape = BalloonShape(
arrow = arrow,
cornerRadius = cornerRadius,
density = this@graphicsLayer,
)
clip = true
}
.shadow(elevation, shape)
.clip(shape)
.then(backgroundModifier)
.padding(arrow.padding),
contentAlignment = contentAlignment,
Expand Down