Ver código fonte

0.0.50.beta29
- 修复 BottomMenu、MessageMenu 布局存在的问题

Kongzue 3 meses atrás
pai
commit
33bb824fe7
23 arquivos alterados com 1024 adições e 884 exclusões
  1. 1 1
      DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java
  2. 1 2
      DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageMenu.java
  3. 38 31
      DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml
  4. 38 30
      DialogX/src/main/res/layout/layout_dialogx_bottom_material_dark.xml
  5. 54 47
      DialogX/src/main/res/layout/layout_dialogx_material.xml
  6. 53 46
      DialogX/src/main/res/layout/layout_dialogx_material_dark.xml
  7. 51 43
      DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios.xml
  8. 49 42
      DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios_dark.xml
  9. 58 52
      DialogXIOSStyle/src/main/res/layout/layout_dialogx_ios.xml
  10. 58 52
      DialogXIOSStyle/src/main/res/layout/layout_dialogx_ios_dark.xml
  11. 48 41
      DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue.xml
  12. 48 41
      DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue_dark.xml
  13. 64 58
      DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml
  14. 64 57
      DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue_dark.xml
  15. 45 38
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui.xml
  16. 45 39
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui_dark.xml
  17. 63 55
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui.xml
  18. 63 56
      DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui_dark.xml
  19. 42 35
      DialogXMaterialYou/src/main/res/layout/layout_dialogx_bottom_material_you.xml
  20. 41 33
      DialogXMaterialYou/src/main/res/layout/layout_dialogx_bottom_material_you_dark.xml
  21. 49 42
      DialogXMaterialYou/src/main/res/layout/layout_dialogx_material_you.xml
  22. 50 42
      DialogXMaterialYou/src/main/res/layout/layout_dialogx_material_you_dark.xml
  23. 1 1
      gradle.properties

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

@@ -12,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
@@ -625,7 +626,6 @@ public class BottomMenu extends BottomDialog {
 
             ViewGroup.LayoutParams listViewLp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             getDialogImpl().boxList.addView(listView, listViewLp);
-
             refreshUI();
         }
     }

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

@@ -12,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
@@ -504,7 +505,6 @@ public class MessageMenu extends MessageDialog {
                 dividerDrawableResId = isLightTheme() ? R.drawable.rect_dialogx_material_menu_split_divider : R.drawable.rect_dialogx_material_menu_split_divider_night;
             }
 
-
             if (!isLightTheme()) {
                 listView = new DialogListView(getDialogImpl(), getOwnActivity(), R.style.DialogXCompatThemeDark);
             } else {
@@ -618,7 +618,6 @@ public class MessageMenu extends MessageDialog {
 
             ViewGroup.LayoutParams listViewLp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             getDialogImpl().boxList.addView(listView, listViewLp);
-
             refreshUI();
         }
     }

+ 38 - 31
DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml

@@ -50,45 +50,52 @@
                     android:textColor="@color/black"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbars="vertical">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginBottom="5dp"
-                            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>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="20dp"
+                                android:layout_marginRight="20dp"
+                                android:layout_marginBottom="5dp"
+                                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>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"

+ 38 - 30
DialogX/src/main/res/layout/layout_dialogx_bottom_material_dark.xml

@@ -50,45 +50,53 @@
                     android:textColor="@color/white"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbars="vertical">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginBottom="5dp"
-                            android:paddingBottom="5dp"
-                            android:text="This is content text."
-                            android:textColor="@color/white60"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="20dp"
+                                android:layout_marginRight="20dp"
+                                android:layout_marginBottom="5dp"
+                                android:paddingBottom="5dp"
+                                android:text="This is content text."
+                                android:textColor="@color/white60"
+                                android:textSize="16dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 54 - 47
DialogX/src/main/res/layout/layout_dialogx_material.xml

@@ -40,61 +40,68 @@
                     android:textColor="@color/black"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="20dp"
-                            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"
-                            android:visibility="gone" />
+                        android:overScrollMode="never">
 
-                        <EditText
-                            android:id="@+id/txt_input"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginEnd="20dp"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:paddingTop="10dp"
-                            android:paddingBottom="10dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/black90"
-                            android:textSize="18dp"
-                            android:theme="@style/DialogXCompatThemeLight" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginEnd="20dp"
+                                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"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginEnd="20dp"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:paddingTop="10dp"
+                                android:paddingBottom="10dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/black90"
+                                android:textSize="18dp"
+                                android:theme="@style/DialogXCompatThemeLight" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 53 - 46
DialogX/src/main/res/layout/layout_dialogx_material_dark.xml

