Copy xml during patching

Author: LisoUseInAIKyrios

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

@@ -14,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",
@@ -101,6 +101,7 @@ internal fun baseCustomBrandingPatch(
 
     execute {
         val iconPathTrimmed = iconPath!!.trim()
+
         if (iconPathTrimmed == REVANCED_ICON) {
             val mipmapIconResourceGroups = mipmapDirectories.map { directory ->
                 ResourceGroup(
@@ -150,7 +151,7 @@ internal fun baseCustomBrandingPatch(
                 }
             }
 
-            // Copy all monochrome icons if provided.
+            // Replace monochrome icons if provided.
             monochromeIconFileNames.forEach { fileName ->
                 val replacementMonochrome = filePath.resolve("drawable").resolve(fileName)
                 if (replacementMonochrome.exists()) {

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

@@ -1,15 +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 val youtubeIconResourceFileNames_19_34 = mapOf(
-    "adaptiveproduct_youtube_foreground_color_108" to "adaptiveproduct_youtube_2024_q4_foreground_color_108",
-    "adaptiveproduct_youtube_background_color_108" to "adaptiveproduct_youtube_2024_q4_background_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(
@@ -32,10 +29,8 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "ringo2_adaptive_monochrome_ic_youtube_launcher.xml"
     ),
     adaptiveIconFileNames = arrayOf(
-        "adaptiveproduct_youtube_2024_q4_background_color_108.xml",
-        "adaptiveproduct_youtube_2024_q4_foreground_color_108.xml",
-        "adaptiveproduct_youtube_background_color_108.xml",
-        "adaptiveproduct_youtube_foreground_color_108.xml",
+        ADAPTIVE_BACKGROUND_RESOURCE_FILE_NAME,
+        ADAPTIVE_FOREGROUND_RESOURCE_FILE_NAME,
     ),
     legacyIconResourceFileNames = arrayOf(
         "ic_launcher",
@@ -54,17 +49,17 @@ val customBrandingPatch = baseCustomBrandingPatch(
     },
 
     executeBlock = {
-        val resourceDirectory = get("res")
-
-        mipmapDirectories.forEach { directory ->
-            val targetDirectory = resourceDirectory.resolve(directory)
+        val resourceDirectory = get("res/mipmap-anydpi")
 
-            youtubeIconResourceFileNames_19_34.forEach { (old, new) ->
-                val oldFile = targetDirectory.resolve("$old.png")
-                val newFile = targetDirectory.resolve("$new.png")
+        // Copy adaptive icon to secondary adaptive file.
+        arrayOf(
+            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 oldFile = resourceDirectory.resolve(old)
+            val newFile = resourceDirectory.resolve(new)
 
-                Files.write(newFile.toPath(), oldFile.readBytes())
-            }
+            Files.write(newFile.toPath(), oldFile.readBytes())
         }
     }
 )