perf: Personal Logo && Add upstream sync

.github/workflows/clean.yml

@@ -0,0 +1,28 @@
+name: Delete old workflow runs
+on:
+  workflow_dispatch:
+    inputs:
+      days:
+        description: 'Number of days.'
+        required: true
+        default: 0
+      minimum_runs:
+        description: 'The minimum runs to keep for each workflow.'
+        required: true
+        default: 0
+      delete_workflow_pattern:
+        description: 'The name of the workflow. if not set then it will target all workflows.'
+        required: false
+
+jobs:
+  del_runs:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: ${{ github.event.inputs.days }}
+          keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
+          delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: Release
 
 on:
+  workflow_call:
   workflow_dispatch:
   push:
     branches:

.github/workflows/sync_upstream.yml

@@ -0,0 +1,52 @@
+name: Sync upstream
+on:
+  workflow_call:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 */8 * * *"
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GH_PAT }}
+
+      - name: sync
+        id: sync
+        shell: bash
+        run: |
+          git config --global user.name 'E85Addict'
+          git config --global user.email '[email protected]'
+          if [[ $(git log | grep Author | head -1) == *"semantic"* ]]; then
+            git reset --hard HEAD~1
+          fi
+          T=$(git tag --sort=creatordate | tail -1)
+          git remote add upstream https://github.com/revanced/revanced-patches
+          git tag -d $(git tag -l)
+          git fetch upstream --tags -f
+          LatestRemoteTag=$(curl -s https://api.github.com/repos/revanced/revanced-patches/releases/latest | jq -r '.tag_name')
+          C=$(git rev-list --left-right --count origin/main...remotes/upstream/main | awk '{print$2}')
+          echo "Ahead $C commits."
+
+          if [ "$C" -gt 0 ]; then
+            echo "Rebasing"
+            # git push origin --delete $T
+            git rebase -X ours upstream/main
+            git push --tags -f
+            git push origin --delete $LatestRemoteTag
+            git push -f
+          else
+            echo "in sync"
+          fi
+
+      - name: Delete old workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 0
+          keep_minimum_runs: 10

.releaserc

@@ -37,13 +37,6 @@
         ],
         successComment: false
       }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        backmergeBranches: [{"from": "main", "to": "dev"}],
-        clearWorkspace: true
-      }
     ]
   ]
 }

patches/api/patches.api

