Merge pull request #7 from dokar3/v0.1.2

V0.1.2

Author: dokar3

README.md

@@ -87,12 +87,10 @@ BottomSheet(state = state) {
 
 **Skip peek state**
 
-To skip peek state, set `peekHeight` to a value at least equal to the content height, eg. `PeekHeight.px(Int.MAX_VALUE)`, `PeekHeight.fraction(1f)`:
-
 ```kotlin
 BottomSheet(
     state = state,
-    peekHeight = PeekHeight.fraction(1f),
+    skipPeek = true,
 ) { 
     ...
 }

build.gradle

@@ -21,6 +21,9 @@ buildscript {
 
 allprojects {
     plugins.withId("com.vanniktech.maven.publish") {
+        mavenPublish {
+            androidVariantToPublish = "release"
+        }
         mavenPublishing {
             publishToMavenCentral("S01")
             signAllPublications()

gradle.properties

@@ -20,7 +20,7 @@ android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-VERSION_NAME=0.1.1
+VERSION_NAME=0.1.2
 GROUP=io.github.dokar3
 
 POM_NAME=sheets

sample/src/main/java/com/dokar/sheets/sample/MainActivity.kt

@@ -55,7 +55,6 @@ class MainActivity : ComponentActivity() {
     }
 }
 
-@Suppress("deprecation")
 @Composable
 fun App() {
     var dark by remember { mutableStateOf(false) }
@@ -149,7 +148,7 @@ fun SimpleBottomSheet(
     BottomSheet(
         state = state,
         modifier = modifier,
-        peekHeight = PeekHeight.px(Int.MAX_VALUE),
+        skipPeek = true,
     ) {
         SimpleSheetContent(state)
     }
@@ -206,7 +205,7 @@ private fun TextFieldBottomSheet(
     BottomSheet(
         state = state,
         modifier = modifier,
-        peekHeight = PeekHeight.fraction(1f),
+        skipPeek = true,
     ) {
         TextFieldSheetContent(state = state)
     }
@@ -221,7 +220,7 @@ private fun EmbeddedBottomSheet(
         BottomSheetLayout(
             state = state,
             modifier = modifier,
-            peekHeight = PeekHeight.fraction(1f),
+            skipPeek = true,
         ) {
             Box(
                 modifier = Modifier

sheets/src/main/java/com/dokar/sheets/BottomSheet.kt

@@ -53,9 +53,8 @@ import kotlin.math.min
  *
  * @param state The bottom sheet state. Call [rememberBottomSheetState] to create one.
  * @param modifier Modifier for bottom sheet content.
- * @param peekHeight Peek height, could be a dp, px, or fraction value. To skip the peek state,
- * set the peek height to a value at least equal to the content height, e.g, PeekHeight.fraction(1f),
- * PeekHeight.px(Int.MAX_VALUE). Defaults to PeekHeight.fraction(0.5f).
+ * @param skipPeek Skip the peek state if set to true. Defaults to false.
+ * @param peekHeight Peek height, could be a dp, px, or fraction value.
  * @param backgroundColor Background color for sheet content.
  * @param dimColor Dim color. Defaults to [Color.Black].
  * @param maxDimAmount Maximum dim amount. Defaults to 0.45f.
@@ -67,6 +66,7 @@ import kotlin.math.min
 fun BottomSheet(
     state: BottomSheetState,
     modifier: Modifier = Modifier,
+    skipPeek: Boolean = false,
     peekHeight: PeekHeight = PeekHeight.fraction(0.5f),
     shape: Shape = MaterialTheme.shapes.medium.copy(
         bottomStart = CornerSize(0.dp),
@@ -87,6 +87,7 @@ fun BottomSheet(
     val scope = rememberCoroutineScope()
 
     val currentState by rememberUpdatedState(state)
+    val currentSkipPeek by rememberUpdatedState(skipPeek)
     val currentPeekHeight by rememberUpdatedState(peekHeight)
     val currentShape by rememberUpdatedState(shape)
     val currentBackgroundColor by rememberUpdatedState(backgroundColor)
@@ -120,6 +121,7 @@ fun BottomSheet(
                 BottomSheetLayout(
                     state = currentState,
                     modifier = modifier,
+                    skipPeek = currentSkipPeek,
                     peekHeight = currentPeekHeight,
                     shape = currentShape,
                     backgroundColor = currentBackgroundColor,
@@ -156,6 +158,7 @@ fun BottomSheet(
 fun BottomSheetLayout(
     state: BottomSheetState,
     modifier: Modifier = Modifier,
+    skipPeek: Boolean = false,
     peekHeight: PeekHeight = PeekHeight.fraction(0.5f),
     shape: Shape = MaterialTheme.shapes.medium.copy(
         bottomStart = CornerSize(0.dp),
@@ -184,6 +187,7 @@ fun BottomSheetLayout(
 
     SideEffect {
         state.peekHeight = peekHeight
+        state.forceSkipPeek = skipPeek
         state.maxDimAmount = maxDimAmount
     }
 

sheets/src/main/java/com/dokar/sheets/BottomSheetState.kt

@@ -76,6 +76,8 @@ class BottomSheetState(
 
     internal lateinit var peekHeight: PeekHeight
 
+    internal var forceSkipPeek: Boolean = false
+
     private var pendingToStartAnimation = false
 
     internal val isAnimating: Boolean
@@ -370,7 +372,7 @@ class BottomSheetState(
         if (contentHeight == 0 || !::peekHeight.isInitialized) {
             return false
         }
-        return getPeekHeightInPx() >= contentHeight
+        return forceSkipPeek || getPeekHeightInPx() >= contentHeight
     }
 
     internal fun getPeekHeightInPx(): Float {