Skip to content

Commit b2bf204

Browse files
committed
chore: upgrade Gradle to 9.5.1
1 parent 0d54fa1 commit b2bf204

7 files changed

Lines changed: 13 additions & 10 deletions

File tree

app/src/main/java/io/github/soclear/oneuix/hook/Call.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ object Call {
135135
baseCallLogClass.declaredFields.forEach { field ->
136136
if (field.type == String::class.java && !Modifier.isStatic(field.modifiers)) {
137137
field.isAccessible = true
138-
val token = "TOKEN_${field.getName()}"
138+
val token = "TOKEN_${field.name}"
139139

140140
// 将 token 注入到实例中
141141
field.set(instance, token)
@@ -201,7 +201,7 @@ object Call {
201201
callLogViewItemClass.declaredFields.forEach { field ->
202202
if (field.type == String::class.java && !Modifier.isStatic(field.modifiers)) {
203203
field.isAccessible = true
204-
val token = "TOKEN_${field.getName()}"
204+
val token = "TOKEN_${field.name}"
205205

206206
// 将 token 注入到实例中
207207
field.set(callLogViewItem, token)

app/src/main/java/io/github/soclear/oneuix/hook/GalaxyStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ object GalaxyStore {
175175
"com.sec.android.app.samsungapps.slotpage.GalaxyAppsMainActivity",
176176
classLoader,
177177
"onAdAvailable",
178-
"com.sec.android.app.samsungapps.curate.ad.AdInventoryManager\$PLATFORM",
178+
$$"com.sec.android.app.samsungapps.curate.ad.AdInventoryManager$PLATFORM",
179179
returnNull
180180
)
181181

app/src/main/java/io/github/soclear/oneuix/hook/HideBatteryIconHook.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.soclear.oneuix.hook
22

3+
import android.annotation.SuppressLint
34
import android.view.View
45
import android.view.ViewGroup
56
import android.widget.ImageView
@@ -16,6 +17,7 @@ import io.github.soclear.oneuix.data.Package
1617
import java.lang.reflect.Field
1718
import java.util.Collections
1819
import java.util.WeakHashMap
20+
import androidx.core.view.isVisible
1921

2022
internal object HideBatteryIconHook {
2123
private const val STATUS_BAR_CHARGING_ICON = "stat_sys_battery_charging"
@@ -81,7 +83,7 @@ internal object HideBatteryIconHook {
8183
try {
8284
hookAllMethods(
8385
findClass(
84-
"com.android.systemui.battery.BatteryMeterViewController\$3",
86+
$$"com.android.systemui.battery.BatteryMeterViewController$3",
8587
loadPackageParam.classLoader
8688
),
8789
"onBatteryLevelChanged",
@@ -157,7 +159,7 @@ internal object HideBatteryIconHook {
157159

158160
private fun resolveBatteryMeterView(instance: Any): Any? {
159161
if (instance is View) return instance
160-
val controller = readFieldValue(instance, listOf("this\$0")) ?: return null
162+
val controller = readFieldValue(instance, listOf($$"this$0")) ?: return null
161163
return readFieldValue(controller, listOf("mView"))
162164
}
163165

@@ -187,6 +189,7 @@ internal object HideBatteryIconHook {
187189
appliedBatteryChargingIconIds[iconView] = drawableId
188190
}
189191

192+
@SuppressLint("DiscouragedApi")
190193
private fun resolveBatteryChargingIconId(iconView: ImageView): Int {
191194
if (batteryChargingIconId != UNRESOLVED_CHARGING_ICON_ID) return batteryChargingIconId
192195
val resources = iconView.resources
@@ -386,7 +389,7 @@ internal object HideBatteryIconHook {
386389
}
387390

388391
private fun TextView.isVisibleWithText(): Boolean =
389-
visibility == View.VISIBLE && text.isNotBlank()
392+
isVisible && text.isNotBlank()
390393

391394
private data class BatteryIconLayout(
392395
val width: Int,

app/src/main/java/io/github/soclear/oneuix/hook/Network.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ object Network {
187187
}
188188
try {
189189
findAndHookMethod(
190-
"$controllerString\$NetworkSpeedManager$1",
190+
$$"$$controllerString$NetworkSpeedManager$1",
191191
loadPackageParam.classLoader,
192192
"handleMessage",
193193
Message::class.java,

app/src/main/java/io/github/soclear/oneuix/hook/Settings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ object Settings {
4646
loadPackageParam.classLoader,
4747
"setAppLabelAndIcon",
4848
PackageInfo::class.java,
49-
"com.android.settingslib.applications.ApplicationsState\$AppEntry",
49+
$$"com.android.settingslib.applications.ApplicationsState$AppEntry",
5050
callback
5151
)
5252
} catch (t: Throwable) {

app/src/main/java/io/github/soclear/oneuix/hook/WatchPairing.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ object WatchPairing {
9898
private fun bypassPairingProblemCheck(lpparam: LoadPackageParam) {
9999
try {
100100
val problemClass = XposedHelpers.findClass(
101-
"com.samsung.android.app.watchmanager.setupwizard.pairing.PairingProblemChecker\$Problem",
101+
$$"com.samsung.android.app.watchmanager.setupwizard.pairing.PairingProblemChecker$Problem",
102102
lpparam.classLoader
103103
)
104104

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Jan 20 23:04:29 CST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)