refactor

Author: LisoUseInAIKyrios

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

@@ -52,6 +52,9 @@ private val disableSplashAnimationPatch = bytecodePatch {
 
 private const val APP_NAME = "YT Music ReVanced"
 
+private const val ADAPTIVE_BACKGROUND_RESOURCE_NAME = "adaptiveproduct_youtube_music_2024_q4_background_color_108"
+private const val ADAPTIVE_FOREGROUND_RESOURCE_NAME = "adaptiveproduct_youtube_music_2024_q4_foreground_color_108"
+
 @Suppress("unused")
 val customBrandingPatch = baseCustomBrandingPatch(
     defaultAppName = APP_NAME,
@@ -62,16 +65,16 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "YT Music" to "YT Music",
     ),
     resourceFolder = "custom-branding/music",
-    iconResourceFileNames = arrayOf(
-        "adaptiveproduct_youtube_music_2024_q4_background_color_108.png",
-        "adaptiveproduct_youtube_music_2024_q4_foreground_color_108.png"
+    adaptiveAnydpiFileNames = arrayOf(
+        "$ADAPTIVE_BACKGROUND_RESOURCE_NAME.xml",
+        "$ADAPTIVE_FOREGROUND_RESOURCE_NAME.xml"
     ),
-    monochromeIconFileNames = arrayOf("ic_app_icons_themed_youtube_music.xml"),
-    adaptiveIconFileNames = arrayOf(
-        "adaptiveproduct_youtube_music_2024_q4_background_color_108.xml",
-        "adaptiveproduct_youtube_music_2024_q4_foreground_color_108.xml"
+    mipmapIconFileNames = arrayOf(
+        "$ADAPTIVE_BACKGROUND_RESOURCE_NAME.png",
+        "$ADAPTIVE_FOREGROUND_RESOURCE_NAME.png"
     ),
-    legacyIconResourceFileNames = arrayOf("ic_launcher_release.png"),
+    legacyMipmapIconFileNames = arrayOf("ic_launcher_release.png"),
+    monochromeIconFileNames = arrayOf("ic_app_icons_themed_youtube_music.xml"),
 
     block = {
         dependsOn(disableSplashAnimationPatch)

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

@@ -53,10 +53,10 @@ internal fun baseCustomBrandingPatch(
     defaultAppName: String,
     appNameValues: Map<String, String>,
     resourceFolder: String,
-    iconResourceFileNames: Array<String>,
+    adaptiveAnydpiFileNames: Array<String>,
+    mipmapIconFileNames: Array<String>,
+    legacyMipmapIconFileNames: Array<String>,
     monochromeIconFileNames: Array<String>,
-    adaptiveIconFileNames: Array<String>,
-    legacyIconResourceFileNames: Array<String>,
     block: ResourcePatchBuilder.() -> Unit = {},
     executeBlock: ResourcePatchContext.() -> Unit = {}
 ): ResourcePatch = resourcePatch(
@@ -84,7 +84,7 @@ internal fun baseCustomBrandingPatch(
             ${formatResourceFileList(mipmapDirectories)}
     
             Each of these folders must contain the following files:
-            ${formatResourceFileList((iconResourceFileNames + legacyIconResourceFileNames))}
+            ${formatResourceFileList((mipmapIconFileNames + legacyMipmapIconFileNames))}
             
             Optionally, a 'drawable' folder with the monochrome icon files:
             ${formatResourceFileList(monochromeIconFileNames)}
@@ -100,14 +100,14 @@ internal fun baseCustomBrandingPatch(
             // Copy adaptive icons.
             copyResources(
                 resourceFolder,
-                ResourceGroup("mipmap-anydpi", *adaptiveIconFileNames)
+                ResourceGroup("mipmap-anydpi", *adaptiveAnydpiFileNames)
             )
 
             // Copy legacy icons.
             mipmapDirectories.map { directory ->
                 ResourceGroup(
                     directory,
-                    *legacyIconResourceFileNames,
+                    *legacyMipmapIconFileNames,
                 )
             }.forEach { groupResources ->
                 copyResources(resourceFolder, groupResources)
@@ -127,7 +127,7 @@ internal fun baseCustomBrandingPatch(
             mipmapDirectories.map { directory ->
                 ResourceGroup(
                     directory,
-                    *iconResourceFileNames,
+                    *mipmapIconFileNames,
                 )
             }.forEach { groupResources ->
                 val groupResourceDirectoryName = groupResources.resourceDirectoryName

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

@@ -19,22 +19,22 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "YouTube" to "YouTube",
     ),
     resourceFolder = "custom-branding/youtube",
-    iconResourceFileNames = arrayOf(
+    adaptiveAnydpiFileNames = arrayOf(
+        "$ADAPTIVE_BACKGROUND_RESOURCE_NAME.xml",
+        "$ADAPTIVE_FOREGROUND_RESOURCE_NAME.xml",
+    ),
+    mipmapIconFileNames = arrayOf(
         "$ADAPTIVE_BACKGROUND_RESOURCE_NAME.png",
         "$ADAPTIVE_FOREGROUND_RESOURCE_NAME.png",
     ),
+    legacyMipmapIconFileNames = arrayOf(
+        "ic_launcher.png",
+        // "ic_launcher_round" exists in 19.34, but was removed in later targets.
+    ),
     monochromeIconFileNames = arrayOf(
         "adaptive_monochrome_ic_youtube_launcher.xml",
         "ringo2_adaptive_monochrome_ic_youtube_launcher.xml"
     ),
-    adaptiveIconFileNames = arrayOf(
-        "$ADAPTIVE_BACKGROUND_RESOURCE_NAME.xml",
-        "$ADAPTIVE_FOREGROUND_RESOURCE_NAME.xml",
-    ),
-    legacyIconResourceFileNames = arrayOf(
-        "ic_launcher.png",
-        // "ic_launcher_round" exists in 19.34, but was removed in later targets.
-    ),
 
     block = {
         compatibleWith(
@@ -45,38 +45,37 @@ val customBrandingPatch = baseCustomBrandingPatch(
                 "20.14.43",
             )
         )
-    },
+    }
+
+) {
+    val resourceDirectory = get("res")
+
+    // 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",
+    ).forEach { (old, new) ->
+        var resourceType = "mipmap-anydpi"
+        val oldFile = resourceDirectory.resolve("$resourceType/$old.xml")
+        if (oldFile.exists()) {
+            val newFile = resourceDirectory.resolve("$resourceType/$new.xml")
+            Files.write(newFile.toPath(), oldFile.readBytes())
+        }
+    }
 
-    executeBlock = {
-        val resourceDirectory = get("res")
+    // Copy mipmaps to secondary files.
+    mipmapDirectories.forEach { directory ->
+        val targetDirectory = resourceDirectory.resolve(directory)
 
-        // 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",
         ).forEach { (old, new) ->
-            var resourceType = "mipmap-anydpi"
-            val oldFile = resourceDirectory.resolve("$resourceType/$old.xml")
+            val oldFile = targetDirectory.resolve("$old.png")
             if (oldFile.exists()) {
-                val newFile = resourceDirectory.resolve("$resourceType/$new.xml")
+                val newFile = targetDirectory.resolve("$new.png")
                 Files.write(newFile.toPath(), oldFile.readBytes())
             }
         }
-
-        // Copy mipmaps to secondary files.
-        mipmapDirectories.forEach { directory ->
-            val targetDirectory = resourceDirectory.resolve(directory)
-
-            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 oldFile = targetDirectory.resolve("$old.png")
-                if (oldFile.exists()) {
-                    val newFile = targetDirectory.resolve("$new.png")
-                    Files.write(newFile.toPath(), oldFile.readBytes())
-                }
-            }
-        }
     }
-)
+}