Revert commit until it's fixed

This reverts commit 5f2f61a.

Author: LisoUseInAIKyrios

patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/BaseCustomBrandingPatch.kt

@@ -1,6 +1,5 @@
 package app.revanced.patches.shared.layout.branding
 
-import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.ResourcePatchBuilder
 import app.revanced.patcher.patch.ResourcePatchContext
@@ -15,7 +14,7 @@ import java.util.logging.Logger
 
 private const val REVANCED_ICON = "ReVanced*Logo" // Can never be a valid path.
 
-internal val mipmapDirectories = arrayOf(
+private val mipmapDirectories = arrayOf(
     // Target app does not have ldpi icons.
     "mdpi",
     "hdpi",
@@ -84,13 +83,16 @@ internal fun baseCustomBrandingPatch(
         description = """
             The icon to apply to the app.
             
-            If a path to a folder is provided, the folder must contain one or more of the following folders:
+            If a path to a folder is provided, the folder must contain the following folders:
+    
             ${formatResourceFileList(mipmapDirectories)}
     
             Each of these folders must contain the following files:
+    
             ${formatResourceFileList((iconResourceFileNamesPng + legacyIconResourceFileNamesPng))}
             
             Optionally, a 'drawable' folder with the monochrome icon files:
+    
             ${formatResourceFileList(monochromeIconFileNames)}
         """.trimIndentMultiline(),
     )
@@ -125,48 +127,40 @@ internal fun baseCustomBrandingPatch(
                 ResourceGroup("mipmap-anydpi", *adaptiveIconFileNames)
             )
         } else {
-            val filePath = File(iconPathTrimmed)
-            val resourceDirectory = get("res")
-            var replacedResources = false
-
-            // Replace mipmap icons.
-            mipmapDirectories.map { directory ->
+            val mipmapIconResourceGroups = mipmapDirectories.map { directory ->
                 ResourceGroup(
                     directory,
                     *iconResourceFileNamesPng,
                 )
-            }.forEach { groupResources ->
+            }
+
+            val filePath = File(iconPathTrimmed)
+            val resourceDirectory = get("res")
+
+            // Replace mipmap icons.
+            mipmapIconResourceGroups.forEach { groupResources ->
                 val groupResourceDirectoryName = groupResources.resourceDirectoryName
                 val fromDirectory = filePath.resolve(groupResourceDirectoryName)
                 val toDirectory = resourceDirectory.resolve(groupResourceDirectoryName)
 
                 groupResources.resources.forEach { iconFileName ->
-                    val replacement = fromDirectory.resolve(iconFileName)
-                    if (replacement.exists()) {
-                        Files.write(
-                            toDirectory.resolve(iconFileName).toPath(),
-                            replacement.readBytes(),
-                        )
-                        replacedResources = true
-                    }
+                    Files.write(
+                        toDirectory.resolve(iconFileName).toPath(),
+                        fromDirectory.resolve(iconFileName).readBytes(),
+                    )
                 }
             }
 
             // Replace monochrome icons if provided.
-            monochromeIconFileNames.forEach { iconFileName ->
-                val replacement = filePath.resolve("drawable").resolve(iconFileName)
-                if (replacement.exists()) {
+            monochromeIconFileNames.forEach { fileName ->
+                val replacementMonochrome = filePath.resolve("drawable").resolve(fileName)
+                if (replacementMonochrome.exists()) {
                     Files.write(
-                        resourceDirectory.resolve("drawable").resolve(iconFileName).toPath(),
-                        replacement.readBytes(),
+                        resourceDirectory.resolve("drawable").resolve(fileName).toPath(),
+                        replacementMonochrome.readBytes(),
                     )
-                    replacedResources = true
                 }
             }
-
-            if (!replacedResources) {
-                throw PatchException("Could not find any replacement images in patch option path: $iconPathTrimmed")
-            }
         }
 
         // Change the app name.

patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt

@@ -1,13 +1,12 @@
 package app.revanced.patches.youtube.layout.branding
 
 import app.revanced.patches.shared.layout.branding.baseCustomBrandingPatch
-import app.revanced.patches.shared.layout.branding.mipmapDirectories
 import java.nio.file.Files
 
 private const val APP_NAME = "YouTube ReVanced"
 
-private const val ADAPTIVE_BACKGROUND_RESOURCE_NAME = "adaptiveproduct_youtube_background_color_108"
-private const val ADAPTIVE_FOREGROUND_RESOURCE_NAME = "adaptiveproduct_youtube_foreground_color_108"
+private const val ADAPTIVE_BACKGROUND_RESOURCE_FILE_NAME = "adaptiveproduct_youtube_background_color_108.xml"
+private const val ADAPTIVE_FOREGROUND_RESOURCE_FILE_NAME = "adaptiveproduct_youtube_foreground_color_108.xml"
 
 @Suppress("unused")
 val customBrandingPatch = baseCustomBrandingPatch(
@@ -30,8 +29,8 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "ringo2_adaptive_monochrome_ic_youtube_launcher.xml"
     ),
     adaptiveIconFileNames = arrayOf(
-        ADAPTIVE_BACKGROUND_RESOURCE_NAME,
-        ADAPTIVE_FOREGROUND_RESOURCE_NAME,
+        ADAPTIVE_BACKGROUND_RESOURCE_FILE_NAME,
+        ADAPTIVE_FOREGROUND_RESOURCE_FILE_NAME,
     ),
     legacyIconResourceFileNames = arrayOf(
         "ic_launcher",
@@ -50,34 +49,17 @@ val customBrandingPatch = baseCustomBrandingPatch(
     },
 
     executeBlock = {
-        val resourceDirectory = get("res")
+        val resourceDirectory = get("res/mipmap-anydpi")
 
         // Copy adaptive icon to secondary adaptive file.
         arrayOf(
-            ADAPTIVE_BACKGROUND_RESOURCE_NAME to "adaptiveproduct_youtube_2024_q4_background_color_108",
-            ADAPTIVE_FOREGROUND_RESOURCE_NAME to "adaptiveproduct_youtube_2024_q4_foreground_color_108",
+            ADAPTIVE_BACKGROUND_RESOURCE_FILE_NAME to "adaptiveproduct_youtube_2024_q4_background_color_108.xml",
+            ADAPTIVE_FOREGROUND_RESOURCE_FILE_NAME to "adaptiveproduct_youtube_2024_q4_foreground_color_108.xml",
         ).forEach { (old, new) ->
-            val newFile = resourceDirectory.resolve("/mipmap-anydpi/$new.xml")
-            if (newFile.exists()) {
-                val oldFile = resourceDirectory.resolve("$old.xml")
-                Files.write(oldFile.toPath(), newFile.readBytes())
-            }
-        }
-
-        // Copy mipmaps to secondary files.
-        mipmapDirectories.forEach { directory ->
-            val targetDirectory = resourceDirectory.resolve(directory)
+            val oldFile = resourceDirectory.resolve(old)
+            val newFile = resourceDirectory.resolve(new)
 
-            arrayOf(
-                ADAPTIVE_BACKGROUND_RESOURCE_NAME to "adaptiveproduct_youtube_2024_q4_background_color_108",
-                ADAPTIVE_FOREGROUND_RESOURCE_NAME to "adaptiveproduct_youtube_2024_q4_foreground_color_108",
-            ).forEach { (old, new) ->
-                val newFile = targetDirectory.resolve("$new.png")
-                if (newFile.exists()) {
-                    val oldFile = targetDirectory.resolve("$old.png")
-                    Files.write(newFile.toPath(), oldFile.readBytes())
-                }
-            }
+            Files.write(newFile.toPath(), oldFile.readBytes())
         }
     }
 )