From c5f83a29c06e55ef6995404ecf3acfbe2ef89a3b Mon Sep 17 00:00:00 2001 From: Jossi Wolf Date: Wed, 15 Sep 2021 10:26:28 +0200 Subject: [PATCH] Expose all public ModalBottomSheetState and SwipeProgress properties in BottomSheetNavigatorState Fixes #673 --- navigation-material/api/current.api | 6 ++++++ .../material/BottomSheetNavigator.kt | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/navigation-material/api/current.api b/navigation-material/api/current.api index 6e18884a0..e52681aa2 100644 --- a/navigation-material/api/current.api +++ b/navigation-material/api/current.api @@ -25,12 +25,18 @@ package com.google.accompanist.navigation.material { @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public final class BottomSheetNavigatorSheetState { ctor public BottomSheetNavigatorSheetState(androidx.compose.material.ModalBottomSheetState sheetState); method public androidx.compose.material.ModalBottomSheetValue getCurrentValue(); + method public float getDirection(); method public androidx.compose.runtime.State getOffset(); + method public androidx.compose.runtime.State getOverflow(); + method public androidx.compose.material.SwipeProgress getProgress(); method public androidx.compose.material.ModalBottomSheetValue getTargetValue(); method public boolean isVisible(); property public final androidx.compose.material.ModalBottomSheetValue currentValue; + property public final float direction; property public final boolean isVisible; property public final androidx.compose.runtime.State offset; + property public final androidx.compose.runtime.State overflow; + property public final androidx.compose.material.SwipeProgress progress; property public final androidx.compose.material.ModalBottomSheetValue targetValue; } diff --git a/navigation-material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt b/navigation-material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt index 644f1783d..05af1416a 100644 --- a/navigation-material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt +++ b/navigation-material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt @@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.ColumnScope import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ModalBottomSheetState import androidx.compose.material.ModalBottomSheetValue +import androidx.compose.material.SwipeProgress import androidx.compose.material.SwipeableDefaults import androidx.compose.material.rememberModalBottomSheetState import androidx.compose.runtime.Composable @@ -74,6 +75,24 @@ public class BottomSheetNavigatorSheetState(private val sheetState: ModalBottomS */ public val offset: State get() = sheetState.offset + + /** + * @see ModalBottomSheetState.overflow + */ + public val overflow: State + get() = sheetState.overflow + + /** + * @see ModalBottomSheetState.direction + */ + public val direction: Float + get() = sheetState.direction + + /** + * @see ModalBottomSheetState.progress + */ + public val progress: SwipeProgress + get() = sheetState.progress } /**