add kongzue style for BottomDialog & BottomMenu

.idea/compiler.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.7">
+      <module name="DialogXDemo.app" target="1.8" />
+      <module name="DialogXDemo.DialogX" target="1.8" />
+      <module name="DialogXDemo.DialogXIOSStyle" target="1.8" />
+      <module name="DialogXDemo.DialogXKongzueStyle" target="1.8" />
+      <module name="DialogXDemo.DialogXMIUIStyle" target="1.8" />
       <module name="DialogXInterface" target="1.7" />
     </bytecodeTargetLevel>
   </component>

.idea/gradle.xml

@@ -20,6 +20,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -123,7 +123,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -206,11 +206,6 @@ public class BottomDialog extends BaseDialog {
                         cancelBlurView.setUseBlur(false);
                         cancelBlurView.setRadiusPx(style.messageDialogBlurSettings().blurBackgroundRoundRadiusPx());
                         boxCancel.addView(cancelBlurView, 0, cancelButtonLp);
-                        
-                        int cancelButtonDrawable = style.overrideBottomDialogRes().overrideMenuCancelButtonBackgroundRes(isLightTheme());
-                        if (cancelButtonDrawable != 0) {
-                            btnCancel.setBackgroundResource(cancelButtonDrawable);
-                        }
                     }
                 }
                 

DialogX/src/main/java/com/kongzue/dialogx/style/BuildStyle.java

@@ -117,47 +117,7 @@ public class BuildStyle implements DialogXStyle {
     
     @Override
     public BottomDialogRes overrideBottomDialogRes() {
-        return new BottomDialogRes() {
-            
-            @Override
-            public boolean touchSlide() {
-                return true;
-            }
-            
-            @Override
-            public int overrideDialogLayout(boolean light) {
-                return light ? R.layout.layout_dialogx_bottom_material : R.layout.layout_dialogx_bottom_material_dark;
-            }
-            
-            @Override
-            public int overrideMenuDividerDrawableRes(boolean light) {
-                return light ? R.drawable.rect_dialogx_material_menu_split_divider : R.drawable.rect_dialogx_material_menu_split_divider_night;
-            }
-            
-            @Override
-            public int overrideMenuDividerHeight(boolean light) {
-                return 1;
-            }
-            
-            @Override
-            public int overrideMenuTextColor(boolean light) {
-                return light?R.color.black90:R.color.white90;
-            }
-            
-            @Override
-            public float overrideBottomDialogMaxHeight() {
-                return 0.6f;
-            }
-            
-            @Override
-            public int overrideMenuCancelButtonBackgroundRes(boolean b) {
-                return 0;
-            }
-            
-            @Override
-            public int overrideMenuItemLayout(boolean b, int i, int i1) {
-                return R.layout.item_dialogx_material_bottom_menu_normal_text;
-            }
-        };
+        return null;
     }
+    
 }

DialogX/src/main/java/com/kongzue/dialogx/style/MaterialStyle.java

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

DialogX/src/main/res/values/colors.xml

@@ -34,11 +34,4 @@
     <color name="dialogxWaitBkgLight">#CCF4F5F6</color>
     <color name="dialogxWaitBkgDark">#D1161616</color>
 
-    <color name="dialogxKongzueLightOkButtonBkgColor">#E1E9F1</color>
-    <color name="dialogxKongzueLightOkButtonBkgColorPress">#CEDAE6</color>
-    <color name="dialogxKongzueLightOtherButtonBkgColor">#F4F5F6</color>
-    <color name="dialogxKongzueLightOtherButtonBkgColorPress">#E6E8EA</color>
-    <color name="dialogxKongzueDarkBkgColor">#181818</color>
-    <color name="dialogxKongzueDarkButtonBkgColor">#272727</color>
-    <color name="dialogxKongzueDarkButtonBkgColorPress">#33363B</color>
 </resources>

DialogXIOSStyle/src/main/java/com/kongzue/dialogx/style/IOSStyle.java

@@ -182,11 +182,6 @@ public class IOSStyle implements DialogXStyle {
                 return 0f;
             }
             
