Merge remote-tracking branch 'upstream/dev' into feat/patcher_instruction_filters

# Conflicts: # patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
2025-12-07 01:51:27 +01:00 · 2025-10-30 09:28:16 +01:00
parent 260afefaab a0c5604951
commit 78689fde83
12 changed files with 124 additions and 72 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [5.45.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.2...v5.45.0-dev.3) (2025-10-27)
+
+
+### Features
+
+* **YouTube - Change Header:** Use SVG for header logo ([#6178](https://github.com/ReVanced/revanced-patches/issues/6178)) ([e9f45ce](https://github.com/ReVanced/revanced-patches/commit/e9f45ce92695d5857473ff71c14b190bded28a73))
+
 # [5.45.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.1...v5.45.0-dev.2) (2025-10-26)


--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.45.0-dev.2
+version = 5.45.0-dev.3
--- a/patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/AddBrandLicensePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/AddBrandLicensePatch.kt
@@ -0,0 +1,25 @@
+package app.revanced.patches.shared.layout.branding
+
+import app.revanced.patcher.patch.rawResourcePatch
+import app.revanced.util.inputStreamFromBundledResource
+import java.nio.file.Files
+
+/**
+ * Copies a branding license text file to the target apk.
+ *
+ * This patch must be a dependency for all patches that add ReVanced branding to the target app.
+ */
+internal val addBrandLicensePatch = rawResourcePatch {
+    execute {
+        val brandingLicenseFileName = "LICENSE_REVANCED.TXT"
+
+        val inputFileStream = inputStreamFromBundledResource(
+            "branding-license",
+            brandingLicenseFileName
+        )!!
+
+        val targetFile = get(brandingLicenseFileName, false).toPath()
+
+        Files.copy(inputFileStream, targetFile)
+    }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/BaseCustomBrandingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/BaseCustomBrandingPatch.kt
@@ -123,6 +123,7 @@ internal fun baseCustomBrandingPatch(
    dependsOn(
        addResourcesPatch,
        resourceMappingPatch,
+        addBrandLicensePatch,
        bytecodePatch {
            execute {
                mainActivityOnCreateFingerprint.method.addInstruction(
--- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/SettingsPatch.kt
@@ -6,6 +6,7 @@ import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResource
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.layout.branding.addBrandLicensePatch
 import app.revanced.patches.shared.misc.settings.preference.BasePreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceCategory
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
@@ -51,7 +52,11 @@ fun settingsPatch (
    rootPreferences: List<Pair<BasePreference, String>>? = null,
    preferences: Set<BasePreference>,
 ) = resourcePatch {
-    dependsOn(addResourcesPatch, settingsColorPatch)
+    dependsOn(
+        addResourcesPatch,
+        settingsColorPatch,
+        addBrandLicensePatch
+    )

    execute {
        copyResources(
--- a/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.shared.layout.branding.addBrandLicensePatch
 import app.revanced.patches.tiktok.misc.extension.sharedExtensionPatch
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
@@ -18,7 +19,7 @@ val settingsPatch = bytecodePatch(
    name = "Settings",
    description = "Adds ReVanced settings to TikTok.",
 ) {
-    dependsOn(sharedExtensionPatch)
+    dependsOn(sharedExtensionPatch, addBrandLicensePatch)

    compatibleWith(
        "com.ss.android.ugc.trill"("36.5.4"),
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
@@ -9,6 +9,7 @@ import app.revanced.patcher.patch.stringOption
 import app.revanced.patcher.util.Document
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.layout.branding.addBrandLicensePatch
 import app.revanced.patches.shared.misc.mapping.ResourceType
 import app.revanced.patches.shared.misc.mapping.getResourceId
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
@@ -54,7 +55,10 @@ private val customHeaderResourceFileNames = variants.map { variant ->
 private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/ChangeHeaderPatch;"

 private val changeHeaderBytecodePatch = bytecodePatch {
-    dependsOn(resourceMappingPatch)
+    dependsOn(
+        resourceMappingPatch,
+        addBrandLicensePatch
+    )

    execute {
        // Verify images exist. Resources are not used during patching but extension code does.
--- a/patches/src/main/resources/branding-license/LICENSE_REVANCED.TXT
+++ b/patches/src/main/resources/branding-license/LICENSE_REVANCED.TXT
@@ -0,0 +1,5 @@
+The ReVanced branding found in this software is copyrighted and not covered under the GPL.
+
+To use or distribute ReVanced branding, you must obtain permission by contacting branding@revanced.app
+
+For more information see https://github.com/ReVanced/revanced-branding
--- a/patches/src/main/resources/change-header/drawable/revanced_header_minimal_dark.xml
+++ b/patches/src/main/resources/change-header/drawable/revanced_header_minimal_dark.xml
@@ -3,6 +3,7 @@
    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="129dp"
    android:height="48dp"
+    android:autoMirrored="false"
    android:viewportWidth="129"
    android:viewportHeight="48">

--- a/patches/src/main/resources/change-header/drawable/revanced_header_minimal_light.xml
+++ b/patches/src/main/resources/change-header/drawable/revanced_header_minimal_light.xml
@@ -3,6 +3,7 @@
    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="129dp"
    android:height="48dp"
+    android:autoMirrored="false"
    android:viewportWidth="129"
    android:viewportHeight="48">

--- a/patches/src/main/resources/change-header/drawable/revanced_header_rounded_dark.xml
+++ b/patches/src/main/resources/change-header/drawable/revanced_header_rounded_dark.xml
@@ -3,54 +3,55 @@
    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="129dp"
    android:height="48dp"
+    android:autoMirrored="false"
    android:viewportWidth="129"
    android:viewportHeight="48">

-    <path
-        android:fillColor="#1B1B1B"
-        android:pathData="M23,11.5C29.9,11.5 35.5,17.1 35.5,24C35.5,30.9 29.9,36.5 23,36.5C16.1,36.5 10.5,30.9 10.5,24C10.5,17.1 16.1,11.5 23,11.5ZM23,11.5" />
-    <path
-        android:pathData="M23,11.5C29.9,11.5 35.5,17.1 35.5,24C35.5,30.9 29.9,36.5 23,36.5C16.1,36.5 10.5,30.9 10.5,24C10.5,17.1 16.1,11.5 23,11.5ZM23,12.63C16.72,12.63 11.63,17.72 11.63,24C11.63,30.28 16.72,35.38 23,35.38C29.28,35.38 34.38,30.28 34.38,24C34.38,17.72 29.28,12.63 23,12.63ZM23,12.63">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:startX="23"
-                android:startY="11.5"
-                android:endX="23"
-                android:endY="36.5"
-                android:type="linear">
-                <item
-                    android:offset="0"
-                    android:color="#F04E98"/>
-                <item
-                    android:offset="0.5"
-                    android:color="#5F65D4"/>
-                <item
-                    android:offset="1"
-                    android:color="#4E98F0"/>
-            </gradient>
-        </aapt:attr>
-    </path>
+    <group>
+        <path android:pathData="M23,11.5C29.9,11.5 35.5,17.1 35.5,24C35.5,30.9 29.9,36.5 23,36.5C16.1,36.5 10.5,30.9 10.5,24C10.5,17.1 16.1,11.5 23,11.5Z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="23"
+                    android:endY="36.5"
+                    android:startX="23"
+                    android:startY="11.5"
+                    android:type="linear">
+                    <item
+                        android:color="#F04E98"
+                        android:offset="0" />
+                    <item
+                        android:color="#5F65D4"
+                        android:offset="0.5" />
+                    <item
+                        android:color="#4E98F0"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:fillColor="#1B1B1B"
+            android:pathData="M23,12.63C29.28,12.63 34.38,17.72 34.38,24C34.38,30.28 29.28,35.38 23,35.38C16.72,35.38 11.63,30.28 11.63,24C11.63,17.72 16.72,12.63 23,12.63Z" />
+    </group>
    <path
        android:fillColor="#FFFFFF"
        android:pathData="M27.34,19.93C27.38,19.83 27.37,19.71 27.31,19.61C27.25,19.51 27.14,19.45 27.02,19.45C26.86,19.45 26.7,19.45 26.58,19.45C26.48,19.45 26.39,19.51 26.36,19.6C25.96,20.49 23.91,25.17 23.22,26.73C23.18,26.82 23.1,26.88 23,26.88C22.9,26.88 22.82,26.82 22.78,26.73C22.09,25.17 20.04,20.49 19.64,19.6C19.61,19.51 19.52,19.45 19.42,19.45C19.3,19.45 19.14,19.45 18.98,19.45C18.86,19.45 18.75,19.51 18.69,19.61C18.63,19.71 18.62,19.83 18.66,19.93C19.4,21.61 21.85,27.2 22.35,28.34C22.4,28.46 22.52,28.55 22.66,28.55C22.86,28.55 23.14,28.55 23.34,28.55C23.48,28.55 23.6,28.46 23.65,28.34C24.15,27.2 26.6,21.61 27.34,19.93ZM27.34,19.93" />
-    <path
-        android:pathData="M23.25,23.85C23.2,23.95 23.11,24 23,24C22.89,24 22.8,23.95 22.75,23.85C22.21,22.93 20.99,20.81 20.46,19.89C20.41,19.8 20.41,19.69 20.46,19.6C20.51,19.51 20.61,19.45 20.71,19.45L25.29,19.45C25.39,19.45 25.49,19.51 25.54,19.6C25.59,19.69 25.59,19.8 25.54,19.89C25.01,20.81 23.79,22.93 23.25,23.85ZM23.25,23.85">
+    <path android:pathData="M23.25,23.85C23.2,23.95 23.11,24 23,24C22.89,24 22.8,23.95 22.75,23.85C22.21,22.93 20.99,20.81 20.46,19.89C20.41,19.8 20.41,19.69 20.46,19.6C20.51,19.51 20.61,19.45 20.71,19.45L25.29,19.45C25.39,19.45 25.49,19.51 25.54,19.6C25.59,19.69 25.59,19.8 25.54,19.89C25.01,20.81 23.79,22.93 23.25,23.85ZM23.25,23.85">
        <aapt:attr name="android:fillColor">
            <gradient
-                android:startX="23"
-                android:startY="19.45"
                android:endX="23"
                android:endY="28.5"
+                android:startX="23"
+                android:startY="19.45"
                android:type="linear">
                <item
-                    android:offset="0"
-                    android:color="#F04E98"/>
+                    android:color="#F04E98"
+                    android:offset="0" />
                <item
-                    android:offset="0.5"
-                    android:color="#5F65D4"/>
+                    android:color="#5F65D4"
+                    android:offset="0.5" />
                <item
-                    android:offset="1"
-                    android:color="#4E98F0"/>
+                    android:color="#4E98F0"
+                    android:offset="1" />
            </gradient>
        </aapt:attr>
    </path>
--- a/patches/src/main/resources/change-header/drawable/revanced_header_rounded_light.xml
+++ b/patches/src/main/resources/change-header/drawable/revanced_header_rounded_light.xml
@@ -3,54 +3,55 @@
    xmlns:aapt="http://schemas.android.com/aapt"
    android:width="129dp"
    android:height="48dp"
+    android:autoMirrored="false"
    android:viewportWidth="129"
    android:viewportHeight="48">

-    <path
-        android:fillColor="#1B1B1B"
-        android:pathData="M23,11.5C29.9,11.5 35.5,17.1 35.5,24C35.5,30.9 29.9,36.5 23,36.5C16.1,36.5 10.5,30.9 10.5,24C10.5,17.1 16.1,11.5 23,11.5ZM23,11.5" />
-    <path
-        android:pathData="M23,11.5C29.9,11.5 35.5,17.1 35.5,24C35.5,30.9 29.9,36.5 23,36.5C16.1,36.5 10.5,30.9 10.5,24C10.5,17.1 16.1,11.5 23,11.5ZM23,12.63C16.72,12.63 11.63,17.72 11.63,24C11.63,30.28 16.72,35.38 23,35.38C29.28,35.38 34.38,30.28 34.38,24C34.38,17.72 29.28,12.63 23,12.63ZM23,12.63">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:startX="23"
-                android:startY="11.5"
-                android:endX="23"
-                android:endY="36.5"
-                android:type="linear">
-                <item
-                    android:offset="0"
-                    android:color="#F04E98"/>
-                <item
-                    android:offset="0.5"
-                    android:color="#5F65D4"/>
-                <item
-                    android:offset="1"
-                    android:color="#4E98F0"/>
-              </gradient>
-        </aapt:attr>
-    </path>
+    <group>
+        <path android:pathData="M23,11.5C29.9,11.5 35.5,17.1 35.5,24C35.5,30.9 29.9,36.5 23,36.5C16.1,36.5 10.5,30.9 10.5,24C10.5,17.1 16.1,11.5 23,11.5Z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="23"
+                    android:endY="36.5"
+                    android:startX="23"
+                    android:startY="11.5"
+                    android:type="linear">
+                    <item
+                        android:color="#F04E98"
+                        android:offset="0" />
+                    <item
+                        android:color="#5F65D4"
+                        android:offset="0.5" />
+                    <item
+                        android:color="#4E98F0"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:fillColor="#1B1B1B"
+            android:pathData="M23,12.63C29.28,12.63 34.38,17.72 34.38,24C34.38,30.28 29.28,35.38 23,35.38C16.72,35.38 11.63,30.28 11.63,24C11.63,17.72 16.72,12.63 23,12.63Z" />
+    </group>
    <path
        android:fillColor="#FFFFFF"
        android:pathData="M27.34,19.93C27.38,19.83 27.37,19.71 27.31,19.61C27.25,19.51 27.14,19.45 27.02,19.45C26.86,19.45 26.7,19.45 26.58,19.45C26.48,19.45 26.39,19.51 26.36,19.6C25.96,20.49 23.91,25.17 23.22,26.73C23.18,26.82 23.1,26.88 23,26.88C22.9,26.88 22.82,26.82 22.78,26.73C22.09,25.17 20.04,20.49 19.64,19.6C19.61,19.51 19.52,19.45 19.42,19.45C19.3,19.45 19.14,19.45 18.98,19.45C18.86,19.45 18.75,19.51 18.69,19.61C18.63,19.71 18.62,19.83 18.66,19.93C19.4,21.61 21.85,27.2 22.35,28.34C22.4,28.46 22.52,28.55 22.66,28.55C22.86,28.55 23.14,28.55 23.34,28.55C23.48,28.55 23.6,28.46 23.65,28.34C24.15,27.2 26.6,21.61 27.34,19.93ZM27.34,19.93" />
-    <path
-        android:pathData="M23.25,23.85C23.2,23.95 23.11,24 23,24C22.89,24 22.8,23.95 22.75,23.85C22.21,22.93 20.99,20.81 20.46,19.89C20.41,19.8 20.41,19.69 20.46,19.6C20.51,19.51 20.61,19.45 20.71,19.45L25.29,19.45C25.39,19.45 25.49,19.51 25.54,19.6C25.59,19.69 25.59,19.8 25.54,19.89C25.01,20.81 23.79,22.93 23.25,23.85ZM23.25,23.85">
+    <path android:pathData="M23.25,23.85C23.2,23.95 23.11,24 23,24C22.89,24 22.8,23.95 22.75,23.85C22.21,22.93 20.99,20.81 20.46,19.89C20.41,19.8 20.41,19.69 20.46,19.6C20.51,19.51 20.61,19.45 20.71,19.45L25.29,19.45C25.39,19.45 25.49,19.51 25.54,19.6C25.59,19.69 25.59,19.8 25.54,19.89C25.01,20.81 23.79,22.93 23.25,23.85ZM23.25,23.85">
        <aapt:attr name="android:fillColor">
            <gradient
-                android:startX="23"
-                android:startY="19.45"
                android:endX="23"
                android:endY="28.5"
+                android:startX="23"
+                android:startY="19.45"
                android:type="linear">
                <item
-                    android:offset="0"
-                    android:color="#F04E98"/>
+                    android:color="#F04E98"
+                    android:offset="0" />
                <item
-                    android:offset="0.5"
-                    android:color="#5F65D4"/>
+                    android:color="#5F65D4"
+                    android:offset="0.5" />
                <item
-                    android:offset="1"
-                    android:color="#4E98F0"/>
+                    android:color="#4E98F0"
+                    android:offset="1" />
            </gradient>
        </aapt:attr>
    </path>