Browse Source

0.0.48.beta29
- 修复可能存在的空指针异常;
- 修复 BottomDialog/BottomMenu 在暗色模式下 Cancel 按钮存在显示异常;
- 完善 iOS 主题下的模糊组件;

Kongzue 1 year ago
parent
commit
b463fe40fd

+ 7 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -448,7 +448,10 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
                 public void run() {
                     getDialogXAnimImpl().doShowAnim(BottomDialog.this, bkg);
 
-                    int blurFrontColor = getResources().getColor(style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()));
+                    Integer blurFrontColor = null;
+                    if (style.messageDialogBlurSettings() != null && style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()) != 0) {
+                        blurFrontColor = getResources().getColor(style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()));
+                    }
 
                     if (blurViews == null) {
                         blurViews = findAllBlurView(dialogView);
@@ -456,7 +459,9 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
 
                     if (blurViews != null) {
                         for (View blurView : blurViews) {
-                            ((BlurViewType) blurView).setOverlayColor(blurFrontColor);
+                            if (blurFrontColor != null) {
+                                ((BlurViewType) blurView).setOverlayColor(blurFrontColor);
+                            }
                             ((BlurViewType) blurView).setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
                         }
                     }

+ 7 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java

@@ -354,7 +354,10 @@ public class MessageDialog extends BaseDialog {
                         bkg.post(new Runnable() {
                             @Override
                             public void run() {
-                                int blurFrontColor = getResources().getColor(style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()));
+                                Integer blurFrontColor = null;
+                                if (style.messageDialogBlurSettings() != null && style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()) != 0) {
+                                    blurFrontColor = getResources().getColor(style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()));
+                                }
 
                                 if (blurViews == null) {
                                     blurViews = findAllBlurView(dialogView);
@@ -362,7 +365,9 @@ public class MessageDialog extends BaseDialog {
 
                                 if (blurViews != null) {
                                     for (View blurView : blurViews) {
-                                        ((BlurViewType) blurView).setOverlayColor(blurFrontColor);
+                                        if (blurFrontColor != null) {
+                                            ((BlurViewType) blurView).setOverlayColor(blurFrontColor);
+                                        }
                                         ((BlurViewType) blurView).setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
                                     }
                                 }

+ 1 - 1
gradle.properties

@@ -19,6 +19,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.48.beta28
+BUILD_VERSION=0.0.48.beta29
 BUILD_VERSION_INT=47
 DIALOGX_STYLE_VERSION=5