@@ -288,6 +288,10 @@ public final class app/revanced/patches/music/interaction/permanentshuffle/Perma
 	public static final fun getPermanentShufflePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/music/layout/branding/CustomBrandingMusicPatchKt {
+	public static final fun getCustomBrandingPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
 public final class app/revanced/patches/music/layout/compactheader/HideCategoryBarKt {
 	public static final fun getHideCategoryBar ()Lapp/revanced/patcher/patch/BytecodePatch;
 }

patches/build.gradle.kts

@@ -31,7 +31,7 @@ publishing {
     repositories {
         maven {
             name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/revanced/revanced-patches")
+            url = uri("https://maven.pkg.github.com/E85Addict/revanced-patches")
             credentials {
                 username = System.getenv("GITHUB_ACTOR")
                 password = System.getenv("GITHUB_TOKEN")

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

@@ -0,0 +1,128 @@
+package app.revanced.patches.music.layout.branding
+
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.patcher.patch.stringOption
+import app.revanced.util.ResourceGroup
+import app.revanced.util.Utils.trimIndentMultiline
+import app.revanced.util.copyResources
+import java.io.File
+import java.nio.file.Files
+
+private const val REVANCED_ICON = "ReVanced*Logo" // Can never be a valid path.
+private const val APP_NAME = "YT Music"
+
+private val iconResourceFileNames = arrayOf(
+    "adaptiveproduct_youtube_music_background_color_108",
+    "adaptiveproduct_youtube_music_foreground_color_108",
+    "ic_launcher",
+    "ic_launcher_round",
+).map { "$it.png" }.toTypedArray()
+
+private val iconResourceFileNamesNew = mapOf(
+    "adaptiveproduct_youtube_music_foreground_color_108" to "adaptiveproduct_youtube_music_2024_q4_foreground_color_108",
+    "adaptiveproduct_youtube_music_background_color_108" to "adaptiveproduct_youtube_music_2024_q4_background_color_108",
+)
+
+private val mipmapDirectories = arrayOf(
+    "xxxhdpi",
+    "xxhdpi",
+    "xhdpi",
+    "hdpi",
+    "mdpi",
+).map { "mipmap-$it" }
+
+@Suppress("unused")
+val customBrandingPatch = resourcePatch(
+    name = "Custom Music branding",
+    description = "Applies a custom app name and icon. Defaults to \"YT Music ReVanced\" and the ReVanced logo.",
+    use = true,
+) {
+    compatibleWith("com.google.android.apps.youtube.music")
+
+    val appName by stringOption(
+        key = "appName",
+        default = APP_NAME,
+        values = mapOf(
+            "YouTube Music ReVanced" to APP_NAME,
+            "YTM ReVanced" to "YTM ReVanced",
+            "YTM" to "YTM",
+            "YouTube Music" to "YouTube Music",
+        ),
+        title = "App name",
+        description = "The name of the app.",
+    )
+
+    val icon by stringOption(
+        key = "iconPath",
+        default = REVANCED_ICON,
+        values = mapOf("ReVanced Logo" to REVANCED_ICON),
+        title = "App icon",
+        description = """
+            The icon to apply to the app.
+            
+            If a path to a folder is provided, the folder must contain the following folders:
+
+            ${mipmapDirectories.joinToString("\n") { "- $it" }}
+
+            Each of these folders must contain the following files:
+
+            ${iconResourceFileNames.joinToString("\n") { "- $it" }}
+        """.trimIndentMultiline(),
+    )
+
+    execute {
+        icon?.let { icon ->
+            // Change the app icon.
+            mipmapDirectories.map { directory ->
+                ResourceGroup(
+                    directory,
+                    *iconResourceFileNames,
+                )
+            }.let { resourceGroups ->
+                if (icon != REVANCED_ICON) {
+                    val path = File(icon)
+                    val resourceDirectory = get("res")
+
+                    resourceGroups.forEach { group ->
+                        val fromDirectory = path.resolve(group.resourceDirectoryName)
+                        val toDirectory = resourceDirectory.resolve(group.resourceDirectoryName)
+
+                        group.resources.forEach { iconFileName ->
+                            Files.write(
+                                toDirectory.resolve(iconFileName).toPath(),
+                                fromDirectory.resolve(iconFileName).readBytes(),
+                            )
+                        }
+                    }
+                } else {
+                    resourceGroups.forEach { copyResources("branding/music", it) }
+                }
+            }
+
+            val resourceDirectory = get("res")
+
+            mipmapDirectories.forEach { directory ->
+                val targetDirectory = resourceDirectory.resolve(directory)
+
+                iconResourceFileNamesNew.forEach { (old, new) ->
+                    val oldFile = targetDirectory.resolve("$old.png")
+                    val newFile = targetDirectory.resolve("$new.png")
+
+                    Files.write(newFile.toPath(), oldFile.readBytes())
+                }
+            }
+        }
+
+        appName?.let { name ->
+            // Change the app name.
+            val manifest = get("AndroidManifest.xml")
+            manifest.writeText(
+                manifest.readText()
+                    .replace(
+                        "android:label=\"@string/application_name",
+                        "android:label=\"$name",
+                    ),
+            )
+        }
+    }
+}

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

@@ -11,7 +11,7 @@ import java.io.File
 import java.nio.file.Files
 
 private const val REVANCED_ICON = "ReVanced*Logo" // Can never be a valid path.
-private const val APP_NAME = "YouTube ReVanced"
+private const val APP_NAME = "YouTube"
 
 private val iconResourceFileNames = arrayOf(
     "adaptiveproduct_youtube_background_color_108",
@@ -37,7 +37,7 @@ private val mipmapDirectories = arrayOf(
 val customBrandingPatch = resourcePatch(
     name = "Custom branding",
     description = "Applies a custom app name and icon. Defaults to \"YouTube ReVanced\" and the ReVanced logo.",
-    use = false,
+    use = true,
 ) {
     dependsOn(versionCheckPatch)
 
@@ -99,7 +99,7 @@ val customBrandingPatch = resourcePatch(
                         }
                     }
                 } else {
-                    resourceGroups.forEach { copyResources("custom-branding", it) }
+                    resourceGroups.forEach { copyResources("branding/youtube", it) }
                 }
             }