diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 3e2289b3b8cd381f675ad40210aa9673b0514721..0000000000000000000000000000000000000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ 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 4a42bce5769b0b488b9e2f35ac040c9684a1be94..595e1cc956ed586960d2217f8ab68aaa65ca303b 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,11 +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(maxContentRatio) dialog.setCancelable(cancelable) dialog.setActionBtn(text = actionButtonText) { onActionClick?.invoke(true) } if (cancelable) { @@ -52,18 +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(maxContentRatio) 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 43b887e4dbd5582f7c0d24306dd397f3ba1dd0cb..9b2c8ac540601f1be106c3ca90d4318e4d645eca 100644 --- a/LibDialog/src/main/res/values/dimens.xml +++ b/LibDialog/src/main/res/values/dimens.xml @@ -5,7 +5,6 @@ 15sp 17sp - 8dp 12dp 20dp