From 0000e4874f83245095a77e2b8947ffa1c17d7a48 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Tue, 27 May 2025 11:07:28 -0700
Subject: [PATCH] fix(IconOpts): old discord logo option live preview

---
 .../manager/patcher/steps/patch/PatchIconsStep.kt      |  2 +-
 .../manager/ui/components/CustomDiscordAppIcon.kt      | 10 ++++++++--
 .../ui/previews/screens/IconOptionsScreenPreview.kt    |  4 ++--
 .../manager/ui/screens/iconopts/IconOptionsScreen.kt   |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

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<IconOptio
             selectedImage = { null },
         ),
         IconOptionsParameters(
-            mode = IconOptionsMode.Aliucord,
-            selectedColor = IconReplacement.AliucordColor,
+            mode = IconOptionsMode.OldDiscord,
+            selectedColor = Color.Black,
             selectedImage = { null },
         ),
         IconOptionsParameters(
diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt
index bee6a38..c7e61ee 100644
--- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt
@@ -106,6 +106,7 @@ fun IconOptionsScreenContent(
 
                 val drawable = discordIconDrawable(
                     backgroundColor = throttledColor,
+                    oldLogo = mode == IconOptionsMode.OldDiscord,
                     size = 72.dp,
                 )