1
0
kongzue 4 жил өмнө
parent
commit
d2ad3e6b83

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

@@ -4,6 +4,8 @@ import android.animation.Animator;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.res.Configuration;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -540,13 +542,14 @@ public class BottomDialog extends BaseDialog {
             boxRoot.animate()
                     .alpha(0f)
                     .setInterpolator(new AccelerateInterpolator())
-                    .setDuration(exitAnimDurationTemp)
-                    .setListener(new AnimatorListenerEndCallBack() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            dismiss(dialogView);
-                        }
-                    });
+                    .setDuration(exitAnimDurationTemp);
+            
+            new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    dismiss(dialogView);
+                }
+            },exitAnimDurationTemp);
         }
         
         public void preDismiss() {

+ 10 - 7
DialogX/src/main/java/com/kongzue/dialogx/dialogs/FullScreenDialog.java

@@ -5,6 +5,8 @@ import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.graphics.Rect;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
@@ -238,13 +240,14 @@ public class FullScreenDialog extends BaseDialog {
             boxRoot.animate()
                     .alpha(0f)
                     .setInterpolator(new AccelerateInterpolator())
-                    .setDuration(exitAnimDurationTemp)
-                    .setListener(new AnimatorListenerEndCallBack() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            dismiss(dialogView);
-                        }
-                    });
+                    .setDuration(exitAnimDurationTemp);
+            
+            new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    dismiss(dialogView);
+                }
+            },exitAnimDurationTemp);
         }
         
         public void preDismiss() {

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

@@ -4,6 +4,8 @@ import android.animation.Animator;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.view.View;
@@ -653,13 +655,14 @@ public class MessageDialog extends BaseDialog {
             boxRoot.animate()
                     .alpha(0f)
                     .setInterpolator(new AccelerateInterpolator())
-                    .setDuration(exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration)
-                    .setListener(new AnimatorListenerEndCallBack() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            dismiss(dialogView);
-                        }
-                    });
+                    .setDuration(exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
+            
+            new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    dismiss(dialogView);
+                }
+            },exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
         }
     }
     

+ 10 - 7
DialogX/src/main/java/com/kongzue/dialogx/dialogs/PopTip.java

@@ -4,6 +4,8 @@ import android.animation.Animator;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.graphics.Rect;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
@@ -543,13 +545,14 @@ public class PopTip extends BaseDialog {
                     boxRoot.animate()
                             .alpha(0f)
                             .setInterpolator(new AccelerateInterpolator())
-                            .setDuration(exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration)
-                            .setListener(new AnimatorListenerEndCallBack() {
-                                @Override
-                                public void onAnimationEnd(Animator animation) {
-                                    dismiss(dialogView);
-                                }
-                            });
+                            .setDuration(exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
+                    
+                    new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            dismiss(dialogView);
+                        }
+                    },exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
                 }
             });
         }

+ 10 - 7
DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -4,6 +4,8 @@ import android.animation.Animator;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
@@ -465,13 +467,14 @@ public class WaitDialog extends BaseDialog {
                     boxRoot.animate()
                             .alpha(0f)
                             .setInterpolator(new AccelerateInterpolator())
-                            .setDuration(exitAnimDurationTemp)
-                            .setListener(new AnimatorListenerEndCallBack() {
-                                @Override
-                                public void onAnimationEnd(Animator animation) {
-                                    dismiss(dialogView);
-                                }
-                            });
+                            .setDuration(exitAnimDurationTemp);
+                    
+                    new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            dismiss(dialogView);
+                        }
+                    },exitAnimDurationTemp);
                 }
             });
         }

+ 8 - 1
DialogX/src/main/java/com/kongzue/dialogx/util/views/MaxRelativeLayout.java

@@ -14,6 +14,8 @@ import android.widget.ScrollView;
 
 import com.kongzue.dialogx.R;
 
+import static android.view.View.MeasureSpec.EXACTLY;
+
 /**
  * @author: Kongzue
  * @github: https://github.com/kongzue/
@@ -108,7 +110,6 @@ public class MaxRelativeLayout extends RelativeLayout {
         if (maxWidth > 0) {
             widthSize = Math.min(widthSize, maxWidth);
         }
-        
         View blurView = findViewWithTag("blurView");
         View contentView = findViewWithoutTag("blurView");
         if (contentView != null) {
@@ -117,6 +118,12 @@ public class MaxRelativeLayout extends RelativeLayout {
             if (widthTemp < minWidth) widthTemp = minWidth;
             if (heightTemp < minHeight) heightTemp = minHeight;
             if (blurView != null) {
+                if (heightMode == EXACTLY){
+                    heightTemp = getMeasuredHeight();
+                }
+                if (widthMode == EXACTLY){
+                    widthTemp = getMeasuredWidth();
+                }
                 LayoutParams lp = (LayoutParams) blurView.getLayoutParams();
                 lp.width = widthTemp;
                 lp.height = heightTemp;

+ 1 - 1
gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.37.beta2
+BUILD_VERSION=0.0.37.beta3
 BUILD_VERSION_INT=37