From e2ff60e2efd0be2127cebfdcb9519f6370f24ade Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Sat, 1 Oct 2022 00:46:56 +0800
Subject: [PATCH] Modify standard code naming in FunctionFactory

---
 .../com/fankes/tsbattery/ui/activity/MainActivity.kt |  6 +++---
 .../ui/activity/parasitic/ConfigActivity.kt          |  4 ++--
 .../tsbattery/utils/factory/FunctionFactory.kt       | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
index 9c8cc38..04341fc 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
@@ -95,9 +95,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 noCancelable()
             }
         /** 设置安装状态 */
-        binding.mainTextQqVer.text = if (PackageName.QQ.isInstall) version(PackageName.QQ) else "未安装"
-        binding.mainTextTimVer.text = if (PackageName.TIM.isInstall) version(PackageName.TIM) else "未安装"
-        binding.mainTextWechatVer.text = if (PackageName.WECHAT.isInstall) version(PackageName.WECHAT) else "未安装"
+        binding.mainTextQqVer.text = if (PackageName.QQ.isInstall) versionBrandOf(PackageName.QQ) else "未安装"
+        binding.mainTextTimVer.text = if (PackageName.TIM.isInstall) versionBrandOf(PackageName.TIM) else "未安装"
+        binding.mainTextWechatVer.text = if (PackageName.WECHAT.isInstall) versionBrandOf(PackageName.WECHAT) else "未安装"
         /** 设置文本 */
         binding.mainTextVersion.text = "模块版本：${BuildConfig.VERSION_NAME} $pendingFlag"
         binding.mainQqItem.setOnClickListener {
diff --git a/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt
index 8d52d9d..1374a9f 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt
@@ -70,7 +70,7 @@ class ConfigActivity : BaseActivity<ActivityConfigBinding>() {
             }
         }
         binding.titleNameText.text = "TSBattery 设置 (${appName.trim()})"
-        binding.appIcon.setImageDrawable(findAppIcon())
+        binding.appIcon.setImageDrawable(appIconOf())
         binding.appName.text = appName.trim()
         binding.appVersion.text = "${versionName}($versionCode)"
         binding.moduleVersion.text = "${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})"
@@ -134,5 +134,5 @@ class ConfigActivity : BaseActivity<ActivityConfigBinding>() {
      * 获取当前 APP 名称
      * @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 " } }
 }
\ No newline at end of file
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 ff5a451..f00b9bd 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
@@ -69,7 +69,7 @@ inline val Context.isNotSystemInDarkMode get() = !isSystemInDarkMode
  * 得到安装包信息
  * @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]
  */
-fun Context.version(packageName: String) = safeOfNothing {
-    packageManager?.getPackageInfo(packageName, 0)?.let {
+fun Context.versionBrandOf(name: String = packageName) = safeOfNothing {
+    packageManager?.getPackageInfo(name, 0)?.let {
         "${it.versionName}(${it.versionCode})"
     } ?: ""
 }
@@ -114,7 +114,7 @@ fun Context.version(packageName: String) = safeOfNothing {
  * @param name APP 包名 - 默认为当前 APP
  * @return [String]
  */
-fun Context.findAppName(name: String = packageName) =
+fun Context.appNameOf(name: String = packageName) =
     safeOfNothing { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadLabel(packageManager).toString() }
 
 /**
@@ -122,7 +122,7 @@ fun Context.findAppName(name: String = packageName) =
  * @param name APP 包名 - 默认为当前 APP
  * @return [Drawable] or null
  */
-fun Context.findAppIcon(name: String = packageName) =
+fun Context.appIconOf(name: String = packageName) =
     safeOfNull { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadIcon(packageManager) }
 
 /**