diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 920ef7e465b0e91051f7c4e665155b76780211b0..a4029a3f74549f6da9503d7e41abbd93b7707214 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
+
-
+
diff --git a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
index cca12fdb9cc1b3c7029fda61c39ab06beb59d716..37e51becc6439d555dd63bfd3de53fac9aefa4d5 100644
--- a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
@@ -9,7 +9,6 @@ import com.mx.dialog.tip.MXTipDialog
import com.mx.dialog.utils.IMXLifecycle
import com.mx.dialog.utils.MXUtils
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
object MXDialog {
@@ -46,6 +45,7 @@ object MXDialog {
actionButtonText: CharSequence? = null,
cancelButtonText: CharSequence? = null,
cancelable: Boolean = true,
+ cancelableOnTouchOutside: Boolean = true,
maxContentRatio: Float = 1f,
onActionClick: ((confirm: Boolean) -> Unit)? = null
): MXTipDialog {
@@ -54,6 +54,7 @@ object MXDialog {
dialog.setMessage(message)
dialog.setMaxContentRatio(maxContentRatio)
dialog.setCancelable(cancelable)
+ dialog.setCanceledOnTouchOutside(cancelableOnTouchOutside)
dialog.setActionBtn(text = actionButtonText) { onActionClick?.invoke(true) }
if (cancelable) {
dialog.setCancelBtn(text = cancelButtonText) {
@@ -75,17 +76,15 @@ object MXDialog {
actionButtonText: CharSequence? = null,
cancelButtonText: CharSequence? = null,
cancelable: Boolean = true,
+ cancelableOnTouchOutside: Boolean = true,
maxContentRatio: Float = 1f
): Boolean = withContext(Dispatchers.Main) {
var hasConfirm = false
val lock = Object()
confirm(
- context,
- message,
- title,
- actionButtonText,
- cancelButtonText,
- cancelable,
+ context, message, title,
+ actionButtonText, cancelButtonText,
+ cancelable, cancelableOnTouchOutside,
maxContentRatio
) { confirm ->
hasConfirm = confirm
diff --git a/app/build.gradle b/app/build.gradle
index 353793ed8035bb63536f4b64df58be13d3d00bc9..1d9176f49f08b05ac571bd04c62d8435b9a0193d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,13 +35,13 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+ implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
- implementation 'androidx.core:core-ktx:1.8.0'
- implementation 'androidx.appcompat:appcompat:1.5.1'
- implementation 'com.google.android.material:material:1.6.1'
+ implementation 'androidx.core:core-ktx:1.9.0'
+ implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'com.google.android.material:material:1.8.0'
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'com.squareup.okio:okio:2.10.0'
diff --git a/build.gradle b/build.gradle
index e8634cb863a6e2228f87200c08bdd6bad5fd6fdc..db7e90f831c07f7ec85e063ccbdadc49237cf62a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,5 +32,5 @@ ext {
minSdkVersion = 19
versionCode = 1
- versionName = "1.6.1"
+ versionName = "1.6.2"
}
\ No newline at end of file