Browse Source

0.0.46.beta9

kongzue 2 years ago
parent
commit
2ab85e539f

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

@@ -6,6 +6,7 @@ import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Outline;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Handler;
@@ -542,7 +543,7 @@ public class BottomDialog extends BaseDialog {
             }
             
             if (maskColor != -1) {
-                boxRoot.setBackgroundColor(maskColor);
+                boxRoot.setBackground(new ColorDrawable(maskColor));
             }
             
             if (onBindView != null && onBindView.getCustomView() != null) {

+ 18 - 0
DialogX/src/main/java/com/kongzue/dialogx/dialogs/CustomDialog.java

@@ -744,6 +744,24 @@ public class CustomDialog extends BaseDialog {
         return this;
     }
     
+    public CustomDialog setAlignBaseView(View baseView) {
+        this.baseView = baseView;
+        baseViewLoc = new int[4];
+        baseView.getLocationOnScreen(baseViewLoc);
+        setFullScreen(true);
+        return this;
+    }
+    
+    public CustomDialog setAlignBaseViewGravity(int alignGravity) {
+        this.alignViewGravity = alignGravity;
+        if (baseView != null) {
+            baseViewLoc = new int[4];
+            baseView.getLocationOnScreen(baseViewLoc);
+        }
+        setFullScreen(true);
+        return this;
+    }
+    
     public CustomDialog setAlignBaseViewGravity(View baseView, int alignGravity, int marginLeft,
                                                 int marginTop, int marginRight, int marginBottom) {
         this.marginRelativeBaseView = new int[]{marginLeft, marginTop, marginRight, marginBottom};

+ 19 - 1
DialogX/src/main/java/com/kongzue/dialogx/dialogs/GuideDialog.java

@@ -425,12 +425,30 @@ public class GuideDialog extends CustomDialog {
     public GuideDialog setAlignBaseViewGravity(View baseView, int alignGravity) {
         this.baseView = baseView;
         this.alignViewGravity = alignGravity;
-        baseViewLoc = new int[2];
+        baseViewLoc = new int[4];
         baseView.getLocationOnScreen(baseViewLoc);
         setFullScreen(true);
         return this;
     }
     
+    public GuideDialog setAlignBaseViewGravity(View baseView) {
+        this.baseView = baseView;
+        baseViewLoc = new int[4];
+        baseView.getLocationOnScreen(baseViewLoc);
+        setFullScreen(true);
+        return this;
+    }
+    
+    public GuideDialog setAlignBaseViewGravity(int alignGravity) {
+        this.alignViewGravity = alignGravity;
+        if (baseView != null) {
+            baseViewLoc = new int[4];
+            baseView.getLocationOnScreen(baseViewLoc);
+        }
+        setFullScreen(true);
+        return this;
+    }
+    
     public GuideDialog setAlignBaseViewGravity(View baseView, int alignGravity, int marginLeft,
                                                int marginTop, int marginRight, int marginBottom) {
         this.marginRelativeBaseView = new int[]{marginLeft, marginTop, marginRight, marginBottom};

+ 6 - 0
DialogX/src/main/java/com/kongzue/dialogx/util/views/DialogXBaseRelativeLayout.java

@@ -6,6 +6,7 @@ import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
@@ -318,6 +319,11 @@ public class DialogXBaseRelativeLayout extends RelativeLayout {
         super.setBackground(background);
     }
     
+    @Override
+    public void setBackgroundColor(int color) {
+        setBackground(new ColorDrawable(color));
+    }
+    
     public boolean isBaseFocusable() {
         return focusable;
     }

+ 2 - 2
DialogXMaterialYou/src/main/res/layout/layout_dialogx_bottom_material_you.xml

@@ -34,7 +34,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingTop="15dp">
+                android:paddingTop="17dp">
 
                 <TextView
                     android:id="@+id/txt_dialog_title"
@@ -42,7 +42,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center"
-                    android:paddingTop="15dp"
+                    android:paddingTop="13dp"
                     android:paddingLeft="20dp"
                     android:paddingRight="20dp"
                     android:text="Title"

+ 2 - 2
DialogXMaterialYou/src/main/res/layout/layout_dialogx_bottom_material_you_dark.xml

@@ -34,7 +34,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingTop="15dp">
+                android:paddingTop="17dp">
 
                 <TextView
                     android:id="@+id/txt_dialog_title"
@@ -43,7 +43,7 @@
                     android:layout_gravity="center_horizontal"
                     android:gravity="center"
                     android:paddingLeft="20dp"
-                    android:paddingTop="15dp"
+                    android:paddingTop="13dp"
                     android:paddingRight="20dp"
                     android:text="Title"
                     android:textColor="@color/white"

+ 8 - 1
app/src/main/java/com/kongzue/dialogxdemo/activity/MainActivity.java

@@ -61,6 +61,7 @@ import com.kongzue.dialogx.interfaces.DialogLifecycleCallback;
 import com.kongzue.dialogx.interfaces.DialogXStyle;
 import com.kongzue.dialogx.interfaces.MenuItemTextInfoInterceptor;
 import com.kongzue.dialogx.interfaces.OnBackPressedListener;
+import com.kongzue.dialogx.interfaces.OnBackgroundMaskClickListener;
 import com.kongzue.dialogx.interfaces.OnBindView;
 import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnIconChangeCallBack;
@@ -767,7 +768,6 @@ public class MainActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 GuideDialog.show(btnFullScreenDialogLogin, R.mipmap.img_tip_login)
-                        .setStageLightType(GuideDialog.STAGE_LIGHT_TYPE.CIRCLE_INSIDE)
                         .setBaseViewMarginTop(-dip2px(30));
             }
         });
@@ -780,6 +780,13 @@ public class MainActivity extends BaseActivity {
                                 R.mipmap.img_tip_login_clicktest)
                         .setStageLightFilletRadius(dip2px(5))
                         .setBaseViewMarginTop(-dip2px(30))
+                        .setOnBackgroundMaskClickListener(new OnBackgroundMaskClickListener<CustomDialog>() {
+                            @Override
+                            public boolean onClick(CustomDialog dialog, View v) {
+                                toast("点击了外围遮罩");
+                                return false;
+                            }
+                        })
                         .setOnStageLightPathClickListener(new OnDialogButtonClickListener<GuideDialog>() {
                             @Override
                             public boolean onClick(GuideDialog dialog, View v) {

+ 1 - 1
gradle.properties

@@ -19,5 +19,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.46.beta8
+BUILD_VERSION=0.0.46.beta9
 BUILD_VERSION_INT=45