更新AlertDialog方法参数的位置

shaoshuai904 · May 23, 2020 · a5539aa · a5539aa
1 parent 4c5ebfe
commit a5539aa
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # iOS style Dialog
 
-[![API](https://img.shields.io/badge/API-14%2B-green.svg?style=flat)](https://android-arsenal.com/api?level=14)
+[![API](https://img.shields.io/badge/API-14%2B-green.svg?style=flat)](https://android-arsenal.com/api?level=19)
 [![jitpack](https://jitpack.io/v/shaoshuai904/iOS_Style_Dialog.svg)](https://jitpack.io/#shaoshuai904/iOS_Style_Dialog)
 [![demo](https://img.shields.io/badge/download-demo-blue.svg)](https://github.com/shaoshuai904/IOSDialog/blob/master/screens/app-v1.4.0_15.apk) <-- 点击下载demo
 
@@ -20,7 +20,7 @@ allprojects {
 
 ```groovy
 dependencies {
-	implementation 'com.github.shaoshuai904:iOS_Style_Dialog:1.4.0'
+	implementation 'com.github.shaoshuai904:iOS_Style_Dialog:1.4.1'
 }
 ```
 
@@ -51,24 +51,6 @@ dependencies {
                 .show();
 ```
 
-### AlertEditDialog
-
-	样式布局:[ 标题 + 消息 + 输入框 + 左按钮 + 右按钮 ]
-
-```java       
-        new AlertEditDialog(mContext)
-                .setTitle("姓名")
-                .setMessage("请输入您的真实姓名。")
-                .setLeftButton("取消", null)
-                .setRightButton("确定", new AlertEditDialog.EditTextCallListener() {
-                    @Override
-                    public void callBack(String str) {
-                        showToast(str);
-                    }
-                })
-                .show();
-```
-
 ### ActionSheetDialog
 
 	样式布局:[ 标题 + 页签条目 + 取消按钮 ]
@@ -91,37 +73,11 @@ dependencies {
             }.show()
 ```
 
-### AlertNumberPickerDialog
-
-	样式布局:[ 标题 + 选择框 + 左按钮 + 右按钮 ]
-
-```java 
-        numbers = new String[]{"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
-        defValue = numbers[index];
-
-        new AlertNumberPickerDialog(mContext)
-                .setTitle("Number")
-                .setNumberValues(numbers, index, new NumberPicker.OnValueChangeListener() {
-                    @Override
-                    public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
-                        defValue = numbers[newVal];
-                    }
-                })
-                .setLeftButton("Cancel", null)
-                .setRightButton("OK", new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        showToast(defValue);
-                    }
-                })
-                .show();
-```
-
+[完整预览各类用法 -（简单使用类 传送门）](https://github.com/shaoshuai904/iOS_Style_Dialog/blob/master/app/src/main/java/com/maple/iosdialog/MainActivity.kt)
 
-[完整预览各类用法 -（简单使用类 传送门）](https://github.com/shaoshuai904/iOS_Style_Dialog/blob/master/app/src/main/java/com/maple/iosdialog/MainActivity.java)
 
 ----------
-## v1.4.0 ##
+## v1.4.1 ##
  - AlertDialog 兼容html样式
  - 新增ActionSheetRecyclerDialog，支持自定义item Bean，自定义最大高度，自定义样式选择
  - 更新minSdkVersion = 19

diff --git a/app/src/main/java/com/maple/iosdialog/MainActivity.kt b/app/src/main/java/com/maple/iosdialog/MainActivity.kt
@@ -34,7 +34,7 @@ class MainActivity : Activity() {
             setTitle("退出当前账号")
             setHtmlMessage("再连续登陆<font color=\"#ff0000\">15</font>天，就可变身为QQ达人。退出QQ可能会使你现有记录归零，确定退出？")
             setLeftButton("取消")
-            setRightButton("确认退出", listener = View.OnClickListener { showToast("exit") })
+            setRightButton("确认退出", View.OnClickListener { showToast("exit") })
         }.show()
     }
 
@@ -43,7 +43,7 @@ class MainActivity : Activity() {
             setCancelable(true)
             setScaleWidth(rootView, 0.7) // 设置宽度，占屏幕宽度百分比
             setMessage("你现在无法接收到新消息提醒。请到系统-设置-通知中开启消息提醒")
-            setRightButton("确定", listener = View.OnClickListener { showToast("OK") })
+            setRightButton("确定", View.OnClickListener { showToast("OK") })
         }.show()
     }
 
@@ -52,7 +52,7 @@ class MainActivity : Activity() {
             setTitle("确认删除：XXXX？", isBold = true)
             setMessage("1.必须确保空间下不存在任何文件、文件夹或图片样式，否则无法删除;\n2.存储空间删除后不可恢复且可能会影响正在使用该空间的其他用户。",
                     spSize = 14f, gravity = Gravity.START)
-            setRightButton("确定", listener = View.OnClickListener { showToast("OK") })
+            setRightButton("确定", View.OnClickListener { showToast("OK") })
         }.show()
     }
 
@@ -202,7 +202,7 @@ class MainActivity : Activity() {
             setTitle("姓名")
             setMessage("请输入您的真实姓名。")
             setLeftButton("取消")
-            setRightButton("确定", listener = object : EditTextCallListener {
+            setRightButton("确定", object : EditTextCallListener {
                 override fun callBack(str: String?) {
                     showToast(str)
                 }
@@ -213,7 +213,7 @@ class MainActivity : Activity() {
     fun aeTwo(view: View?) {
         AlertEditDialog(this).apply {
             setMessage("给自己起一个好听的名字吧")
-            setRightButton("确定", listener = object : EditTextCallListener {
+            setRightButton("确定", object : EditTextCallListener {
                 override fun callBack(str: String?) {
                     if (!TextUtils.isEmpty(str)) {
                         showToast(str)
@@ -234,7 +234,7 @@ class MainActivity : Activity() {
             setTitle("Number")
             setNumberValues(numbers, index, OnValueChangeListener { picker: NumberPicker?, oldVal: Int, newVal: Int -> defValue = numbers[newVal] })
             setLeftButton("Cancel")
-            setRightButton("OK", listener = View.OnClickListener { showToast(defValue) })
+            setRightButton("OK", View.OnClickListener { showToast(defValue) })
         }.show()
     }
 
@@ -248,7 +248,7 @@ class MainActivity : Activity() {
             setNumberValues(numbers, index, OnValueChangeListener { picker: NumberPicker?, oldVal: Int, newVal: Int -> defValue = numbers[newVal] })
             setNumberValueSuffix("市")
             setLeftButton("取消")
-            setRightButton("确定", listener = View.OnClickListener { showToast(defValue) })
+            setRightButton("确定", View.OnClickListener { showToast(defValue) })
         }.show()
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,5 +16,5 @@ android.injected.testOnly=false
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_CODE=15
-VERSION_NAME=1.4.0
+VERSION_CODE=16
+VERSION_NAME=1.4.1
diff --git a/msdialog/src/main/java/com/maple/msdialog/AlertDialog.kt b/msdialog/src/main/java/com/maple/msdialog/AlertDialog.kt
@@ -9,8 +9,8 @@ import android.text.Html
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
-import com.maple.msdialog.utils.DialogUtil.setScaleWidth
 import com.maple.msdialog.databinding.DialogAlertBinding
+import com.maple.msdialog.utils.DialogUtil.setScaleWidth
 
 /**
  * 警告框式Dialog [ 标题 + 消息文本 + 左按钮 + 右按钮 ]
@@ -88,10 +88,15 @@ class AlertDialog(private val mContext: Context) : Dialog(mContext, R.style.Aler
 
     fun setLeftButton(
             text: CharSequence?,
+            listener: View.OnClickListener? = null
+    ) = setLeftButton(text, listener, ContextCompat.getColor(mContext, R.color.def_left_color), 17f, false)
+
+    fun setLeftButton(
+            text: CharSequence?,
+            listener: View.OnClickListener? = null,
             color: Int = ContextCompat.getColor(mContext, R.color.def_left_color),
             spSize: Float = 17f,
-            isBold: Boolean = false,
-            listener: View.OnClickListener? = null
+            isBold: Boolean = false
     ): AlertDialog {
         showLeftBtn = true
         binding.btLeft.apply {
@@ -109,10 +114,15 @@ class AlertDialog(private val mContext: Context) : Dialog(mContext, R.style.Aler
 
     fun setRightButton(
             text: CharSequence?,
+            listener: View.OnClickListener? = null
+    ) = setRightButton(text, listener, ContextCompat.getColor(mContext, R.color.def_right_color), 17f, false)
+
+    fun setRightButton(
+            text: CharSequence?,
+            listener: View.OnClickListener? = null,
             color: Int = ContextCompat.getColor(mContext, R.color.def_right_color),
             spSize: Float = 17f,
-            isBold: Boolean = false,
-            listener: View.OnClickListener? = null
+            isBold: Boolean = false
     ): AlertDialog {
         showRightBtn = true
         binding.btRight.apply {

diff --git a/msdialog/src/main/java/com/maple/msdialog/AlertEditDialog.kt b/msdialog/src/main/java/com/maple/msdialog/AlertEditDialog.kt
@@ -79,10 +79,15 @@ class AlertEditDialog(private val mContext: Context) : Dialog(mContext, R.style.
 
     fun setLeftButton(
             text: CharSequence?,
+            listener: View.OnClickListener? = null
+    ) = setLeftButton(text, listener, ContextCompat.getColor(mContext, R.color.def_left_color), 16f, false)
+
+    fun setLeftButton(
+            text: CharSequence?,
+            listener: View.OnClickListener? = null,
             color: Int = ContextCompat.getColor(mContext, R.color.def_left_color),
             spSize: Float = 16f,
-            isBold: Boolean = false,
-            listener: View.OnClickListener? = null
+            isBold: Boolean = false
     ): AlertEditDialog {
         showLeftBtn = true
         binding.btLeft.apply {
@@ -100,10 +105,15 @@ class AlertEditDialog(private val mContext: Context) : Dialog(mContext, R.style.
 
     fun setRightButton(
             text: CharSequence?,
+            listener: EditTextCallListener? = null
+    ) = setRightButton(text, listener, ContextCompat.getColor(mContext, R.color.def_right_color), 16f, false)
+
+    fun setRightButton(
+            text: CharSequence?,
+            listener: EditTextCallListener? = null,
             color: Int = ContextCompat.getColor(mContext, R.color.def_right_color),
             spSize: Float = 16f,
-            isBold: Boolean = false,
-            listener: EditTextCallListener? = null
+            isBold: Boolean = false
     ): AlertEditDialog {
         showRightBtn = true
         binding.btRight.apply {

diff --git a/msdialog/src/main/java/com/maple/msdialog/AlertNumberPickerDialog.kt b/msdialog/src/main/java/com/maple/msdialog/AlertNumberPickerDialog.kt
@@ -9,8 +9,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.DatePicker
 import android.widget.NumberPicker.OnValueChangeListener
-import com.maple.msdialog.utils.DialogUtil.setScaleWidth
 import com.maple.msdialog.databinding.DialogNumberPickerBinding
+import com.maple.msdialog.utils.DialogUtil.setScaleWidth
 
 /**
  * 警告框式数字选择器Dialog [ 标题 + 数字选择 + 左按钮 + 右按钮 ]
@@ -95,10 +95,15 @@ class AlertNumberPickerDialog(private val mContext: Context) : Dialog(mContext,
 
     fun setLeftButton(
             text: CharSequence?,
+            listener: View.OnClickListener? = null
+    ) = setLeftButton(text, listener, ContextCompat.getColor(mContext, R.color.def_left_color), 16f, false)
+
+    fun setLeftButton(
+            text: CharSequence?,
+            listener: View.OnClickListener? = null,
             color: Int = ContextCompat.getColor(mContext, R.color.def_left_color),
             spSize: Float = 16f,
-            isBold: Boolean = false,
-            listener: View.OnClickListener? = null
+            isBold: Boolean = false
     ): AlertNumberPickerDialog {
         showLeftBtn = true
         binding.tvLeft.apply {
@@ -116,10 +121,15 @@ class AlertNumberPickerDialog(private val mContext: Context) : Dialog(mContext,
 
     fun setRightButton(
             text: CharSequence?,
+            listener: View.OnClickListener? = null
+    ) = setRightButton(text, listener, ContextCompat.getColor(mContext, R.color.def_right_color), 16f, false)
+
+    fun setRightButton(
+            text: CharSequence?,
+            listener: View.OnClickListener? = null,
             color: Int = ContextCompat.getColor(mContext, R.color.def_right_color),
             spSize: Float = 16f,
-            isBold: Boolean = false,
-            listener: View.OnClickListener? = null
+            isBold: Boolean = false
     ): AlertNumberPickerDialog {
         showRightBtn = true
         binding.tvRight.apply {