refactor: migrate and update to YukiHookAPI 1.3.0

Author: fankes

app/build.gradle.kts

@@ -81,6 +81,8 @@ dependencies {
     compileOnly(de.robv.android.xposed.api)
     implementation(com.highcapable.yukihookapi.api)
     ksp(com.highcapable.yukihookapi.ksp.xposed)
+    implementation(com.highcapable.kavaref.kavaref.core)
+    implementation(com.highcapable.kavaref.kavaref.extension)
     implementation(com.fankes.projectpromote.project.promote)
     implementation(com.github.topjohnwu.libsu.core)
     implementation(com.github.duanhong169.drawabletoolbox)

app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt

@@ -20,21 +20,20 @@
  *
  * This file is created by fankes on 2022/1/30.
  */
-@file:Suppress("DEPRECATION")
-
 package com.fankes.miui.notify.ui.activity.base
 
 import android.os.Build
 import android.os.Bundle
+import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.WindowCompat
 import androidx.viewbinding.ViewBinding
 import com.fankes.miui.notify.R
 import com.fankes.miui.notify.utils.factory.isNotSystemInDarkMode
-import com.highcapable.yukihookapi.hook.factory.current
-import com.highcapable.yukihookapi.hook.factory.method
-import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass
+import com.highcapable.kavaref.KavaRef.Companion.resolve
+import com.highcapable.kavaref.extension.genericSuperclassTypeArguments
+import com.highcapable.kavaref.extension.toClassOrNull
 
 abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
@@ -50,10 +49,11 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         isMainThreadRunning = true
-        binding = current().generic()?.argument()?.method {
+        val bindingClass = javaClass.genericSuperclassTypeArguments().firstOrNull()?.toClassOrNull()
+        binding = bindingClass?.resolve()?.optional()?.firstMethodOrNull {
             name = "inflate"
-            param(LayoutInflaterClass)
-        }?.get()?.invoke<VB>(layoutInflater) ?: error("binding failed")
+            parameters(LayoutInflater::class)
+        }?.invoke<VB>(layoutInflater) ?: error("binding failed")
         if (Build.VERSION.SDK_INT >= 35) binding.root.fitsSystemWindows = true
         setContentView(binding.root)
         /** 隐藏系统的标题栏 */
@@ -63,6 +63,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             isAppearanceLightStatusBars = isNotSystemInDarkMode
             isAppearanceLightNavigationBars = isNotSystemInDarkMode
         }
