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/coloros/notify/hook/entity/FrameworkHooker.kt

@@ -22,11 +22,9 @@
  */
 package com.fankes.coloros.notify.hook.entity
 
+import android.app.Notification
+import com.highcapable.kavaref.KavaRef.Companion.resolve
 import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker
-import com.highcapable.yukihookapi.hook.factory.method
-import com.highcapable.yukihookapi.hook.type.android.NotificationClass
-import com.highcapable.yukihookapi.hook.type.java.BooleanType
-import com.highcapable.yukihookapi.hook.type.java.StringClass
 
 /**
  * 系统框架核心 Hook 类
@@ -38,9 +36,9 @@ object FrameworkHooker : YukiBaseHooker() {
 
     override fun onHook() {
         /** 拦截 ColorOS 覆盖应用通知图标 */
-        OplusNotificationFixHelperClass?.method {
+        OplusNotificationFixHelperClass?.resolve()?.optional()?.firstMethodOrNull {
             name = "fixSmallIcon"
-            param(NotificationClass, StringClass, StringClass, BooleanType)
-        }?.ignored()?.hook()?.intercept()
+            parameters(Notification::class, String::class, String::class, Boolean::class)
+        }?.hook()?.intercept()
     }
 }

app/src/main/java/com/fankes/coloros/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.coloros.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.coloros.notify.R
 import com.fankes.coloros.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/coloros/notify/ui/activity/base/BaseActivity.kt

@@ -20,6 +20,8 @@
  *
  * This file is created by fankes on 2022/6/3.
  */
+@file:Suppress("DEPRECATION")
+
 package com.fankes.coloros.notify.utils.factory
 
 import android.content.Context

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

@@ -20,7 +20,7 @@
  *
  * This file is created by fankes on 2022/1/7.
  */
-@file:Suppress("unused")
+@file:Suppress("unused", "DEPRECATION")
 
 package com.fankes.coloros.notify.utils.factory
 

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

@@ -20,7 +20,7 @@
  *
  * This file is created by fankes on 2022/1/7.
  */
-@file:Suppress("unused", "ObsoleteSdkInt")
+@file:Suppress("unused", "ObsoleteSdkInt", "DEPRECATION")
 
 package com.fankes.coloros.notify.utils.factory
 
@@ -56,6 +56,7 @@ 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.net.toUri
 import com.fankes.coloros.notify.wrapper.BuildConfigWrapper
 import com.google.android.material.snackbar.Snackbar
 import com.highcapable.yukihookapi.hook.factory.field
@@ -133,7 +134,7 @@ inline val isNotColorOS get() = !isColorOS
 val isRealmeUI
     get() = safeOfFalse {
         val query = appContext.contentResolver.query(
-            Uri.parse("content://com.oplus.customize.coreapp.configmanager.configprovider.AppFeatureProvider")
+            "content://com.oplus.customize.coreapp.configmanager.configprovider.AppFeatureProvider".toUri()
                 .buildUpon()
                 .appendPath("app_feature")
                 .build(), null, "featurename=?", arrayOf("com.android.launcher.device_rm"), null
@@ -485,7 +486,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/coloros/notify/utils/factory/FunctionFactory.kt

@@ -1306,6 +1306,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