From 676dcff236925f02b394624758e6e483b15387d7 Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Wed, 28 Sep 2022 15:37:15 +0800
Subject: [PATCH 1/2] 666

---
 LibDialog/build.gradle                   | 1 +
 LibDialog/src/main/AndroidManifest.xml   | 2 +-
 app/build.gradle                         | 1 +
 app/src/main/AndroidManifest.xml         | 3 +--
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/LibDialog/build.gradle b/LibDialog/build.gradle
index 5a923c9..054c9d8 100644
--- a/LibDialog/build.gradle
+++ b/LibDialog/build.gradle
@@ -24,6 +24,7 @@ android {
     kotlinOptions {
         jvmTarget = '11'
     }
+    namespace 'com.mx.dialog'
 }
 afterEvaluate {
     publishing {
diff --git a/LibDialog/src/main/AndroidManifest.xml b/LibDialog/src/main/AndroidManifest.xml
index 43e416b..568741e 100644
--- a/LibDialog/src/main/AndroidManifest.xml
+++ b/LibDialog/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.mx.dialog" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e9c5e04..252a9c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = '11'
     }
+    namespace 'com.mx.example'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d70ab4d..0b408fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mx.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/build.gradle b/build.gradle
index 67b952d..198436f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b891b8a..f0d4593 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 09 13:56:32 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-- 
Gitee


From ffc075b65893390098904ffb48bf2df587acbb55 Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Wed, 12 Oct 2022 14:44:39 +0800
Subject: [PATCH 2/2] 1.5.8

---
 LibDialog/src/main/java/com/mx/dialog/MXDialog.kt     | 4 ++--
 LibDialog/src/main/res/layout/mx_content_loading.xml  | 1 +
 LibDialog/src/main/res/layout/mx_dialog_base_card.xml | 1 +
 LibDialog/src/main/res/layout/mx_dialog_list.xml      | 1 +
 LibDialog/src/main/res/layout/mx_dialog_upgrade.xml   | 1 +
 build.gradle                                          | 2 +-
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
index 7bb7a80..cca12fd 100644
--- a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
@@ -162,7 +162,7 @@ object MXDialog {
         contentMaxHeightRatio: Float = 1f,
         contentRadiusDP: Float = 10f,
         contentMarginDP: Float = 20f,
-        position: MXDialogPosition = MXDialogPosition.CENTER,
+        position: MXDialogPosition = MXDialogPosition.BOTTOM,
         textColor: Int? = null,
         textSizeSP: Float? = null,
         textGravity: Int? = Gravity.LEFT or Gravity.CENTER_VERTICAL,
@@ -198,7 +198,7 @@ object MXDialog {
         contentMaxHeightRatio: Float = 1f,
         contentRadiusDP: Float = 10f,
         contentMarginDP: Float = 20f,
-        position: MXDialogPosition = MXDialogPosition.CENTER,
+        position: MXDialogPosition = MXDialogPosition.BOTTOM,
         textColor: Int? = null,
         textSizeSP: Float? = null,
         textGravity: Int? = Gravity.LEFT or Gravity.CENTER_VERTICAL
diff --git a/LibDialog/src/main/res/layout/mx_content_loading.xml b/LibDialog/src/main/res/layout/mx_content_loading.xml
index e80d714..acd6477 100644
--- a/LibDialog/src/main/res/layout/mx_content_loading.xml
+++ b/LibDialog/src/main/res/layout/mx_content_loading.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:fitsSystemWindows="true"
     android:gravity="center"
     android:orientation="vertical"
     android:paddingHorizontal="30dp"
diff --git a/LibDialog/src/main/res/layout/mx_dialog_base_card.xml b/LibDialog/src/main/res/layout/mx_dialog_base_card.xml
index d49e25c..a915eb1 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_base_card.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_base_card.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mx_dialog_color_background_root"
+    android:fitsSystemWindows="true"
     android:soundEffectsEnabled="false">
 
     <LinearLayout
diff --git a/LibDialog/src/main/res/layout/mx_dialog_list.xml b/LibDialog/src/main/res/layout/mx_dialog_list.xml
index e6c31ae..0f7021b 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_list.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_list.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/mx_dialog_color_background_root"
+    android:fitsSystemWindows="true"
     android:gravity="bottom|center_horizontal"
     android:orientation="vertical"
     android:padding="@dimen/mx_dialog_size_card_corner_radius">
diff --git a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
index ef994cf..2867be5 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:fitsSystemWindows="true"
     android:gravity="center"
     android:orientation="vertical">
 
diff --git a/build.gradle b/build.gradle
index 198436f..f423acd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,5 +34,5 @@ ext {
     minSdkVersion = 19
 
     versionCode = 1
-    versionName = "1.5.7"
+    versionName = "1.5.8"
 }
\ No newline at end of file
-- 
Gitee