0.0.50.beta22

- 新增默认文本设置： // 默认消息对话框标题文本 DialogX.defaultMessageDialogTitleText // 等待提示框默认文本 DialogX.defaultWaitDialogWaitingText; // 成功提示框默认文本 DialogX.defaultTipDialogSuccessText; // 错误提示框默认文本 DialogX.defaultTipDialogErrorText; // 警告提示框默认文本 DialogX.defaultTipDialogWarningText; 设置文本后可以在不指定对应对话框的相关文本时直接使用默认文本；对应的对话框静态启动方法省略默认可设置文本的方法也已添加，比如 `MessageDialog.show(messageText)` 或者 `WaitDialog.showWaitWithDefaultText()` 以及 `TipDialog.showTipWithDefaultText(TYPE)` - 修复 PopNotification 在允许同时显示多条通知时，关闭后依然能够接收到触摸事件的问题； - 修复 PopNotification 在 DialogFragment 模式下默认顶部位置异常的问题
kongzue · Oct 22, 2024 · ccc5a91 · ccc5a91
1 parent b846250
commit ccc5a91
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 4 deletions.
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/DialogX.java b/DialogX/src/main/java/com/kongzue/dialogx/DialogX.java
@@ -199,4 +199,19 @@ private static int dip2px(float dpValue) {
     public static DialogListBuilder showDialogList(BaseDialog... dialogs) {
         return DialogListBuilder.create(dialogs).show();
     }
+
+    // 默认消息对话框标题文本
+    public static CharSequence defaultMessageDialogTitleText;
+
+    // 等待提示框默认文本
+    public static CharSequence defaultWaitDialogWaitingText;
+
+    // 成功提示框默认文本
+    public static CharSequence defaultTipDialogSuccessText;
+
+    // 错误提示框默认文本
+    public static CharSequence defaultTipDialogErrorText;
+
+    // 警告提示框默认文本
+    public static CharSequence defaultTipDialogWarningText;
 }
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java
@@ -127,6 +127,10 @@ public static MessageDialog build(OnBindView<MessageDialog> onBindView) {
         return new MessageDialog().setCustomView(onBindView);
     }
 
+    public MessageDialog(CharSequence message) {
+        this.message = message;
+    }
+
     public MessageDialog(CharSequence title, CharSequence message) {
         this.title = title;
         this.message = message;
@@ -640,7 +644,7 @@ public void getOutline(View view, Outline outline) {
                 }
             }
 
-            showText(txtDialogTitle, title);
+            showText(txtDialogTitle, title == null ? DialogX.defaultMessageDialogTitleText : title);
             showText(txtDialogTip, message);
             showText(btnSelectPositive, okText);
             showText(btnSelectNegative, cancelText);

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/TipDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/TipDialog.java
@@ -31,6 +31,10 @@ protected TipDialog() {
         super();
     }
 
+    public static WaitDialog showTipWithDefaultText(TYPE tip) {
+        return WaitDialog.showTipWithDefaultText(tip);
+    }
+
     public static WaitDialog show(int messageResId) {
         return show((Activity) null, messageResId);
     }

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java
@@ -104,6 +104,36 @@ public static WaitDialog build() {
         return new WaitDialog();
     }
 
+    public static WaitDialog showWaitWithDefaultText() {
+        WaitDialog dialog = getInstance();
+        if (dialog != null) {
+            dialog.setTip(null, TYPE.NONE);
+            if (dialog.getDialogImpl() == null) {
+                dialog.show();
+            } else {
+                dialog.cancelDelayDismissTimer();
+            }
+            return dialog;
+        } else {
+            return instanceBuild();
+        }
+    }
+
+    protected static WaitDialog showTipWithDefaultText(TYPE tip) {
+        WaitDialog dialog = getInstance();
+        if (dialog != null) {
+            dialog.setTip(null, tip);
+            if (dialog.getDialogImpl() == null) {
+                dialog.show();
+            } else {
+                dialog.cancelDelayDismissTimer();
+            }
+            return dialog;
+        } else {
+            return instanceBuild();
+        }
+    }
+
     public static WaitDialog show(CharSequence message) {
         WaitDialog dialog = getInstance();
         if (dialog != null) {
@@ -530,7 +560,7 @@ public void getOutline(View view, Outline outline) {
                 }
             }
 
-            showText(txtInfo, message);
+            showText(txtInfo, message == null ? getDefaultTipText(readyTipType) : message);
             useTextInfo(txtInfo, messageTextInfo);
 
             if (maskColor != null) {
@@ -565,6 +595,21 @@ public void onClick(View v) {
             onDialogRefreshUI();
         }
 
+        private CharSequence getDefaultTipText(TYPE readyTipType) {
+            switch (readyTipType) {
+                case WARNING:
+                    return DialogX.defaultTipDialogWarningText;
+                case SUCCESS:
+                    return DialogX.defaultTipDialogSuccessText;
+                case ERROR:
+                    return DialogX.defaultTipDialogErrorText;
+                case NONE:
+                    return DialogX.defaultWaitDialogWaitingText;
+                default:
+                    return null;
+            }
+        }
+
         public void doDismiss(final View v) {
             if (WaitDialog.this.preDismiss(WaitDialog.this)) {
                 return;

diff --git a/app/src/main/java/com/kongzue/dialogxdemo/App.java b/app/src/main/java/com/kongzue/dialogxdemo/App.java
@@ -44,6 +44,8 @@ public ALIGN align() {
         DialogX.onlyOnePopTip = false;
         DialogX.onlyOnePopNotification=false;
         DialogX.DEBUGMODE = BuildConfig.DEBUG;
+        DialogX.defaultWaitDialogWaitingText="hahah";
+        DialogX.defaultTipDialogSuccessText="okok!!!";
         //DialogX.ignoreUnsafeInsetsHorizontal = true;
 
         //以下代码用于测试后台 Service 启动对话框

diff --git a/app/src/main/java/com/kongzue/dialogxdemo/activity/MainActivity.java b/app/src/main/java/com/kongzue/dialogxdemo/activity/MainActivity.java
@@ -1233,7 +1233,7 @@ public boolean onClick(PopTip popTip, View v) {
                             toast("邮件已撤回");
                             return false;
                         }
-                    }).setTintIcon(true).showLong().setAlign(DialogXStyle.PopTipSettings.ALIGN.TOP);
+                    }).setTintIcon(true).showLong();
                 }
             }
         });

diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.50.beta21
+BUILD_VERSION=0.0.50.beta22
 BUILD_VERSION_INT=50
 DIALOGX_STYLE_VERSION=5
 android.nonTransitiveRClass=true