From 9ca5ad8edd0a923afef9d1f8e914b0603ac656f7 Mon Sep 17 00:00:00 2001 From: Artem Slinkin Date: Wed, 25 May 2022 13:55:19 +0500 Subject: [PATCH 1/6] fix: dialog close by screamer double click error --- .../navigation/modal_navigation/views/BottomSheetModalView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt b/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt index f81bd9fd..e51a0e14 100644 --- a/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt +++ b/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/navigation/modal_navigation/views/BottomSheetModalView.kt @@ -57,7 +57,7 @@ internal fun BoxScope.BottomModalSheet( bundle.backContent.invoke() } else { Screamer(backdropAlpha) { - if (bundle.closeOnBackdropClick) { + if (bundle.closeOnBackdropClick && bundle.dialogState !is ModalDialogState.Close) { modalController.popBackStack() } } From 67d1c4baea5075c16a226d2b28ad0cb2c8b80ce1 Mon Sep 17 00:00:00 2001 From: Alex Gladkov Date: Fri, 3 Jun 2022 14:21:02 +0300 Subject: [PATCH 2/6] Version increase --- buildSrc/buildSrc/src/main/kotlin/Dependencies.kt | 2 +- documentation/GETTING_STARTED.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt index 0e5ffd48..a013f721 100644 --- 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-beta07" + val odyssey = "1.0.0-beta08" val odysseyPackage = "io.github.alexgladkov" object DI { diff --git a/documentation/GETTING_STARTED.md b/documentation/GETTING_STARTED.md index 863546bf..c3334a98 100644 --- 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-beta07") // For core classes - implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta07") // For compose extensions + implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta08") // For core classes + implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta08") // For compose extensions } } ``` \ No newline at end of file From be6e552c90b9cdda27117049ed6c88bf4fdce0c5 Mon Sep 17 00:00:00 2001 From: Artem Slinkin Date: Wed, 8 Jun 2022 16:43:48 +0500 Subject: [PATCH 3/6] fix: double backpressed on modal screen error --- .../odyssey/compose/controllers/ModalRootController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/controllers/ModalRootController.kt b/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/controllers/ModalRootController.kt index b5429379..47897a61 100644 --- a/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/controllers/ModalRootController.kt +++ b/odyssey/odyssey-compose/src/commonMain/kotlin/ru/alexgladkov/odyssey/compose/controllers/ModalRootController.kt @@ -160,7 +160,7 @@ open class ModalController { _backStack.clear() } - fun isEmpty() = _backStack.isEmpty() + fun isEmpty() = _backStack.none { it.dialogState !is ModalDialogState.Close } private fun redrawStack() { val newStack = ArrayList().apply { From 7e6d272e83ac9288cbdd6fb24cd9b00aa0f6ca42 Mon Sep 17 00:00:00 2001 From: Artem Slinkin Date: Wed, 8 Jun 2022 16:44:09 +0500 Subject: [PATCH 4/6] Increase Version --- buildSrc/buildSrc/src/main/kotlin/Dependencies.kt | 2 +- documentation/GETTING_STARTED.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt index a013f721..051ba575 100644 --- 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-beta08" + val odyssey = "1.0.0-beta09" val odysseyPackage = "io.github.alexgladkov" object DI { diff --git a/documentation/GETTING_STARTED.md b/documentation/GETTING_STARTED.md index c3334a98..6ca86589 100644 --- 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-beta08") // For core classes - implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta08") // For compose extensions + implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta09") // For core classes + implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta09") // For compose extensions } } ``` \ No newline at end of file From cc73273af5100eedda08b958812bd3ab4d0e8b48 Mon Sep 17 00:00:00 2001 From: Alex Gladkov Date: Tue, 14 Jun 2022 10:40:43 +0300 Subject: [PATCH 5/6] Version increase --- buildSrc/buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt index 051ba575..56f1cdf5 100644 --- 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-beta09" + val odyssey = "1.0.0-beta11" val odysseyPackage = "io.github.alexgladkov" object DI { From a7e4e67db1cf05e17f92c12a4ce8d85ef3bcfd71 Mon Sep 17 00:00:00 2001 From: Alex Gladkov Date: Tue, 14 Jun 2022 10:41:18 +0300 Subject: [PATCH 6/6] Read me version increase --- documentation/GETTING_STARTED.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/GETTING_STARTED.md b/documentation/GETTING_STARTED.md index 6ca86589..cd338d13 100644 --- 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-beta09") // For core classes - implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta09") // For compose extensions + implementation("io.github.alexgladkov:odyssey-core:1.0.0-beta11") // For core classes + implementation("io.github.alexgladkov:odyssey-compose:1.0.0-beta11") // For compose extensions } } ``` \ No newline at end of file