From bd298c0858b654e2140086510b9b0f96e23211ad Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Sun, 18 May 2025 15:58:33 -0700 Subject: [PATCH] fix: proguard optimization breaking icon patching Proguard optimized out an assert call that was necessary. Fixed in binary-resources 2.0.1 --- .../com/aliucord/manager/patcher/steps/patch/ReplaceIconStep.kt | 2 +- .../main/kotlin/com/aliucord/manager/patcher/util/ArscUtil.kt | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReplaceIconStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReplaceIconStep.kt index b512f75..028fcde 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReplaceIconStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReplaceIconStep.kt @@ -90,7 +90,7 @@ class ReplaceIconStep(private val options: PatchOptions) : Step(), KoinComponent } // Add a new mipmap resource and the file to be added later - if (options.iconReplacement is IconReplacement.CustomImage) { + else if (options.iconReplacement is IconReplacement.CustomImage) { container.log("Adding custom icon foreground to arsc") val iconPathIdx = arsc.getMainArscChunk().stringPool diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/util/ArscUtil.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/util/ArscUtil.kt index d8e33c3..241e57a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/util/ArscUtil.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/util/ArscUtil.kt @@ -54,7 +54,7 @@ object ArscUtil { return this.addResource( typeName = "color", resourceName = name, - configurations = { true }, + configurations = { it.isDefault }, valueType = BinaryResourceValue.Type.INT_COLOR_ARGB8, valueData = color.toArgb(), ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af73e7b..b0eba2b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidx-splashscreen = "1.0.1" androidx-lifecycle = "2.9.0" apksig = "8.10.0" axml = "1.0.1" -binary-resources = "2.0.0" +binary-resources = "2.0.1" bouncycastle = "1.80" coil = "3.2.0" compose = "1.8.1"