Browse Source

0.0.37.beta5

kongzue 4 years ago
parent
commit
b579f4a055

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

@@ -668,12 +668,14 @@ public class BottomDialog extends BaseDialog {
     public BottomDialog setCancelButton(CharSequence cancelText, OnDialogButtonClickListener<BottomDialog> cancelButtonClickListener) {
         this.cancelText = cancelText;
         this.cancelButtonClickListener = cancelButtonClickListener;
+        refreshUI();
         return this;
     }
     
     public BottomDialog setCancelButton(int cancelTextResId, OnDialogButtonClickListener<BottomDialog> cancelButtonClickListener) {
         this.cancelText = getString(cancelTextResId);
         this.cancelButtonClickListener = cancelButtonClickListener;
+        refreshUI();
         return this;
     }
     
@@ -714,7 +716,6 @@ public class BottomDialog extends BaseDialog {
     
     public BottomDialog setCancelButtonClickListener(OnDialogButtonClickListener<BottomDialog> cancelButtonClickListener) {
         this.cancelButtonClickListener = cancelButtonClickListener;
-        refreshUI();
         return this;
     }
     
@@ -788,12 +789,14 @@ public class BottomDialog extends BaseDialog {
     public BottomDialog setOkButton(CharSequence OkText, OnDialogButtonClickListener<BottomDialog> OkButtonClickListener) {
         this.okText = OkText;
         this.okButtonClickListener = OkButtonClickListener;
+        refreshUI();
         return this;
     }
     
     public BottomDialog setOkButton(int OkTextResId, OnDialogButtonClickListener<BottomDialog> OkButtonClickListener) {
         this.okText = getString(OkTextResId);
         this.okButtonClickListener = OkButtonClickListener;
+        refreshUI();
         return this;
     }
     
@@ -821,12 +824,14 @@ public class BottomDialog extends BaseDialog {
     public BottomDialog setOtherButton(CharSequence OtherText, OnDialogButtonClickListener<BottomDialog> OtherButtonClickListener) {
         this.otherText = OtherText;
         this.otherButtonClickListener = OtherButtonClickListener;
+        refreshUI();
         return this;
     }
     
     public BottomDialog setOtherButton(int OtherTextResId, OnDialogButtonClickListener<BottomDialog> OtherButtonClickListener) {
         this.otherText = getString(OtherTextResId);
         this.otherButtonClickListener = OtherButtonClickListener;
+        refreshUI();
         return this;
     }
     

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

@@ -212,42 +212,6 @@ public class MainActivity extends BaseActivity {
     
     private int selectMenuIndex;
     
-    private void b(){
-        CustomDialog.show(new OnBindView<CustomDialog>(R.layout.layout_custom_view) {
-            @Override
-            public void onBind(final CustomDialog dialog, View v) {
-                log("#B");
-                v.findViewById(R.id.img_ico).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        log("B click!");
-                    }
-                });
-            }
-        })
-        .setAutoUnsafePlacePadding(true)
-        .setMaskColor(getResources().getColor(R.color.black30))
-        .setAlign(CustomDialog.ALIGN.TOP);
-    }
-    
-    private void a(){
-        CustomDialog.show(new OnBindView<CustomDialog>(R.layout.layout_custom_dialog) {
-            @Override
-            public void onBind(final CustomDialog dialog, View v) {
-                log("#A");
-                v.findViewById(R.id.btn_ok).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        b();
-                        dialog.dismiss();
-                    }
-                });
-            }
-        })
-                .setFullScreen(true)
-                .setMaskColor(getResources().getColor(R.color.black30));
-    }
-    
     @Override
     public void setEvents() {
         grpTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@@ -292,14 +256,13 @@ public class MainActivity extends BaseActivity {
         btnMessageDialog.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-//                MessageDialog.show("标题", "这里是正文内容。", "确定").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
-//                    @Override
-//                    public boolean onClick(MessageDialog baseDialog, View v) {
-//                        PopTip.show("点击确定按钮");
-//                        return false;
-//                    }
-//                });
-               a();
+                MessageDialog.show("标题", "这里是正文内容。", "确定").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
+                    @Override
+                    public boolean onClick(MessageDialog baseDialog, View v) {
+                        PopTip.show("点击确定按钮");
+                        return false;
+                    }
+                });
             }
         });
         
@@ -445,7 +408,7 @@ public class MainActivity extends BaseActivity {
                         new OnBindView<BottomDialog>(R.layout.layout_custom_view) {
                             @Override
                             public void onBind(BottomDialog dialog, View v) {
-                            
+
                             }
                         })
                         .show();

+ 1 - 1
gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.37.beta4
+BUILD_VERSION=0.0.37.beta5
 BUILD_VERSION_INT=36