diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt index a735cf2..eaa3824 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt @@ -141,7 +141,7 @@ class PatchIconsStep(private val options: PatchOptions) : Step(), KoinComponent foregroundIcon = arsc.getPackageChunk().addResource( typeName = "drawable", resourceName = "ic_foreground_replacement", - configurations = { println("configuration: $it"); true }, + configurations = { it.toString() == "anydpi" }, valueType = BinaryResourceValue.Type.STRING, valueData = iconPathIdx, ) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt index f3963c2..c0cb97c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt @@ -23,6 +23,7 @@ import com.aliucord.manager.R @Composable fun discordIconDrawable( backgroundColor: Color, + oldLogo: Boolean = false, size: Dp = 24.dp, ): Drawable { val density = LocalDensity.current @@ -30,9 +31,14 @@ fun discordIconDrawable( val size = with(density) { size.roundToPx() } val bitmap = remember(size) { createBitmap(size, size) } - val drawable = remember(context) { + val drawable = remember(context, oldLogo) { + val drawableId = when (oldLogo) { + false -> R.drawable.ic_discord + true -> R.drawable.ic_discord_old + } + InsetDrawable( - /* drawable = */ ContextCompat.getDrawable(context, R.drawable.ic_discord)!!, + /* drawable = */ ContextCompat.getDrawable(context, drawableId)!!, /* inset = */ (size * .17f).toInt(), ).apply { setTint(Color.White.toArgb()) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt b/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt index 0ee5bbf..00b8a3e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt @@ -64,8 +64,8 @@ private class IconOptionsParametersProvider : PreviewParameterProvider