From 2b5837f8a5e98f2a0dc6c4e12cc8099ac3214a7e Mon Sep 17 00:00:00 2001 From: Sven Jacobs Date: Sun, 19 Jan 2025 16:25:27 +0100 Subject: [PATCH] feat: add borderStroke attribute to revealable() modifier (#198) --- .../android/tests/presentation/MainScreen.kt | 4 ++ demo-app/.run/Demo (Android).run.xml | 1 + .../reveal/demo/presentation/MainScreen.kt | 4 ++ reveal-core/api/android/reveal-core.api | 48 +++++++------- reveal-core/api/desktop/reveal-core.api | 48 +++++++------- reveal-core/api/reveal-core.klib.api | 34 ++++++---- .../kotlin/com/svenjacobs/reveal/Modifiers.kt | 64 +++++++++++-------- .../kotlin/com/svenjacobs/reveal/Reveal.kt | 1 + .../com/svenjacobs/reveal/RevealScope.kt | 61 +++++++++++------- .../com/svenjacobs/reveal/Revealable.kt | 3 + .../effect/dim/DimRevealOverlayEffect.kt | 30 +++++++-- 11 files changed, 183 insertions(+), 115 deletions(-) diff --git a/android-tests/src/main/kotlin/com/svenjacobs/reveal/android/tests/presentation/MainScreen.kt b/android-tests/src/main/kotlin/com/svenjacobs/reveal/android/tests/presentation/MainScreen.kt index a0d3cf2..8ec3775 100644 --- a/android-tests/src/main/kotlin/com/svenjacobs/reveal/android/tests/presentation/MainScreen.kt +++ b/android-tests/src/main/kotlin/com/svenjacobs/reveal/android/tests/presentation/MainScreen.kt @@ -1,5 +1,6 @@ package com.svenjacobs.reveal.android.tests.presentation +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding @@ -17,6 +18,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.svenjacobs.reveal.Key @@ -65,6 +67,7 @@ fun MainScreen(revealCanvasState: RevealCanvasState, modifier: Modifier = Modifi modifier = Modifier.revealable( key = Keys.Fab, shape = RevealShape.RoundRect(16.dp), + borderStroke = BorderStroke(2.dp, Color.DarkGray), onClick = { scope.launch { revealState.reveal(Keys.Explanation) } }, @@ -92,6 +95,7 @@ fun MainScreen(revealCanvasState: RevealCanvasState, modifier: Modifier = Modifi .padding(top = 16.dp) .revealable( key = Keys.Explanation, + borderStroke = BorderStroke(2.dp, Color.DarkGray), onClick = { scope.launch { revealState.hide() } }, diff --git a/demo-app/.run/Demo (Android).run.xml b/demo-app/.run/Demo (Android).run.xml index b276155..c20a6d1 100644 --- a/demo-app/.run/Demo (Android).run.xml +++ b/demo-app/.run/Demo (Android).run.xml @@ -1,6 +1,7 @@ +