-            @Override
-            public int overrideMenuCancelButtonBackgroundRes(boolean light) {
-                return light ? R.drawable.button_dialogx_ios_light : R.drawable.button_dialogx_ios_night;
-            }
-            
             @Override
             public int overrideMenuItemLayout(boolean light, int index, int count) {
                 if (light) {

DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios.xml

@@ -115,6 +115,8 @@
                         android:singleLine="true"
                         android:text="取消"
                         android:textColor="@color/dialogxIOSBlue"
+                        android:clickable="true"
+                        android:background="@drawable/button_dialogx_ios_light"
                         android:textSize="19dp"
                         android:textStyle="bold" />
 

DialogXIOSStyle/src/main/res/layout/layout_dialogx_bottom_ios_dark.xml

@@ -114,6 +114,8 @@
                         android:paddingRight="15dp"
                         android:singleLine="true"
                         android:textColor="@color/dialogxIOSBlueDark"
+                        android:clickable="true"
+                        android:background="@drawable/button_dialogx_ios_night"
                         android:text="取消"
                         android:textSize="19dp"
                         android:textStyle="bold" />

DialogXInterface/src/main/java/com/kongzue/dialogx/interfaces/DialogXStyle.java

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

DialogXKongzueStyle/src/main/java/com/kongzue/dialogx/style/KongzueStyle.java

@@ -91,6 +91,42 @@ public class KongzueStyle implements DialogXStyle {
     
     @Override
     public BottomDialogRes overrideBottomDialogRes() {
-        return null;
+        return new BottomDialogRes() {
+            
+            @Override
+            public boolean touchSlide() {
+                return false;
+            }
+            
+            @Override
+            public int overrideDialogLayout(boolean light) {
+                return light ? R.layout.layout_dialogx_bottom_kongzue : R.layout.layout_dialogx_bottom_kongzue_dark;
+            }
+            
+            @Override
+            public int overrideMenuDividerDrawableRes(boolean light) {
+                return light ? R.color.dialogxKongzueButtonSplitLineColor : R.color.dialogxKongzueDarkButtonSplitLineColor;
+            }
+            
+            @Override
+            public int overrideMenuDividerHeight(boolean light) {
+                return 1;
+            }
+            
+            @Override
+            public int overrideMenuTextColor(boolean light) {
+                return light?R.color.black90:R.color.white90;
+            }
+            
+            @Override
+            public float overrideBottomDialogMaxHeight() {
+                return 0.6f;
+            }
+            
+            @Override
+            public int overrideMenuItemLayout(boolean light, int index, int count) {
+                return light?R.layout.item_dialogx_kongzue_bottom_menu_normal_text:R.layout.item_dialogx_kongzue_bottom_menu_normal_text_dark;
+            }
+        };
     }
 }

DialogXKongzueStyle/src/main/res/drawable/button_dialogx_kongzue_menu_light.xml

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

DialogXKongzueStyle/src/main/res/drawable/button_dialogx_kongzue_menu_night.xml

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

DialogXKongzueStyle/src/main/res/layout/item_dialogx_kongzue_bottom_menu_normal_text.xml

@@ -0,0 +1,34 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_kongzue_menu_light">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="-5dp"
+            android:layout_marginRight="10dp"
+            android:padding="5dp" />
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text=""
+            android:textColor="@color/black90"
+            android:textSize="16dp" />
+
+    </RelativeLayout>
+
+</RelativeLayout>

DialogXKongzueStyle/src/main/res/layout/item_dialogx_kongzue_bottom_menu_normal_text_dark.xml

@@ -0,0 +1,34 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/button_dialogx_kongzue_menu_night">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp">
+
+        <ImageView
+            android:id="@+id/img_dialogx_menu_icon"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="-5dp"
+            android:layout_marginRight="10dp"
+            android:padding="5dp" />
+
+        <TextView
+            android:id="@+id/txt_dialogx_menu_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text=""
+            android:textColor="@color/black90"
+            android:textSize="16dp" />
+
+    </RelativeLayout>
+
+</RelativeLayout>

DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/box_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black20"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/box_bkg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.kongzue.dialogx.util.views.MaxRelativeLayout
+            android:id="@+id/bkg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/white"
+            android:focusableInTouchMode="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:clickable="true"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/txt_dialog_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center_vertical"
+                    android:paddingHorizontal="20dp"
+                    android:paddingBottom="10dp"
+                    android:text="Title"
+                    android:textColor="@color/black"
+                    android:textSize="21dp" />
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:overScrollMode="never"
+                    android:scrollbarSize="7dp"
+                    android:scrollbars="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/box_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/txt_dialog_tip"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="20dp"
+                            android:paddingBottom="5dp"
+                            android:text="This is content text."
+                            android:textColor="@color/black70"
+                            android:textSize="16dp" />
+
+                        <ImageView
+                            android:tag="split"
+                            android:layout_width="match_parent"
+                            android:background="@color/dialogxKongzueButtonSplitLineColor"
+                            android:layout_height="1px"/>
+
+                        <RelativeLayout
+                            android:id="@+id/box_custom"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:background="@color/dialogxKongzueButtonSplitLineColor"
+                    android:layout_height="1px"/>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:background="@color/dialogxKongzueButtonSplitSpaceColor"
+                    android:layout_height="8dp"/>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:background="@color/dialogxKongzueButtonSplitLineColor"
+                    android:layout_height="1px"/>
+
+                <TextView
+                    android:tag="cancel"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                    android:singleLine="true"
+                    android:background="@drawable/button_dialogx_kongzue_menu_light"
+                    android:text="取消"
+                    android:textColor="@color/black90"
+                    android:textSize="16dp"/>
+
+            </LinearLayout>
+
+        </com.kongzue.dialogx.util.views.MaxRelativeLayout>
+
+    </RelativeLayout>
+
+</com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout>

DialogXKongzueStyle/src/main/res/layout/layout_dialogx_bottom_kongzue_dark.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/box_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black20"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/box_bkg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.kongzue.dialogx.util.views.MaxRelativeLayout
+            android:id="@+id/bkg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/dialogxKongzueDarkDialogBkgColor"
+            android:focusableInTouchMode="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:clickable="true"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/txt_dialog_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center_vertical"
+                    android:paddingHorizontal="20dp"
+                    android:paddingBottom="10dp"
+                    android:text="Title"
+                    android:textColor="@color/white"
+                    android:textSize="21dp" />
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:overScrollMode="never"
+                    android:scrollbarSize="7dp"
+                    android:scrollbars="vertical">
+
+                    <LinearLayout
+                        android:id="@+id/box_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/txt_dialog_tip"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="20dp"
+                            android:paddingBottom="5dp"
+                            android:text="This is content text."
+                            android:textColor="@color/white60"
+                            android:textSize="16dp" />
+
+                        <ImageView
+                            android:tag="split"
+                            android:layout_width="match_parent"
+                            android:background="@color/dialogxKongzueDarkButtonSplitLineColor"
+                            android:layout_height="1px"/>
+
+                        <RelativeLayout
+                            android:id="@+id/box_custom"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:background="@color/dialogxKongzueDarkButtonSplitSpaceColor"
+                    android:layout_height="8dp"/>
+
+                <TextView
+                    android:tag="cancel"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:gravity="center"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                    android:singleLine="true"
+                    android:background="@drawable/button_dialogx_kongzue_menu_night"
+                    android:text="取消"
+                    android:textColor="@color/white90"
+                    android:textSize="16dp"/>
+
+            </LinearLayout>
+
+        </com.kongzue.dialogx.util.views.MaxRelativeLayout>
+
+    </RelativeLayout>
+
+</com.kongzue.dialogx.util.views.DialogXBaseRelativeLayout>

DialogXKongzueStyle/src/main/res/values/colors.xml

@@ -39,5 +39,11 @@
     <color name="dialogxKongzueDarkBkgColor">#181818</color>
     <color name="dialogxKongzueDarkButtonBkgColor">#272727</color>
     <color name="dialogxKongzueDarkButtonBkgColorPress">#33363B</color>
+    <color name="dialogxKongzueButtonSplitSpaceColor">#0D000000</color>
+    <color name="dialogxKongzueButtonSplitLineColor">#26000000</color>
+    <color name="dialogxKongzueDarkDialogBkgColor">#343434</color>
+    <color name="dialogxKongzueDarkButtonSplitSpaceColor">#1AFFFFFF</color>
+    <color name="dialogxKongzueDarkButtonMenuBackgroundColor">#0DFFFFFF</color>
+    <color name="dialogxKongzueDarkButtonSplitLineColor">#26FFFFFF</color>
 
 </resources>

README.md

@@ -7,7 +7,7 @@ DialogX 采用分离设计，默认自带 Material 主题，可选引入 IOS、K
 
 更低的耦合度，无论对话框是否正在显示，请肆意执行的 Activity 关闭逻辑，而无需担心引发 WindowLeaked 错误。
 
-```目前开发进度：64% [●●●●●●●●●●●●●○○○○○○○]```
+```目前开发进度：66% [●●●●●●●●●●●●●○○○○○○○]```
 
 ## 开发计划
 

app/src/main/java/com/kongzue/dialogxdemo/MainActivity.java

@@ -366,8 +366,7 @@ public class MainActivity extends BaseActivity {
                                     return false;
                                 }
                             });
-                }
-                if (rdoIos.isChecked()) {
+                }else{
                     BottomMenu.show(new String[]{"新标签页中打开", "稍后阅读", "复制链接网址"})
                             .setMessage("http://www.kongzue.com/DialogX")
                             .setOnMenuItemClickListener(new OnMenuItemClickListener<BottomMenu>() {