Browse Source

0.0.50.beta20 pre
- 修复了 issues:468 提到的首次使用 WaitDialog 展示进度时 progress 不能设为 0 的问题;
- BottomDialog 提供了对外暴露的 boxBody(对话框内容布局外层)实例;
- WindowUtil 提供了额外自定义WindowManager.LayoutParams的接口:

```java
WindowUtil.windowSettings = new WindowUtil.WindowSettings() {
@Override
public WindowManager.LayoutParams overrideWindowLayoutParamsInterface(Context context, View dialogView, WindowManager.LayoutParams originWindowLayoutParams) {
//处理 originWindowLayoutParams...
return originWindowLayoutParams;
}
};
```

- 修复Window模式下,多层Dialog触摸事件逐级向下层传递的问题;
- 修复了 setMinHeight 和 setMinWidth 无效的问题;

Kongzue 6 months ago
parent
commit
21076a4a26

+ 6 - 5
DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -352,11 +352,6 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
 
             boxBkg.setY(getRootFrameLayout().getMeasuredHeight());
 
-            bkg.setMaxWidth(getMaxWidth());
-            bkg.setMaxHeight(getMaxHeight());
-            bkg.setMinimumWidth(getMinWidth());
-            bkg.setMinimumHeight(getMinHeight());
-
             boxRoot.setParentDialog(me);
             boxRoot.setOnLifecycleCallBack(new DialogXBaseRelativeLayout.OnLifecycleCallBack() {
                 @Override
@@ -517,6 +512,12 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
             if (boxRoot == null || getOwnActivity() == null) {
                 return;
             }
+
+            bkg.setMaxWidth(getMaxWidth());
+            bkg.setMaxHeight(getMaxHeight());
+            bkg.setMinWidth(getMinWidth());
+            bkg.setMinHeight(getMinHeight());
+
             boxRoot.setAutoUnsafePlacePadding(isEnableImmersiveMode());
             boxRoot.setRootPadding(screenPaddings[0], screenPaddings[1], screenPaddings[2], screenPaddings[3]);
             if (backgroundColor != null) {

+ 0 - 3
DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java

@@ -1021,11 +1021,8 @@ public abstract class BaseDialog implements LifecycleOwner {
 
     protected Float getFloatStyleAttr(Float styleValue, Float defaultValue) {
         if (styleValue <= 0) {
-            log("styleValue=" + styleValue + "<=0 ");
-            log("return defaultValue=" + defaultValue);
             return defaultValue;
         }
-        log("return styleValue=" + styleValue);
         return styleValue;
     }
 

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

@@ -7,6 +7,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.os.Build;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -91,11 +92,12 @@ public class MaxRelativeLayout extends RelativeLayout implements DialogXSafetyMo
 
     public void setMinHeight(int minHeight) {
         if (minHeight > 0) this.minHeight = minHeight;
-
+        setMinimumHeight(minHeight);
     }
 
     public void setMinWidth(int minWidth) {
         if (minWidth > 0) this.minWidth = minWidth;
+        setMinimumWidth(minWidth);
     }
 
     private int preWidth = -1;

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

@@ -743,56 +743,56 @@ public class MainActivity extends BaseActivity {
         btnBottomMenu.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (rdoMaterial.isChecked()) {
-                    //Material 可滑动展开 BottomMenu 演示
-                    BottomMenu.build().setBottomDialogMaxHeight(0.6f).setMenuList(new String[]{"添加", "查看", "编辑", "删除", "分享", "评论", "下载", "收藏", "赞!", "不喜欢", "所属专辑", "复制链接", "类似推荐", "添加", "查看", "编辑", "删除", "分享", "评论", "下载", "收藏", "赞!", "不喜欢", "所属专辑", "复制链接", "类似推荐"}).setOnIconChangeCallBack(new OnIconChangeCallBack<BottomMenu>(true) {
-                        @Override
-                        public int getIcon(BottomMenu bottomMenu, int index, String menuText) {
-                            switch (menuText) {
-                                case "添加":
-                                    return R.mipmap.img_dialogx_demo_add;
-                                case "查看":
-                                    return R.mipmap.img_dialogx_demo_view;
-                                case "编辑":
-                                    return R.mipmap.img_dialogx_demo_edit;
-                                case "删除":
-                                    return R.mipmap.img_dialogx_demo_delete;
-                                case "分享":
-                                    return R.mipmap.img_dialogx_demo_share;
-                                case "评论":
-                                    return R.mipmap.img_dialogx_demo_comment;
-                                case "下载":
-                                    return R.mipmap.img_dialogx_demo_download;
-                                case "收藏":
-                                    return R.mipmap.img_dialogx_demo_favorite;
-                                case "赞!":
-                                    return R.mipmap.img_dialogx_demo_good;
-                                case "不喜欢":
-                                    return R.mipmap.img_dialogx_demo_dislike;
-                                case "所属专辑":
-                                    return R.mipmap.img_dialogx_demo_album;
-                                case "复制链接":
-                                    return R.mipmap.img_dialogx_demo_link;
-                                case "类似推荐":
-                                    return R.mipmap.img_dialogx_demo_recommend;
-                            }
-                            return 0;
-                        }
-                    }).setOnMenuItemClickListener(new OnMenuItemClickListener<BottomMenu>() {
-                        @Override
-                        public boolean onClick(BottomMenu dialog, CharSequence text, int index) {
-                            PopTip.show(text);
-                            return false;
-                        }
-                    }).show();
-
-//                      测试用代码
-//                    BottomMenu.show("添加", "查看", "编辑")
-//                            .setIconResIds(R.mipmap.img_dialogx_demo_add,
-//                                    R.mipmap.img_dialogx_demo_view,
-//                                    R.mipmap.img_dialogx_demo_edit
-//                            );
-                } else {
+//                if (rdoMaterial.isChecked()) {
+//                    //Material 可滑动展开 BottomMenu 演示
+//                    BottomMenu.build().setBottomDialogMaxHeight(0.6f).setMenuList(new String[]{"添加", "查看", "编辑", "删除", "分享", "评论", "下载", "收藏", "赞!", "不喜欢", "所属专辑", "复制链接", "类似推荐", "添加", "查看", "编辑", "删除", "分享", "评论", "下载", "收藏", "赞!", "不喜欢", "所属专辑", "复制链接", "类似推荐"}).setOnIconChangeCallBack(new OnIconChangeCallBack<BottomMenu>(true) {
+//                        @Override
+//                        public int getIcon(BottomMenu bottomMenu, int index, String menuText) {
+//                            switch (menuText) {
+//                                case "添加":
+//                                    return R.mipmap.img_dialogx_demo_add;
+//                                case "查看":
+//                                    return R.mipmap.img_dialogx_demo_view;
+//                                case "编辑":
+//                                    return R.mipmap.img_dialogx_demo_edit;
+//                                case "删除":
+//                                    return R.mipmap.img_dialogx_demo_delete;
+//                                case "分享":
+//                                    return R.mipmap.img_dialogx_demo_share;
+//                                case "评论":
+//                                    return R.mipmap.img_dialogx_demo_comment;
+//                                case "下载":
+//                                    return R.mipmap.img_dialogx_demo_download;
+//                                case "收藏":
+//                                    return R.mipmap.img_dialogx_demo_favorite;
+//                                case "赞!":
+//                                    return R.mipmap.img_dialogx_demo_good;
+//                                case "不喜欢":
+//                                    return R.mipmap.img_dialogx_demo_dislike;
+//                                case "所属专辑":
+//                                    return R.mipmap.img_dialogx_demo_album;
+//                                case "复制链接":
+//                                    return R.mipmap.img_dialogx_demo_link;
+//                                case "类似推荐":
+//                                    return R.mipmap.img_dialogx_demo_recommend;
+//                            }
+//                            return 0;
+//                        }
+//                    }).setOnMenuItemClickListener(new OnMenuItemClickListener<BottomMenu>() {
+//                        @Override
+//                        public boolean onClick(BottomMenu dialog, CharSequence text, int index) {
+//                            PopTip.show(text);
+//                            return false;
+//                        }
+//                    }).show();
+//
+////                      测试用代码
+////                    BottomMenu.show("添加", "查看", "编辑")
+////                            .setIconResIds(R.mipmap.img_dialogx_demo_add,
+////                                    R.mipmap.img_dialogx_demo_view,
+////                                    R.mipmap.img_dialogx_demo_edit
+////                            );
+//                } else {
                     BottomMenu.show(new String[]{"新标签页中打开", "稍后阅读", "复制链接网址"}).setMessage("http://www.kongzue.com/DialogX").setMenuItemTextInfoInterceptor(new MenuItemTextInfoInterceptor<BottomMenu>() {
                         @Override
                         public TextInfo menuItemTextInfo(BottomMenu dialog, int index, String menuText) {
@@ -808,7 +808,7 @@ public class MainActivity extends BaseActivity {
                             return false;
                         }
                     });
-                }
+//                }
             }
         });
 

+ 2 - 2
gradle.properties

@@ -19,7 +19,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.50.beta19
-BUILD_VERSION_INT=49
+BUILD_VERSION=0.0.50.beta20
+BUILD_VERSION_INT=50
 DIALOGX_STYLE_VERSION=5
 android.nonTransitiveRClass=true