diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 58c8078..7ecd71e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { applicationId = "com.hoker.supraexample" minSdk = 28 targetSdk = 35 - versionCode = 7 - versionName = "0.0.7" + versionCode = 8 + versionName = "0.0.8" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/supra/build.gradle.kts b/supra/build.gradle.kts index ff2a46a..778cf0b 100644 --- a/supra/build.gradle.kts +++ b/supra/build.gradle.kts @@ -73,7 +73,7 @@ afterEvaluate { from(components["release"]) groupId = "com.github.hoker" artifactId = "Supra" - version = "0.0.7" + version = "0.0.8" } } } diff --git a/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraGyroScaffold.kt b/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraGyroScaffold.kt index 29153d2..04f7ebc 100644 --- a/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraGyroScaffold.kt +++ b/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraGyroScaffold.kt @@ -21,6 +21,7 @@ import androidx.hilt.navigation.compose.hiltViewModel @Composable fun SupraGyroScaffold( + modifier: Modifier = Modifier, topBar: (@Composable () -> Unit)? = null, bottomBar: (@Composable () -> Unit)? = null, borderColor: Color, @@ -37,6 +38,7 @@ fun SupraGyroScaffold( val animatedYOffset = animateDpAsState(targetValue = yOffset.dp, label = "") Scaffold( + modifier = modifier, topBar = { topBar?.invoke() }, diff --git a/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraScaffold.kt b/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraScaffold.kt index 0d00db4..e5cb02f 100644 --- a/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraScaffold.kt +++ b/supra/src/main/java/com/hoker/supra/presentation/scaffolds/SupraScaffold.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp @Composable fun SupraScaffold( + modifier: Modifier = Modifier, topBar: (@Composable () -> Unit)? = null, bottomBar: (@Composable () -> Unit)? = null, borderColor: Color, @@ -25,6 +26,7 @@ fun SupraScaffold( content: @Composable (modifier: Modifier) -> Unit ){ Scaffold ( + modifier = modifier, topBar = { topBar?.invoke() },