Merge code

This commit is contained in:
2022-05-30 01:45:42 +08:00
parent 26712b18e4
commit a461010b56
2 changed files with 15 additions and 15 deletions

View File

@@ -148,34 +148,34 @@ class DialogBuilder(val context: Context) {
/**
* 设置对话框确定按钮
* @param text 按钮文本内容
* @param it 点击事件
* @param callback 点击事件
*/
fun confirmButton(text: String = LocaleString.confirm, it: () -> Unit = {}) {
fun confirmButton(text: String = LocaleString.confirm, callback: () -> Unit = {}) {
if (isUsingAndroidX)
runCatching { instanceAndroidX?.setPositiveButton(text) { _, _ -> it() } }
else runCatching { instanceAndroid?.setPositiveButton(text) { _, _ -> it() } }
runCatching { instanceAndroidX?.setPositiveButton(text) { _, _ -> callback() } }
else runCatching { instanceAndroid?.setPositiveButton(text) { _, _ -> callback() } }
}
/**
* 设置对话框取消按钮
* @param text 按钮文本内容
* @param it 点击事件
* @param callback 点击事件
*/
fun cancelButton(text: String = LocaleString.cancel, it: () -> Unit = {}) {
fun cancelButton(text: String = LocaleString.cancel, callback: () -> Unit = {}) {
if (isUsingAndroidX)
runCatching { instanceAndroidX?.setNegativeButton(text) { _, _ -> it() } }
else runCatching { instanceAndroid?.setNegativeButton(text) { _, _ -> it() } }
runCatching { instanceAndroidX?.setNegativeButton(text) { _, _ -> callback() } }
else runCatching { instanceAndroid?.setNegativeButton(text) { _, _ -> callback() } }
}
/**
* 设置对话框第三个按钮
* @param text 按钮文本内容
* @param it 点击事件
* @param callback 点击事件
*/
fun neutralButton(text: String = LocaleString.more, it: () -> Unit = {}) {
fun neutralButton(text: String = LocaleString.more, callback: () -> Unit = {}) {
if (isUsingAndroidX)
runCatching { instanceAndroidX?.setNeutralButton(text) { _, _ -> it() } }
else runCatching { instanceAndroid?.setNeutralButton(text) { _, _ -> it() } }
runCatching { instanceAndroidX?.setNeutralButton(text) { _, _ -> callback() } }
else runCatching { instanceAndroid?.setNeutralButton(text) { _, _ -> callback() } }
}
/**

View File

@@ -121,13 +121,13 @@ fun Context.toast(msg: String) = Toast.makeText(this, msg, Toast.LENGTH_SHORT).s
* 弹出 [Snackbar]
* @param msg 提示内容
* @param actionText 按钮文本 - 不写默认取消按钮
* @param it 按钮事件回调
* @param callback 按钮事件回调
*/
fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) =
fun Context.snake(msg: String, actionText: String = "", callback: () -> Unit = {}) =
Snackbar.make((this as Activity).findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG).apply {
if (actionText.isBlank()) return@apply
setActionTextColor(if (isSystemInDarkMode) Color.BLACK else Color.WHITE)
setAction(actionText) { it() }
setAction(actionText) { callback() }
}.show()
/**