fix(Custom branding): Update ReVanced logo sizing (#6029)

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

@@ -67,6 +67,7 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "adaptiveproduct_youtube_music_2024_q4_foreground_color_108",
         "ic_launcher_release",
     ),
+    monochromeIconFileNames = arrayOf("ic_app_icons_themed_youtube_music.xml"),
 
     block = {
         dependsOn(disableSplashAnimationPatch)

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

@@ -15,11 +15,12 @@ import java.util.logging.Logger
 private const val REVANCED_ICON = "ReVanced*Logo" // Can never be a valid path.
 
 internal val mipmapDirectories = arrayOf(
-    "xxxhdpi",
-    "xxhdpi",
-    "xhdpi",
-    "hdpi",
+    // Target app does not have ldpi icons.
     "mdpi",
+    "hdpi",
+    "xhdpi",
+    "xxhdpi",
+    "xxxhdpi",
 ).map { "mipmap-$it" }.toTypedArray()
 
 private fun formatResourceFileList(resourceNames: Array<String>) = resourceNames.joinToString("\n") { "- $it" }
@@ -52,6 +53,7 @@ internal fun baseCustomBrandingPatch(
     appNameValues: Map<String, String>,
     resourceFolder: String,
     iconResourceFileNames: Array<String>,
+    monochromeIconFileNames: Array<String>,
     block: ResourcePatchBuilder.() -> Unit = {},
     executeBlock: ResourcePatchContext.() -> Unit = {}
 ): ResourcePatch = resourcePatch(
@@ -84,14 +86,17 @@ internal fun baseCustomBrandingPatch(
             Each of these folders must contain the following files:
     
             ${formatResourceFileList(iconResourceFileNamesPng)}
+            
+            Optionally, a 'drawable' folder with the monochrome icon files:
+    
+            ${formatResourceFileList(monochromeIconFileNames)}
         """.trimIndentMultiline(),
     )
 
     block()
 
     execute {
-        // Change the app icon and launch screen.
-        val iconResourceGroups = mipmapDirectories.map { directory ->
+        val mipmapIconResourceGroups = mipmapDirectories.map { directory ->
             ResourceGroup(
                 directory,
                 *iconResourceFileNamesPng,
@@ -100,24 +105,46 @@ internal fun baseCustomBrandingPatch(
 
         val iconPathTrimmed = iconPath!!.trim()
         if (iconPathTrimmed == REVANCED_ICON) {
-            iconResourceGroups.forEach {
-                copyResources(resourceFolder, it)
+            // Replace mipmap icons with preset patch icons.
+            mipmapIconResourceGroups.forEach { groupResources ->
+                copyResources(resourceFolder, groupResources)
+            }
+
+            // Replace monochrome icons.
+            monochromeIconFileNames.forEach { fileName ->
+                copyResources(
+                    resourceFolder,
+                    ResourceGroup("drawable", fileName)
+                )
             }
         } else {
             val filePath = File(iconPathTrimmed)
             val resourceDirectory = get("res")
 
-            iconResourceGroups.forEach { group ->
-                val fromDirectory = filePath.resolve(group.resourceDirectoryName)
-                val toDirectory = resourceDirectory.resolve(group.resourceDirectoryName)
+            // Replace
+            mipmapIconResourceGroups.forEach { groupResources ->
+                val groupResourceDirectoryName = groupResources.resourceDirectoryName
+                val fromDirectory = filePath.resolve(groupResourceDirectoryName)
+                val toDirectory = resourceDirectory.resolve(groupResourceDirectoryName)
 
-                group.resources.forEach { iconFileName ->
+                groupResources.resources.forEach { iconFileName ->
                     Files.write(
                         toDirectory.resolve(iconFileName).toPath(),
                         fromDirectory.resolve(iconFileName).readBytes(),
                     )
                 }
             }
+
+            // Copy all monochrome icons if provided.
+            monochromeIconFileNames.forEach { fileName ->
+                val replacementMonochrome = filePath.resolve("drawable").resolve(fileName)
+                if (replacementMonochrome.exists()) {
+                    Files.write(
+                        resourceDirectory.resolve("drawable").resolve(fileName).toPath(),
+                        replacementMonochrome.readBytes(),
+                    )
+                }
+            }
         }
 
         // Change the app name.

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

@@ -27,6 +27,10 @@ val customBrandingPatch = baseCustomBrandingPatch(
         "ic_launcher",
         "ic_launcher_round",
     ),
+    monochromeIconFileNames = arrayOf(
+        "adaptive_monochrome_ic_youtube_launcher.xml",
+        "ringo2_adaptive_monochrome_ic_youtube_launcher.xml"
+    ),
 
     block = {
         compatibleWith(

patches/src/main/resources/custom-branding/music/drawable/ic_app_icons_themed_youtube_music.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <group android:scaleX="0.3"
+      android:scaleY="0.3"
+      android:translateX="89.6"
+      android:translateY="89.6">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M253.85,4.9C254.32,3.82 254.22,2.57 253.58,1.58C252.93,0.6 251.83,0 250.64,0C243.29,0 230.47,0 225.95,0C224.96,0 224.06,0.59 223.66,1.5C216.03,18.88 144.1,182.7 130.29,214.16C129.89,215.07 128.99,215.66 128,215.66C127.01,215.66 126.11,215.07 125.71,214.16C111.9,182.7 39.97,18.88 32.34,1.5C31.94,0.59 31.04,0 30.05,0C25.53,0 12.71,0 5.36,0C4.17,0 3.07,0.6 2.42,1.58C1.78,2.57 1.68,3.82 2.15,4.9C16.78,38.3 101.47,231.61 111.24,253.9C111.8,255.18 113.06,256 114.45,256C120.29,256 135.71,256 141.55,256C142.94,256 144.2,255.18 144.76,253.9C154.52,231.61 239.22,38.3 253.85,4.9Z"/>
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M130.59,131.75C130.06,132.68 129.07,133.25 128,133.25C126.93,133.25 125.94,132.68 125.4,131.75C113.45,111.06 63.88,25.19 51.93,4.5C51.4,3.57 51.4,2.43 51.93,1.5C52.47,0.57 53.46,-0 54.53,-0L201.47,-0C202.54,-0 203.53,0.57 204.06,1.5C204.6,2.43 204.6,3.57 204.06,4.5C192.12,25.19 142.54,111.06 130.59,131.75Z"/>
+  </group>
+</vector>

patches/src/main/resources/custom-branding/youtube/drawable/adaptive_monochrome_ic_youtube_launcher.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <group android:scaleX="0.3"
+      android:scaleY="0.3"
+      android:translateX="89.6"
+      android:translateY="89.6">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M253.85,4.9C254.32,3.82 254.22,2.57 253.58,1.58C252.93,0.6 251.83,0 250.64,0C243.29,0 230.47,0 225.95,0C224.96,0 224.06,0.59 223.66,1.5C216.03,18.88 144.1,182.7 130.29,214.16C129.89,215.07 128.99,215.66 128,215.66C127.01,215.66 126.11,215.07 125.71,214.16C111.9,182.7 39.97,18.88 32.34,1.5C31.94,0.59 31.04,0 30.05,0C25.53,0 12.71,0 5.36,0C4.17,0 3.07,0.6 2.42,1.58C1.78,2.57 1.68,3.82 2.15,4.9C16.78,38.3 101.47,231.61 111.24,253.9C111.8,255.18 113.06,256 114.45,256C120.29,256 135.71,256 141.55,256C142.94,256 144.2,255.18 144.76,253.9C154.52,231.61 239.22,38.3 253.85,4.9Z"/>
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M130.59,131.75C130.06,132.68 129.07,133.25 128,133.25C126.93,133.25 125.94,132.68 125.4,131.75C113.45,111.06 63.88,25.19 51.93,4.5C51.4,3.57 51.4,2.43 51.93,1.5C52.47,0.57 53.46,-0 54.53,-0L201.47,-0C202.54,-0 203.53,0.57 204.06,1.5C204.6,2.43 204.6,3.57 204.06,4.5C192.12,25.19 142.54,111.06 130.59,131.75Z"/>
+  </group>
+</vector>

patches/src/main/resources/custom-branding/youtube/drawable/ringo2_adaptive_monochrome_ic_youtube_launcher.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <group android:scaleX="0.3"
+      android:scaleY="0.3"
+      android:translateX="89.6"
+      android:translateY="89.6">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M253.85,4.9C254.32,3.82 254.22,2.57 253.58,1.58C252.93,0.6 251.83,0 250.64,0C243.29,0 230.47,0 225.95,0C224.96,0 224.06,0.59 223.66,1.5C216.03,18.88 144.1,182.7 130.29,214.16C129.89,215.07 128.99,215.66 128,215.66C127.01,215.66 126.11,215.07 125.71,214.16C111.9,182.7 39.97,18.88 32.34,1.5C31.94,0.59 31.04,0 30.05,0C25.53,0 12.71,0 5.36,0C4.17,0 3.07,0.6 2.42,1.58C1.78,2.57 1.68,3.82 2.15,4.9C16.78,38.3 101.47,231.61 111.24,253.9C111.8,255.18 113.06,256 114.45,256C120.29,256 135.71,256 141.55,256C142.94,256 144.2,255.18 144.76,253.9C154.52,231.61 239.22,38.3 253.85,4.9Z"/>
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M130.59,131.75C130.06,132.68 129.07,133.25 128,133.25C126.93,133.25 125.94,132.68 125.4,131.75C113.45,111.06 63.88,25.19 51.93,4.5C51.4,3.57 51.4,2.43 51.93,1.5C52.47,0.57 53.46,-0 54.53,-0L201.47,-0C202.54,-0 203.53,0.57 204.06,1.5C204.6,2.43 204.6,3.57 204.06,4.5C192.12,25.19 142.54,111.06 130.59,131.75Z"/>
+  </group>
+</vector>