浏览代码

add MIUI style for BottomDialog & BottomMenu and fix bugs.

kongzue 4 年之前
父节点
当前提交
89a4490b69
共有 39 个文件被更改,包括 650 次插入217 次删除
  1. 二进制
      DialogX/libs/DialogXInterface.jar
  2. 12 2
      DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java
  3. 6 3
      DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java
  4. 0 123
      DialogX/src/main/java/com/kongzue/dialogx/style/BuildStyle.java
  5. 1 1
      DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java
  6. 5 5
      DialogX/src/main/java/com/kongzue/dialogx/util/NormalMenuArrayAdapter.java
  7. 二进制
      DialogXIOSStyle/libs/DialogXInterface.jar
  8. 6 6
      DialogXIOSStyle/src/main/java/com/kongzue/dialogx/style/IOSStyle.java
  9. 9 10
      DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios.xml
  10. 14 15
      DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios_dark.xml
  11. 1 1
      DialogXIOSStyle/src/main/res/values/colors.xml
  12. 1 1
      DialogXInterface/src/main/java/com/kongzue/dialogx/interfaces/DialogXStyle.java
  13. 二进制
      DialogXKongzueStyle/libs/DialogXInterface.jar
  14. 4 4
      DialogXKongzueStyle/src/main/java/com/kongzue/dialogx/style/KongzueStyle.java
  15. 19 17
      DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue.xml
  16. 15 13
      DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue_dark.xml
  17. 二进制
      DialogXMIUIStyle/libs/DialogXInterface.jar
  18. 52 1
      DialogXMIUIStyle/src/main/java/com/kongzue/dialogx/style/MIUIStyle.java
  19. 6 0
      DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_bottom_light.xml
  20. 6 0
      DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_bottom_night.xml
  21. 6 0
      DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_center_light.xml
  22. 6 0
      DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_center_night.xml
  23. 6 0
      DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_top_light.xml
  24. 6 0
      DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_top_night.xml
  25. 11 0
      DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_bottom_gray_press.xml
  26. 11 0
      DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_bottom_gray_press_night.xml
  27. 11 0
      DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_top_gray_press.xml
  28. 11 0
      DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_top_gray_press_night.xml
  29. 36 0
      DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_bottom_dark.xml
  30. 36 0
      DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_bottom_light.xml
  31. 36 0
      DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_center_dark.xml
  32. 36 0
      DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_center_light.xml
  33. 36 0
      DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_top_dark.xml
  34. 36 0
      DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_top_light.xml
  35. 99 0
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui.xml
  36. 99 0
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui_dark.xml
  37. 5 4
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui.xml
  38. 5 4
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui_dark.xml
  39. 1 7
      app/src/main/java/com/kongzue/dialogxdemo/MainActivity.java

二进制
DialogX/libs/DialogXInterface.jar


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

@@ -28,6 +28,7 @@ import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnMenuItemClickListener;
 import com.kongzue.dialogx.util.BottomDialogTouchEventInterceptor;
+import com.kongzue.dialogx.util.TextInfo;
 import com.kongzue.dialogx.util.views.BlurView;
 import com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout;
 import com.kongzue.dialogx.util.views.MaxRelativeLayout;
