From 04b18e41f1838499ad6563b55911c22346f8740d Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Thu, 26 May 2022 15:14:27 +0800
Subject: [PATCH 1/2] 666

---
 .idea/deploymentTargetDropDown.xml              | 17 -----------------
 .../src/main/java/com/mx/dialog/MXDialog.kt     |  2 ++
 LibDialog/src/main/res/values/dimens.xml        |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 3e2289b..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="8KEDU19A11005046" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-05-16T15:49:31.427494400Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
index 4a42bce..0d11250 100644
--- a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
@@ -33,6 +33,7 @@ object MXDialog {
         val dialog = MXTipDialog(context)
         dialog.setTitle(title)
         dialog.setMessage(message)
+        dialog.setMaxContentRatio(1f)
         dialog.setCancelable(cancelable)
         dialog.setActionBtn(text = actionButtonText) { onActionClick?.invoke(true) }
         if (cancelable) {
@@ -64,6 +65,7 @@ object MXDialog {
         dialog.setTitle(title)
         dialog.setMessage(message)
         dialog.setCancelable(true)
+        dialog.setMaxContentRatio(1f)
         dialog.setDismissDelay(dismissDelay)
         dialog.setCancelBtn(visible = false)
 
diff --git a/LibDialog/src/main/res/values/dimens.xml b/LibDialog/src/main/res/values/dimens.xml
index 43b887e..9b2c8ac 100644
--- a/LibDialog/src/main/res/values/dimens.xml
+++ b/LibDialog/src/main/res/values/dimens.xml
@@ -5,7 +5,6 @@
     <dimen name="mx_dialog_text_size_button">15sp</dimen>
     <dimen name="mx_dialog_text_size_title">17sp</dimen>
 
-    <dimen name="mx_dialog_size_divider_small">8dp</dimen>
     <dimen name="mx_dialog_size_divider_normal">12dp</dimen>
     <dimen name="mx_dialog_size_divider_large">20dp</dimen>
 
-- 
Gitee


From 22201b463e69d08ec8bda2aebaab0f8ff2f222a5 Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Thu, 26 May 2022 15:16:21 +0800
Subject: [PATCH 2/2] Update MXDialog.kt

---
 LibDialog/src/main/java/com/mx/dialog/MXDialog.kt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
index 0d11250..595e1cc 100644
--- a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
@@ -19,7 +19,8 @@ object MXDialog {
      * @param title 标题 默认=“温馨提示”
      * @param actionButtonText 确认按钮文字
      * @param cancelButtonText 取消按钮文字
-     * @param onActionClick 操作点击回调
+     * @param onActionClick 操作点击回调、
+     * @param maxContentRatio 内容最大高度比
      */
     fun confirm(
         context: Context,
@@ -28,12 +29,13 @@ object MXDialog {
         actionButtonText: CharSequence? = null,
         cancelButtonText: CharSequence? = null,
         cancelable: Boolean = true,
+        maxContentRatio: Float = 1f,
         onActionClick: ((confirm: Boolean) -> Unit)? = null
     ) {
         val dialog = MXTipDialog(context)
         dialog.setTitle(title)
         dialog.setMessage(message)
-        dialog.setMaxContentRatio(1f)
+        dialog.setMaxContentRatio(maxContentRatio)
         dialog.setCancelable(cancelable)
         dialog.setActionBtn(text = actionButtonText) { onActionClick?.invoke(true) }
         if (cancelable) {
@@ -53,19 +55,20 @@ object MXDialog {
      * @param message 内容
      * @param title 标题
      * @param actionButtonText 活动按钮文字
+     * @param maxContentRatio 内容最大高度比
      * @param dismissDelay x秒后弹窗消失
      * @param dialogType Icon类型
      */
     fun tip(
         context: Context, message: CharSequence, title: CharSequence? = null,
-        actionButtonText: CharSequence? = null,
+        actionButtonText: CharSequence? = null, maxContentRatio: Float = 1f,
         dismissDelay: Int? = null, dialogType: MXDialogType? = null,
     ) {
         val dialog = MXTipDialog(context)
         dialog.setTitle(title)
         dialog.setMessage(message)
         dialog.setCancelable(true)
-        dialog.setMaxContentRatio(1f)
+        dialog.setMaxContentRatio(maxContentRatio)
         dialog.setDismissDelay(dismissDelay)
         dialog.setCancelBtn(visible = false)
 
-- 
Gitee