0.0.35 update

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

@@ -491,7 +491,7 @@ public class MessageDialog extends BaseDialog {
             }
             
             if (splitHorizontal != null) {
-                splitHorizontal.setBackgroundColor(style.splitColorRes(isLightTheme()));
+                splitHorizontal.setBackgroundColor(getColor(style.splitColorRes(isLightTheme())));
             }
             
             boxButton.setOrientation(buttonOrientation);

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

@@ -420,6 +420,7 @@ public class PopTip extends BaseDialog {
                 case BOTTOM:
                     rlp.removeRule(RelativeLayout.CENTER_IN_PARENT);
                     rlp.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+                    boxRoot.setAutoUnsafePlacePadding(true);
                     break;
                 case CENTER:
                     rlp.removeRule(RelativeLayout.ALIGN_PARENT_TOP);

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

@@ -243,7 +243,11 @@ public class WaitDialog extends BaseDialog {
     
     public WaitDialog show() {
         super.beforeShow();
-        dialogView = createView(R.layout.layout_dialogx_wait);
+        int layoutResId = R.layout.layout_dialogx_wait;
+        if (style.overrideWaitTipRes() != null && style.overrideWaitTipRes().overrideWaitLayout(isLightTheme()) != 0) {
+            layoutResId = style.overrideWaitTipRes().overrideWaitLayout(isLightTheme());
+        }
+        dialogView = createView(layoutResId);
         dialogImpl = new DialogImpl(dialogView);
         dialogView.setTag(dialogKey());
         show(dialogView);
@@ -252,7 +256,11 @@ public class WaitDialog extends BaseDialog {
     
     public WaitDialog show(Activity activity) {
         super.beforeShow();
-        dialogView = createView(R.layout.layout_dialogx_wait);
+        int layoutResId = R.layout.layout_dialogx_wait;
+        if (style.overrideWaitTipRes() != null && style.overrideWaitTipRes().overrideWaitLayout(isLightTheme()) != 0) {
+            layoutResId = style.overrideWaitTipRes().overrideWaitLayout(isLightTheme());
+        }
+        dialogView = createView(layoutResId);
         dialogImpl = new DialogImpl(dialogView);
         dialogView.setTag(dialogKey());
         show(activity, dialogView);
@@ -291,7 +299,11 @@ public class WaitDialog extends BaseDialog {
             if (messageTextInfo == null) messageTextInfo = DialogX.tipTextInfo;
             if (backgroundColor == -1) backgroundColor = DialogX.tipBackgroundColor;
             
-            blurView.setRadiusPx(dip2px(15));
+            if (style.overrideWaitTipRes() == null) {
+                blurView.setRadiusPx(dip2px(15));
+            } else {
+                blurView.setRadiusPx(style.overrideWaitTipRes().overrideRadiusPx() < 0 ? dip2px(15) : style.overrideWaitTipRes().overrideRadiusPx());
+            }
             boxRoot.setClickable(true);
             
             boxRoot.setParentDialog(me.get());
@@ -440,38 +452,43 @@ public class WaitDialog extends BaseDialog {
             });
         }
         
-        public void showTip(TYPE tip) {
-            showType = tip.ordinal();
-            if (progressView == null) return;
-            switch (tip) {
-                case NONE:
-                    progressView.loading();
-                    return;
-                case SUCCESS:
-                    progressView.success();
-                    break;
-                case WARNING:
-                    progressView.warning();
-                    break;
-                case ERROR:
-                    progressView.error();
-                    break;
-            }
-            
-            //此事件是在完成衔接动画绘制后执行的逻辑
-            progressView.whenShowTick(new Runnable() {
+        public void showTip(final TYPE tip) {
+            getMainHandler().post(new Runnable() {
                 @Override
                 public void run() {
-                    getDialogLifecycleCallback().onShow(WaitDialog.this);
-                    refreshView();
-                    ((View) progressView).postDelayed(new Runnable() {
+                    showType = tip.ordinal();
+                    if (progressView == null) return;
+                    switch (tip) {
+                        case NONE:
+                            progressView.loading();
+                            return;
+                        case SUCCESS:
+                            progressView.success();
+                            break;
+                        case WARNING:
+                            progressView.warning();
+                            break;
+                        case ERROR:
+                            progressView.error();
+                            break;
+                    }
+                    
+                    //此事件是在完成衔接动画绘制后执行的逻辑
+                    progressView.whenShowTick(new Runnable() {
                         @Override
                         public void run() {
-                            if (showType > -1) {
-                                doDismiss(null);
-                            }
+                            getDialogLifecycleCallback().onShow(WaitDialog.this);
+                            refreshView();
+                            ((View) progressView).postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    if (showType > -1) {
+                                        doDismiss(null);
+                                    }
+                                }
+                            }, tipShowDuration);
                         }
-                    }, tipShowDuration);
+                    });
                 }
             });
         }
@@ -670,7 +687,7 @@ public class WaitDialog extends BaseDialog {
         refreshUI();
     }
     
-    public static WaitDialog getInstance(){
+    public static WaitDialog getInstance() {
         return me();
     }
 }

DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java

@@ -103,6 +103,16 @@ public class MaterialStyle implements DialogXStyle {
     @Override
     public WaitTipRes overrideWaitTipRes() {
         return new WaitTipRes() {
+            @Override
+            public int overrideWaitLayout(boolean light) {
+                return R.layout.layout_dialogx_wait;
+            }
+            
+            @Override
+            public int overrideRadiusPx() {
+                return -1;
+            }
+            
             @Override
             public boolean blurBackground() {
                 return false;

DialogX/src/main/java/com/kongzue/dialogx/util/views/BlurView.java

@@ -340,7 +340,7 @@ public class BlurView extends View {
         if (!useBlur) {
             Paint cutPaint = new Paint();
             cutPaint.setAntiAlias(true);
-            cutPaint.setColor(removeAlphaColor(mOverlayColor));
+            cutPaint.setColor(mOverlayColor);
             mRectF.right = getWidth();
             mRectF.bottom = getHeight();
             canvas.drawRoundRect(mRectF, mRadius, mRadius, cutPaint);

DialogX/src/main/java/com/kongzue/dialogx/util/views/DialogXBaseRelativeLayout.java

@@ -3,6 +3,7 @@ package com.kongzue.dialogx.util.views;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.os.Build;
 import android.util.AttributeSet;
@@ -38,40 +39,48 @@ public class DialogXBaseRelativeLayout extends RelativeLayout {
     private OnSafeInsetsChangeListener onSafeInsetsChangeListener;
     private BaseDialog parentDialog;
     private boolean autoUnsafePlacePadding = true;
+    private boolean focusable = true;
     
     private OnLifecycleCallBack onLifecycleCallBack;
     private OnBackPressedListener onBackPressedListener;
     
     public DialogXBaseRelativeLayout(Context context) {
         super(context);
-        init();
+        init(null);
     }
     
     public DialogXBaseRelativeLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init();
+        init(attrs);
     }
     
     public DialogXBaseRelativeLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init();
+        init(attrs);
     }
     
     public DialogXBaseRelativeLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        init();
+        init(attrs);
     }
     
     private boolean isInited = false;
     
-    private void init() {
+    private void init(AttributeSet attrs) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             setForceDarkAllowed(false);
         }
-        if (!isInited) {
-            setFocusable(true);
-            setFocusableInTouchMode(true);
-            requestFocus();
+        if (!isInited ) {
+            if (attrs != null) {
+                TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.DialogXBaseRelativeLayout);
+                focusable = a.getBoolean(R.styleable.DialogXBaseRelativeLayout_baseFocusable, true);
+                a.recycle();
+            }
+            if (focusable) {
+                setFocusable(true);
+                setFocusableInTouchMode(true);
+                requestFocus();
+            }
         }
     }
     

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

@@ -4,7 +4,8 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:baseFocusable="false">
 
     <LinearLayout
         android:id="@+id/box_body"

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

@@ -4,7 +4,8 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:baseFocusable="false">
 
     <LinearLayout
         android:id="@+id/box_body"

DialogX/src/main/res/values/attrs.xml

@@ -19,4 +19,10 @@
         <attr name="progressStrokeWidth" format="dimension"/>
         <attr name="progressStrokeColor" format="color"/>
     </declare-styleable>
+
+    <declare-styleable name="DialogXBaseRelativeLayout">
+        <attr name="baseFocusable" format="boolean"/>
+    </declare-styleable>
+
+
 </resources>

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

@@ -33,8 +33,8 @@
     <color name="dialogxColorBlue">#2196F3</color>
 
     <color name="dialogxMaterialDarkDialogBkgColor">#343434</color>
-    <color name="dialogxWaitBkgLight">#CCF4F5F6</color>
-    <color name="dialogxWaitBkgDark">#D1161616</color>
+    <color name="dialogxWaitBkgLight">#F5F6F7</color>
+    <color name="dialogxWaitBkgDark">#232323</color>
 
     <color name="dialogxPopButtonBlueDark">#86B3D6</color>
 </resources>

DialogXIOSStyle/src/main/java/com/kongzue/dialogx/style/IOSStyle.java

@@ -128,6 +128,16 @@ public class IOSStyle implements DialogXStyle {
     @Override
     public WaitTipRes overrideWaitTipRes() {
         return new WaitTipRes() {
+            @Override
+            public int overrideWaitLayout(boolean light) {
+                return 0;
+            }
+            
+            @Override
+            public int overrideRadiusPx() {
+                return -1;
+            }
+            
             @Override
             public boolean blurBackground() {
                 return true;
@@ -135,14 +145,14 @@ public class IOSStyle implements DialogXStyle {
             
             @Override
             public int overrideBackgroundColorRes(boolean light) {
-                return 0;
+                return light ? R.color.dialogxIOSWaitBkgDark : R.color.dialogxIOSWaitBkgLight;
             }
             
             @Override
             public int overrideTextColorRes(boolean light) {
-                return light ? R.color.white : R.color.black;
+                return 0;
             }
-    
+            
             @Override
             public ProgressViewInterface overrideWaitView(Context context, boolean light) {
                 return new ProgressView(context).setLightMode(light);
@@ -205,12 +215,12 @@ public class IOSStyle implements DialogXStyle {
                     }
                 }
             }
-    
+            
             @Override
             public int overrideSelectionMenuBackgroundColor(boolean light) {
                 return 0;
             }
-    
+            
             @Override
             public boolean selectionImageTint(boolean light) {
                 return true;
@@ -228,7 +238,7 @@ public class IOSStyle implements DialogXStyle {
         return new PopTipSettings() {
             @Override
             public int layout(boolean light) {
-                return light?R.layout.layout_dialogx_poptip_ios :R.layout.layout_dialogx_poptip_ios_dark;
+                return light ? R.layout.layout_dialogx_poptip_ios : R.layout.layout_dialogx_poptip_ios_dark;
             }
             
             @Override

DialogXIOSStyle/src/main/res/layout/layout_dialogx_poptip_ios.xml

@@ -4,7 +4,8 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:baseFocusable="false">
 
     <LinearLayout
         android:id="@+id/box_body"

DialogXIOSStyle/src/main/res/layout/layout_dialogx_poptip_ios_dark.xml

@@ -4,7 +4,8 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:baseFocusable="false">
 
     <LinearLayout
         android:id="@+id/box_body"

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

@@ -43,4 +43,7 @@
     <color name="dialogxIOSTipTextDark">#9AA8B9</color>
     <color name="dialogxIOSBlueDark">#8AB4F8</color>
     <color name="dialogxIOSDarkDialogBkgColor">#262727</color>
+
+    <color name="dialogxIOSWaitBkgLight">#CCF4F5F6</color>
+    <color name="dialogxIOSWaitBkgDark">#D1161616</color>
 </resources>

DialogXInterface/src/main/java/com/kongzue/dialogx/interfaces/DialogXStyle.java

@@ -4,7 +4,7 @@ import android.content.Context;
 
 public interface DialogXStyle {
     
-    int styleVer = 1;
+    int styleVer = 2;
     
     int BUTTON_OK = 1;
     int BUTTON_CANCEL = 2;
@@ -66,6 +66,10 @@ public interface DialogXStyle {
     }
     
     interface WaitTipRes {
+    
+        int overrideWaitLayout(boolean light);
+        
+        int overrideRadiusPx();
         
         boolean blurBackground();
         

DialogXKongzueStyle/src/main/java/com/kongzue/dialogx/style/KongzueStyle.java

@@ -72,6 +72,16 @@ public class KongzueStyle implements DialogXStyle {
     @Override
     public WaitTipRes overrideWaitTipRes() {
         return new WaitTipRes() {
+            @Override
+            public int overrideWaitLayout(boolean light) {
+                return 0;
+            }
+    
+            @Override
+            public int overrideRadiusPx() {
+                return -1;
+            }
+            
             @Override
             public boolean blurBackground() {
                 return false;

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

@@ -4,7 +4,8 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:baseFocusable="false">
 
     <LinearLayout
         android:id="@+id/box_body"

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

@@ -4,7 +4,8 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:baseFocusable="false">
 
     <LinearLayout
         android:id="@+id/box_body"

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

@@ -46,6 +46,9 @@
     <color name="dialogxKongzueDarkButtonMenuBackgroundColor">#0DFFFFFF</color>
     <color name="dialogxKongzueDarkButtonSplitLineColor">#26FFFFFF</color>
 
+    <color name="dialogxWaitBkgLight">#F5F6F7</color>
+    <color name="dialogxWaitBkgDark">#3F3F3F</color>
+
     <color name="dialogxPopButtonBlueDark">#86B3D6</color>
     <color name="dialogxKongzuePopDarkBkgColor">#343434</color>
 

DialogXMIUIStyle/src/main/java/com/kongzue/dialogx/style/MIUIStyle.java

@@ -72,6 +72,16 @@ public class MIUIStyle implements DialogXStyle {
     @Override
     public WaitTipRes overrideWaitTipRes() {
         return new WaitTipRes() {
+            @Override
+            public int overrideWaitLayout(boolean light) {
+                return 0;
+            }
+    
+            @Override
+            public int overrideRadiusPx() {
+                return -1;
+            }
+            
             @Override
             public boolean blurBackground() {
                 return false;

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

@@ -49,4 +49,7 @@
     <color name="dialogxMIUIItemSelectionBkg">#1A0C84FF</color>
     <color name="dialogxMIUIItemSelectionBkgDark">#6282BA</color>
 
+    <color name="dialogxWaitBkgLight">#F5F6F7</color>
+    <color name="dialogxWaitBkgDark">#3F3F3F</color>
+
 </resources>

README.md

@@ -108,7 +108,7 @@ DialogX 采用了主题分离结构，主框架仅包含 Material 设计风格
 想要在您的项目引入 DialogX，您需要在 app 的 build.gradle 文件中找到 `dependencies{}` 代码块，并在其中加入以下语句：
 
 ```
-implementation 'com.kongzue.dialogx:DialogX:0.0.34'
+implementation 'com.kongzue.dialogx:DialogX:0.0.35'
 ```
 
 ### 方式二：Gradle 引入  jitPack 源
@@ -128,7 +128,7 @@ allprojects {
 2) 在 app 的 build.gradle 文件中找到 `dependencies{}` 代码块，并在其中加入以下语句：
 
 ```
-implementation 'com.github.kongzue.dialogx:DialogX:0.0.34'
+implementation 'com.github.kongzue.dialogx:DialogX:0.0.35'
 ```
 
 ### 方式三：直接引入 AAR 包文件
@@ -155,7 +155,7 @@ implementation(name: 'AAR文件名', ext: 'aar')
 <dependency>
   <groupId>com.kongzue.dialogx</groupId>
   <artifactId>DialogX</artifactId>
-  <version>0.0.34</version>
+  <version>0.0.35</version>
   <type>pom</type>
 </dependency>
 ```

app/build.gradle

@@ -29,11 +29,13 @@ repositories {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.kongzue.baseframeworkx:baseframework:6.7.7'
+    implementation 'com.kongzue.baseframeworkx:baseframework:6.7.9'
 
-    implementation 'com.kongzue.dialogx.style.ios:DialogXIOSStyle:0.0.33'
-    implementation 'com.kongzue.dialogx.style.kongzue:DialogXKongzueStyle:0.0.33'
-    implementation 'com.kongzue.dialogx.style.miui:DialogXMIUIStyle:0.0.33'
+    implementation 'com.kongzue.dialogx.style.ios:DialogXIOSStyle:0.0.35'
+    implementation 'com.kongzue.dialogx.style.kongzue:DialogXKongzueStyle:0.0.35'
+    implementation 'com.kongzue.dialogx.style.miui:DialogXMIUIStyle:0.0.35'
+
+    implementation 'com.github.kongzue:DialogXStyle-Snackbar:1.0.3'
 
     implementation project(path: ':DialogX')
 }

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

@@ -1,9 +1,13 @@
 package com.kongzue.dialogxdemo;
 
+import android.content.Context;
+
 import com.kongzue.baseframework.BaseApp;
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.dialogs.CustomDialog;
+import com.kongzue.dialogx.interfaces.ProgressViewInterface;
 import com.kongzue.dialogx.style.MaterialStyle;
+import com.kongzue.dialogx.util.views.ProgressView;
 
 /**
  * @author: Kongzue
@@ -16,7 +20,34 @@ public class App extends BaseApp<App> {
     @Override
     public void init() {
         DialogX.init(this);
-        DialogX.globalStyle = CustomStyle.style();
+        DialogX.globalStyle = new MaterialStyle()
+//        {
+//            @Override
+//            public PopTipSettings popTipSettings() {
+//                return new PopTipSettings() {
+//                    @Override
+//                    public int layout(boolean light) {
+//                        return light?R.layout.layout_dialogx_poptip_snackbar:R.layout.layout_dialogx_poptip_snackbar_dark;
+//                    }
+//
+//                    @Override
+//                    public ALIGN align() {
+//                        return ALIGN.BOTTOM;
+//                    }
+//
+//                    @Override
+//                    public int enterAnimResId(boolean light) {
+//                        return com.kongzue.dialogx.R.anim.anim_dialogx_default_enter;
+//                    }
+//
+//                    @Override
+//                    public int exitAnimResId(boolean light) {
+//                        return com.kongzue.dialogx.R.anim.anim_dialogx_default_exit;
+//                    }
+//                };
+//            }
+//        }
+        ;
         DialogX.globalTheme = DialogX.THEME.AUTO;
         DialogX.onlyOnePopTip = false;
     }

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

@@ -14,9 +14,6 @@ import com.kongzue.dialogx.util.views.NoArticulatedProgressView;
  */
 public class CustomStyle extends MaterialStyle {
     
-    private CustomStyle() {
-    }
-    
     public static CustomStyle style() {
         return new CustomStyle();
     }
@@ -24,6 +21,16 @@ public class CustomStyle extends MaterialStyle {
     @Override
     public WaitTipRes overrideWaitTipRes() {
         return new WaitTipRes() {
+            @Override
+            public int overrideWaitLayout(boolean b) {
+                return 0;
+            }
+    
+            @Override
+            public int overrideRadiusPx() {
+                return -1;
+            }
+    
             @Override
             public boolean blurBackground() {
                 return false;

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

@@ -63,7 +63,7 @@ import java.util.TimerTask;
 @Layout(R.layout.activity_main)
 @DarkStatusBarTheme(true)
 @DarkNavigationBarTheme(true)
-@NavigationBarBackgroundColorRes(R.color.colorNavbarBkg)
+@NavigationBarBackgroundColorRes(R.color.emptyNavBar)
 public class MainActivity extends BaseActivity {
     
     private RelativeLayout boxTable;

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

@@ -5,4 +5,6 @@
     <color name="colorAccent">#2196F3</color>
 
     <color name="colorNavbarBkg">#01000000</color>
+    <color name="emptyNavBar">#01FFFFFF</color>
+
 </resources>

gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.34
-BUILD_VERSION_INT=34
+BUILD_VERSION=0.0.35
+BUILD_VERSION_INT=35