@@ -40,61 +40,68 @@
                     android:textColor="@color/white"
                     android:textSize="21dp" />
 
-
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="20dp"
-                            android:text="This is content text."
-                            android:textColor="@color/white60"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginEnd="20dp"
+                                android:text="This is content text."
+                                android:textColor="@color/white60"
+                                android:textSize="16dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginEnd="20dp"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:paddingTop="10dp"
+                                android:paddingBottom="10dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/white"
+                                android:textSize="18dp"
+                                android:theme="@style/DialogXCompatThemeDark" />
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-                        <EditText
-                            android:id="@+id/txt_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginEnd="20dp"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:paddingTop="10dp"
-                            android:paddingBottom="10dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/white"
-                            android:textSize="18dp"
-                            android:theme="@style/DialogXCompatThemeDark" />
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 51 - 43
DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios.xml

@@ -56,54 +56,62 @@
                             android:textSize="12dp"
                             android:textStyle="bold" />
 
-                        <com.kongzue.dialogx.util.views.DialogScrollView
-                            android:id="@+id/scrollView"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:overScrollMode="never"
-                            android:scrollbarSize="7dp"
-                            android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
-                            android:scrollbars="vertical">
+                            android:layout_weight="1"
+                            android:orientation="vertical">
 
-                            <LinearLayout
-                                android:id="@+id/box_content"
+                            <com.kongzue.dialogx.util.views.DialogScrollView
+                                android:id="@+id/scrollView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical">
+                                android:overScrollMode="never"
+                                android:scrollbarSize="7dp"
+                                android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
+                                android:scrollbars="vertical">
 
-                                <TextView
-                                    android:id="@+id/txt_dialog_tip"
+                                <LinearLayout
+                                    android:id="@+id/box_content"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginLeft="20dp"
-                                    android:layout_marginRight="20dp"
-                                    android:gravity="center_horizontal"
-                                    android:paddingTop="7dp"
-                                    android:paddingBottom="7dp"
-                                    android:text="This is content text."
-                                    android:textColor="@color/dialogxIOSTipTextLight"
-                                    android:textSize="12dp" />
-
-                                <RelativeLayout
-                                    android:id="@+id/box_custom"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content" />
-
-                                <ImageView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="1px"
-                                    android:tag="split"
-                                    android:visibility="gone" />
-
-                            </LinearLayout>
-
-                        </com.kongzue.dialogx.util.views.DialogScrollView>
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:id="@+id/txt_dialog_tip"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="20dp"
+                                        android:layout_marginRight="20dp"
+                                        android:gravity="center_horizontal"
+                                        android:paddingTop="7dp"
+                                        android:paddingBottom="7dp"
+                                        android:text="This is content text."
+                                        android:textColor="@color/dialogxIOSTipTextLight"
+                                        android:textSize="12dp" />
+
+                                    <RelativeLayout
+                                        android:id="@+id/box_custom"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content" />
+
+                                    <ImageView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="1px"
+                                        android:tag="split"
+                                        android:visibility="gone" />
+
+                                </LinearLayout>
+
+                            </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                            <FrameLayout
+                                android:id="@+id/box_list"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
 
-                        <FrameLayout
-                            android:id="@+id/box_list"
-                            android:layout_weight="1"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                        </LinearLayout>
 
                     </com.kongzue.dialogx.style.views.BlurLinearLayout>
 
@@ -136,8 +144,8 @@
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="1px"
-                        android:tag="imgPositiveButtonSplit"
-                        android:background="@color/dialogxIOSSplitLight"/>
+                        android:background="@color/dialogxIOSSplitLight"
+                        android:tag="imgPositiveButtonSplit" />
 
                     <TextView
                         android:id="@+id/btn_selectOther"
@@ -156,9 +164,9 @@
                     <ImageView
                         android:id="@+id/split_selectOther"
                         android:layout_width="match_parent"
-                        android:tag="imgOtherButtonSplit"
                         android:layout_height="1px"
