Fix bugs in Android 16 and HyperOS 3

Upgraded dependencies.
Fix icon normalization hook for HyperOS 3.
Fix IconProvider.getIcon hook for Android 16.

Author: Howard20181

app/src/main/java/com/gswxxn/restoresplashscreen/hook/NewSystemUIHooker.kt

@@ -12,6 +12,7 @@ import com.highcapable.yukihookapi.hook.factory.constructor
 import com.highcapable.yukihookapi.hook.factory.method
 import com.highcapable.yukihookapi.hook.log.YLog
 import com.highcapable.yukihookapi.hook.type.android.ActivityInfoClass
+import com.highcapable.yukihookapi.hook.type.android.ComponentInfoClass
 import com.highcapable.yukihookapi.hook.type.android.DrawableClass
 import com.highcapable.yukihookapi.hook.type.java.FloatType
 import com.highcapable.yukihookapi.hook.type.java.IntType
@@ -54,7 +55,7 @@ object NewSystemUIHooker: YukiBaseHooker() {
             "com.android.launcher3.icons.IconProvider".toClass().method {
                 name = "getIcon"
                 paramCount(2)
-                param { IntType in it && ActivityInfoClass in it }
+                param { IntType in it && (ActivityInfoClass in it || ComponentInfoClass in it) }
             }.give()!!
         }
         val normalizeAndWrapToAdaptiveIcon = HookManager {

app/src/main/java/com/gswxxn/restoresplashscreen/hook/systemui/IconHookHandler.kt

@@ -173,25 +173,30 @@ object IconHookHandler : BaseHookHandler() {
 
         // 不使用自带的图标缩放, 防止在 MIUI 上出现图标白边及图标错位
         NewSystemUIHooker.Members.normalizeAndWrapToAdaptiveIcon.addBeforeHook {
-            val scale = instance.current()
-                .method { name = "getNormalizer"; superClass() }.call()!!.current()
-                .method { name = "getScale"; paramCount(4); superClass() }
-                .invoke<Float>(
-                    args.first { it is Drawable },
-                    args.first { it is RectF },
-                    null,
-                    null
-                )!!
-            args(args.indexOfFirst { it is FloatArray }).cast<FloatArray>()!![0] = scale
-
-            val oriDrawable = args.first { it is Drawable } as Drawable
-            val returnType = NewSystemUIHooker.Members.normalizeAndWrapToAdaptiveIcon.returnType
-
-            printLog("normalizeAndWrapToAdaptiveIcon(): avoid shrink icon by system ui")
-            result = if (returnType == AdaptiveIconDrawable::class.java)
-                TransparentAdaptiveIconDrawable(oriDrawable)
-            else
-                oriDrawable
+            if (Thread.currentThread().stackTrace.any { it.methodName == "makeSplashScreenContentView" }) {
+                printLog("normalizeAndWrapToAdaptiveIcon(): avoid shrink icon by system ui")
+                val boolShrinkNonAdaptiveIconsIndex = args.indexOfFirst { it is Boolean }
+                if (boolShrinkNonAdaptiveIconsIndex != -1) {
+                    args(boolShrinkNonAdaptiveIconsIndex).setFalse()
+                } else {
+                    val scale = instance.current(ignored = true)
+                        .method { name = "getNormalizer"; superClass() }.call()?.current()
+                        ?.method { name = "getScale"; paramCount(4); superClass() }
+                        ?.invoke<Float>(
+                            args.first { it is Drawable },
+                            args.first { it is RectF },
+                            null,
+                            null
+                        ) ?: 0.92f
+                    args(args.indexOfFirst { it is FloatArray }).cast<FloatArray>()!![0] = scale
+                    val oriDrawable = args.first { it is Drawable } as Drawable
+                    val returnType = NewSystemUIHooker.Members.normalizeAndWrapToAdaptiveIcon.returnType
+                    result = if (returnType == AdaptiveIconDrawable::class.java)
+                        TransparentAdaptiveIconDrawable(oriDrawable)
+                    else
+                        oriDrawable
+                }
+            }
         }
         NewSystemUIHooker.Members.createIconBitmap_BaseIconFactory.addBeforeHook {
             args(0).cast<Drawable>()?.let { drawable ->

app/src/main/java/com/gswxxn/restoresplashscreen/ui/ConfigAppsActivity.kt

@@ -1,6 +1,5 @@
 package com.gswxxn.restoresplashscreen.ui
 
-import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.text.Editable
@@ -130,11 +129,11 @@ class ConfigAppsActivity : BaseActivity<ActivityConfigAppsBinding>(), CoroutineS
         binding.searchEditText.apply {
             // 焦点事件
             setOnFocusChangeListener { v, hasFocus ->
-                val imm = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                val imm = v.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
                 if (hasFocus) {
                     showView(false, binding.appListTitle, binding.configDescription, binding.configTitleFilter, binding.overallSettings)
                     // 弹出软键盘
-                    imm.showSoftInput(binding.searchEditText, InputMethodManager.SHOW_FORCED)
+                    imm.showSoftInput(binding.searchEditText, 0)
                 } else {
                     // 隐藏软键盘
                     imm.hideSoftInputFromWindow(this.windowToken, 0)
@@ -162,7 +161,7 @@ class ConfigAppsActivity : BaseActivity<ActivityConfigAppsBinding>(), CoroutineS
                         cView = holder.root
                         cView.tag = holder
                     } else {
-                        holder = cView?.tag as AdapterConfigBinding
+                        holder = cView.tag as AdapterConfigBinding
                     }
                     getItem(position).also { item ->
                         // 设置图标

gradle/sweet-dependency/sweet-dependency-config.yaml

@@ -22,13 +22,13 @@ repositories:
 
 plugins:
   com.android.application:
-    version: 8.7.3
+    version: 8.13.0
   org.jetbrains.kotlin.android:
-    version: 2.1.0
+    version: 2.1.21
   org.jetbrains.kotlin.plugin.serialization:
-    version: 2.1.0
+    version: 2.1.21
   com.google.devtools.ksp:
-    version: 2.1.0-1.0.29
+    version: 2.1.21-2.0.2
 
 libraries:
   de.robv.android.xposed:
@@ -44,12 +44,12 @@ libraries:
       version: 1.0.0
   androidx.compose.material3:
     material3:
-      version: 1.3.1
+      version: 1.4.0
   org.jetbrains.kotlinx:
     kotlinx-coroutines-android:
-      version: 1.9.0
+      version: 1.10.2
     kotlinx-serialization-json:
-      version: 1.7.3
+      version: 1.9.0
   androidx.annotation:
     annotation:
       version: 1.9.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME