Ver Fonte

0.0.39.beta1

kongzue há 3 anos atrás
pai
commit
7b18ba82c9

+ 1 - 0
.idea/runConfigurations.xml

@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

+ 21 - 16
DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -301,22 +301,27 @@ public class BottomDialog extends BaseDialog {
                     
                     onDialogInit(dialogImpl);
                     
-                    if (style.messageDialogBlurSettings() != null && style.messageDialogBlurSettings().blurBackground() && boxBody != null && boxCancel != null) {
-                        int blurFrontColor = getResources().getColor(style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()));
-                        blurView = new BlurView(bkg.getContext(), null);
-                        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(bkg.getWidth(), bkg.getHeight());
-                        blurView.setOverlayColor(backgroundColor == -1 ? blurFrontColor : backgroundColor);
-                        blurView.setTag("blurView");
-                        blurView.setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
-                        boxBody.addView(blurView, 0, params);
-                        
-                        cancelBlurView = new BlurView(boxCancel.getContext(), null);
-                        RelativeLayout.LayoutParams cancelButtonLp = new RelativeLayout.LayoutParams(boxCancel.getWidth(), boxCancel.getHeight());
-                        cancelBlurView.setOverlayColor(backgroundColor == -1 ? blurFrontColor : backgroundColor);
-                        cancelBlurView.setTag("blurView");
-                        cancelBlurView.setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
-                        boxCancel.addView(cancelBlurView, 0, cancelButtonLp);
-                    }
+                    boxRoot.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (style.messageDialogBlurSettings() != null && style.messageDialogBlurSettings().blurBackground() && boxBody != null && boxCancel != null) {
+                                int blurFrontColor = getResources().getColor(style.messageDialogBlurSettings().blurForwardColorRes(isLightTheme()));
+                                blurView = new BlurView(bkg.getContext(), null);
+                                RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(bkg.getWidth(), bkg.getHeight());
+                                blurView.setOverlayColor(backgroundColor == -1 ? blurFrontColor : backgroundColor);
+                                blurView.setTag("blurView");
+                                blurView.setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
+                                boxBody.addView(blurView, 0, params);
+        
+                                cancelBlurView = new BlurView(boxCancel.getContext(), null);
+                                RelativeLayout.LayoutParams cancelButtonLp = new RelativeLayout.LayoutParams(boxCancel.getWidth(), boxCancel.getHeight());
+                                cancelBlurView.setOverlayColor(backgroundColor == -1 ? blurFrontColor : backgroundColor);
+                                cancelBlurView.setTag("blurView");
+                                cancelBlurView.setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
+                                boxCancel.addView(cancelBlurView, 0, cancelButtonLp);
+                            }
+                        }
+                    });
                 }
                 
                 @Override

+ 18 - 1
DialogX/src/main/java/com/kongzue/dialogx/util/views/BottomDialogListView.java

@@ -1,6 +1,7 @@
 package com.kongzue.dialogx.util.views;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -8,6 +9,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.ScrollView;
 
@@ -49,7 +51,14 @@ public class BottomDialogListView extends ListView {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
-        super.onMeasure(widthMeasureSpec, expandSpec);
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(dip2px(55)*size+size, MeasureSpec.EXACTLY));
+    
+        //super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(expandSpec, MeasureSpec.AT_MOST));
+    }
+    
+    private int dip2px(float dpValue) {
+        final float scale = Resources.getSystem().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
     }
     
     private int mPosition;
@@ -91,6 +100,14 @@ public class BottomDialogListView extends ListView {
         return bottomMenuListViewTouchEvent;
     }
     
+    private int size =1;
+    
+    @Override
+    public void setAdapter(ListAdapter adapter) {
+        size = adapter.getCount();
+        super.setAdapter(adapter);
+    }
+    
     public BottomDialogListView setBottomMenuListViewTouchEvent(BottomMenuListViewTouchEvent bottomMenuListViewTouchEvent) {
         this.bottomMenuListViewTouchEvent = bottomMenuListViewTouchEvent;
         return this;

+ 1 - 1
build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 

+ 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.38
+BUILD_VERSION=0.0.39.beta1
 BUILD_VERSION_INT=38

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip