merge origin/main to compose-1.4

Author: workspace

.github/workflows/publish.yml

@@ -2,8 +2,7 @@ name: Publish
 
 on:
   release:
-    # We'll run this workflow when a new GitHub release is created
-    types: [released]
+    types: [published]
 
 jobs:
   publish:

README.md

@@ -13,10 +13,15 @@
 
 # Get Started
 ## Gradle
+|Compose|Library|
+|--|--|
+|Compose 1.3.x|<img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.holix.android/bottomsheetdialog-compose?style=for-the-badge&versionPrefix=1.1"/>|
+|Compose 1.4.x|<img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.holix.android/bottomsheetdialog-compose?style=for-the-badge&versionPrefix=1.2"/>|
+|Compose 1.5.x|<img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.holix.android/bottomsheetdialog-compose?style=for-the-badge&versionPrefix=1.3"/>|
 ```gradle
 // module's build.gradle
 dependencies {
-    implementation "com.holix.android:bottomsheetdialog-compose:1.1.0"
+    implementation "com.holix.android:bottomsheetdialog-compose:{version}"
 }
 ```
 ## Usage

bottomsheetdialog-compose/build.gradle

@@ -52,6 +52,7 @@ android {
 dependencies {
     implementation platform(Dependencies.composeBom)
     implementation Dependencies.composeUI
+    implementation Dependencies.composeFoundation
     implementation Dependencies.androidxActivityKtx
     implementation Dependencies.androidxCoreKtx
     implementation Dependencies.material

bottomsheetdialog-compose/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/BottomSheetDialog.kt

@@ -5,9 +5,13 @@ import android.graphics.Outline
 import android.os.Build
 import android.view.*
 import androidx.activity.addCallback
+import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
 import androidx.annotation.FloatRange
 import androidx.annotation.IntRange
 import androidx.annotation.Px
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.rememberScrollableState
+import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
@@ -278,6 +282,7 @@ fun BottomSheetDialog(
                 BottomSheetDialogLayout(
                     Modifier
                         .nestedScroll(rememberNestedScrollInteropConnection())
+                        .scrollable(state = rememberScrollableState{ 0f }, orientation = Orientation.Vertical)
                         .semantics { dialog() },
                 ) {
                     currentContent()
@@ -423,6 +428,7 @@ private class BottomSheetDialogWrapper(
         setContentView(bottomSheetDialogLayout)
         bottomSheetDialogLayout.setViewTreeLifecycleOwner(composeView.findViewTreeLifecycleOwner())
         bottomSheetDialogLayout.setViewTreeViewModelStoreOwner(composeView.findViewTreeViewModelStoreOwner())
+        bottomSheetDialogLayout.setViewTreeOnBackPressedDispatcherOwner(this)
         bottomSheetDialogLayout.setViewTreeSavedStateRegistryOwner(
             composeView.findViewTreeSavedStateRegistryOwner()
         )

buildSrc/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/Configuration.kt

@@ -6,9 +6,9 @@ object Configuration {
     const val minSdk = 21
     const val majorVersion = 1
     const val minorVersion = 2
-    const val patchVersion = 0
+    const val patchVersion = 1
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 120
+    const val versionCode = 121
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "com.holix.android"
 }