Merge branch 'develop' into main

AlexGladkov · Jul 28, 2022 · 3f4d794 · 3f4d794
2 parents 467ab27 + db6ca45
commit 3f4d794
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,6 +1,6 @@
 object Dependencies {
 
-    val odyssey = "1.0.0-beta13"
+    val odyssey = "1.0.0-beta14"
     val odysseyPackage = "io.github.alexgladkov"
 
     object DI {

diff --git a/documentation/GETTING_STARTED.md b/documentation/GETTING_STARTED.md
@@ -4,8 +4,8 @@ Add dependencies to gradle
 ```kotlin
 named("commonMain") {
     dependencies {
-        implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta13") // For core classes
-        implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta13") // For compose extensions
+        implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta14") // For core classes
+        implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta14") // For compose extensions
     }
 }
 ```
diff --git a/.../ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/AlertDialogModalView.kt b/.../ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/AlertDialogModalView.kt
@@ -63,7 +63,11 @@ internal fun BoxScope.AlertDialog(
         }
     )
 
-    Screamer(backdropAlpha) { modalController.popBackStack() }
+    Screamer(backdropAlpha) {
+        if (bundle.closeOnBackdropClick && bundle.dialogState !is ModalDialogState.Close) {
+            modalController.popBackStack()
+        }
+    }
 
     Card(
         modifier = modifier.alpha(dialogAlpha).offset { IntOffset(x = 0, y = offset) },