Skip to content

Commit 39a37c7

Browse files
Howard20181Howard20181
committed
Fix bugs in Android 16 and HyperOS 3
Upgraded dependencies. Fix icon normalization hook for HyperOS 3. Fix IconProvider.getIcon hook for Android 16.
1 parent c96c809 commit 39a37c7

8 files changed

Lines changed: 44 additions & 39 deletions

File tree

‎.github/workflows/android.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818

1919
steps:
2020
- name: Checkout Repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222
with:
2323
submodules: true
2424

25-
- name: Set up JDK 20
26-
uses: actions/setup-java@v4
25+
- name: Set up JDK
26+
uses: actions/setup-java@v5
2727
with:
28-
java-version: "20"
28+
java-version: "21"
2929
distribution: "temurin"
3030

3131
- name: Build with Gradle and Sign

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ android {
5454
isMinifyEnabled = true
5555
isShrinkResources = true
5656
vcsInfo.include = false
57-
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
57+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
5858
}
5959
}
6060

@@ -127,7 +127,7 @@ fun getGitHeadRefsSuffix(project: Project): String {
127127
// 示例："90312cd9157587d11779ed7be776e3220050b308\n"
128128
refFile.readText(Charsets.UTF_8).replace(Regex("""\s"""), "").subSequence(0, 7)
129129
} else {
130-
string.substring(0, 7)
130+
string.take(7)
131131
}
132132
println("commit_id: $result")
133133
return result.toString()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.highcapable.yukihookapi.hook.factory.constructor
1212
import com.highcapable.yukihookapi.hook.factory.method
1313
import com.highcapable.yukihookapi.hook.log.YLog
1414
import com.highcapable.yukihookapi.hook.type.android.ActivityInfoClass
15+
import com.highcapable.yukihookapi.hook.type.android.ComponentInfoClass
1516
import com.highcapable.yukihookapi.hook.type.android.DrawableClass
1617
import com.highcapable.yukihookapi.hook.type.java.FloatType
1718
import com.highcapable.yukihookapi.hook.type.java.IntType
@@ -54,7 +55,7 @@ object NewSystemUIHooker: YukiBaseHooker() {
5455
"com.android.launcher3.icons.IconProvider".toClass().method {
5556
name = "getIcon"
5657
paramCount(2)
57-
param { IntType in it && ActivityInfoClass in it }
58+
param { IntType in it && (ActivityInfoClass in it || ComponentInfoClass in it) }
5859
}.give()!!
5960
}
6061
val normalizeAndWrapToAdaptiveIcon = HookManager {

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

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -173,25 +173,30 @@ object IconHookHandler : BaseHookHandler() {
173173

174174
// 不使用自带的图标缩放, 防止在 MIUI 上出现图标白边及图标错位
175175
NewSystemUIHooker.Members.normalizeAndWrapToAdaptiveIcon.addBeforeHook {
176-
val scale = instance.current()
177-
.method { name = "getNormalizer"; superClass() }.call()!!.current()
178-
.method { name = "getScale"; paramCount(4); superClass() }
179-
.invoke<Float>(
180-
args.first { it is Drawable },
181-
args.first { it is RectF },
182-
null,
183-
null
184-
)!!
185-
args(args.indexOfFirst { it is FloatArray }).cast<FloatArray>()!![0] = scale
186-
187-
val oriDrawable = args.first { it is Drawable } as Drawable
188-
val returnType = NewSystemUIHooker.Members.normalizeAndWrapToAdaptiveIcon.returnType
189-
190-
printLog("normalizeAndWrapToAdaptiveIcon(): avoid shrink icon by system ui")
191-
result = if (returnType == AdaptiveIconDrawable::class.java)
192-
TransparentAdaptiveIconDrawable(oriDrawable)
193-
else
194-
oriDrawable
176+
if (Thread.currentThread().stackTrace.any { it.methodName == "makeSplashScreenContentView" }) {
177+
printLog("normalizeAndWrapToAdaptiveIcon(): avoid shrink icon by system ui")
178+
val boolShrinkNonAdaptiveIconsIndex = args.indexOfFirst { it is Boolean }
179+
if (boolShrinkNonAdaptiveIconsIndex != -1) {
180+
args(boolShrinkNonAdaptiveIconsIndex).setFalse()
181+
} else {
182+
val scale = instance.current(ignored = true)
183+
.method { name = "getNormalizer"; superClass() }.call()?.current()
184+
?.method { name = "getScale"; paramCount(4); superClass() }
185+
?.invoke<Float>(
186+
args.first { it is Drawable },
187+
args.first { it is RectF },
188+
null,
189+
null
190+
) ?: 0.92f
191+
args(args.indexOfFirst { it is FloatArray }).cast<FloatArray>()!![0] = scale
192+
val oriDrawable = args.first { it is Drawable } as Drawable
193+
val returnType = NewSystemUIHooker.Members.normalizeAndWrapToAdaptiveIcon.returnType
194+
result = if (returnType == AdaptiveIconDrawable::class.java)
195+
TransparentAdaptiveIconDrawable(oriDrawable)
196+
else
197+
oriDrawable
198+
}
199+
}
195200
}
196201
NewSystemUIHooker.Members.createIconBitmap_BaseIconFactory.addBeforeHook {
197202
args(0).cast<Drawable>()?.let { drawable ->

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.gswxxn.restoresplashscreen.ui
22

3-
import android.content.Context
43
import android.content.Intent
54
import android.content.res.Configuration
65
import android.text.Editable
@@ -130,11 +129,11 @@ class ConfigAppsActivity : BaseActivity<ActivityConfigAppsBinding>(), CoroutineS
130129
binding.searchEditText.apply {
131130
// 焦点事件
132131
setOnFocusChangeListener { v, hasFocus ->
133-
val imm = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
132+
val imm = v.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
134133
if (hasFocus) {
135134
showView(false, binding.appListTitle, binding.configDescription, binding.configTitleFilter, binding.overallSettings)
136135
// 弹出软键盘
137-
imm.showSoftInput(binding.searchEditText, InputMethodManager.SHOW_FORCED)
136+
imm.showSoftInput(binding.searchEditText, 0)
138137
} else {
139138
// 隐藏软键盘
140139
imm.hideSoftInputFromWindow(this.windowToken, 0)
@@ -162,7 +161,7 @@ class ConfigAppsActivity : BaseActivity<ActivityConfigAppsBinding>(), CoroutineS
162161
cView = holder.root
163162
cView.tag = holder
164163
} else {
165-
holder = cView?.tag as AdapterConfigBinding
164+
holder = cView.tag as AdapterConfigBinding
166165
}
167166
getItem(position).also { item ->
168167
// 设置图标

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ repositories:
2222

2323
plugins:
2424
com.android.application:
25-
version: 8.7.3
25+
version: 8.13.0
2626
org.jetbrains.kotlin.android:
27-
version: 2.1.0
27+
version: 2.1.21
2828
org.jetbrains.kotlin.plugin.serialization:
29-
version: 2.1.0
29+
version: 2.1.21
3030
com.google.devtools.ksp:
31-
version: 2.1.0-1.0.29
31+
version: 2.1.21-2.0.2
3232

3333
libraries:
3434
de.robv.android.xposed:
@@ -44,12 +44,12 @@ libraries:
4444
version: 1.0.0
4545
androidx.compose.material3:
4646
material3:
47-
version: 1.3.1
47+
version: 1.4.0
4848
org.jetbrains.kotlinx:
4949
kotlinx-coroutines-android:
50-
version: 1.9.0
50+
version: 1.10.2
5151
kotlinx-serialization-json:
52-
version: 1.7.3
52+
version: 1.9.0
5353
androidx.annotation:
5454
annotation:
5555
version: 1.9.1

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pluginManagement {
99
}
1010
plugins {
1111
id("com.highcapable.sweetdependency") version "1.0.4"
12-
id("com.highcapable.sweetproperty") version "1.0.5"
12+
id("com.highcapable.sweetproperty") version "1.0.8"
1313
}
1414
sweetProperty {
1515
project(":app") {

0 commit comments

Comments
 (0)