-                        android:background="@color/dialogxIOSSplitLight"/>
+                        android:background="@color/dialogxIOSSplitLight"
+                        android:tag="imgOtherButtonSplit" />
 
                     <TextView
                         android:id="@+id/btn_selectNegative"

+ 49 - 42
DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios_dark.xml

@@ -57,54 +57,61 @@
                             android:textSize="12dp"
                             android:textStyle="bold" />
 
-                        <com.kongzue.dialogx.util.views.DialogScrollView
-                            android:id="@+id/scrollView"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:overScrollMode="never"
-                            android:scrollbarSize="7dp"
-                            android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
-                            android:scrollbars="vertical">
+                            android:layout_weight="1"
+                            android:orientation="vertical">
 
-                            <LinearLayout
-                                android:id="@+id/box_content"
+                            <com.kongzue.dialogx.util.views.DialogScrollView
+                                android:id="@+id/scrollView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical">
+                                android:overScrollMode="never"
+                                android:scrollbarSize="7dp"
+                                android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
+                                android:scrollbars="vertical">
 
-                                <TextView
-                                    android:id="@+id/txt_dialog_tip"
+                                <LinearLayout
+                                    android:id="@+id/box_content"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginLeft="20dp"
-                                    android:layout_marginRight="20dp"
-                                    android:gravity="center"
-                                    android:paddingTop="13dp"
-                                    android:paddingBottom="13dp"
-                                    android:text="This is content text."
-                                    android:textColor="@color/dialogxIOSTipTextDark"
-                                    android:textSize="12dp" />
-
-                                <RelativeLayout
-                                    android:id="@+id/box_custom"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content" />
-
-                                <ImageView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="1px"
-                                    android:tag="split"
-                                    android:visibility="gone" />
-
-                            </LinearLayout>
-
-                        </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                        <FrameLayout
-                            android:id="@+id/box_list"
-                            android:layout_weight="1"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:id="@+id/txt_dialog_tip"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="20dp"
+                                        android:layout_marginRight="20dp"
+                                        android:gravity="center"
+                                        android:paddingTop="13dp"
+                                        android:paddingBottom="13dp"
+                                        android:text="This is content text."
+                                        android:textColor="@color/dialogxIOSTipTextDark"
+                                        android:textSize="12dp" />
+
+                                    <RelativeLayout
+                                        android:id="@+id/box_custom"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content" />
+
+                                    <ImageView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="1px"
+                                        android:tag="split"
+                                        android:visibility="gone" />
+
+                                </LinearLayout>
+
+                            </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                            <FrameLayout
+                                android:id="@+id/box_list"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+                        </LinearLayout>
 
                     </com.kongzue.dialogx.style.views.BlurLinearLayout>
 
@@ -118,8 +125,8 @@
                     android:divider="@drawable/rect_dialogx_ios_menu_split_divider"
                     android:orientation="vertical"
                     android:showDividers="middle"
-                    app:dialogxOverlayColorNoAlpha="true"
-                    app:dialogxDarkMode="true">
+                    app:dialogxDarkMode="true"
+                    app:dialogxOverlayColorNoAlpha="true">
 
                     <TextView
                         android:id="@+id/btn_selectPositive"

+ 58 - 52
DialogXIOSStyle/src/main/res/layout/layout_dialogx_ios.xml

@@ -40,66 +40,72 @@
                     android:textColor="@color/black"
                     android:textSize="17dp" />
 
-
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         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_marginStart="15dp"
-                            android:layout_marginEnd="15dp"
-                            android:gravity="start"
-                            android:text="This is content text."
-                            android:textColor="@color/black"
-                            android:textSize="13dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
+                        android:scrollbars="vertical">
 
-                        <EditText
-                            android:id="@+id/txt_input"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="15dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginEnd="15dp"
-                            android:background="@drawable/editbox_dialogx_ios_light"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="5dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/black90"
-                            android:textSize="14dp"
-                            android:theme="@style/DialogXCompatThemeLight" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                            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_marginStart="15dp"
+                                android:layout_marginEnd="15dp"
+                                android:gravity="start"
+                                android:text="This is content text."
+                                android:textColor="@color/black"
+                                android:textSize="13dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="15dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginEnd="15dp"
+                                android:background="@drawable/editbox_dialogx_ios_light"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="5dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/black90"
+                                android:textSize="14dp"
+                                android:theme="@style/DialogXCompatThemeLight" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <ImageView
                     android:id="@+id/split_horizontal"

