diff --git a/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt b/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt index 148b6fa..9f80bd5 100644 --- a/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt +++ b/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt @@ -44,10 +44,10 @@ import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass /** * 构造对话框 * @param isUseBlackTheme 是否使用深色主题 - * @param it 对话框方法体 + * @param initiate 对话框方法体 */ -fun Context.showDialog(isUseBlackTheme: Boolean = false, it: DialogBuilder.() -> Unit) = - DialogBuilder(this, isUseBlackTheme).apply(it).show() +fun Context.showDialog(isUseBlackTheme: Boolean = false, initiate: DialogBuilder.() -> Unit) = + DialogBuilder(this, isUseBlackTheme).apply(initiate).show() /** * 对话框构造器 @@ -140,34 +140,34 @@ class DialogBuilder(val context: Context, private val isUseBlackTheme: Boolean) /** * 设置对话框确定按钮 * @param text 按钮文本内容 - * @param it 点击事件 + * @param callback 点击事件 */ - fun confirmButton(text: String = "确定", it: () -> Unit = {}) { + fun confirmButton(text: String = "确定", callback: () -> Unit = {}) { if (isUsingAndroidX) - runInSafe { instanceAndroidX?.setPositiveButton(text) { _, _ -> it() } } - else runInSafe { instanceAndroid?.setPositiveButton(text) { _, _ -> it() } } + runInSafe { instanceAndroidX?.setPositiveButton(text) { _, _ -> callback() } } + else runInSafe { instanceAndroid?.setPositiveButton(text) { _, _ -> callback() } } } /** * 设置对话框取消按钮 * @param text 按钮文本内容 - * @param it 点击事件 + * @param callback 点击事件 */ - fun cancelButton(text: String = "取消", it: () -> Unit = {}) { + fun cancelButton(text: String = "取消", callback: () -> Unit = {}) { if (isUsingAndroidX) - runInSafe { instanceAndroidX?.setNegativeButton(text) { _, _ -> it() } } - else runInSafe { instanceAndroid?.setNegativeButton(text) { _, _ -> it() } } + runInSafe { instanceAndroidX?.setNegativeButton(text) { _, _ -> callback() } } + else runInSafe { instanceAndroid?.setNegativeButton(text) { _, _ -> callback() } } } /** * 设置对话框第三个按钮 * @param text 按钮文本内容 - * @param it 点击事件 + * @param callback 点击事件 */ - fun neutralButton(text: String = "更多", it: () -> Unit = {}) { + fun neutralButton(text: String = "更多", callback: () -> Unit = {}) { if (isUsingAndroidX) - runInSafe { instanceAndroidX?.setNeutralButton(text) { _, _ -> it() } } - else runInSafe { instanceAndroid?.setNeutralButton(text) { _, _ -> it() } } + runInSafe { instanceAndroidX?.setNeutralButton(text) { _, _ -> callback() } } + else runInSafe { instanceAndroid?.setNeutralButton(text) { _, _ -> callback() } } } /** 取消对话框 */ diff --git a/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt index 3c140d2..d2b981b 100644 --- a/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt @@ -137,13 +137,13 @@ fun toast(msg: String) = Toast.makeText(appContext, msg, Toast.LENGTH_SHORT).sho * 弹出 [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() /** diff --git a/app/src/main/java/com/fankes/tsbattery/utils/tool/GithubReleaseTool.kt b/app/src/main/java/com/fankes/tsbattery/utils/tool/GithubReleaseTool.kt index a7404ea..6cca4dd 100644 --- a/app/src/main/java/com/fankes/tsbattery/utils/tool/GithubReleaseTool.kt +++ b/app/src/main/java/com/fankes/tsbattery/utils/tool/GithubReleaseTool.kt @@ -44,9 +44,9 @@ object GithubReleaseTool { * 获取最新版本信息 * @param context 实例 * @param version 当前版本 - * @param it 成功后回调 - ([String] 最新版本,[Function] 更新对话框方法体) + * @param result 成功后回调 - ([String] 最新版本,[Function] 更新对话框方法体) */ - fun checkingForUpdate(context: Context, version: String, it: (String, () -> Unit) -> Unit) = checkingInternetConnect(context) { + fun checkingForUpdate(context: Context, version: String, result: (String, () -> Unit) -> Unit) = checkingInternetConnect(context) { OkHttpClient().newBuilder().build().newCall( Request.Builder() .url("https://api.github.com/repos/$REPO_AUTHOR/$REPO_NAME/releases/latest") @@ -72,7 +72,7 @@ object GithubReleaseTool { } if (name != version) (context as? Activity?)?.runOnUiThread { showUpdate() - it(name) { showUpdate() } + result(name) { showUpdate() } } } } @@ -83,9 +83,9 @@ object GithubReleaseTool { /** * 检查网络连接情况 * @param context 实例 - * @param it 已连接回调 + * @param result 已连接回调 */ - private fun checkingInternetConnect(context: Context, it: () -> Unit) = runInSafe { + private fun checkingInternetConnect(context: Context, result: () -> Unit) = runInSafe { if (isNetWorkSuccess) OkHttpClient().newBuilder().build().newCall( Request.Builder() @@ -106,7 +106,7 @@ object GithubReleaseTool { } override fun onResponse(call: Call, response: Response) = runInSafe { - (context as? Activity?)?.runOnUiThread { runInSafe { it() } } + (context as? Activity?)?.runOnUiThread { runInSafe { result() } } } }) }