@@ -48,6 +49,10 @@ public class BottomDialog extends BaseDialog {
     protected boolean allowInterceptTouch = true;
     protected OnDialogButtonClickListener cancelButtonClickListener;
     
+    protected TextInfo titleTextInfo;
+    protected TextInfo messageTextInfo;
+    protected TextInfo cancelTextInfo = new TextInfo().setBold(true);
+    
     /**
      * 此值用于,当禁用滑动时(style.overrideBottomDialogRes.touchSlide = false时)的最大显示高度。
      * 0:不限制,最大显示到屏幕可用高度。
@@ -257,7 +262,7 @@ public class BottomDialog extends BaseDialog {
             });
             
             bottomDialogTouchEventInterceptor = new BottomDialogTouchEventInterceptor(me, dialogImpl);
-    
+            
             boxRoot.post(new Runnable() {
                 @Override
                 public void run() {
@@ -266,7 +271,7 @@ public class BottomDialog extends BaseDialog {
                     Animation enterAnim = AnimationUtils.loadAnimation(getContext(), R.anim.anim_dialogx_bottom_enter);
                     enterAnim.setInterpolator(new DecelerateInterpolator(2f));
                     bkg.startAnimation(enterAnim);
-    
+                    
                     bkg.setY(bkgEnterAimY);
                 }
             });
@@ -296,6 +301,10 @@ public class BottomDialog extends BaseDialog {
             showText(txtDialogTitle, title);
             showText(txtDialogTip, message);
             
+            useTextInfo(txtDialogTitle, titleTextInfo);
+            useTextInfo(txtDialogTip, messageTextInfo);
+            useTextInfo(btnCancel, cancelTextInfo);
+            
             if (cancelable) {
                 boxRoot.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -340,6 +349,7 @@ public class BottomDialog extends BaseDialog {
                 if (isNull(cancelText)) {
                     boxCancel.setVisibility(View.GONE);
                 } else {
+                    showText(btnCancel, cancelText);
                     boxCancel.setVisibility(View.VISIBLE);
                 }
             }

+ 6 - 3
DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java

@@ -95,12 +95,15 @@ public class BottomMenu extends BottomDialog {
                 }
             }
             
-            int dividerDrawableResId = isLightTheme() ? R.drawable.rect_dialogx_material_menu_split_divider : R.drawable.rect_dialogx_material_menu_split_divider_night;
+            int dividerDrawableResId = 0;
             int dividerHeight = 1;
             if (style.overrideBottomDialogRes() != null) {
                 dividerDrawableResId = style.overrideBottomDialogRes().overrideMenuDividerDrawableRes(isLightTheme());
                 dividerHeight = style.overrideBottomDialogRes().overrideMenuDividerHeight(isLightTheme());
             }
+            if (dividerDrawableResId == 0) {
+                dividerDrawableResId = isLightTheme() ? R.drawable.rect_dialogx_material_menu_split_divider : R.drawable.rect_dialogx_material_menu_split_divider_night;
+            }
             
             listView = new BottomDialogListView(getContext());
             listView.setOverScrollMode(OVER_SCROLL_NEVER);
@@ -120,7 +123,7 @@ public class BottomMenu extends BottomDialog {
                 }
             });
             if (style.overrideBottomDialogRes() != null) {
-                if (style.overrideBottomDialogRes().overrideMenuItemLayout(true, 0, 1) != 0) {
+                if (style.overrideBottomDialogRes().overrideMenuItemLayout(true, 0, 1,false) != 0) {
                     listView.setSelector(R.color.empty);
                 }
             }
@@ -264,7 +267,7 @@ public class BottomMenu extends BottomDialog {
         return this;
     }
     
-    public BottomMenu setCancelButton(CharSequence cancelText,OnDialogButtonClickListener cancelButtonClickListener) {
+    public BottomMenu setCancelButton(CharSequence cancelText, OnDialogButtonClickListener cancelButtonClickListener) {
         this.cancelText = cancelText;
         this.cancelButtonClickListener = cancelButtonClickListener;
         refreshUI();

+ 0 - 123
DialogX/src/main/java/com/kongzue/dialogx/style/BuildStyle.java

@@ -1,123 +0,0 @@
-package com.kongzue.dialogx.style;
-
-import com.kongzue.dialogx.R;
-import com.kongzue.dialogx.interfaces.DialogXStyle;
-
-/**
- * @author: Kongzue
- * @github: https://github.com/kongzue/
- * @homepage: http://kongzue.com/
- * @mail: myzcxhh@live.cn
- * @createTime: 2020/10/11 12:26
- */
-public class BuildStyle implements DialogXStyle {
-    public static BuildStyle style() {
-        return new BuildStyle();
-    }
-    
-    @Override
-    public int layout(boolean light) {
-        return light ? R.layout.layout_dialogx_material : R.layout.layout_dialogx_material_dark;
-    }
-    
-    @Override
-    public int enterAnimResId() {
-        return R.anim.anim_dialogx_default_enter;
-    }
-    
-    @Override
-    public int exitAnimResId() {
-        return R.anim.anim_dialogx_default_exit;
-    }
-    
-    @Override
-    public int[] verticalButtonOrder() {
-        return new int[]{BUTTON_OK, BUTTON_OTHER, BUTTON_CANCEL};
-    }
-    
-    @Override
-    public int[] horizontalButtonOrder() {
-        return new int[]{BUTTON_OTHER, SPACE, BUTTON_CANCEL, BUTTON_OK};
-    }
-    
-    @Override
-    public int splitWidthPx() {
-        return 1;
-    }
-    
-    @Override
-    public int splitColorRes(boolean light) {
-        return 0;
-    }
-    
-    @Override
-    public BlurBackgroundSetting messageDialogBlurSettings() {
-        return null;
-    }
-    
-    @Override
-    public HorizontalButtonRes overrideHorizontalButtonRes() {
-        return new HorizontalButtonRes() {
-            @Override
-            public int overrideHorizontalOkButtonBackgroundRes(int visibleButtonCount, boolean light) {
-                return light ? R.drawable.button_dialogx_material_light : R.drawable.button_dialogx_material_night;
-            }
-            
-            @Override
-            public int overrideHorizontalCancelButtonBackgroundRes(int visibleButtonCount, boolean light) {
-                return light ? R.drawable.button_dialogx_material_light : R.drawable.button_dialogx_material_night;
-            }
-            
-            @Override
-            public int overrideHorizontalOtherButtonBackgroundRes(int visibleButtonCount, boolean light) {
-                return light ? R.drawable.button_dialogx_material_light : R.drawable.button_dialogx_material_night;
-            }
-        };
-    }
-    
-    @Override
-    public VerticalButtonRes overrideVerticalButtonRes() {
-        return new VerticalButtonRes() {
-            @Override
-            public int overrideVerticalOkButtonBackgroundRes(int visibleButtonCount, boolean light) {
-                return light ? R.drawable.button_dialogx_material_light : R.drawable.button_dialogx_material_night;
-            }
-            
-            @Override
-            public int overrideVerticalCancelButtonBackgroundRes(int visibleButtonCount, boolean light) {
-                return light ? R.drawable.button_dialogx_material_light : R.drawable.button_dialogx_material_night;
-            }
-            
-            @Override
-            public int overrideVerticalOtherButtonBackgroundRes(int visibleButtonCount, boolean light) {
-                return light ? R.drawable.button_dialogx_material_light : R.drawable.button_dialogx_material_night;
-            }
-        };
-    }
-    
-    @Override
-    public WaitTipRes overrideWaitTipRes() {
-        return new WaitTipRes() {
-            @Override
-            public boolean blurBackground() {
-                return false;
-            }
-            
-            @Override
-            public int overrideBackgroundColorRes(boolean light) {
-                return 0;
-            }
-            
-            @Override
-            public int overrideTextColorRes(boolean light) {
-                return light ? R.color.white : R.color.black;
-            }
-        };
-    }
-    
-    @Override
-    public BottomDialogRes overrideBottomDialogRes() {
-        return null;
-    }
-    
-}

+ 1 - 1
DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java

@@ -156,7 +156,7 @@ public class MaterialStyle implements DialogXStyle {
             }
     
             @Override
-            public int overrideMenuItemLayout(boolean light, int index, int count) {
+            public int overrideMenuItemLayout(boolean light, int index, int count, boolean isContentVisibility) {
                 return R.layout.item_dialogx_material_bottom_menu_normal_text;
             }
     

+ 5 - 5
DialogX/src/main/java/com/kongzue/dialogx/util/NormalMenuArrayAdapter.java

@@ -2,6 +2,7 @@ package com.kongzue.dialogx.util;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -64,16 +65,15 @@ public class NormalMenuArrayAdapter extends BaseAdapter {
             
             int resourceId = R.layout.item_dialogx_material_bottom_menu_normal_text;
             if (bottomMenu.getStyle().overrideBottomDialogRes() != null) {
-                resourceId = bottomMenu.getStyle().overrideBottomDialogRes().overrideMenuItemLayout(bottomMenu.isLightTheme(), position, getCount());
+                resourceId = bottomMenu.getStyle().overrideBottomDialogRes().overrideMenuItemLayout(bottomMenu.isLightTheme(), position, getCount(), false);
                 if (resourceId == 0) {
                     resourceId = R.layout.item_dialogx_material_bottom_menu_normal_text;
                 } else {
                     if (bottomMenu.getDialogImpl().txtDialogTitle.getVisibility() == View.VISIBLE ||
-                            bottomMenu.getDialogImpl().txtDialogTip.getVisibility() == View.VISIBLE||
-                            bottomMenu.getCustomView()!=null) {
+                            bottomMenu.getDialogImpl().txtDialogTip.getVisibility() == View.VISIBLE ||
+                            bottomMenu.getCustomView() != null) {
                         if (position == 0) {
-                            //有显示 title、tip 或自定义布局时第一个 item 按钮显示为 center 部分的样式
-                            resourceId = bottomMenu.getStyle().overrideBottomDialogRes().overrideMenuItemLayout(bottomMenu.isLightTheme(), 1, getCount() + 1);
+                            resourceId = bottomMenu.getStyle().overrideBottomDialogRes().overrideMenuItemLayout(bottomMenu.isLightTheme(), position, getCount(), true);
                         }
                     }
                 }

二进制
DialogXIOSStyle/libs/DialogXInterface.jar


+ 6 - 6
DialogXIOSStyle/src/main/java/com/kongzue/dialogx/style/IOSStyle.java

@@ -114,12 +114,12 @@ public class IOSStyle implements DialogXStyle {
             public int overrideVerticalOkButtonBackgroundRes(int visibleButtonCount, boolean light) {
                 return light ? R.drawable.button_dialogx_ios_center_light : R.drawable.button_dialogx_ios_center_night;
             }
-    
+            
             @Override
             public int overrideVerticalCancelButtonBackgroundRes(int visibleButtonCount, boolean light) {
                 return light ? R.drawable.button_dialogx_ios_bottom_light : R.drawable.button_dialogx_ios_bottom_night;
             }
-    
+            
             @Override
             public int overrideVerticalOtherButtonBackgroundRes(int visibleButtonCount, boolean light) {
                 return light ? R.drawable.button_dialogx_ios_center_light : R.drawable.button_dialogx_ios_center_night;
@@ -142,7 +142,7 @@ public class IOSStyle implements DialogXStyle {
             
             @Override
             public int overrideTextColorRes(boolean light) {
-                return light?R.color.white:R.color.black;
+                return light ? R.color.white : R.color.black;
             }
         };
     }
@@ -183,10 +183,10 @@ public class IOSStyle implements DialogXStyle {
             }
             
             @Override
-            public int overrideMenuItemLayout(boolean light, int index, int count) {
+            public int overrideMenuItemLayout(boolean light, int index, int count, boolean isContentVisibility) {
                 if (light) {
                     if (index == 0) {
-                        return R.layout.item_dialogx_ios_bottom_menu_top_light;
+                        return isContentVisibility ? R.layout.item_dialogx_ios_bottom_menu_center_light : R.layout.item_dialogx_ios_bottom_menu_top_light;
                     } else if (index == count - 1) {
                         return R.layout.item_dialogx_ios_bottom_menu_bottom_light;
                     } else {
@@ -194,7 +194,7 @@ public class IOSStyle implements DialogXStyle {
                     }
                 } else {
                     if (index == 0) {
-                        return R.layout.item_dialogx_ios_bottom_menu_top_dark;
+                        return isContentVisibility ? R.layout.item_dialogx_ios_bottom_menu_center_dark : R.layout.item_dialogx_ios_bottom_menu_top_dark;
                     } else if (index == count - 1) {
                         return R.layout.item_dialogx_ios_bottom_menu_bottom_dark;
                     } else {

+ 9 - 10
DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios.xml

@@ -28,10 +28,10 @@
                 android:orientation="vertical">
 
                 <com.kongzue.dialogx.util.views.MaxRelativeLayout
-                    android:tag="body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:tag="body">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -80,9 +80,9 @@
                                     android:textSize="12dp" />
 
                                 <ImageView
-                                    android:tag="split"
                                     android:layout_width="match_parent"
                                     android:layout_height="1px"
+                                    android:tag="split"
                                     android:visibility="gone" />
 
                                 <RelativeLayout
@@ -99,26 +99,25 @@
                 </com.kongzue.dialogx.util.views.MaxRelativeLayout>
 
                 <com.kongzue.dialogx.util.views.MaxRelativeLayout
-                    android:tag="cancelBox"
                     android:layout_width="match_parent"
                     android:layout_height="53dp"
                     android:layout_marginTop="7dp"
-                    android:layout_marginBottom="10dp">
+                    android:layout_marginBottom="10dp"
+                    android:tag="cancelBox">
 
                     <TextView
-                        android:tag="cancel"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:background="@drawable/button_dialogx_ios_light"
+                        android:clickable="true"
                         android:gravity="center"
                         android:paddingLeft="15dp"
                         android:paddingRight="15dp"
                         android:singleLine="true"
+                        android:tag="cancel"
                         android:text="取消"
                         android:textColor="@color/dialogxIOSBlue"
-                        android:clickable="true"
-                        android:background="@drawable/button_dialogx_ios_light"
-                        android:textSize="19dp"
-                        android:textStyle="bold" />
+                        android:textSize="19dp" />
 
                 </com.kongzue.dialogx.util.views.MaxRelativeLayout>
 

+ 14 - 15
DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios_dark.xml

@@ -28,10 +28,10 @@
                 android:orientation="vertical">
 
                 <com.kongzue.dialogx.util.views.MaxRelativeLayout
-                    android:tag="body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:tag="body">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -50,16 +50,16 @@
                             android:text="Title"
                             android:textColor="@color/dialogxIOSTipTextDark"
                             android:textSize="12dp"
-                            android:textStyle="bold"/>
+                            android:textStyle="bold" />
 
                         <ScrollView
                             android:id="@+id/scrollView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
                             android:overScrollMode="never"
                             android:scrollbarSize="7dp"
+                            android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
                             android:scrollbars="vertical">
 
                             <LinearLayout
@@ -75,14 +75,14 @@
                                     android:layout_marginHorizontal="20dp"
                                     android:gravity="center"
                                     android:paddingVertical="13dp"
+                                    android:text="This is content text."
                                     android:textColor="@color/dialogxIOSTipTextDark"
-                                    android:textSize="12dp"
-                                    android:text="This is content text." />
+                                    android:textSize="12dp" />
 
                                 <ImageView
-                                    android:tag="split"
                                     android:layout_width="match_parent"
                                     android:layout_height="1px"
+                                    android:tag="split"
                                     android:visibility="gone" />
 
                                 <RelativeLayout
@@ -99,26 +99,25 @@
                 </com.kongzue.dialogx.util.views.MaxRelativeLayout>
 
                 <com.kongzue.dialogx.util.views.MaxRelativeLayout
-                    android:tag="cancelBox"
                     android:layout_width="match_parent"
                     android:layout_height="53dp"
                     android:layout_marginTop="7dp"
-                    android:layout_marginBottom="10dp">
+                    android:layout_marginBottom="10dp"
+                    android:tag="cancelBox">
 
                     <TextView
-                        android:tag="cancel"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:background="@drawable/button_dialogx_ios_night"
+                        android:clickable="true"
                         android:gravity="center"
                         android:paddingLeft="15dp"
                         android:paddingRight="15dp"
                         android:singleLine="true"
-                        android:textColor="@color/dialogxIOSBlueDark"
-                        android:clickable="true"
-                        android:background="@drawable/button_dialogx_ios_night"
+                        android:tag="cancel"
                         android:text="取消"
-                        android:textSize="19dp"
-                        android:textStyle="bold" />
+                        android:textColor="@color/dialogxIOSBlueDark"
+                        android:textSize="19dp" />
 
                 </com.kongzue.dialogx.util.views.MaxRelativeLayout>
 

+ 1 - 1
DialogXIOSStyle/src/main/res/values/colors.xml

@@ -38,7 +38,7 @@
     <color name="dialogxIOSSplitDark">#99777878</color>
     <color name="dialogxIOSBlue">#007aff</color>
     <color name="dialogxIOSBkgLight">#CCF4F5F6</color>
-    <color name="dialogxIOSBkgDark">#E62C2C2D</color>
+    <color name="dialogxIOSBkgDark">#E6202020</color>
     <color name="dialogxIOSTipTextLight">#8f8f8f</color>
     <color name="dialogxIOSTipTextDark">#9AA8B9</color>
     <color name="dialogxIOSBlueDark">#8AB4F8</color>

+ 1 - 1
DialogXInterface/src/main/java/com/kongzue/dialogx/interfaces/DialogXStyle.java

@@ -84,6 +84,6 @@ public interface DialogXStyle {
         
         float overrideBottomDialogMaxHeight();
         
-        int overrideMenuItemLayout(boolean light, int index, int count);
+        int overrideMenuItemLayout(boolean light, int index, int count, boolean isContentVisibility);
     }
 }

二进制
DialogXKongzueStyle/libs/DialogXInterface.jar


+ 4 - 4
DialogXKongzueStyle/src/main/java/com/kongzue/dialogx/style/KongzueStyle.java

@@ -84,7 +84,7 @@ public class KongzueStyle implements DialogXStyle {
             
             @Override
             public int overrideTextColorRes(boolean light) {
-                return light?R.color.white:R.color.black;
+                return light ? R.color.white : R.color.black;
             }
         };
     }
@@ -115,7 +115,7 @@ public class KongzueStyle implements DialogXStyle {
             
             @Override
             public int overrideMenuTextColor(boolean light) {
-                return light?R.color.black90:R.color.white90;
+                return light ? R.color.black90 : R.color.white90;
             }
             
             @Override
@@ -124,8 +124,8 @@ public class KongzueStyle implements DialogXStyle {
             }
             
             @Override
-            public int overrideMenuItemLayout(boolean light, int index, int count) {
-                return light?R.layout.item_dialogx_kongzue_bottom_menu_normal_text:R.layout.item_dialogx_kongzue_bottom_menu_normal_text_dark;
+            public int overrideMenuItemLayout(boolean light, int index, int count, boolean isContentVisibility) {
+                return light ? R.layout.item_dialogx_kongzue_bottom_menu_normal_text : R.layout.item_dialogx_kongzue_bottom_menu_normal_text_dark;
             }
         };
     }

+ 19 - 17
DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue.xml

@@ -22,21 +22,21 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="10dp"
                 android:clickable="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingTop="10dp">
 
                 <TextView
                     android:id="@+id/txt_dialog_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:gravity="center_vertical"
+                    android:gravity="center"
                     android:paddingHorizontal="20dp"
                     android:paddingBottom="10dp"
                     android:text="Title"
                     android:textColor="@color/black"
-                    android:textSize="21dp" />
+                    android:textSize="18dp" />
 
                 <ScrollView
                     android:id="@+id/scrollView"
@@ -55,24 +55,26 @@
 
                         <TextView
                             android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
                             android:layout_marginHorizontal="20dp"
+                            android:gravity="left"
                             android:paddingBottom="5dp"
                             android:text="This is content text."
                             android:textColor="@color/black70"
                             android:textSize="16dp" />
 
                         <ImageView
-                            android:tag="split"
                             android:layout_width="match_parent"
+                            android:layout_height="1px"
                             android:background="@color/dialogxKongzueButtonSplitLineColor"
-                            android:layout_height="1px"/>
+                            android:tag="split" />
 
                         <RelativeLayout
                             android:id="@+id/box_custom"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
+                            android:layout_height="wrap_content" />
 
                     </LinearLayout>
 
@@ -80,31 +82,31 @@
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:background="@color/dialogxKongzueButtonSplitLineColor"
-                    android:layout_height="1px"/>
+                    android:layout_height="1px"
+                    android:background="@color/dialogxKongzueButtonSplitLineColor" />
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:background="@color/dialogxKongzueButtonSplitSpaceColor"
-                    android:layout_height="8dp"/>
+                    android:layout_height="8dp"
+                    android:background="@color/dialogxKongzueButtonSplitSpaceColor" />
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:background="@color/dialogxKongzueButtonSplitLineColor"
-                    android:layout_height="1px"/>
+                    android:layout_height="1px"
+                    android:background="@color/dialogxKongzueButtonSplitLineColor" />
 
                 <TextView
-                    android:tag="cancel"
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
+                    android:background="@drawable/button_dialogx_kongzue_menu_light"
                     android:gravity="center"
                     android:paddingLeft="15dp"
                     android:paddingRight="15dp"
                     android:singleLine="true"
-                    android:background="@drawable/button_dialogx_kongzue_menu_light"
+                    android:tag="cancel"
                     android:text="取消"
                     android:textColor="@color/black90"
-                    android:textSize="16dp"/>
+                    android:textSize="16dp" />
 
             </LinearLayout>
 

+ 15 - 13
DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue_dark.xml

@@ -22,21 +22,21 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="10dp"
                 android:clickable="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingTop="10dp">
 
                 <TextView
                     android:id="@+id/txt_dialog_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:gravity="center_vertical"
+                    android:gravity="center"
                     android:paddingHorizontal="20dp"
                     android:paddingBottom="10dp"
                     android:text="Title"
                     android:textColor="@color/white"
-                    android:textSize="21dp" />
+                    android:textSize="18dp" />
 
                 <ScrollView
                     android:id="@+id/scrollView"
@@ -55,24 +55,26 @@
 
                         <TextView
                             android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
                             android:layout_marginHorizontal="20dp"
+                            android:gravity="left"
                             android:paddingBottom="5dp"
                             android:text="This is content text."
                             android:textColor="@color/white60"
                             android:textSize="16dp" />
 
                         <ImageView
-                            android:tag="split"
                             android:layout_width="match_parent"
+                            android:layout_height="1px"
                             android:background="@color/dialogxKongzueDarkButtonSplitLineColor"
-                            android:layout_height="1px"/>
+                            android:tag="split" />
 
                         <RelativeLayout
                             android:id="@+id/box_custom"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
+                            android:layout_height="wrap_content" />
 
                     </LinearLayout>
 
@@ -80,21 +82,21 @@
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:background="@color/dialogxKongzueDarkButtonSplitSpaceColor"
-                    android:layout_height="8dp"/>
+                    android:layout_height="8dp"
+                    android:background="@color/dialogxKongzueDarkButtonSplitSpaceColor" />
 
                 <TextView
-                    android:tag="cancel"
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
+                    android:background="@drawable/button_dialogx_kongzue_menu_night"
                     android:gravity="center"
                     android:paddingLeft="15dp"
                     android:paddingRight="15dp"
                     android:singleLine="true"
-                    android:background="@drawable/button_dialogx_kongzue_menu_night"
+                    android:tag="cancel"
                     android:text="取消"
                     android:textColor="@color/white90"
-                    android:textSize="16dp"/>
+                    android:textSize="16dp" />
 
             </LinearLayout>
 

二进制
DialogXMIUIStyle/libs/DialogXInterface.jar


+ 52 - 1
DialogXMIUIStyle/src/main/java/com/kongzue/dialogx/style/MIUIStyle.java

@@ -91,6 +91,57 @@ public class MIUIStyle implements DialogXStyle {
     
     @Override
     public BottomDialogRes overrideBottomDialogRes() {
-        return null;
+        return new BottomDialogRes() {
+            @Override
+            public boolean touchSlide() {
+                return false;
+            }
+            
+            @Override
+            public int overrideDialogLayout(boolean light) {
+                return light ? R.layout.layout_dialogx_bottom_miui : R.layout.layout_dialogx_bottom_miui_dark;
+            }
+            
+            @Override
+            public int overrideMenuDividerDrawableRes(boolean light) {
+                return 0;
+            }
+            
+            @Override
+            public int overrideMenuDividerHeight(boolean light) {
+                return 0;
+            }
+            
+            @Override
+            public int overrideMenuTextColor(boolean light) {
+                return light ? R.color.black : R.color.dialogxMIUITextDark;
+            }
+            
+            @Override
+            public float overrideBottomDialogMaxHeight() {
+                return 0.6f;
+            }
+            
+            @Override
+            public int overrideMenuItemLayout(boolean light, int index, int count, boolean isContentVisibility) {
+                if (light) {
+                    if (index == 0) {
+                        return R.layout.item_dialogx_miui_bottom_menu_top_light;
+                    } else if (index == count - 1) {
+                        return R.layout.item_dialogx_miui_bottom_menu_bottom_light;
+                    } else {
+                        return R.layout.item_dialogx_miui_bottom_menu_center_light;
+                    }
+                } else {
+                    if (index == 0) {
+                        return R.layout.item_dialogx_miui_bottom_menu_top_dark;
+                    } else if (index == count - 1) {
+                        return R.layout.item_dialogx_miui_bottom_menu_bottom_dark;
+                    } else {
+                        return R.layout.item_dialogx_miui_bottom_menu_center_dark;
+                    }
+                }
+            }
+        };
     }
 }

+ 6 - 0
DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_bottom_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="100">
+    <item android:drawable="@drawable/rect_dialogx_miui_button_bottom_gray_press" android:state_pressed="true" />
+    <item android:drawable="@color/empty" android:state_pressed="false" />
+</selector>

+ 6 - 0
DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_bottom_night.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="100">
+    <item android:drawable="@drawable/rect_dialogx_miui_button_bottom_gray_press_night" android:state_pressed="true" />
+    <item android:drawable="@color/empty" android:state_pressed="false" />
+</selector>

+ 6 - 0
DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_center_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="100">
+    <item android:drawable="@color/dialogxMIUIButtonGrayNormal" android:state_pressed="true" />
+    <item android:drawable="@color/empty" android:state_pressed="false" />
+</selector>

+ 6 - 0
DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_center_night.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="100">
+    <item android:drawable="@color/white10" android:state_pressed="true" />
+    <item android:drawable="@color/empty" android:state_pressed="false" />
+</selector>

+ 6 - 0
DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_top_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="100">
+    <item android:drawable="@drawable/rect_dialogx_miui_button_top_gray_press" android:state_pressed="true" />
+    <item android:drawable="@color/empty" android:state_pressed="false" />
+</selector>

+ 6 - 0
DialogXMIUIStyle/src/main/res/drawable/button_dialogx_miui_top_night.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="100">
+    <item android:drawable="@drawable/rect_dialogx_miui_button_top_gray_press_night" android:state_pressed="true" />
+    <item android:drawable="@color/empty" android:state_pressed="false" />
+</selector>

+ 11 - 0
DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_bottom_gray_press.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/dialogxMIUIButtonGrayNormal"/>
+
+    <corners
+        android:bottomRightRadius="15dp"
+        android:bottomLeftRadius="15dp"/>
+
+</shape>

+ 11 - 0
DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_bottom_gray_press_night.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white10"/>
+
+    <corners
+        android:bottomRightRadius="15dp"
+        android:bottomLeftRadius="15dp"/>
+
+</shape>

+ 11 - 0
DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_top_gray_press.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/dialogxMIUIButtonGrayNormal"/>
+
+    <corners
+        android:topRightRadius="15dp"
+        android:topLeftRadius="15dp"/>
+
+</shape>

+ 11 - 0
DialogXMIUIStyle/src/main/res/drawable/rect_dialogx_miui_button_top_gray_press_night.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white10"/>
+
+    <corners
+        android:topRightRadius="15dp"
+        android:topLeftRadius="15dp"/>
+
+</shape>

+ 36 - 0
DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_bottom_dark.xml

@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_miui_bottom_night">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginHorizontal="25dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="-5dp"
+            android:layout_marginRight="10dp"
+            android:padding="5dp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:singleLine="true"
+            android:text="MenuText"
+            android:textColor="@color/dialogxMIUITextDark"
+            android:textSize="16dp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 36 - 0
DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_bottom_light.xml

@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_miui_bottom_light">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginHorizontal="25dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="-5dp"
+            android:layout_marginRight="10dp"
+            android:padding="5dp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:singleLine="true"
+            android:text="MenuText"
+            android:textColor="@color/black"
+            android:textSize="16dp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 36 - 0
DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_center_dark.xml

@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_miui_center_night">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginHorizontal="25dp">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="-5dp"
+            android:visibility="gone"
+            android:padding="5dp"/>
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:singleLine="true"
+            android:text="MenuText"
+            android:textSize="16dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 36 - 0
DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_center_light.xml

@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_miui_center_light">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginHorizontal="25dp">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="-5dp"
+            android:visibility="gone"
+            android:padding="5dp"/>
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:singleLine="true"
+            android:text="MenuText"
+            android:textSize="16dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 36 - 0
DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_top_dark.xml

@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_miui_top_night">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginHorizontal="25dp">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="-5dp"
+            android:visibility="gone"
+            android:padding="5dp"/>
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textStyle="bold"
+            android:textColor="@color/black"
+            android:singleLine="true"
+            android:text="MenuText"
+            android:textSize="16dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 36 - 0
DialogXMIUIStyle/src/main/res/layout/item_dialogx_miui_bottom_menu_top_light.xml

@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_miui_top_light">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginHorizontal="25dp">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="-5dp"
+            android:visibility="gone"
+            android:padding="5dp"/>
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textStyle="bold"
+            android:textColor="@color/black"
+            android:singleLine="true"
+            android:text="MenuText"
+            android:textSize="16dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 99 - 0
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/box_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black20"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/box_bkg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.kongzue.dialogx.util.views.MaxRelativeLayout
+            android:id="@+id/bkg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/rect_dialogx_miui_bkg_light"
+            android:focusableInTouchMode="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:orientation="vertical"
+                android:paddingTop="20dp">
+
+                <TextView
+                    android:id="@+id/txt_dialog_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="7dp"
+                    android:paddingBottom="10dp"
+                    android:text="Title"
+                    android:textColor="@color/black"
+                    android:textSize="18dp" />
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:overScrollMode="never"
+                    android:scrollbarSize="7dp"
+                    android:scrollbars="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/box_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/txt_dialog_tip"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginHorizontal="26dp"
+                            android:gravity="left"
+                            android:paddingBottom="5dp"
+                            android:text="This is content text."
+                            android:textColor="@color/black70"
+                            android:textSize="16dp" />
+
+                        <RelativeLayout
+                            android:id="@+id/box_custom"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginHorizontal="26dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="20dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_dialogx_miui_gray"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:tag="cancel"
+                    android:text="取消"
+                    android:textColor="@color/black80"
+                    android:textSize="16dp"/>
+
+            </LinearLayout>
+
+        </com.kongzue.dialogx.util.views.MaxRelativeLayout>
+
+    </RelativeLayout>
+
+</com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout>

+ 99 - 0
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui_dark.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/box_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black40"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/box_bkg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.kongzue.dialogx.util.views.MaxRelativeLayout
+            android:id="@+id/bkg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/rect_dialogx_miui_bkg_night"
+            android:focusableInTouchMode="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:orientation="vertical"
+                android:paddingTop="20dp">
+
+                <TextView
+                    android:id="@+id/txt_dialog_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="7dp"
+                    android:paddingBottom="10dp"
+                    android:text="Title"
+                    android:textColor="@color/dialogxMIUITextDark"
+                    android:textSize="18dp" />
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:overScrollMode="never"
+                    android:scrollbarSize="7dp"
+                    android:scrollbars="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/box_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/txt_dialog_tip"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginHorizontal="26dp"
+                            android:gravity="left"
+                            android:paddingBottom="5dp"
+                            android:text="This is content text."
+                            android:textColor="@color/dialogxMIUITextDark"
+                            android:textSize="16dp" />
+
+                        <RelativeLayout
+                            android:id="@+id/box_custom"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginHorizontal="26dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="20dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_dialogx_miui_gray_night"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:tag="cancel"
+                    android:text="取消"
+                    android:textColor="@color/dialogxMIUITextDark"
+                    android:textSize="16dp" />
+
+            </LinearLayout>
+
+        </com.kongzue.dialogx.util.views.MaxRelativeLayout>
+
+    </RelativeLayout>
+
+</com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout>

+ 5 - 4
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui.xml

@@ -33,7 +33,7 @@
                     android:paddingHorizontal="20dp"
                     android:text="Title"
                     android:textColor="@color/black"
-                    android:textSize="20dp" />
+                    android:textSize="18dp" />
 
                 <ScrollView
                     android:layout_width="match_parent"
@@ -51,14 +51,15 @@
 
                         <TextView
                             android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="left"
                             android:paddingTop="10dp"
                             android:paddingBottom="15dp"
                             android:layout_marginHorizontal="20dp"
                             android:text="This is content text."
-                            android:textColor="@color/black"
+                            android:textColor="@color/black60"
                             android:textSize="16dp" />
 
                         <RelativeLayout

+ 5 - 4
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui_dark.xml

@@ -33,7 +33,7 @@
                     android:paddingHorizontal="20dp"
                     android:text="Title"
                     android:textColor="@color/dialogxMIUITextDark"
-                    android:textSize="20dp" />
+                    android:textSize="18dp" />
 
                 <ScrollView
                     android:layout_width="match_parent"
@@ -51,9 +51,10 @@
 
                         <TextView
                             android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="left"
                             android:paddingTop="10dp"
                             android:paddingBottom="15dp"
                             android:layout_marginHorizontal="20dp"
@@ -127,7 +128,7 @@
                         android:layout_marginHorizontal="6dp"
                         android:visibility="gone"
                         android:text="Other"
-                        android:textColor="@color/white"
+                        android:textColor="@color/dialogxMIUITextDark"
                         android:textSize="16dp" />
 
                     <TextView

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

@@ -33,7 +33,6 @@ import com.kongzue.dialogx.interfaces.OnBindView;
 import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnIconChangeCallBack;
 import com.kongzue.dialogx.interfaces.OnMenuItemClickListener;
-import com.kongzue.dialogx.style.BuildStyle;
 import com.kongzue.dialogx.style.IOSStyle;
 import com.kongzue.dialogx.style.KongzueStyle;
 import com.kongzue.dialogx.style.MIUIStyle;
@@ -121,12 +120,7 @@ public class MainActivity extends BaseActivity {
     
     @Override
     public void initDatas(JumpParameter parameter) {
-        if (BuildConfig.DEBUG) {
-            //开发中...
-            DialogX.globalStyle = BuildStyle.style();
-        } else {
-            DialogX.globalStyle = IOSStyle.style();
-        }
+        DialogX.globalStyle = IOSStyle.style();
     }
     
     //用于模拟进度提示