From 348406e56ce6599d44c38dcca0c0752d052b132d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:11:10 +0000 Subject: [PATCH 1/5] Update Kotlin & Dokka & Compose Compiler --- build.gradle.kts | 8 ++++---- gradle/libs.versions.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c1d2b7a..b4de6a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,10 +3,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { - id("org.jetbrains.kotlin.android") version "2.0.0" apply false - id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false - id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.14.0" apply false + id("org.jetbrains.kotlin.android") version "2.0.20" apply false + id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.0.20" apply false + id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false id("org.jmailen.kotlinter") version "4.4.1" apply false id("com.android.application") version "8.6.1" apply false id("com.vanniktech.maven.publish") version "0.29.0" apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 609e74f..7eabda4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,8 @@ minSdk = "21" [libraries] -kotlin-serialization-core = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3" -kotlin-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3" +kotlin-serialization-core = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3" +kotlin-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3" appcompat = "androidx.appcompat:appcompat:1.6.1" androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime:2.8.5" compose-foundation = "androidx.compose.foundation:foundation:1.6.8" From 1ca946be2fecfc55ff30504d1534c4d6ba2cd12f Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Sun, 29 Sep 2024 13:13:01 +0200 Subject: [PATCH 2/5] ignore deps that shouldn't be forced on users to be the latest ones --- .github/renovate.json5 | 9 +++++++++ gradle/libs.versions.toml | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index b3eba0d..cdae40d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -9,6 +9,15 @@ "skip-changelog", ], "rebaseWhen": "conflicted", + // deps that shouldn't be forced on users to be the latest ones + "ignoreDeps": [ + "org.jetbrains.kotlinx:kotlinx-serialization-core", + "org.jetbrains.kotlinx:kotlinx-serialization-json", + "androidx.appcompat:appcompat", + "androidx.compose.foundation:foundation", + "androidx.compose.material3:material3", + "androidx.lifecycle:lifecycle-runtime", + ], "packageRules": [ { "groupName": "GitHub Actions", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7eabda4..609e74f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,8 @@ minSdk = "21" [libraries] -kotlin-serialization-core = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3" -kotlin-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3" +kotlin-serialization-core = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3" +kotlin-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3" appcompat = "androidx.appcompat:appcompat:1.6.1" androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime:2.8.5" compose-foundation = "androidx.compose.foundation:foundation:1.6.8" From a87c670cbef8464404a1d1d16bb64d534892625d Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Sun, 29 Sep 2024 13:23:18 +0200 Subject: [PATCH 3/5] implement API checks --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 1 + bottomsheet/api/bottomsheet.api | 50 ++++++++++++++++++++++++++++ modalsheet/api/modalsheet.api | 59 +++++++++++++++++++++++++++++++++ results/api/results.api | 5 +++ 5 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 bottomsheet/api/bottomsheet.api create mode 100644 modalsheet/api/modalsheet.api create mode 100644 results/api/results.api diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf85b32..dbade63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Assemble & Linters run: | ./gradlew :bottomsheet:testDebugUnitTest :modalsheet:testDebugUnitTest - ./gradlew lintDebug lintKotlin :demo:assembleDebug + ./gradlew lintDebug lintKotlin :demo:assembleDebug apiCheck - uses: yutailang0119/action-android-lint@v4.0.0 name: App Lint errors to annotations if: ${{ failure() }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e835f05..7ab588d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,7 @@ jobs: echo ${{ secrets.ENCRYPT_KEY }} | release/signing-unpack.sh - name: Deploy to Sonatype run: | + ./gradlew apiCheck ./gradlew :publishAggregatedPublicationToCentralPortal --no-configuration-cache - name: Build APK run: | diff --git a/bottomsheet/api/bottomsheet.api b/bottomsheet/api/bottomsheet.api new file mode 100644 index 0000000..85d4080 --- /dev/null +++ b/bottomsheet/api/bottomsheet.api @@ -0,0 +1,50 @@ +public final class dev/hrach/navigation/bottomsheet/BottomSheetHostKt { + public static final fun BottomSheetHost-sAOB22Y (Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator;Landroidx/compose/ui/Modifier;FLandroidx/compose/ui/graphics/Shape;JJFJLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V +} + +public final class dev/hrach/navigation/bottomsheet/BottomSheetNavigator : androidx/navigation/Navigator { + public static final field $stable I + public fun ()V + public synthetic fun createDestination ()Landroidx/navigation/NavDestination; + public fun createDestination ()Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator$Destination; + public fun navigate (Ljava/util/List;Landroidx/navigation/NavOptions;Landroidx/navigation/Navigator$Extras;)V + public fun popBackStack (Landroidx/navigation/NavBackStackEntry;Z)V +} + +public final class dev/hrach/navigation/bottomsheet/BottomSheetNavigator$Destination : androidx/navigation/NavDestination, androidx/navigation/FloatingWindow { + public static final field $stable I + public fun (Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator;Lkotlin/jvm/functions/Function3;)V +} + +public final class dev/hrach/navigation/bottomsheet/BottomSheetNavigatorDestinationBuilder : androidx/navigation/NavDestinationBuilder { + public static final field $stable I + public fun (Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator;Ljava/lang/String;Lkotlin/jvm/functions/Function3;)V + public fun (Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator;Lkotlin/reflect/KClass;Ljava/util/Map;Lkotlin/jvm/functions/Function3;)V + public synthetic fun build ()Landroidx/navigation/NavDestination; + public fun build ()Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator$Destination; + public final fun getSecurePolicy ()Landroidx/compose/ui/window/SecureFlagPolicy; + public final fun getSkipPartiallyExpanded ()Z + public synthetic fun instantiateDestination ()Landroidx/navigation/NavDestination; + public final fun setSecurePolicy (Landroidx/compose/ui/window/SecureFlagPolicy;)V + public final fun setSkipPartiallyExpanded (Z)V +} + +public final class dev/hrach/navigation/bottomsheet/ComposableSingletons$BottomSheetHostKt { + public static final field INSTANCE Ldev/hrach/navigation/bottomsheet/ComposableSingletons$BottomSheetHostKt; + public static field lambda-1 Lkotlin/jvm/functions/Function2; + public fun ()V + public final fun getLambda-1$bottomsheet_release ()Lkotlin/jvm/functions/Function2; +} + +public final class dev/hrach/navigation/bottomsheet/ComposableSingletons$BottomSheetNavigatorKt { + public static final field INSTANCE Ldev/hrach/navigation/bottomsheet/ComposableSingletons$BottomSheetNavigatorKt; + public static field lambda-1 Lkotlin/jvm/functions/Function3; + public fun ()V + public final fun getLambda-1$bottomsheet_release ()Lkotlin/jvm/functions/Function3; +} + +public final class dev/hrach/navigation/bottomsheet/NavGraphBuilderKt { + public static final fun bottomSheet (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Landroidx/compose/ui/window/SecureFlagPolicy;ZLkotlin/jvm/functions/Function3;)V + public static synthetic fun bottomSheet$default (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Landroidx/compose/ui/window/SecureFlagPolicy;ZLkotlin/jvm/functions/Function3;ILjava/lang/Object;)V +} + diff --git a/modalsheet/api/modalsheet.api b/modalsheet/api/modalsheet.api new file mode 100644 index 0000000..efdc0d7 --- /dev/null +++ b/modalsheet/api/modalsheet.api @@ -0,0 +1,59 @@ +public final class dev/hrach/navigation/modalsheet/ComposableSingletons$ModalSheetDialogKt { + public static final field INSTANCE Ldev/hrach/navigation/modalsheet/ComposableSingletons$ModalSheetDialogKt; + public static field lambda-1 Lkotlin/jvm/functions/Function2; + public fun ()V + public final fun getLambda-1$modalsheet_release ()Lkotlin/jvm/functions/Function2; +} + +public final class dev/hrach/navigation/modalsheet/ComposableSingletons$ModalSheetNavigatorKt { + public static final field INSTANCE Ldev/hrach/navigation/modalsheet/ComposableSingletons$ModalSheetNavigatorKt; + public static field lambda-1 Lkotlin/jvm/functions/Function4; + public fun ()V + public final fun getLambda-1$modalsheet_release ()Lkotlin/jvm/functions/Function4; +} + +public final class dev/hrach/navigation/modalsheet/ModalSheetHostKt { + public static final fun ModalSheetHost-Y2L_72g (Ldev/hrach/navigation/modalsheet/ModalSheetNavigator;JLandroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V +} + +public final class dev/hrach/navigation/modalsheet/ModalSheetNavigator : androidx/navigation/Navigator { + public static final field $stable I + public fun ()V + public synthetic fun createDestination ()Landroidx/navigation/NavDestination; + public fun createDestination ()Ldev/hrach/navigation/modalsheet/ModalSheetNavigator$Destination; + public fun navigate (Ljava/util/List;Landroidx/navigation/NavOptions;Landroidx/navigation/Navigator$Extras;)V + public fun popBackStack (Landroidx/navigation/NavBackStackEntry;Z)V + public final fun prepareForTransition (Landroidx/navigation/NavBackStackEntry;)V +} + +public final class dev/hrach/navigation/modalsheet/ModalSheetNavigator$Destination : androidx/navigation/NavDestination, androidx/navigation/FloatingWindow { + public static final field $stable I + public fun (Ldev/hrach/navigation/modalsheet/ModalSheetNavigator;Lkotlin/jvm/functions/Function4;)V +} + +public final class dev/hrach/navigation/modalsheet/ModalSheetNavigatorDestinationBuilder : androidx/navigation/NavDestinationBuilder { + public static final field $stable I + public fun (Ldev/hrach/navigation/modalsheet/ModalSheetNavigator;Ljava/lang/String;Lkotlin/jvm/functions/Function4;)V + public fun (Ldev/hrach/navigation/modalsheet/ModalSheetNavigator;Lkotlin/reflect/KClass;Ljava/util/Map;Lkotlin/jvm/functions/Function4;)V + public synthetic fun build ()Landroidx/navigation/NavDestination; + public fun build ()Ldev/hrach/navigation/modalsheet/ModalSheetNavigator$Destination; + public final fun getEnterTransition ()Lkotlin/jvm/functions/Function1; + public final fun getExitTransition ()Lkotlin/jvm/functions/Function1; + public final fun getPopEnterTransition ()Lkotlin/jvm/functions/Function1; + public final fun getPopExitTransition ()Lkotlin/jvm/functions/Function1; + public final fun getSecurePolicy ()Landroidx/compose/ui/window/SecureFlagPolicy; + public final fun getSizeTransform ()Lkotlin/jvm/functions/Function1; + public synthetic fun instantiateDestination ()Landroidx/navigation/NavDestination; + public final fun setEnterTransition (Lkotlin/jvm/functions/Function1;)V + public final fun setExitTransition (Lkotlin/jvm/functions/Function1;)V + public final fun setPopEnterTransition (Lkotlin/jvm/functions/Function1;)V + public final fun setPopExitTransition (Lkotlin/jvm/functions/Function1;)V + public final fun setSecurePolicy (Landroidx/compose/ui/window/SecureFlagPolicy;)V + public final fun setSizeTransform (Lkotlin/jvm/functions/Function1;)V +} + +public final class dev/hrach/navigation/modalsheet/NavGraphBuilderKt { + public static final fun modalSheet (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Landroidx/compose/ui/window/SecureFlagPolicy;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;)V + public static synthetic fun modalSheet$default (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Landroidx/compose/ui/window/SecureFlagPolicy;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)V +} + diff --git a/results/api/results.api b/results/api/results.api new file mode 100644 index 0000000..169e5df --- /dev/null +++ b/results/api/results.api @@ -0,0 +1,5 @@ +public final class dev/hrach/navigation/results/ResultsKt { + public static final fun NavigationResultEffectImpl (Landroidx/navigation/NavBackStackEntry;Landroidx/navigation/NavController;Lkotlinx/serialization/KSerializer;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;I)V + public static final fun setResultImpl (Landroidx/navigation/NavController;Ljava/lang/Object;Lkotlinx/serialization/KSerializer;)V +} + From 500f5bb55f3c6e21d1a78cf877bc1ebd229774da Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Sun, 29 Sep 2024 13:23:30 +0200 Subject: [PATCH 4/5] formatting & expose experimental status --- .../navigation/bottomsheet/BottomSheetHost.kt | 18 ++++++------------ .../dev/hrach/navigation/demo/NavHost.kt | 2 ++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt b/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt index e376731..ab90c6f 100644 --- a/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt +++ b/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt @@ -1,6 +1,5 @@ package dev.hrach.navigation.bottomsheet -import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.material3.BottomSheetDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalBottomSheet @@ -29,7 +28,7 @@ import kotlinx.coroutines.CancellationException import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow -@OptIn(ExperimentalMaterial3Api::class) +@ExperimentalMaterial3Api @Composable public fun BottomSheetHost( navigator: BottomSheetNavigator, @@ -40,9 +39,7 @@ public fun BottomSheetHost( contentColor: Color = contentColorFor(containerColor), tonalElevation: Dp = 0.dp, scrimColor: Color = BottomSheetDefaults.ScrimColor, - dragHandle: - @Composable() - (() -> Unit)? = { BottomSheetDefaults.DragHandle() }, + dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() }, ) { val saveableStateHolder = rememberSaveableStateHolder() @@ -97,9 +94,7 @@ private fun BottomSheetHost( contentColor: Color, tonalElevation: Dp, scrimColor: Color, - dragHandle: - @Composable() - (() -> Unit)?, + dragHandle: @Composable (() -> Unit)?, saveableStateHolder: SaveableStateHolder, targetBackStackEntry: NavBackStackEntry?, ) { @@ -107,6 +102,7 @@ private fun BottomSheetHost( val sheetState = rememberModalBottomSheetState( skipPartiallyExpanded = destination?.skipPartiallyExpanded ?: true, ) + @Suppress("ProduceStateDoesNotAssignValue") // false positive val backStackEntry by produceState( initialValue = null, @@ -138,7 +134,7 @@ private fun BottomSheetHost( ) } -@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun BottomSheetHost( navigator: BottomSheetNavigator, @@ -149,9 +145,7 @@ private fun BottomSheetHost( contentColor: Color, tonalElevation: Dp, scrimColor: Color, - dragHandle: - @Composable() - (() -> Unit)?, + dragHandle: @Composable (() -> Unit)?, sheetState: SheetState, saveableStateHolder: SaveableStateHolder, backStackEntry: NavBackStackEntry, diff --git a/demo/src/main/kotlin/dev/hrach/navigation/demo/NavHost.kt b/demo/src/main/kotlin/dev/hrach/navigation/demo/NavHost.kt index b34c7ba..b3f8217 100644 --- a/demo/src/main/kotlin/dev/hrach/navigation/demo/NavHost.kt +++ b/demo/src/main/kotlin/dev/hrach/navigation/demo/NavHost.kt @@ -2,6 +2,7 @@ package dev.hrach.navigation.demo import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp @@ -21,6 +22,7 @@ import dev.hrach.navigation.modalsheet.ModalSheetHost import dev.hrach.navigation.modalsheet.ModalSheetNavigator import dev.hrach.navigation.modalsheet.modalSheet +@OptIn(ExperimentalMaterial3Api::class) @Composable internal fun NavHost( navController: NavHostController, From 6050adb419a424bc187eed3fa22cd821622f0e58 Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Sun, 29 Sep 2024 13:25:47 +0200 Subject: [PATCH 5/5] expose contentWidnowsInsets on BottomSheetHost --- bottomsheet/api/bottomsheet.api | 2 +- .../dev/hrach/navigation/bottomsheet/BottomSheetHost.kt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bottomsheet/api/bottomsheet.api b/bottomsheet/api/bottomsheet.api index 85d4080..eb06a45 100644 --- a/bottomsheet/api/bottomsheet.api +++ b/bottomsheet/api/bottomsheet.api @@ -1,5 +1,5 @@ public final class dev/hrach/navigation/bottomsheet/BottomSheetHostKt { - public static final fun BottomSheetHost-sAOB22Y (Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator;Landroidx/compose/ui/Modifier;FLandroidx/compose/ui/graphics/Shape;JJFJLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun BottomSheetHost-u5qS3lI (Ldev/hrach/navigation/bottomsheet/BottomSheetNavigator;Landroidx/compose/ui/Modifier;FLandroidx/compose/ui/graphics/Shape;JJFJLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } public final class dev/hrach/navigation/bottomsheet/BottomSheetNavigator : androidx/navigation/Navigator { diff --git a/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt b/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt index ab90c6f..14c8ecc 100644 --- a/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt +++ b/bottomsheet/src/main/kotlin/dev/hrach/navigation/bottomsheet/BottomSheetHost.kt @@ -1,5 +1,6 @@ package dev.hrach.navigation.bottomsheet +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.material3.BottomSheetDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalBottomSheet @@ -40,6 +41,7 @@ public fun BottomSheetHost( tonalElevation: Dp = 0.dp, scrimColor: Color = BottomSheetDefaults.ScrimColor, dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() }, + contentWindowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets }, ) { val saveableStateHolder = rememberSaveableStateHolder() @@ -68,6 +70,7 @@ public fun BottomSheetHost( tonalElevation = tonalElevation, scrimColor = scrimColor, dragHandle = dragHandle, + contentWindowInsets = contentWindowInsets, saveableStateHolder = saveableStateHolder, targetBackStackEntry = backStackEntry, ) @@ -95,6 +98,7 @@ private fun BottomSheetHost( tonalElevation: Dp, scrimColor: Color, dragHandle: @Composable (() -> Unit)?, + contentWindowInsets: @Composable () -> WindowInsets, saveableStateHolder: SaveableStateHolder, targetBackStackEntry: NavBackStackEntry?, ) { @@ -129,6 +133,7 @@ private fun BottomSheetHost( scrimColor = scrimColor, dragHandle = dragHandle, sheetState = sheetState, + contentWindowInsets = contentWindowInsets, saveableStateHolder = saveableStateHolder, backStackEntry = backStackEntry ?: return, ) @@ -146,6 +151,7 @@ private fun BottomSheetHost( tonalElevation: Dp, scrimColor: Color, dragHandle: @Composable (() -> Unit)?, + contentWindowInsets: @Composable () -> WindowInsets, sheetState: SheetState, saveableStateHolder: SaveableStateHolder, backStackEntry: NavBackStackEntry, @@ -168,6 +174,7 @@ private fun BottomSheetHost( tonalElevation = tonalElevation, scrimColor = scrimColor, dragHandle = dragHandle, + contentWindowInsets = contentWindowInsets, properties = ModalBottomSheetProperties(securePolicy = destination.securePolicy), ) { LaunchedEffect(backStackEntry) {