chore(release): 1.5.0 [skip ci]

# [1.5.0](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.5.0) (2022-06-15)

### Bug Fixes

* sync version ([0f204af](0f204afa2a))

### Features

* `hide-cast-button` patch ([d71290f](d71290f6f1))

CHANGELOG.md

@@ -1,3 +1,27 @@
+# [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)
 
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.2.1
+version = 1.4.1

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.branding.annotations
+package app.revanced.patches.youtube.layout.branding.icon.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.branding.patch
+package app.revanced.patches.youtube.layout.branding.icon.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -10,7 +10,7 @@ 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.annotations.CustomBrandingCompatibility
+import app.revanced.patches.youtube.layout.branding.icon.annotations.CustomBrandingCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import java.nio.file.Files
 
@@ -35,18 +35,18 @@ class CustomBrandingPatch : ResourcePatch() {
         )
 
         mapOf(
-            "mipmap-xxxhdpi" to 192,
-            "mipmap-xxhdpi" to 144,
-            "mipmap-xhdpi" to 96,
-            "mipmap-hdpi" to 72,
-            "mipmap-mdpi" to 48
+            "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(iconDirectory).resolve("$iconName.png").toPath(), iconFile.readAllBytes()
+                    resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(), iconFile.readAllBytes()
                 )
             }
         }

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/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/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -15,6 +15,7 @@ import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 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
@@ -24,13 +25,14 @@ 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
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21s
 import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 
 @Patch(include = false)
-@Dependencies(dependencies = [MicroGResourcePatch::class])
+@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
@@ -56,17 +58,6 @@ class MicroGBytecodePatch : BytecodePatch(
 
                 var proxiedImplementation: MutableMethodImplementation? = null
 
-                // disable cast button since it is unsupported by microg and causes battery issues
-                // the code is here instead of the fixCastIssues method because we do not need a signature this way
-                if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {
-                    proxiedClass = data.proxy(classDef).resolve()
-                    proxiedImplementation = proxiedClass!!.methods.first { it.name == "setVisibility" }.implementation
-
-                    proxiedImplementation!!.replaceInstruction(
-                        0, BuilderInstruction21s(Opcode.CONST_16, 1, 8) // 8 == HIDDEN
-                    )
-                }
-
                 implementation.instructions.forEachIndexed { i, instruction ->
                     if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
 

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

@@ -3,5 +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"
-}
+    internal const val REVANCED_APP_NAME = "ReVanced"
+}