+ 58 - 52
DialogXIOSStyle/src/main/res/layout/layout_dialogx_ios_dark.xml

@@ -41,66 +41,72 @@
                     android:textColor="@color/white"
                     android:textSize="17dp" />
 
-
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         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_marginStart="15dp"
-                            android:layout_marginEnd="15dp"
-                            android:gravity="start"
-                            android:text="This is content text."
-                            android:textColor="@color/white"
-                            android:textSize="13dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
+                        android:scrollbars="vertical">
 
-                        <EditText
-                            android:id="@+id/txt_input"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="15dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginEnd="15dp"
-                            android:background="@drawable/editbox_dialogx_ios_dark"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="5dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/white"
-                            android:textSize="14dp"
-                            android:theme="@style/DialogXCompatThemeDark" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                            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_marginStart="15dp"
+                                android:layout_marginEnd="15dp"
+                                android:gravity="start"
+                                android:text="This is content text."
+                                android:textColor="@color/white"
+                                android:textSize="13dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="15dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginEnd="15dp"
+                                android:background="@drawable/editbox_dialogx_ios_dark"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="5dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/white"
+                                android:textSize="14dp"
+                                android:theme="@style/DialogXCompatThemeDark" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <ImageView
                     android:id="@+id/split_horizontal"

+ 48 - 41
DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue.xml

@@ -41,60 +41,67 @@
                     android:textColor="@color/black"
                     android:textSize="18dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         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_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:gravity="start"
-                            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" />
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbars="vertical">
 
-                        <ImageView
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:background="@color/dialogxKongzueButtonSplitLineColor"
-                            android:tag="split" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                            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_marginLeft="20dp"
+                                android:layout_marginRight="20dp"
+                                android:gravity="start"
+                                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" />
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="1px"
+                                android:background="@color/dialogxKongzueButtonSplitLineColor"
+                                android:tag="split" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:divider="@color/dialogxKongzueButtonSplitLineColor"
                     android:orientation="vertical"
                     android:showDividers="middle"
-                    android:divider="@color/dialogxKongzueButtonSplitLineColor"
                     android:tag="cancelBox">
 
                     <ImageView

+ 48 - 41
DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue_dark.xml

@@ -41,59 +41,66 @@
                     android:textColor="@color/white"
                     android:textSize="18dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         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_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:gravity="start"
-                            android:paddingBottom="5dp"
-                            android:text="This is content text."
-                            android:textColor="@color/white60"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbars="vertical">
 
-                        <ImageView
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:background="@color/dialogxKongzueDarkButtonSplitLineColor"
-                            android:tag="split" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                            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_marginLeft="20dp"
+                                android:layout_marginRight="20dp"
+                                android:gravity="start"
+                                android:paddingBottom="5dp"
+                                android:text="This is content text."
+                                android:textColor="@color/white60"
+                                android:textSize="16dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="1px"
+                                android:background="@color/dialogxKongzueDarkButtonSplitLineColor"
+                                android:tag="split" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
                     android:divider="@color/dialogxKongzueDarkButtonSplitLineColor"
+                    android:orientation="vertical"
                     android:showDividers="middle"
                     android:tag="buttonBox">
 

+ 64 - 58
DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml

@@ -39,72 +39,78 @@
                     android:textColor="@color/black"
                     android:textSize="20dp" />
 
-
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         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_marginStart="25dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginEnd="25dp"
-                            android:layout_marginBottom="10dp"
-                            android:gravity="start"
-                            android:paddingTop="5dp"
-                            android:paddingBottom="10dp"
-                            android:text="This is content text."
-                            android:textColor="@color/black70"
-                            android:textSize="14dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                        android:overScrollMode="never">
 
