update 0.0.27 ver.

DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -52,6 +52,7 @@ import com.kongzue.dialogx.util.views.MaxRelativeLayout;
  */
 public class BottomDialog extends BaseDialog {
     
+    public static BOOLEAN overrideCancelable;
     protected OnBindView<BottomDialog> onBindView;
     protected CharSequence title;
     protected CharSequence message;
@@ -177,7 +178,7 @@ public class BottomDialog extends BaseDialog {
         
         dialogView = createView(layoutId);
         dialogImpl = new DialogImpl(dialogView);
-        dialogView.setTag(getClass().getSimpleName() + "(" +Integer.toHexString(hashCode()) + ")");
+        dialogView.setTag(getClass().getSimpleName() + "(" + Integer.toHexString(hashCode()) + ")");
         show(dialogView);
     }
     
@@ -190,7 +191,7 @@ public class BottomDialog extends BaseDialog {
         
         dialogView = createView(layoutId);
         dialogImpl = new DialogImpl(dialogView);
-        dialogView.setTag(getClass().getSimpleName() + "(" +Integer.toHexString(hashCode()) + ")");
+        dialogView.setTag(getClass().getSimpleName() + "(" + Integer.toHexString(hashCode()) + ")");
         show(activity, dialogView);
     }
     
@@ -373,7 +374,7 @@ public class BottomDialog extends BaseDialog {
                         dismiss();
                         return false;
                     }
-                    if (cancelable) {
+                    if (isCancelable()) {
                         dismiss();
                     }
                     return false;
@@ -432,7 +433,7 @@ public class BottomDialog extends BaseDialog {
             useTextInfo(btnSelectOther, otherTextInfo);
             useTextInfo(btnSelectPositive, okTextInfo);
             
-            if (cancelable) {
+            if (isCancelable()) {
                 boxRoot.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -442,7 +443,13 @@ public class BottomDialog extends BaseDialog {
             } else {
                 boxRoot.setOnClickListener(null);
             }
-    
+            boxBkg.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    boxRoot.callOnClick();
+                }
+            });
+            
             if (maskColor != -1) boxRoot.setBackgroundColor(maskColor);
             
             if (onBindView != null) {
@@ -456,7 +463,7 @@ public class BottomDialog extends BaseDialog {
                 }
             }
             
-            if (isAllowInterceptTouch() && cancelable) {
+            if (isAllowInterceptTouch() && isCancelable()) {
                 if (imgTab != null) imgTab.setVisibility(View.VISIBLE);
             } else {
                 if (imgTab != null) imgTab.setVisibility(View.GONE);
@@ -505,7 +512,7 @@ public class BottomDialog extends BaseDialog {
         }
         
         public void preDismiss() {
-            if (cancelable) {
+            if (isCancelable()) {
                 doDismiss(boxRoot);
             } else {
                 ObjectAnimator enterAnim = ObjectAnimator.ofFloat(bkg, "y", bkg.getY(), bkgEnterAimY);
@@ -564,6 +571,9 @@ public class BottomDialog extends BaseDialog {
     }
     
     public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
         return cancelable;
     }
     

DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java

@@ -610,6 +610,9 @@ public class BottomMenu extends BottomDialog {
     }
     
     public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
         return cancelable;
     }
     

DialogX/src/main/java/com/kongzue/dialogx/dialogs/CustomDialog.java

@@ -33,6 +33,7 @@ import com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout;
  */
 public class CustomDialog extends BaseDialog {
     
+    public static BOOLEAN overrideCancelable;
     protected OnBindView<CustomDialog> onBindView;
     protected DialogLifecycleCallback<CustomDialog> dialogLifecycleCallback;
     protected CustomDialog me = this;
@@ -79,7 +80,7 @@ public class CustomDialog extends BaseDialog {
         super.beforeShow();
         dialogView = createView(R.layout.layout_dialogx_custom);
         dialogImpl = new DialogImpl(dialogView);
-        dialogView.setTag(getClass().getSimpleName() + "(" +Integer.toHexString(hashCode()) + ")");
+        dialogView.setTag(getClass().getSimpleName() + "(" + Integer.toHexString(hashCode()) + ")");
         show(dialogView);
     }
     
@@ -87,7 +88,7 @@ public class CustomDialog extends BaseDialog {
         super.beforeShow();
         dialogView = createView(R.layout.layout_dialogx_custom);
         dialogImpl = new DialogImpl(dialogView);
-        dialogView.setTag(getClass().getSimpleName() + "(" +Integer.toHexString(hashCode()) + ")");
+        dialogView.setTag(getClass().getSimpleName() + "(" + Integer.toHexString(hashCode()) + ")");
         show(activity, dialogView);
     }
     
@@ -131,7 +132,7 @@ public class CustomDialog extends BaseDialog {
                         dismiss();
                         return false;
                     }
-                    if (cancelable) {
+                    if (isCancelable()) {
                         dismiss();
                     }
                     return false;
@@ -189,7 +190,7 @@ public class CustomDialog extends BaseDialog {
         @Override
         public void refreshView() {
             boxRoot.setAutoUnsafePlacePadding(autoUnsafePlacePadding);
-            if (cancelable) {
+            if (isCancelable()) {
                 boxRoot.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -276,6 +277,9 @@ public class CustomDialog extends BaseDialog {
     }
     
     public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
         return cancelable;
     }
     

DialogX/src/main/java/com/kongzue/dialogx/dialogs/FullScreenDialog.java

@@ -44,6 +44,7 @@ import com.kongzue.dialogx.util.views.MaxRelativeLayout;
  */
 public class FullScreenDialog extends BaseDialog {
     
+    public static BOOLEAN overrideCancelable;
     protected OnBindView<FullScreenDialog> onBindView;
     
     protected DialogLifecycleCallback<FullScreenDialog> dialogLifecycleCallback;
@@ -137,7 +138,7 @@ public class FullScreenDialog extends BaseDialog {
                         dismiss();
                         return false;
                     }
-                    if (cancelable) {
+                    if (isCancelable()) {
                         dismiss();
                     }
                     return false;
@@ -190,7 +191,7 @@ public class FullScreenDialog extends BaseDialog {
                 tintColor(bkg, backgroundColor);
             }
             
-            if (cancelable) {
+            if (isCancelable()) {
                 boxRoot.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -232,7 +233,7 @@ public class FullScreenDialog extends BaseDialog {
         }
         
         public void preDismiss() {
-            if (cancelable) {
+            if (isCancelable()) {
                 doDismiss(boxRoot);
             } else {
                 ObjectAnimator enterAnim = ObjectAnimator.ofFloat(bkg, "y", bkg.getY(), bkgEnterAimY);
@@ -288,6 +289,9 @@ public class FullScreenDialog extends BaseDialog {
     }
     
     public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
         return cancelable;
     }
     

DialogX/src/main/java/com/kongzue/dialogx/dialogs/InputDialog.java

@@ -428,6 +428,9 @@ public class InputDialog extends MessageDialog {
     }
     
     public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
         return cancelable;
     }
     

DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java

@@ -49,6 +49,7 @@ import com.kongzue.dialogx.util.TextInfo;
  */
 public class MessageDialog extends BaseDialog {
     
+    public static BOOLEAN overrideCancelable;
     protected OnBindView<MessageDialog> onBindView;
     protected MessageDialog me = this;
     
@@ -326,7 +327,7 @@ public class MessageDialog extends BaseDialog {
                         dismiss();
                         return false;
                     }
-                    if (cancelable) {
+                    if (isCancelable()) {
                         dismiss();
                     }
                     return false;
@@ -583,7 +584,7 @@ public class MessageDialog extends BaseDialog {
             }
             
             //Events
-            if (cancelable) {
+            if (isCancelable()) {
                 boxRoot.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -874,6 +875,9 @@ public class MessageDialog extends BaseDialog {
     }
     
     public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
         return cancelable;
     }
     

DialogX/src/main/java/com/kongzue/dialogx/dialogs/TipDialog.java

@@ -1,5 +1,7 @@
 package com.kongzue.dialogx.dialogs;
 
+import com.kongzue.dialogx.interfaces.DialogLifecycleCallback;
+
 import java.lang.ref.WeakReference;
 
 /**

DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -41,6 +41,7 @@ import java.lang.ref.WeakReference;
  */
 public class WaitDialog extends BaseDialog {
     
+    public static BOOLEAN overrideCancelable;
     protected OnBindView<WaitDialog> onBindView;
     
     public enum TYPE {
@@ -59,6 +60,7 @@ public class WaitDialog extends BaseDialog {
     protected int maskColor = -1;
     
     private DialogLifecycleCallback<WaitDialog> dialogLifecycleCallback;
+    protected DialogLifecycleCallback<WaitDialog> tipDialogLifecycleCallback;
     
     protected WaitDialog() {
         super();
@@ -162,7 +164,7 @@ public class WaitDialog extends BaseDialog {
         super.beforeShow();
         dialogView = createView(R.layout.layout_dialogx_wait);
         dialogImpl = new DialogImpl(dialogView);
-        dialogView.setTag(getClass().getSimpleName() + "(" +Integer.toHexString(hashCode()) + ")");
+        dialogView.setTag(getClass().getSimpleName() + "(" + Integer.toHexString(hashCode()) + ")");
         show(dialogView);
         return this;
     }
@@ -171,7 +173,7 @@ public class WaitDialog extends BaseDialog {
         super.beforeShow();
         dialogView = createView(R.layout.layout_dialogx_wait);
         dialogImpl = new DialogImpl(dialogView);
-        dialogView.setTag(getClass().getSimpleName() + "(" +Integer.toHexString(hashCode()) + ")");
+        dialogView.setTag(getClass().getSimpleName() + "(" + Integer.toHexString(hashCode()) + ")");
         show(activity, dialogView);
         return this;
     }
@@ -259,7 +261,7 @@ public class WaitDialog extends BaseDialog {
                         dismiss();
                         return false;
                     }
-                    if (cancelable) {
+                    if (isCancelable()) {
                         dismiss();
                     }
                     return false;
@@ -364,6 +366,7 @@ public class WaitDialog extends BaseDialog {
             progressView.whenShowTick(new Runnable() {
                 @Override
                 public void run() {
+                    getTipDialogLifecycleCallback().onShow(WaitDialog.this);
                     refreshView();
                     ((View) progressView).postDelayed(new Runnable() {
                         @Override
@@ -424,6 +427,7 @@ public class WaitDialog extends BaseDialog {
         showType = type.ordinal();
         this.message = getString(messageResId);
         readyTipType = type;
+        setDialogLifecycleCallback(tipDialogLifecycleCallback);
         show();
     }
     
@@ -443,6 +447,13 @@ public class WaitDialog extends BaseDialog {
         return me();
     }
     
+    public boolean isCancelable() {
+        if (overrideCancelable != null && overrideCancelable != BOOLEAN.NONE) {
+            return overrideCancelable == BOOLEAN.TRUE;
+        }
+        return cancelable;
+    }
+    
     /**
      * 用于从 WaitDialog 到 TipDialog 的消息设置
      * 此方法不会立即执行，而是等到动画衔接完成后由事件设置
@@ -522,4 +533,14 @@ public class WaitDialog extends BaseDialog {
         refreshUI();
         return this;
     }
+    
+    public DialogLifecycleCallback<WaitDialog> getTipDialogLifecycleCallback() {
+        return tipDialogLifecycleCallback == null ? new DialogLifecycleCallback<WaitDialog>() {
+        } : tipDialogLifecycleCallback;
+    }
+    
+    public WaitDialog setTipDialogLifecycleCallback(DialogLifecycleCallback<WaitDialog> dialogLifecycleCallback) {
+        this.tipDialogLifecycleCallback = dialogLifecycleCallback;
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java

@@ -239,4 +239,8 @@ public class BaseDialog {
         }
         return getContext().getResources().getColor(backgroundRes);
     }
+    
+    public enum BOOLEAN {
+        NONE, TRUE, FALSE
+    }
 }

DialogX/src/main/res/layout/layout_dialogx_poptip_material.xml

@@ -10,8 +10,6 @@
         android:id="@+id/box_body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="50dp"
-        android:paddingVertical="10dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginHorizontal="35dp"
@@ -19,20 +17,22 @@
         android:background="@drawable/rect_dialogx_material_poptip_bkg"
         android:elevation="20dp"
         android:gravity="center_vertical"
+        android:minHeight="50dp"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/img_dialogx_pop_icon"
             android:layout_width="26dp"
             android:layout_height="26dp"
-            android:visibility="gone"
             android:layout_marginLeft="15dp"
-            android:layout_marginRight="-5dp"/>
+            android:layout_marginRight="-5dp"
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/txt_dialogx_pop_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginVertical="10dp"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
             android:gravity="left|center_vertical"
@@ -50,16 +50,17 @@
             android:id="@+id/txt_dialogx_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginHorizontal="5dp"
             android:layout_marginVertical="5dp"
+            android:layout_marginLeft="-15dp"
+            android:layout_marginRight="5dp"
             android:background="@drawable/button_dialogx_material_light"
             android:gravity="left|center_vertical"
             android:paddingHorizontal="10dp"
             android:singleLine="true"
+            android:visibility="gone"
             android:text="Dismiss"
             android:textColor="@color/dialogxColorBlue"
-            android:textSize="14dp"
-            android:visibility="gone" />
+            android:textSize="14dp" />
 
     </LinearLayout>
 

DialogX/src/main/res/layout/layout_dialogx_poptip_material_dark.xml

@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/box_body"
         android:layout_width="wrap_content"
-        android:layout_height="50dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginHorizontal="35dp"
@@ -17,6 +17,7 @@
         android:background="@drawable/rect_dialogx_material_poptip_bkg_night"
         android:elevation="10dp"
         android:gravity="center_vertical"
+        android:minHeight="50dp"
         android:orientation="horizontal">
 
         <ImageView
@@ -31,8 +32,7 @@
             android:id="@+id/txt_dialogx_pop_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minHeight="50dp"
-            android:paddingVertical="10dp"
+            android:layout_marginVertical="10dp"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
             android:gravity="left|center_vertical"
@@ -50,8 +50,9 @@
             android:id="@+id/txt_dialogx_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginHorizontal="5dp"
             android:layout_marginVertical="5dp"
+            android:layout_marginLeft="-15dp"
+            android:layout_marginRight="5dp"
             android:background="@drawable/button_dialogx_material_night"
             android:gravity="left|center_vertical"
             android:paddingHorizontal="10dp"

DialogXKongzueStyle/src/main/res/drawable/button_dialogx_kongzue_night.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:exitFadeDuration="100">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/dialogxKongzueDarkButtonBkgColorPress" android:state_pressed="true" />
     <item android:drawable="@color/dialogxKongzueDarkButtonBkgColor" android:state_focused="false" />
 </selector>

DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml

@@ -56,7 +56,8 @@
                             android:gravity="left"
                             android:paddingTop="5dp"
                             android:paddingBottom="10dp"
-                            android:layout_marginHorizontal="20dp"
+                            android:layout_marginVertical="10dp"
+                            android:layout_marginHorizontal="25dp"
                             android:text="This is content text."
                             android:textColor="@color/black70"
                             android:textSize="14dp" />
@@ -75,7 +76,6 @@
                             android:layout_gravity="center_horizontal"
                             android:layout_marginHorizontal="20dp"
                             android:visibility="gone"
-                            android:layout_marginTop="10dp"
                             android:layout_marginBottom="15dp"
                             android:paddingTop="10dp"
                             android:maxLines="1"

DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue_dark.xml

@@ -54,7 +54,8 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:gravity="left"
-                            android:layout_marginHorizontal="20dp"
+                            android:layout_marginVertical="10dp"
+                            android:layout_marginHorizontal="25dp"
                             android:paddingTop="5dp"
                             android:paddingBottom="10dp"
                             android:text="This is content text."
@@ -73,7 +74,6 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_marginHorizontal="20dp"
-                            android:layout_marginTop="10dp"
                             android:layout_marginBottom="15dp"
                             android:background="@drawable/editbox_dialogx_kongzue_night"
                             android:inputType="text"

DialogXKongzueStyle/src/main/res/values/colors.xml

@@ -37,8 +37,8 @@
     <color name="dialogxKongzueLightOtherButtonBkgColor">#F4F5F6</color>
     <color name="dialogxKongzueLightOtherButtonBkgColorPress">#E6E8EA</color>
     <color name="dialogxKongzueDarkBkgColor">#181818</color>
-    <color name="dialogxKongzueDarkButtonBkgColor">#272727</color>
-    <color name="dialogxKongzueDarkButtonBkgColorPress">#33363B</color>
+    <color name="dialogxKongzueDarkButtonBkgColor">#0DFFFFFF</color>
+    <color name="dialogxKongzueDarkButtonBkgColorPress">#1AFFFFFF</color>
     <color name="dialogxKongzueButtonSplitSpaceColor">#0D000000</color>
     <color name="dialogxKongzueButtonSplitLineColor">#26000000</color>
     <color name="dialogxKongzueDarkDialogBkgColor">#343434</color>

app/src/main/java/com/kongzue/dialogxdemo/MainActivity.java

@@ -231,7 +231,7 @@ public class MainActivity extends BaseActivity {
         btnMessageDialog.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                MessageDialog.show("标题", "正文内容", "确定").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
+                MessageDialog.show("自动切换回源输入法", "自动切换回源输入法自动切换回源输入法自动切换回源输入法自动切换回源输入法", "确定").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
                     @Override
                     public boolean onClick(MessageDialog baseDialog, View v) {
                         PopTip.show("点击确定按钮");

gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.26
-BUILD_VERSION_INT=26
+BUILD_VERSION=0.0.27
+BUILD_VERSION_INT=27