0.0.43.beta1

kongzue · Aug 10, 2021 · 3f1a14b · 3f1a14b
1 parent 0274ec6
commit 3f1a14b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 14 deletions.
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java
@@ -614,8 +614,11 @@ public void doDismiss(View v) {
             bkgAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
-                    float value = (float) animation.getAnimatedValue();
-                    boxRoot.setBkgAlpha(value);
+                    if (boxRoot != null) {
+                        float value = (float) animation.getAnimatedValue();
+                        boxRoot.setBkgAlpha(value);
+                        if (value == 0) boxRoot.setVisibility(View.GONE);
+                    }
                 }
             });
             bkgAlpha.start();

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/CustomDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/CustomDialog.java
@@ -330,8 +330,11 @@ public void onAnimationRepeat(Animation animation) {
                     bkgAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                         @Override
                         public void onAnimationUpdate(ValueAnimator animation) {
-                            float value = (float) animation.getAnimatedValue();
-                            boxRoot.setBkgAlpha(value);
+                            if (boxRoot != null) {
+                                float value = (float) animation.getAnimatedValue();
+                                boxRoot.setBkgAlpha(value);
+                                if (value == 0) boxRoot.setVisibility(View.GONE);
+                            }
                         }
                     });
                     bkgAlpha.start();

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/FullScreenDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/FullScreenDialog.java
@@ -285,8 +285,11 @@ public void doDismiss(View v) {
             bkgAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
-                    float value = (float) animation.getAnimatedValue();
-                    boxRoot.setBkgAlpha(value);
+                    if (boxRoot != null) {
+                        float value = (float) animation.getAnimatedValue();
+                        boxRoot.setBkgAlpha(value);
+                        if (value == 0) boxRoot.setVisibility(View.GONE);
+                    }
                 }
             });
             bkgAlpha.start();

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java
@@ -684,8 +684,11 @@ public void doDismiss(View v) {
             bkgAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
-                    float value = (float) animation.getAnimatedValue();
-                    boxRoot.setBkgAlpha(value);
+                    if (boxRoot != null) {
+                        float value = (float) animation.getAnimatedValue();
+                        boxRoot.setBkgAlpha(value);
+                        if (value == 0) boxRoot.setVisibility(View.GONE);
+                    }
                 }
             });
             bkgAlpha.start();
@@ -695,7 +698,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 public void run() {
                     dismiss(dialogView);
                 }
-            }, exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
+            }, exitAnimDurationTemp);
         }
     }
 

diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java
@@ -485,8 +485,11 @@ public void run() {
                     bkgAlpha.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                         @Override
                         public void onAnimationUpdate(ValueAnimator animation) {
-                            float value = (float) animation.getAnimatedValue();
-                            boxRoot.setBkgAlpha(value);
+                            if (boxRoot != null) {
+                                float value = (float) animation.getAnimatedValue();
+                                boxRoot.setBkgAlpha(value);
+                                if (value == 0) boxRoot.setVisibility(View.GONE);
+                            }
                         }
                     });
                     bkgAlpha.start();

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 40,
-      "versionName": "0.0.41.beta14",
+      "versionCode": 42,
+      "versionName": "0.0.42",
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/gradle.properties b/gradle.properties
@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.42
+BUILD_VERSION=0.0.43.beta1
 BUILD_VERSION_INT=42