-                        <EditText
-                            android:id="@+id/txt_input"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="20dp"
-                            android:layout_marginBottom="15dp"
-                            android:background="@drawable/editbox_dialogx_kongzue_light"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:paddingStart="10dp"
-                            android:paddingTop="10dp"
-                            android:paddingEnd="10dp"
-                            android:paddingBottom="10dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/black90"
-                            android:textColorHint="@color/black30"
-                            android:textSize="14dp"
-                            android:theme="@style/DialogXCompatThemeLight"
-                            android:visibility="gone" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                            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_marginStart="25dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginEnd="25dp"
+                                android:layout_marginBottom="10dp"
+                                android:gravity="start"
+                                android:paddingTop="5dp"
+                                android:paddingBottom="10dp"
+                                android:text="This is content text."
+                                android:textColor="@color/black70"
+                                android:textSize="14dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginEnd="20dp"
+                                android:layout_marginBottom="15dp"
+                                android:background="@drawable/editbox_dialogx_kongzue_light"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:paddingStart="10dp"
+                                android:paddingTop="10dp"
+                                android:paddingEnd="10dp"
+                                android:paddingBottom="10dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/black90"
+                                android:textColorHint="@color/black30"
+                                android:textSize="14dp"
+                                android:theme="@style/DialogXCompatThemeLight"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 64 - 57
DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue_dark.xml

@@ -39,72 +39,79 @@
                     android:textColor="@color/white"
                     android:textSize="20dp" />
 
-
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never">
+                    android:orientation="vertical"
+                    android:layout_weight="1">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="25dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginEnd="25dp"
-                            android:layout_marginBottom="10dp"
-                            android:gravity="start"
-                            android:paddingTop="5dp"
-                            android:paddingBottom="10dp"
-                            android:text="This is content text."
-                            android:textColor="@color/white80"
-                            android:textSize="14dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                            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_marginStart="25dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginEnd="25dp"
+                                android:layout_marginBottom="10dp"
+                                android:gravity="start"
+                                android:paddingTop="5dp"
+                                android:paddingBottom="10dp"
+                                android:text="This is content text."
+                                android:textColor="@color/white80"
+                                android:textSize="14dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginStart="20dp"
+                                android:layout_marginEnd="20dp"
+                                android:layout_marginBottom="15dp"
+                                android:background="@drawable/editbox_dialogx_kongzue_night"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:paddingStart="10dp"
+                                android:paddingTop="10dp"
+                                android:paddingEnd="10dp"
+                                android:paddingBottom="10dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/white90"
+                                android:textColorHint="@color/white30"
+                                android:textSize="14dp"
+                                android:theme="@style/DialogXCompatThemeDark"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-                        <EditText
-                            android:id="@+id/txt_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="20dp"
-                            android:layout_marginBottom="15dp"
-                            android:background="@drawable/editbox_dialogx_kongzue_night"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:paddingStart="10dp"
-                            android:paddingTop="10dp"
-                            android:paddingEnd="10dp"
-                            android:paddingBottom="10dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/white90"
-                            android:textColorHint="@color/white30"
-                            android:textSize="14dp"
-                            android:theme="@style/DialogXCompatThemeDark"
-                            android:visibility="gone" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 45 - 38
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui.xml

@@ -40,52 +40,59 @@
                     android:textColor="@color/black"
                     android:textSize="18dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
+                        android:scrollbars="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_marginLeft="26dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginRight="26dp"
-                            android:gravity="start"
-                            android:paddingBottom="5dp"
-                            android:text="This is content text."
-                            android:textColor="@color/black70"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
+                            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_marginLeft="26dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginRight="26dp"
+                                android:gravity="start"
+                                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>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:visibility="gone" />
 
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 45 - 39
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_bottom_miui_dark.xml

@@ -40,52 +40,58 @@
                     android:textColor="@color/dialogxMIUITextDark"
                     android:textSize="18dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
+                        android:scrollbars="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_marginLeft="26dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginRight="26dp"
-                            android:gravity="start"
-                            android:paddingBottom="5dp"
-                            android:text="This is content text."
-                            android:textColor="@color/dialogxMIUITextDark"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:layout_weight="1"
-                    android:visibility="gone" />
+                            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_marginLeft="26dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginRight="26dp"
+                                android:gravity="start"
+                                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>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 63 - 55
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui.xml

@@ -40,70 +40,78 @@
                     android:textColor="@color/black"
                     android:textSize="18dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical"
