chore(release): 1.6.1 [skip ci]

## [1.6.1](https://github.com/revanced/revanced-patches/compare/v1.6.0...v1.6.1) (2022-06-16)

### Bug Fixes

* broken gradle task ([d48a8e9](d48a8e93a2))

.github/workflows/release.yml

@@ -28,12 +28,16 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
       - name: Make gradlew executable
         run: chmod +x gradlew
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build clean
+      - name: Install Android build-tools
+        run: sdkmanager "build-tools;32.0.0"
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.releaserc

@@ -26,6 +26,9 @@
         "assets": [
           {
             "path": "build/libs/*.jar"
+          },
+          {
+            "path": "bin/*.dex"
           }
         ]
       }

CHANGELOG.md

@@ -1,3 +1,116 @@
+## [1.6.1](https://github.com/revanced/revanced-patches/compare/v1.6.0...v1.6.1) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([4d07961](https://github.com/revanced/revanced-patches/commit/4d07961c8afd24da7f8879d11419147f2e100f05))
+
+# [1.6.0](https://github.com/revanced/revanced-patches/compare/v1.5.3...v1.6.0) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([28e3f55](https://github.com/revanced/revanced-patches/commit/28e3f554ea6a7144416523fe48ce7adbb613b263))
+
+
+### Features
+
+* generate dex files using gradle task ([c34c1be](https://github.com/revanced/revanced-patches/commit/c34c1be21f50b4f720a7cd81e0dfe5ef6330caab))
+
+## [1.5.3](https://github.com/revanced/revanced-patches/compare/v1.5.2...v1.5.3) (2022-06-16)
+
+
+### Bug Fixes
+
+* forgot about this ([7102a25](https://github.com/revanced/revanced-patches/commit/7102a25dc618f19b324b01870d23f5418f375b2a))
+
+## [1.5.2](https://github.com/revanced/revanced-patches/compare/v1.5.1...v1.5.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* dummy task for Gradle semantic-release plugin ([f6a8911](https://github.com/revanced/revanced-patches/commit/f6a8911906dfe52fcdb685daf7a02d6d0052cba9))
+* releases ([30d5c9a](https://github.com/revanced/revanced-patches/commit/30d5c9a67ccf88ca6ac00d0a9f2a2e330f8092dd))
+
+## [1.5.1](https://github.com/revanced/revanced-patches/compare/v1.5.0...v1.5.1) (2022-06-16)
+
+
+### Reverts
+
+* Revert "Changed app name to ReVanced (#21)" (#24) ([70a48c5](https://github.com/revanced/revanced-patches/commit/70a48c5f35cd236612352a1dbbf50487625e6e96)), closes [#21](https://github.com/revanced/revanced-patches/issues/21) [#24](https://github.com/revanced/revanced-patches/issues/24)
+
+# [1.5.0](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.5.0) (2022-06-15)
+
+
+### Bug Fixes
+
+* sync version ([6170e36](https://github.com/revanced/revanced-patches/commit/6170e3689d9c8998be94a8464352af620cccd11b))
+
+
+### Features
+
+* `hide-cast-button` patch ([2cd531e](https://github.com/revanced/revanced-patches/commit/2cd531eb5a334f3cf91cba4556f07e863cd9ec1b))
+
+# [1.4.0](https://github.com/revanced/revanced-patches/compare/v1.3.1...v1.4.0) (2022-06-15)
+
+
+### Bug Fixes
+
+* add size `48px` for `custom-branding` patch ([f81872b](https://github.com/revanced/revanced-patches/commit/f81872b8e41da215517fdb59364130d8ce681607))
+
+
+### Features
+
+* `premium-heading` patch ([78913bf](https://github.com/revanced/revanced-patches/commit/78913bf1e80f5b91d0dee506fdfe3f875e8e6988))
+
+## [1.3.1](https://github.com/revanced/revanced-patches/compare/v1.3.0...v1.3.1) (2022-06-15)
+
+
+### Bug Fixes
+
+* `custom-branding` patch failing to get resources ([efb6d4c](https://github.com/revanced/revanced-patches/commit/efb6d4c2be515185fc9bd29c40ce202f0d684cee))
+
+# [1.3.0](https://github.com/revanced/revanced-patches/compare/v1.2.2...v1.3.0) (2022-06-14)
+
+
+### Features
+
+* `custom-branding` patch ([0d65ea8](https://github.com/revanced/revanced-patches/commit/0d65ea8cdb0e02287f6be6855cd3d28823a61e70))
+
+## [1.2.2](https://github.com/revanced/revanced-patches/compare/v1.2.1...v1.2.2) (2022-06-13)
+
+
+### Bug Fixes
+
+* environment variable not found in gradle build script ([0da15fb](https://github.com/revanced/revanced-patches/commit/0da15fb0effac0566d080d7b85e9fbe46c3dd34d))
+
+## [1.2.1](https://github.com/revanced/revanced-patches/compare/v1.2.0...v1.2.1) (2022-06-12)
+
+
+### Performance Improvements
+
+* fix high battery consumption due to chromecast not working with `microg` ([dd8b01a](https://github.com/revanced/revanced-patches/commit/dd8b01a5c5d75b00ea4d04ce35bc43942c1b0409))
+
+# [1.2.0](https://github.com/revanced/revanced-patches/compare/v1.1.0...v1.2.0) (2022-06-11)
+
+
+### Bug Fixes
+
+* migrate to `include` annotation ([110bbf1](https://github.com/revanced/revanced-patches/commit/110bbf143a9cec8dce1f0416cff40f8d93055e96))
+
+
+### Features
+
+* `microg-patch` ([48bbd57](https://github.com/revanced/revanced-patches/commit/48bbd574a52c8bf6834b26facfe7384b830f944a))
+* updated all patches to support v17.22.36 of `com.android.google.youtube` ([e12dc11](https://github.com/revanced/revanced-patches/commit/e12dc11b670c2b0c414741616e0a646e8421e418))
+
+# [1.1.0](https://github.com/revanced/revanced-patches/compare/v1.0.0...v1.1.0) (2022-06-11)
+
+
+### Features
+
+* generate & upload dex files ([#18](https://github.com/revanced/revanced-patches/issues/18)) ([e6f5355](https://github.com/revanced/revanced-patches/commit/e6f53553a98c164c4eb926fb273358ed506e00a4))
+
 # 1.0.0 (2022-06-05)
 
 

build.gradle.kts

@@ -1,59 +1,55 @@
 plugins {
-    kotlin("jvm") version "1.6.21"
-    java
-    `maven-publish`
+    kotlin("jvm") version "1.7.0"
 }
 
 group = "app.revanced"
 
 repositories {
     mavenCentral()
-    mavenLocal()
     maven {
-        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") // note the "r"!
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
-            // DO NOT set these variables in the project's gradle.properties.
-            // Instead, you should set them in:
-            // Windows: %homepath%\.gradle\gradle.properties
-            // Linux: ~/.gradle/gradle.properties
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
-            password = project.findProperty("gpr.key")  as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
+            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.key")  as? String ?: System.getenv("GITHUB_TOKEN")
         }
     }
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+    implementation(kotlin("stdlib"))
 
-    implementation("app.revanced:revanced-patcher:1.0.0")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
+    implementation("app.revanced:revanced-patcher:1.1.0")
 }
 
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
+tasks {
+    register<DefaultTask>("generateDex") {
+        description = "Generate dex files from build"
+        dependsOn(build)
 
-val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
+        doLast {
+            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = "${androidHome}/build-tools/32.0.0/d8"
+            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val output = input.replace(".jar", ".dex")
+            val work = File("${buildDir}/libs")
 
-publishing {
-    repositories {
-        if (isGitHubCI) {
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/revanced/revanced-patches") // note the "s"!
-                credentials {
-                    username = System.getenv("GITHUB_ACTOR")
-                    password = System.getenv("GITHUB_TOKEN")
-                }
+            exec {
+                workingDir = work
+                commandLine = listOf(d8, input)
+            }
+
+            exec {
+                workingDir = work
+                commandLine = listOf("mv", "*.dex", output)
             }
-        } else {
-            mavenLocal()
         }
     }
-    publications {
-        register<MavenPublication>("gpr") {
-            from(components["java"])
-        }
+    // Dummy task to fix the Gradle semantic-release plugin.
+    // Remove this if you forked it to support building only.
+    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    register<DefaultTask>("publish") {
+        group = "publish"
+        description = "Dummy task"
+        dependsOn(named("generateDex"))
     }
-}
+}

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.0.0
+version = 1.6.1

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -19,18 +19,18 @@ internal fun Node.doRecursively(action: (Node) -> Unit) {
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
-internal fun String.startsWithAny(vararg prefix: String): Boolean {
-    for (_prefix in prefix)
-        if (this.startsWith(_prefix))
+internal fun String.startsWithAny(vararg prefixes: String): Boolean {
+    for (prefix in prefixes)
+        if (this.startsWith(prefix))
             return true
 
     return false
 }
 
-internal fun String.containsAny(vararg others: String): Boolean {
-    for (other in others)
-        if (this.contains(other))
+internal fun String.equalsAny(vararg other: String): Boolean {
+    for (_other in other)
+        if (this == _other)
             return true
 
     return false
-}
+}

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -20,7 +20,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 @Patch
 @Name("upgrade-button-remover")
-@Description("Remove the upgrade tab from t he pivot bar in YouTube music.")
+@Description("Remove the upgrade tab from the pivot bar in YouTube music.")
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(
@@ -73,4 +73,4 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         )
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt

@@ -43,7 +43,7 @@ import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 @Dependencies(
     dependencies = [ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class, GeneralResourceAdsPatch::class]
 )
-@Name("general-bytecode-ads")
+@Name("general-ads")
 @Description("Patch to remove general ads in bytecode.")
 @GeneralAdsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.branding.header.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PremiumHeadingCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.layout.branding.header.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.layout.branding.header.annotations.PremiumHeadingCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+
+@Patch
+@Dependencies(
+    dependencies = [FixLocaleConfigErrorPatch::class]
+)
+@Name("premium-heading")
+@Description("Show the premium branding on the the YouTube home screen.")
+@PremiumHeadingCompatibility
+@Version("0.0.1")
+class PremiumHeadingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data.get("res")
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"
+        val modes = arrayOf("light", "dark")
+
+        arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi").forEach { size ->
+            val headingDirectory = resDirectory.resolve("drawable-$size")
+            modes.forEach {mode ->
+                Files.copy(
+                    headingDirectory.resolve("${original}_$mode.png").toPath(),
+                    headingDirectory.resolve("${replacement}_$mode.png").toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.branding.icon.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CustomBrandingCompatibility

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

@@ -0,0 +1,56 @@
+package app.revanced.patches.youtube.layout.branding.icon.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.layout.branding.icon.annotations.CustomBrandingCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import java.nio.file.Files
+
+@Patch
+@Dependencies(
+    dependencies = [FixLocaleConfigErrorPatch::class]
+)
+@Name("custom-branding")
+@Description("Change the branding of YouTube.")
+@CustomBrandingCompatibility
+@Version("0.0.1")
+class CustomBrandingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data.get("res")
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val iconNames = arrayOf(
+            "adaptiveproduct_youtube_background_color_108",
+            "adaptiveproduct_youtube_foreground_color_108",
+            "ic_launcher",
+            "ic_launcher_round"
+        )
+
+        mapOf(
+            "xxxhdpi" to 192,
+            "xxhdpi" to 144,
+            "xhdpi" to 96,
+            "hdpi" to 72,
+            "mdpi" to 48
+        ).forEach { (iconDirectory, size) ->
+            iconNames.forEach iconLoop@{ iconName ->
+                val iconFile = this.javaClass.classLoader.getResourceAsStream("branding/$size/$iconName.png")
+                    ?: return PatchResultError("The icon $iconName can not be found.")
+
+                Files.write(
+                    resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(), iconFile.readAllBytes()
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.castbutton.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CastButtonCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt

@@ -0,0 +1,44 @@
+package app.revanced.patches.youtube.layout.castbutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.proxy
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.layout.castbutton.annotations.CastButtonCompatibility
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("hide-cast-button")
+@Description("Patch to hide the cast button.")
+@CastButtonCompatibility
+@Version("0.0.1")
+class HideCastButtonPatch : BytecodePatch(listOf()) {
+    override fun execute(data: BytecodeData): PatchResult {
+        data.classes.forEach { classDef ->
+            classDef.methods.forEach { method ->
+                if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {
+                    val implementation =
+                        data.proxy(classDef).resolve().methods.first { it.name == "setVisibility" }.implementation!!
+
+                    implementation.addInstructions(
+                        0, """
+                        invoke-static {p1}, Lfi/razerman/youtube/XGlobals;->getCastButtonOverrideV2(I)I
+                        move-result p1
+                    """.trimIndent().toInstructions("I", 2, false)
+                    )
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/annotations/CreateButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt

@@ -18,7 +18,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction11x
 
 @Patch
 @Dependencies(dependencies = [IntegrationsPatch::class])
-@Name("shorts-button")
+@Name("disable-shorts-button")
 @Description("Hide the shorts button.")
 @ShortsButtonCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -1,32 +1,27 @@
 package app.revanced.patches.youtube.misc.microg.patch.bytecode
 
-import app.revanced.extensions.containsAny
-import app.revanced.extensions.startsWithAny
+import app.revanced.extensions.equalsAny
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.data.implementation.proxy
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.layout.castbutton.patch.HideCastButtonPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
 import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.signatures.GooglePlayUtilitySignature
-import app.revanced.patches.youtube.misc.microg.signatures.IntegrityCheckSignature
-import app.revanced.patches.youtube.misc.microg.signatures.PrimeSignature
-import app.revanced.patches.youtube.misc.microg.signatures.ServiceCheckSignature
-import org.jf.dexlib2.AccessFlags
+import app.revanced.patches.youtube.misc.microg.signatures.*
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
@@ -34,19 +29,27 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 
-// @Patch TODO: finish patch
-@Name("microg-bytecode-patch")
+@Patch(include = false)
+@Dependencies(
+    dependencies = [MicroGResourcePatch::class, HideCastButtonPatch::class]
+)
+@Name("microg-support")
 @Description("Patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
 class MicroGBytecodePatch : BytecodePatch(
     listOf(
-        IntegrityCheckSignature, ServiceCheckSignature, GooglePlayUtilitySignature, PrimeSignature
+        IntegrityCheckSignature,
+        ServiceCheckSignature,
+        GooglePlayUtilitySignature,
+        CastDynamiteModuleSignature,
+        CastDynamiteModuleV2Signature,
+        CastContextFetchSignature,
+        PrimeSignature,
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        // smali patches
-        disablePlayServiceChecks()
+        disablePlayServiceChecksAndFixCastIssues()
         data.classes.forEach { classDef ->
             var proxiedClass: MutableClass? = null
 
@@ -54,35 +57,39 @@ class MicroGBytecodePatch : BytecodePatch(
                 val implementation = method.implementation ?: return@methodLoop
 
                 var proxiedImplementation: MutableMethodImplementation? = null
+
                 implementation.instructions.forEachIndexed { i, instruction ->
                     if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
 
                     val stringValue = ((instruction as Instruction21c).reference as StringReference).string
 
-                    val replaceMode =
-                        if (stringValue == "com.google" || stringValue == "com.google.android.gms" ||
-                            stringValue.startsWithAny(
-                                "com.google.iid",
-                                "com.google.android.gms.chimera",
-                                "com.google.android.c2dm",
-                            ) || stringValue.containsAny(
-                                "com.google.android.gms.auth.accounts",
-                                "com.google.android.gsf",
-                                "content://com.google.settings"
-                            )
-                        ) {
-                            StringReplaceMode.REPLACE_WITH_MICROG
-                        } else if (stringValue.startsWith("com.google.android.gms.chimera.container")) // https://github.com/TeamVanced/VancedMicroG/pull/139/file
-                            StringReplaceMode.DO_NOT_REPLACE
-                        else if (stringValue.startsWithAny(
-                                "com.google.android.youtube.SuggestionsProvider",
-                                "com.google.android.youtube.fileprovider"
-                            )
-                        ) {
-                            StringReplaceMode.REPLACE_WITH_REVANCED
-                        } else {
-                            StringReplaceMode.DO_NOT_REPLACE
-                        }
+                    val replaceMode = if (stringValue.equalsAny(
+                            "com.google.android.gms",
+                            "com.google.android.youtube.fileprovider",
+                            "com.google.android.c2dm.intent.REGISTER",
+                            "com.google.android.c2dm.permission.SEND",
+                            "com.google.iid.TOKEN_REQUEST",
+                            "com.google",
+                            "com.google.android.gms.auth.accounts",
+                            "com.google.android.youtube.SuggestionProvider",
+                            "com.google.android.c2dm.intent.REGISTRATION",
+                            "com.google.android.gsf.action.GET_GLS",
+                            "com.google.android.gsf.login",
+                            "content://com.google.settings/partner",
+                            "content://com.google.android.gsf.gservices",
+                            "content://com.google.android.gsf.gservices/prefix",
+                            "com.google.android.c2dm.intent.RECEIVE"
+                        )
+                    ) {
+                        StringReplaceMode.REPLACE_WITH_MICROG
+                    } else if (stringValue.equalsAny(
+                            "com.google.android.youtube.SuggestionsProvider", "com.google.android.youtube.fileprovider"
+                        )
+                    ) {
+                        StringReplaceMode.REPLACE_WITH_REVANCED
+                    } else {
+                        StringReplaceMode.DO_NOT_REPLACE
+                    }
 
                     if (replaceMode != StringReplaceMode.DO_NOT_REPLACE) {
                         if (proxiedClass == null) {
@@ -110,24 +117,11 @@ class MicroGBytecodePatch : BytecodePatch(
             }
         }
 
-
-        // replace string back
-        val implementation =
-            signatures.elementAt(2).result!!.findParentMethod(@Name("do-not-replace-method") @MatchingMethod(
-                "Llpe;", "c"
-            ) @DirectPatternScanMethod @MicroGPatchCompatibility @Version("0.0.1") object : MethodSignature(
-                "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null, listOf("com.google.android.gms")
-            ) {})!!.method.implementation!!
-
-        implementation.replaceInstruction(
-            implementation.instructions.indexOfFirst { it.opcode == Opcode.CONST_STRING },
-            "const-string v0, \"com.google.android.gms\"".toInstruction()
-        )
-
+        signatures.last()
         return PatchResultSuccess()
     }
 
-    private fun disablePlayServiceChecks() {
+    private fun disablePlayServiceChecksAndFixCastIssues() {
         for (i in 0 until signatures.count() - 1) {
             val result = signatures.elementAt(i).result!!
             val stringInstructions = when (result.immutableMethod.returnType.first()) {

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -9,61 +9,53 @@ import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_APP_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
 
-// @Patch TODO: finish patch
 @Name("microg-resource-patch")
 @Description("Resource patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
 class MicroGResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
+        data.getXmlEditor("res/xml/settings_fragment.xml").use {
+            val settingsElementIntent = it.file.createElement("intent")
+            settingsElementIntent.setAttribute("android:targetPackage", "$BASE_MICROG_PACKAGE_NAME.android.gms")
+            settingsElementIntent.setAttribute("android:targetClass", "org.microg.gms.ui.SettingsActivity")
+
+            val settingsElement = it.file.createElement("Preference")
+            settingsElement.setAttribute("android:title", "MicroG")
+            settingsElement.appendChild(settingsElementIntent)
+
+            it.file.firstChild.appendChild(settingsElement)
+        }
+
         val manifest = data.get("AndroidManifest.xml").readText()
 
         data.get("AndroidManifest.xml").writeText(
             manifest.replace(
-                "package=\"com.google.android.youtube\"", "package=\"$REVANCED_PACKAGE_NAME\""
+                "package=\"com.google.android.youtube", "package=\"$REVANCED_PACKAGE_NAME"
             ).replace(
-                " android:label=\"@string/application_name\" ", " android:label=\"{APP_NAME}\" "
+                "android:label=\"@string/application_name", "android:label=\"$REVANCED_APP_NAME"
             ).replace(
-                "<uses-permission android:name=\"com.google.android.youtube.permission.C2D_MESSAGE\"",
-                "<uses-permission android:name=\"$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE\""
+                "android:authorities=\"com.google.android.youtube", "android:authorities=\"$REVANCED_PACKAGE_NAME"
             ).replace(
-                "<permission android:name=\"com.google.android.youtube.permission.C2D_MESSAGE\"",
-                "<permission android:name=\"$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE\""
-            ).replace(
-                "<provider android:authorities=\"com.google.android.youtube.lifecycle-trojan\"",
-                "<provider android:authorities=\"$REVANCED_PACKAGE_NAME.lifecycle-trojan\""
-            ).replace(
-                "\"com.google.android.youtube.fileprovider\"", "\"$REVANCED_PACKAGE_NAME.fileprovider\""
-            ).replace(
-                "<provider android:authorities=\"com.google.android.youtube.photopicker_images\"",
-                "<provider android:authorities=\"$REVANCED_PACKAGE_NAME.photopicker_images\""
-            ).replace("com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm").replace(
-                "    </queries>",
-                "        <package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/>\n    </queries>"
-            )
-        )
-
-        val replacement = arrayOf(
-            Pair(
-                "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider"
-            ), Pair(
                 "com.google.android.youtube.fileprovider", "$REVANCED_PACKAGE_NAME.fileprovider"
+            ).replace(
+                "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider"
+            ).replace(
+                "com.google.android.youtube.permission.C2D_MESSAGE", "$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE"
+            ).replace( // TODO: might not be needed
+                "com.google.android.youtube.lifecycle-trojan", "$REVANCED_PACKAGE_NAME.lifecycle-trojan"
+            ).replace( // TODO: might not be needed
+                "com.google.android.youtube.photopicker_images", "$REVANCED_PACKAGE_NAME.photopicker_images"
+            ).replace(
+                "com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm"
+            ).replace(
+                "</queries>", "<package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/></queries>"
             )
         )
 
-        data.forEach {
-            if (it.extension != "xml") return@forEach
-
-            // TODO: use a reader and only replace strings where needed instead of reading & writing the entire file
-            var content = it.readText()
-            replacement.filter { translation -> content.contains(translation.first) }.forEach { translation ->
-                content = content.replace(translation.first, translation.second)
-            }
-            it.writeText(content)
-        }
-
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt

@@ -3,4 +3,5 @@ package app.revanced.patches.youtube.misc.microg.shared
 object Constants {
     internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
     internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
+    internal const val REVANCED_APP_NAME = "YouTube ReVanced"
 }

src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/CastContextFetchSignature.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.misc.microg.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-context-fetch-signature")
+@MatchingMethod(
+    "Lvvz;", "a"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastContextFetchSignature : MethodSignature(
+    null, null, null, null,
+    listOf("Error fetching CastContext.")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/CastDynamiteModuleSignature.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.misc.microg.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-module-signature")
+@MatchingMethod(
+    "Llqh;", "c"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastDynamiteModuleSignature : MethodSignature(
+    null, null, null, null,
+    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/CastDynamiteModuleV2Signature.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.misc.microg.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-context-fetch-signature")
+@MatchingMethod(
+    "Lmcf;", "c"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastDynamiteModuleV2Signature : MethodSignature(
+    null, null, null, null,
+    listOf("Failed to load module via V2: ")
+)