refactor: migrate LogUtils, remove utilcodex

Author: lisonge

app/build.gradle.kts

@@ -199,6 +199,10 @@ composeCompiler {
     )
 }
 
+loc {
+    template = "{packageName}.{methodName}({fileName}:{lineNumber})"
+}
+
 dependencies {
     implementation(libs.kotlin.stdlib)
 
@@ -255,7 +259,6 @@ dependencies {
     // https://github.com/Kotlin/kotlinx-atomicfu/issues/145
     implementation(libs.kotlinx.atomicfu)
 
-    implementation(libs.utilcodex)
     implementation(libs.activityResultLauncher)
 
     implementation(libs.destinations.core)
@@ -273,6 +276,7 @@ dependencies {
 
     implementation(libs.toaster)
     implementation(libs.permissions)
+    implementation(libs.device)
 
     implementation(libs.json5)
     compileOnly(libs.loc.annotation)

app/src/main/kotlin/li/songe/gkd/App.kt

@@ -18,8 +18,6 @@ import android.provider.Settings
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityManager
 import android.view.inputmethod.InputMethodManager
-import com.blankj.utilcode.util.LogUtils
-import com.blankj.utilcode.util.Utils
 import kotlinx.coroutines.MainScope
 import kotlinx.serialization.Serializable
 import li.songe.gkd.data.selfAppInfo
@@ -29,11 +27,11 @@ import li.songe.gkd.service.initA11yWhiteAppList
 import li.songe.gkd.shizuku.initShizuku
 import li.songe.gkd.store.initStore
 import li.songe.gkd.util.AndroidTarget
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.PKG_FLAGS
 import li.songe.gkd.util.initAppState
 import li.songe.gkd.util.initSubsState
 import li.songe.gkd.util.initToast
-import li.songe.gkd.util.toJson5String
 import li.songe.gkd.util.toast
 import org.lsposed.hiddenapibypass.HiddenApiBypass
 
@@ -173,16 +171,7 @@ class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        Utils.init(this)
-        LogUtils.getConfig().apply {
-            setConsoleSwitch(META.debuggable)
-            saveDays = 7
-            isLog2FileSwitch = true
-        }
-        LogUtils.d(
-            "META",
-            toJson5String(META),
-        )
+        LogUtils.d()
         Thread.setDefaultUncaughtExceptionHandler { t, e ->
             toast(e.message ?: e.toString())
             LogUtils.d("UncaughtExceptionHandler", t, e)

app/src/main/kotlin/li/songe/gkd/MainActivity.kt

@@ -48,7 +48,6 @@ import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.rememberNavController
-import com.blankj.utilcode.util.LogUtils
 import com.dylanc.activityresult.launcher.PickContentLauncher
 import com.dylanc.activityresult.launcher.StartActivityLauncher
 import com.ramcosta.composedestinations.DestinationsNavHost
@@ -92,6 +91,7 @@ import li.songe.gkd.util.AndroidTarget
 import li.songe.gkd.util.BarUtils
 import li.songe.gkd.util.EditGithubCookieDlg
 import li.songe.gkd.util.KeyboardUtils
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.ShortUrlSet
 import li.songe.gkd.util.appInfoMapFlow
 import li.songe.gkd.util.componentName
@@ -179,7 +179,7 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         fixSomeProblems()
         super.onCreate(savedInstanceState)
-        LogUtils.d("MainActivity::onCreate")
+        LogUtils.d()
         mainVm
         launcher
         pickContentLauncher
@@ -245,7 +245,7 @@ class MainActivity : ComponentActivity() {
 
     override fun onStart() {
         super.onStart()
-        LogUtils.d("MainActivity::onStart")
+        LogUtils.d()
         activityVisibleState++
         if (topActivityFlow.value.appId != META.appId) {
             updateTopActivity(META.appId, MainActivity::class.jvmName)
@@ -255,7 +255,7 @@ class MainActivity : ComponentActivity() {
     var isFirstResume = true
     override fun onResume() {
         super.onResume()
-        LogUtils.d("MainActivity::onResume")
+        LogUtils.d()
         if (isFirstResume && startTime - app.startTime < 2000) {
             isFirstResume = false
         } else {
@@ -265,13 +265,13 @@ class MainActivity : ComponentActivity() {
 
     override fun onStop() {
         super.onStop()
-        LogUtils.d("MainActivity::onStop")
+        LogUtils.d()
         activityVisibleState--
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        LogUtils.d("MainActivity::onDestroy")
+        LogUtils.d()
     }
 
     private var lastBackPressedTime = 0L

app/src/main/kotlin/li/songe/gkd/MainViewModel.kt

@@ -8,7 +8,6 @@ import android.webkit.URLUtil
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavHostController
 import androidx.navigation.NavOptionsBuilder
-import com.blankj.utilcode.util.LogUtils
 import com.ramcosta.composedestinations.generated.destinations.AdvancedPageDestination
 import com.ramcosta.composedestinations.generated.destinations.SnapshotPageDestination
 import com.ramcosta.composedestinations.generated.destinations.WebViewPageDestination
@@ -44,6 +43,7 @@ import li.songe.gkd.ui.component.UploadOptions
 import li.songe.gkd.ui.home.BottomNavItem
 import li.songe.gkd.ui.share.BaseViewModel
 import li.songe.gkd.util.LOCAL_SUBS_ID
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.OnSimpleLife
 import li.songe.gkd.util.ThrottleTimer
 import li.songe.gkd.util.UpdateStatus
@@ -242,7 +242,7 @@ class MainViewModel : BaseViewModel(), OnSimpleLife {
     }
 
     fun handleIntent(intent: Intent) = viewModelScope.launchTry {
-        LogUtils.d("handleIntent", intent)
+        LogUtils.d(intent)
         val uri = intent.data?.normalizeScheme()
         val source = intent.getStringExtra(activityNavSourceName)
         if (uri?.scheme == "gkd") {

app/src/main/kotlin/li/songe/gkd/a11y/A11yFeat.kt

@@ -12,7 +12,6 @@ import android.view.View
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
 import androidx.core.content.ContextCompat
-import com.blankj.utilcode.util.LogUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.update
@@ -24,6 +23,7 @@ import li.songe.gkd.service.A11yService
 import li.songe.gkd.service.StatusService
 import li.songe.gkd.shizuku.shizukuContextFlow
 import li.songe.gkd.store.storeFlow
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.ScreenUtils
 import li.songe.gkd.util.SnapshotExt
 import li.songe.gkd.util.UpdateTimeOption
@@ -93,8 +93,6 @@ private fun onA11yFeatEvent(event: AccessibilityEvent) = event.run {
 }
 
 private var lastCheckShizukuTime = 0L
-
-context(event: AccessibilityEvent)
 private fun watchCheckShizukuState() {
     // 借助无障碍轮询校验 shizuku 权限, 因为 shizuku 可能无故被关闭
     if (storeFlow.value.enableShizuku) {
@@ -179,8 +177,6 @@ private fun watchCaptureScreenshot() {
 }
 
 private var lastUpdateSubsTime = 0L
-
-context(event: AccessibilityEvent)
 private fun watchAutoUpdateSubs() {
     val i = storeFlow.value.updateSubsInterval
     if (i <= 0) return

app/src/main/kotlin/li/songe/gkd/a11y/A11yState.kt

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.provider.Settings
 import android.util.LruCache
 import android.view.accessibility.AccessibilityNodeInfo
-import com.blankj.utilcode.util.LogUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.updateAndGet
@@ -29,6 +28,7 @@ import li.songe.gkd.store.actionCountFlow
 import li.songe.gkd.store.checkAppBlockMatch
 import li.songe.gkd.store.storeFlow
 import li.songe.gkd.util.AndroidTarget
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.PKG_FLAGS
 import li.songe.gkd.util.RuleSummary
 import li.songe.gkd.util.launchTry

app/src/main/kotlin/li/songe/gkd/data/NodeInfo.kt

@@ -1,10 +1,10 @@
 package li.songe.gkd.data
 
 import android.view.accessibility.AccessibilityNodeInfo
-import com.blankj.utilcode.util.LogUtils
 import kotlinx.serialization.Serializable
 import li.songe.gkd.a11y.MAX_CHILD_SIZE
 import li.songe.gkd.a11y.topActivityFlow
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.toast
 import kotlin.system.measureTimeMillis
 
@@ -77,8 +77,10 @@ fun info2nodeList(root: AccessibilityNodeInfo?): List<NodeInfo> {
             if (times > MAX_KEEP_SIZE) {
                 // https://github.com/gkd-kit/gkd/issues/28
                 toast("节点数量至多保留$MAX_KEEP_SIZE,丢弃后续节点")
-                LogUtils.w(
-                    root.packageName, topActivityFlow.value.activityId, "节点数量过多"
+                LogUtils.d(
+                    "节点数量过多",
+                    root.packageName,
+                    topActivityFlow.value.activityId,
                 )
                 break
             }

app/src/main/kotlin/li/songe/gkd/data/RawSubscription.kt

@@ -1,7 +1,6 @@
 package li.songe.gkd.data
 
 import android.graphics.Rect
-import com.blankj.utilcode.util.LogUtils
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
@@ -17,6 +16,7 @@ import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.long
 import li.songe.gkd.a11y.typeInfo
 import li.songe.gkd.util.LOCAL_SUBS_IDS
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.appInfoMapFlow
 import li.songe.gkd.util.distinctByIfAny
 import li.songe.gkd.util.filterIfNotAll

app/src/main/kotlin/li/songe/gkd/data/TransferData.kt

@@ -1,13 +1,13 @@
 package li.songe.gkd.data
 
 import android.net.Uri
-import com.blankj.utilcode.util.LogUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.util.LOCAL_SUBS_IDS
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.UriUtils
 import li.songe.gkd.util.ZipUtils
 import li.songe.gkd.util.checkSubsUpdate

app/src/main/kotlin/li/songe/gkd/service/A11yService.kt

@@ -9,7 +9,6 @@ import android.content.IntentFilter
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
 import androidx.core.content.ContextCompat
-import com.blankj.utilcode.util.LogUtils
 import com.google.android.accessibility.selecttospeak.SelectToSpeakService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -27,6 +26,7 @@ import li.songe.gkd.data.ActionPerformer
 import li.songe.gkd.data.ActionResult
 import li.songe.gkd.data.GkdAction
 import li.songe.gkd.data.RpcError
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.OnA11yLife
 import li.songe.gkd.util.componentName
 import li.songe.selector.MatchOption