+                        android:scrollbars="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_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:gravity="start"
-                            android:paddingTop="10dp"
-                            android:paddingBottom="15dp"
-                            android:text="This is content text."
-                            android:textColor="@color/black60"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                            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_marginLeft="20dp"
+                                android:layout_marginRight="20dp"
+                                android:gravity="start"
+                                android:paddingTop="10dp"
+                                android:paddingBottom="15dp"
+                                android:text="This is content text."
+                                android:textColor="@color/black60"
+                                android:textSize="16dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginLeft="20dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginRight="20dp"
+                                android:layout_marginBottom="15dp"
+                                android:background="@drawable/editbox_dialogx_miui_light"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="15dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/black90"
+                                android:textColorHint="@color/dialogxMIUIEditTextHintColor"
+                                android:textSize="16dp"
+                                android:theme="@style/DialogXCompatThemeLight"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-                        <EditText
-                            android:id="@+id/txt_input"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginBottom="15dp"
-                            android:background="@drawable/editbox_dialogx_miui_light"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="15dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/black90"
-                            android:textColorHint="@color/dialogxMIUIEditTextHintColor"
-                            android:textSize="16dp"
-                            android:theme="@style/DialogXCompatThemeLight"
-                            android:visibility="gone" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 63 - 56
DialogXMIUIStyle/src/main/res/layout/layout_dialogx_miui_dark.xml

@@ -40,70 +40,77 @@
                     android:textColor="@color/dialogxMIUITextDark"
                     android:textSize="18dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbarSize="7dp"
-                    android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         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_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:gravity="start"
-                            android:paddingTop="10dp"
-                            android:paddingBottom="15dp"
-                            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"
-                            android:visibility="gone" />
+                        android:overScrollMode="never"
+                        android:scrollbarSize="7dp"
+                        android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark"
+                        android:scrollbars="vertical">
 
-                        <EditText
-                            android:id="@+id/txt_input"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginBottom="15dp"
-                            android:background="@drawable/editbox_dialogx_miui_night"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:padding="15dp"
-                            android:scrollbars="vertical"
-                            android:text=""
-                            android:textColor="@color/white"
-                            android:textColorHint="@color/dialogxMIUIEditTextHintColorDark"
-                            android:textSize="16dp"
-                            android:theme="@style/DialogXCompatThemeLight"
-                            android:visibility="gone" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                            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_marginLeft="20dp"
+                                android:layout_marginRight="20dp"
+                                android:gravity="start"
+                                android:paddingTop="10dp"
+                                android:paddingBottom="15dp"
+                                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"
+                                android:visibility="gone" />
+
+                            <EditText
+                                android:id="@+id/txt_input"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginLeft="20dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginRight="20dp"
+                                android:layout_marginBottom="15dp"
+                                android:background="@drawable/editbox_dialogx_miui_night"
+                                android:inputType="text"
+                                android:maxLines="1"
+                                android:padding="15dp"
+                                android:scrollbars="vertical"
+                                android:text=""
+                                android:textColor="@color/white"
+                                android:textColorHint="@color/dialogxMIUIEditTextHintColorDark"
+                                android:textSize="16dp"
+                                android:theme="@style/DialogXCompatThemeLight"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 42 - 35
DialogXMaterialYou/src/main/res/layout/layout_dialogx_bottom_material_you.xml

@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black20"
-    android:theme="@style/DialogXCompatThemeLight"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:theme="@style/DialogXCompatThemeLight">
 
     <RelativeLayout
         android:id="@+id/box_bkg"
@@ -44,53 +44,60 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center"
-                    android:paddingTop="13dp"
                     android:paddingLeft="20dp"
+                    android:paddingTop="13dp"
                     android:paddingRight="20dp"
                     android:text="Title"
                     android:textColor="@color/black"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbars="vertical">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="10dp"
-                            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>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
-
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="20dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginRight="20dp"
+                                android:layout_marginBottom="5dp"
+                                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>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"

+ 41 - 33
DialogXMaterialYou/src/main/res/layout/layout_dialogx_bottom_material_you_dark.xml

@@ -3,9 +3,9 @@
     android:id="@+id/box_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/DialogXCompatThemeNight"
     android:background="@color/black40"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:theme="@style/DialogXCompatThemeNight">
 
     <RelativeLayout
         android:id="@+id/box_bkg"
@@ -51,46 +51,54 @@
                     android:textColor="@color/white"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never"