+        @Suppress("DEPRECATION")
         ResourcesCompat.getColor(resources, R.color.colorThemeBackground, null).also {
             window?.statusBarColor = it
             window?.navigationBarColor = it

app/src/main/java/com/fankes/miui/notify/ui/activity/base/BaseActivity.kt

@@ -64,6 +64,7 @@ class BaseAdapterCreater(val context: Context) {
      * 绑定 [BaseAdapter] 到 [ListView]
      * @param bindViews 回调 - ([VB] 每项,[Int] 下标)
      */
+    @Suppress("DEPRECATION")
     inline fun <reified VB : ViewBinding> onBindViews(crossinline bindViews: (binding: VB, position: Int) -> Unit) {
         baseAdapter = object : BaseAdapter() {
             override fun getCount() = listDataCallback?.let { it() }?.size ?: 0

app/src/main/java/com/fankes/miui/notify/utils/factory/BaseAdapterFactory.kt

@@ -68,6 +68,7 @@ inline fun Context.showDialog(initiate: DialogBuilder<*>.() -> Unit) = DialogBui
  * @param context 实例
  * @param bindingClass [ViewBinding] 的 [Class] 实例 or null
  */
+@Suppress("DEPRECATION")
 class DialogBuilder<VB : ViewBinding>(val context: Context, private val bindingClass: Class<*>? = null) {
 
     /** 实例对象 */

app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt

@@ -63,6 +63,8 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.createBitmap
+import androidx.core.net.toUri
 import com.fankes.miui.notify.wrapper.BuildConfigWrapper
 import com.google.android.material.snackbar.Snackbar
 import com.highcapable.yukihookapi.hook.factory.hasClass
@@ -148,6 +150,7 @@ val isNotMiSystem get() = !isMiSystem
  * 当前设备是否是 MIUI 定制 Android 系统
  * @return [Boolean] 是否符合条件
  */
+@Suppress("DEPRECATION")
 val isMIUI by lazy { "android.miui.R".hasClass() }
 
 /**
@@ -541,7 +544,7 @@ val String.bitmap: Bitmap get() = unbase64.bitmap
  * @return [Bitmap] 圆角后的位图 - 失败会返回处理之前的位图
  */
 fun Bitmap.round(radius: Float): Bitmap = safeOf(default = this) {
-    Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).also { out ->
+    createBitmap(width, height).also { out ->
         Canvas(out).also { canvas ->
             Paint().also { paint ->
                 paint.isAntiAlias = true
@@ -561,6 +564,7 @@ fun Bitmap.round(radius: Float): Bitmap = safeOf(default = this) {
  * @param default 默认值
  * @return [String]
  */
+@Suppress("DEPRECATION")
 fun findPropString(key: String, default: String = "") = safeOf(default) {
     "android.os.SystemProperties".toClassOrNull()?.method {
         name = "get"
@@ -634,7 +638,7 @@ fun Context.openBrowser(url: String, packageName: String = "") = runCatching {
     startActivity(Intent().apply {
         if (packageName.isNotBlank()) setPackage(packageName)
         action = Intent.ACTION_VIEW
-        data = Uri.parse(url)
+        data = url.toUri()
         /** 防止顶栈一样重叠在自己的 APP 中 */
         flags = Intent.FLAG_ACTIVITY_NEW_TASK
     })

app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt

@@ -32,6 +32,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.VectorDrawable
 import android.util.ArrayMap
+import androidx.core.graphics.createBitmap
 import androidx.core.graphics.drawable.toBitmap
 import com.fankes.miui.notify.utils.factory.safeOfFalse
 import kotlin.math.abs
@@ -77,7 +78,7 @@ object BitmapCompatTool {
             var width = bitmap.width
             if (height > 64 || width > 64) {
                 if (tempCompactBitmap == null) {
-                    tempCompactBitmap = Bitmap.createBitmap(64, 64, Bitmap.Config.ARGB_8888)
+                    tempCompactBitmap = createBitmap(64, 64)
                         .also { tempCompactBitmapCanvas = Canvas(it) }
                     tempCompactBitmapPaint = Paint(Paint.FILTER_BITMAP_FLAG).apply { isFilterBitmap = true }
                 }
@@ -91,11 +92,12 @@ object BitmapCompatTool {
             val size = height * width
             ensureBufferSize(size)
             tempCompactBitmap?.getPixels(tempBuffer, 0, width, 0, 0, width, height)
-            for (i in 0 until size)
+            for (i in 0 until size) {
                 if (isGrayscaleColor(tempBuffer[i]).not()) {
                     cachedBitmapGrayscales[bitmap.generationId] = false
                     return@let false
                 }
+            }
             cachedBitmapGrayscales[bitmap.generationId] = true
             true
         }

app/src/main/java/com/fankes/miui/notify/utils/tool/BitmapCompatTool.kt

@@ -1457,6 +1457,35 @@
                     android:textColor="@color/colorTextGray"
                     android:textSize="11sp" />
             </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_permotion_round"
+                android:gravity="center|start"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <ImageView
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginEnd="10dp"
+                    android:src="@mipmap/ic_kavaref" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autoLink="web"
+                    android:ellipsize="end"
+                    android:lineSpacingExtra="6dp"
+                    android:maxLines="2"
+                    android:text="此模块使用 KavaRef 强力驱动。\n了解更多 https://github.com/HighCapable/KavaRef"
+                    android:textColor="@color/colorTextGray"
+                    android:textSize="11sp" />
+            </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>

app/src/main/res/layout/activity_main.xml

@@ -22,7 +22,7 @@ repositories:
 plugins:
   com.android.application:
     alias: android-application
-    version: 8.9.0
+    version: 8.9.3
   org.jetbrains.kotlin.android:
     alias: kotlin-android
     version: 2.1.10
@@ -43,9 +43,14 @@ libraries:
         rovo89-xposed-api
   com.highcapable.yukihookapi:
     api:
-      version: 1.2.1
+      version: 1.3.0
     ksp-xposed:
       version-ref: <this>::api
+  com.highcapable.kavaref:
+    kavaref-core:
+      version: 1.0.0
+    kavaref-extension:
+      version: 1.0.0
   com.github.topjohnwu.libsu:
     core:
       version: 5.2.2
@@ -55,13 +60,13 @@ libraries:
       version: 1.0.7
   com.squareup.okhttp3:
     okhttp:
-      version: 5.0.0-alpha.14
+      version: 5.0.0-alpha.16
   androidx.core:
     core-ktx:
-      version: 1.15.0
+      version: 1.16.0
   androidx.appcompat:
     appcompat:
-      version: 1.7.0
+      version: 1.7.1
   com.google.android.material:
     material:
       version: 1.12.0