Modify standard code naming in FunctionFactory

This commit is contained in:
2022-10-01 00:46:56 +08:00
parent ad0b6d253a
commit e2ff60e2ef
3 changed files with 11 additions and 11 deletions

View File

@@ -95,9 +95,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
noCancelable() noCancelable()
} }
/** 设置安装状态 */ /** 设置安装状态 */
binding.mainTextQqVer.text = if (PackageName.QQ.isInstall) version(PackageName.QQ) else "未安装" binding.mainTextQqVer.text = if (PackageName.QQ.isInstall) versionBrandOf(PackageName.QQ) else "未安装"
binding.mainTextTimVer.text = if (PackageName.TIM.isInstall) version(PackageName.TIM) else "未安装" binding.mainTextTimVer.text = if (PackageName.TIM.isInstall) versionBrandOf(PackageName.TIM) else "未安装"
binding.mainTextWechatVer.text = if (PackageName.WECHAT.isInstall) version(PackageName.WECHAT) else "未安装" binding.mainTextWechatVer.text = if (PackageName.WECHAT.isInstall) versionBrandOf(PackageName.WECHAT) else "未安装"
/** 设置文本 */ /** 设置文本 */
binding.mainTextVersion.text = "模块版本:${BuildConfig.VERSION_NAME} $pendingFlag" binding.mainTextVersion.text = "模块版本:${BuildConfig.VERSION_NAME} $pendingFlag"
binding.mainQqItem.setOnClickListener { binding.mainQqItem.setOnClickListener {

View File

@@ -70,7 +70,7 @@ class ConfigActivity : BaseActivity<ActivityConfigBinding>() {
} }
} }
binding.titleNameText.text = "TSBattery 设置 (${appName.trim()})" binding.titleNameText.text = "TSBattery 设置 (${appName.trim()})"
binding.appIcon.setImageDrawable(findAppIcon()) binding.appIcon.setImageDrawable(appIconOf())
binding.appName.text = appName.trim() binding.appName.text = appName.trim()
binding.appVersion.text = "${versionName}($versionCode)" binding.appVersion.text = "${versionName}($versionCode)"
binding.moduleVersion.text = "${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})" binding.moduleVersion.text = "${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})"
@@ -134,5 +134,5 @@ class ConfigActivity : BaseActivity<ActivityConfigBinding>() {
* 获取当前 APP 名称 * 获取当前 APP 名称
* @return [String] * @return [String]
*/ */
private val appName by lazy { findAppName().let { if (packageName == PackageName.WECHAT) it else " $it " } } private val appName by lazy { appNameOf().let { if (packageName == PackageName.WECHAT) it else " $it " } }
} }

View File

@@ -69,7 +69,7 @@ inline val Context.isNotSystemInDarkMode get() = !isSystemInDarkMode
* 得到安装包信息 * 得到安装包信息
* @return [PackageInfo] * @return [PackageInfo]
*/ */
val Context.packageInfo get() = packageManager?.getPackageInfo(packageName, 0) ?: PackageInfo() private val Context.packageInfo get() = packageManager?.getPackageInfo(packageName, 0) ?: PackageInfo()
/** /**
* 判断应用是否安装 * 判断应用是否安装
@@ -100,11 +100,11 @@ val Context.versionCode get() = packageInfo.versionCode
/** /**
* 得到版本信息与版本号 * 得到版本信息与版本号
* @param packageName 包名 * @param name APP 包名 - 默认为当前 APP
* @return [String] * @return [String]
*/ */
fun Context.version(packageName: String) = safeOfNothing { fun Context.versionBrandOf(name: String = packageName) = safeOfNothing {
packageManager?.getPackageInfo(packageName, 0)?.let { packageManager?.getPackageInfo(name, 0)?.let {
"${it.versionName}(${it.versionCode})" "${it.versionName}(${it.versionCode})"
} ?: "" } ?: ""
} }
@@ -114,7 +114,7 @@ fun Context.version(packageName: String) = safeOfNothing {
* @param name APP 包名 - 默认为当前 APP * @param name APP 包名 - 默认为当前 APP
* @return [String] * @return [String]
*/ */
fun Context.findAppName(name: String = packageName) = fun Context.appNameOf(name: String = packageName) =
safeOfNothing { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadLabel(packageManager).toString() } safeOfNothing { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadLabel(packageManager).toString() }
/** /**
@@ -122,7 +122,7 @@ fun Context.findAppName(name: String = packageName) =
* @param name APP 包名 - 默认为当前 APP * @param name APP 包名 - 默认为当前 APP
* @return [Drawable] or null * @return [Drawable] or null
*/ */
fun Context.findAppIcon(name: String = packageName) = fun Context.appIconOf(name: String = packageName) =
safeOfNull { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadIcon(packageManager) } safeOfNull { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadIcon(packageManager) }
/** /**