-                    android:scrollbars="vertical">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:id="@+id/box_content"
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never"
+                        android:scrollbars="vertical">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
+                        <LinearLayout
+                            android:id="@+id/box_content"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginTop="10dp"
-                            android:layout_marginRight="20dp"
-                            android:layout_marginBottom="5dp"
-                            android:paddingBottom="5dp"
-                            android:text="This is content text."
-                            android:textColor="@color/white60"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="20dp"
+                                android:layout_marginTop="10dp"
+                                android:layout_marginRight="20dp"
+                                android:layout_marginBottom="5dp"
+                                android:paddingBottom="5dp"
+                                android:text="This is content text."
+                                android:textColor="@color/white60"
+                                android:textSize="16dp" />
+
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content" />
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 49 - 42
DialogXMaterialYou/src/main/res/layout/layout_dialogx_material_you.xml

@@ -42,65 +42,72 @@
                     android:textColor="@color/black"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="20dp"
-                            android:text="This is content text."
-                            android:textColor="@color/black90"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                            android:orientation="vertical">
 
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:tag="dialogx_editbox">
-
-                            <EditText
-                                android:id="@+id/txt_input"
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
                                 android:layout_marginStart="20dp"
-                                android:layout_marginTop="10dp"
                                 android:layout_marginEnd="20dp"
-                                android:inputType="text"
-                                android:maxLines="1"
-                                android:padding="10dp"
-                                android:scrollbars="vertical"
+                                android:text="This is content text."
                                 android:textColor="@color/black90"
-                                android:textSize="18dp" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
+                                android:textSize="16dp" />
 
-                    </LinearLayout>
-
-                </com.kongzue.dialogx.util.views.DialogScrollView>
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
 
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:tag="dialogx_editbox">
+
+                                <EditText
+                                    android:id="@+id/txt_input"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_horizontal"
+                                    android:layout_marginStart="20dp"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginEnd="20dp"
+                                    android:inputType="text"
+                                    android:maxLines="1"
+                                    android:padding="10dp"
+                                    android:scrollbars="vertical"
+                                    android:textColor="@color/black90"
+                                    android:textSize="18dp" />
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 50 - 42
DialogXMaterialYou/src/main/res/layout/layout_dialogx_material_you_dark.xml

@@ -41,66 +41,74 @@
                     android:textColor="@color/white"
                     android:textSize="21dp" />
 
-                <com.kongzue.dialogx.util.views.DialogScrollView
-                    android:id="@+id/scrollView"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:overScrollMode="never">
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <com.kongzue.dialogx.util.views.DialogScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:overScrollMode="never">
 
-                        <TextView
-                            android:id="@+id/txt_dialog_tip"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginStart="20dp"
-                            android:layout_marginEnd="20dp"
-                            android:text="This is content text."
-                            android:textColor="@color/white"
-                            android:textSize="16dp" />
-
-                        <RelativeLayout
-                            android:id="@+id/box_custom"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:visibility="gone" />
+                            android:orientation="vertical">
 
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:tag="dialogx_editbox">
-
-                            <EditText
-                                android:id="@+id/txt_input"
+                            <TextView
+                                android:id="@+id/txt_dialog_tip"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
                                 android:layout_marginStart="20dp"
-                                android:layout_marginTop="10dp"
                                 android:layout_marginEnd="20dp"
-                                android:inputType="text"
-                                android:maxLines="1"
-                                android:padding="10dp"
-                                android:scrollbars="vertical"
-                                android:text=""
+                                android:text="This is content text."
                                 android:textColor="@color/white"
-                                android:textSize="18dp" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
+                                android:textSize="16dp" />
 
-                    </LinearLayout>
+                            <RelativeLayout
+                                android:id="@+id/box_custom"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone" />
 
-                </com.kongzue.dialogx.util.views.DialogScrollView>
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:tag="dialogx_editbox">
+
+                                <EditText
+                                    android:id="@+id/txt_input"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_horizontal"
+                                    android:layout_marginStart="20dp"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginEnd="20dp"
+                                    android:inputType="text"
+                                    android:maxLines="1"
+                                    android:padding="10dp"
+                                    android:scrollbars="vertical"
+                                    android:text=""
+                                    android:textColor="@color/white"
+                                    android:textSize="18dp" />
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                        </LinearLayout>
+
+                    </com.kongzue.dialogx.util.views.DialogScrollView>
+
+                    <FrameLayout
+                        android:id="@+id/box_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
-                <FrameLayout
-                    android:id="@+id/box_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/box_button"

+ 1 - 1
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.beta28
+BUILD_VERSION=0.0.50.beta29
 BUILD_VERSION_INT=50
 DIALOGX_STYLE_VERSION=5
 android.nonTransitiveRClass=true