chore(release): 2.14.1 [skip ci]

## [2.14.1](https://github.com/revanced/revanced-patches/compare/v2.14.0...v2.14.1) (2022-07-15)

### Bug Fixes

* `codecs-unlock` patch and update Music patches to `5.14.53` ([97dbb43](97dbb43caa))

.github/ISSUE_TEMPLATE/bug-report.md

@@ -3,21 +3,22 @@ name: Bug report
 about: Create a bug report on patches
 title: 'problem: `some-patch`'
 labels: bug
+assignees: ''
 
 ---
 
-# 🐞 Issue
+## 🐞 Issue
 
 <!-- Describe your issue in detail here -->
 
-# ⚙ Reproduce
+## ⚙ Reproduce
 
 <!-- Include your environment and steps to reproduce the issue as detailed as possible -->
 
-# 🛠 Solution
+## 🛠 Solution
 
 <!-- If applicable, add a possible solution -->
 
-# ⚠ Additional context
+## ⚠ Additional context
 
 <!-- Add any other context about the problem here -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,21 +3,22 @@ name: Feature request
 about: Suggest a change to some patch. Do not submit suggestions for patches here.
 title: 'feat: some feature'
 labels: feature-request
+assignees: ''
 
 ---
 
-# 🐞 Issue
+## 🐞 Issue
 
-<!-- Explain here, what the current problem is and why it lead you to request a feature change -->
+<!-- Explain here, what the current problem is and why it leads you to request a feature change -->
 
-# ❗ Solution
+## ❗ Solution
 
 <!-- Explain how your current issue can be solved -->
 
-# ❓ Motivation
+## ❓ Motivation
 
 <!-- Explain why your feature should be considered -->
 
-# ⚠ Additional context
+## ⚠ Additional context
 
 <!-- Add any other context or screenshots about the feature request here -->

CHANGELOG.md

@@ -1,3 +1,40 @@
+## [2.14.1](https://github.com/revanced/revanced-patches/compare/v2.14.0...v2.14.1) (2022-07-15)
+
+
+### Bug Fixes
+
+* `codecs-unlock` patch and update Music patches to `5.14.53` ([2437d30](https://github.com/revanced/revanced-patches/commit/2437d3070f6a630d353619f642cefebd47abee20))
+
+# [2.14.0](https://github.com/revanced/revanced-patches/compare/v2.13.6...v2.14.0) (2022-07-15)
+
+
+### Features
+
+* `music-video-ads` patch ([#172](https://github.com/revanced/revanced-patches/issues/172)) ([cbb71b5](https://github.com/revanced/revanced-patches/commit/cbb71b5faf1386ed31dd9e0387f6cf0509d92d31))
+
+## [2.13.6](https://github.com/revanced/revanced-patches/compare/v2.13.5...v2.13.6) (2022-07-14)
+
+## [2.13.5](https://github.com/revanced/revanced-patches/compare/v2.13.4...v2.13.5) (2022-07-14)
+
+
+### Bug Fixes
+
+* `swipe-controls` with active engagement panel ([#177](https://github.com/revanced/revanced-patches/issues/177)) ([000ec6d](https://github.com/revanced/revanced-patches/commit/000ec6d8f6ecbb910a06ec852564ee9e5f03dcf8))
+
+## [2.13.4](https://github.com/revanced/revanced-patches/compare/v2.13.3...v2.13.4) (2022-07-13)
+
+
+### Bug Fixes
+
+* constrain `old-quality-layout` to older version ([add7232](https://github.com/revanced/revanced-patches/commit/add72326199e90f677b450b553b9d88c0bb4c490))
+
+## [2.13.3](https://github.com/revanced/revanced-patches/compare/v2.13.2...v2.13.3) (2022-07-11)
+
+
+### Bug Fixes
+
+* `exclusive-audio-playback` patch ([#153](https://github.com/revanced/revanced-patches/issues/153)) ([9beff95](https://github.com/revanced/revanced-patches/commit/9beff9567f1586e5c58690c1f1d2f7f204025ab7))
+
 ## [2.13.2](https://github.com/revanced/revanced-patches/compare/v2.13.1...v2.13.2) (2022-07-11)
 
 

README.md

@@ -6,11 +6,12 @@
 
 | 💊 Patch | 📜 Description | 🎯 Target Package | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|:-----------------:|
-| `exclusive-audio-playback` | Adds the option to play music without video. | `com.google.android.apps.youtube.music` | 5.03.50 |
-| `codecs-unlock` | Enables more audio codecs. Usually results in better audio quality but may depend on song and device. | `com.google.android.apps.youtube.music` | 5.03.50 |
-| `background-play` | Enables playing music in the background. | `com.google.android.apps.youtube.music` | 5.03.50 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the Home screen. The same functionality can be triggered from the settings anyway. | `com.google.android.apps.youtube.music` | 5.03.50 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar in YouTube music. | `com.google.android.apps.youtube.music` | 5.03.50 |
+| `music-video-ads` | Removes ads in the YouTube Music player. | `com.google.android.apps.youtube.music` | 5.14.53 |
+| `exclusive-audio-playback` | Adds the option to play music without video. | `com.google.android.apps.youtube.music` | 5.14.53 |
+| `codecs-unlock` | Enables more audio codecs. Usually results in better audio quality but may depend on song and device. | `com.google.android.apps.youtube.music` | 5.14.53 |
+| `background-play` | Enables playing music in the background. | `com.google.android.apps.youtube.music` | 5.14.53 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the Home screen. The same functionality can be triggered from the settings anyway. | `com.google.android.apps.youtube.music` | 5.14.53 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar in YouTube Music. | `com.google.android.apps.youtube.music` | 5.14.53 |
 | `hide-infocard-suggestions` | Hides infocards in videos. | `com.google.android.youtube` | 17.26.35 |
 | `video-ads` | Removes ads in the YouTube video player. | `com.google.android.youtube` | 17.26.35 |
 | `general-ads` | Removes general ads in bytecode. | `com.google.android.youtube` | 17.26.35 |
@@ -21,7 +22,7 @@
 | `autorepeat-by-default` | Enables auto repeating of videos by default. | `com.google.android.youtube` | 17.26.35 |
 | `custom-playback-speed` | Allows to change the default playback speed options. | `com.google.android.youtube` | 17.26.35 |
 | `enable-debugging` | Enables app debugging by patching the manifest file. | `com.google.android.youtube` | all |
-| `old-quality-layout` | Enables the original quality flyout menu. | `com.google.android.youtube` | 17.26.35 |
+| `old-quality-layout` | Enables the original quality flyout menu. | `com.google.android.youtube` | 17.24.35 |
 | `hide-cast-button` | Hides the cast button. | `com.google.android.youtube` | all |
 | `amoled` | Enables pure black theme. | `com.google.android.youtube` | 17.26.35 |
 | `hide-autoplay-button` | Disables the autoplay button. | `com.google.android.youtube` | 17.26.35 |

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.13.2
+version = 2.14.1

src/main/kotlin/app/revanced/meta/readme/Generator.kt

@@ -21,7 +21,10 @@ class Generator {
             for (patch in bundle) {
                 val patchName = patch.patchName
                 val compatiblePackage = patch.compatiblePackages?.first()
-                val latestVersion = compatiblePackage?.versions?.maxByOrNull { it.replace(".", "").toInt() } ?: "all"
+                val latestVersion =
+                    compatiblePackage?.versions?.map { SemanticVersion.fromString(it) }?.maxWithOrNull(
+                        SemanticVersionComparator
+                    ) ?: "all"
 
                 patches.appendLine("| `$patchName` | ${patch.description} | `${compatiblePackage?.name}` | $latestVersion |")
             }

src/main/kotlin/app/revanced/meta/readme/SemanticVersion.kt

@@ -0,0 +1,24 @@
+package app.revanced.meta.readme
+
+data class SemanticVersion(val major: Int, val minor: Int, val patch: Int) {
+    companion object {
+        fun fromString(version: String): SemanticVersion {
+            var parts = version.split(".")
+
+            if (parts.count() != 3) throw IllegalArgumentException("Invalid semantic version")
+
+            val versionNumbers = parts.map { it.toInt() }
+            return SemanticVersion(versionNumbers[0], versionNumbers[1], versionNumbers[2])
+        }
+    }
+
+    override fun toString(): String = "$major.$minor.$patch"
+}
+
+object SemanticVersionComparator : Comparator<SemanticVersion> {
+    override fun compare(a: SemanticVersion, b: SemanticVersion): Int = when {
+        a.major != b.major -> a.major - b.major
+        a.minor != b.minor -> a.minor - b.minor
+        else -> a.patch - b.patch
+    }
+}

src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt

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

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("show-video-ads-constructor-fingerprint")
+@MatchingMethod(
+    "Laghd;",
+    "<init>",
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@MusicVideoAdsCompatibility
+@Version("0.0.1")
+object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.RETURN_VOID
+    )
+)

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("show-video-ads-method-fingerprint")
+@MatchingMethod(
+    "Laghd;", "d"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@MusicVideoAdsCompatibility
+@Version("0.0.1")
+object ShowMusicVideoAdsFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
+        Opcode.IPUT_BOOLEAN,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID
+    )
+)

src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt

@@ -0,0 +1,40 @@
+package app.revanced.patches.music.ad.video.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
+import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
+import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
+
+@Patch
+@Name("music-video-ads")
+@Description("Removes ads in the YouTube Music player.")
+@MusicVideoAdsCompatibility
+@Version("0.0.1")
+class MusicVideoAdsPatch : BytecodePatch(
+    listOf(
+        ShowMusicVideoAdsConstructorFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        ShowMusicVideoAdsFingerprint.resolve(data, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
+
+        val result = ShowMusicVideoAdsFingerprint.result!!
+
+        result.mutableMethod.addInstructions(
+            result.patternScanResult!!.startIndex, """
+                const/4 p1, 0x0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.03.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt

@@ -20,8 +20,9 @@ import org.jf.dexlib2.Opcode
 @Version("0.0.1")
 object CodecsLockFingerprint : MethodFingerprint(
     "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L", "L", "L"), listOf(
-        Opcode.INVOKE_STATIC,
+        Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
         Opcode.INVOKE_DIRECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
@@ -29,18 +30,11 @@ object CodecsLockFingerprint : MethodFingerprint(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
         Opcode.IF_NEZ,
-        Opcode.SGET,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
         Opcode.INVOKE_DIRECT,
         Opcode.RETURN_OBJECT
     )

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.03.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt

@@ -26,9 +26,7 @@ class ExclusiveAudioPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        ExclusiveAudioFingerprint.resolve(data, AudioOnlyEnablerFingerprint.result!!.classDef)
-
-        val method = ExclusiveAudioFingerprint.result!!.mutableMethod
+        val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
         method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
         method.addInstruction("return v0")
 

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.03.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.03.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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("Removes the upgrade tab from the pivot bar in YouTube music.")
+@Description("Removes the upgrade tab from the pivot bar in YouTube Music.")
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.03.50")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.patch
+package app.revanced.patches.youtube.interaction.swipecontrols.patch.bytecode
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -12,7 +12,9 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 import app.revanced.patches.youtube.interaction.swipecontrols.fingerprints.WatchWhileOnStartFingerprint
+import app.revanced.patches.youtube.interaction.swipecontrols.patch.resource.SwipeControlsResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playeroverlay.patch.PlayerOverlaysHookPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 
 @Patch
@@ -24,10 +26,11 @@ import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
     dependencies = [
         IntegrationsPatch::class,
         PlayerTypeHookPatch::class,
-        SwipeControlsResourcesPatch::class
+        PlayerOverlaysHookPatch::class,
+        SwipeControlsResourcePatch::class
     ]
 )
-class SwipeControlsPatch : BytecodePatch(
+class SwipeControlsBytecodePatch : BytecodePatch(
     listOf(
         WatchWhileOnStartFingerprint
     )

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.interaction.swipecontrols.patch
+package app.revanced.patches.youtube.interaction.swipecontrols.patch.resource
 
 import app.revanced.extensions.injectResources
 import app.revanced.patcher.annotation.Name
@@ -12,7 +12,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
 @Name("swipe-controls-resource-patch")
 @SwipeControlsCompatibility
 @Version("0.0.1")
-class SwipeControlsResourcesPatch : ResourcePatch() {
+class SwipeControlsResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
         val resourcesDir = "swipecontrols"
 

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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/patch/OldQualityLayoutPatch.kt

@@ -37,15 +37,23 @@ class OldQualityLayoutPatch : BytecodePatch(
 
         val implementation = result.mutableMethod.implementation!!
 
+        // use this register because it is free
+        val containerRegister = 5
+
         // if useOldStyleQualitySettings == true, jump over all instructions
-        val jmpInstruction = BuilderInstruction21t(
-            Opcode.IF_NEZ, 0, implementation.instructions[result.patternScanResult!!.endIndex].location.labels.first()
+        implementation.addInstruction(
+            4, BuilderInstruction21t(
+                Opcode.IF_NEZ,
+                containerRegister,
+                implementation.instructions[result.patternScanResult!!.endIndex].location.labels.first()
+            )
         )
-        implementation.addInstruction(5, jmpInstruction)
+
+        // insert the new condition
         result.mutableMethod.addInstructions(
             0, """
                 invoke-static { }, Lapp/revanced/integrations/patches/OldStyleQualityPatch;->useOldStyleQualitySettings()Z
-                move-result v0
+                move-result v$containerRegister
             """
         )
 

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/patch/CustomPlaybackSpeedPatch.kt

@@ -56,7 +56,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
 
         val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA
 
-        val videoSpeedsArrayType = "Lapp/revanced/integrations/videoplayer/videosettings/VideoSpeed;->videoSpeeds:[F"
+        val videoSpeedsArrayType = "Lapp/revanced/integrations/patches/VideoSpeedPatch;->videoSpeeds:[F"
 
         arrayGenMethod.addInstructions(
             arrayLengthConstIndex + 1,

src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/annotation/PlayerOverlaysHookCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.misc.playeroverlay.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PlayerOverlaysHookCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.misc.playeroverlay.fingerprint
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlaysHookCompatibility
+
+@Name("player-overlays-onFinishInflate-fingerprint")
+@MatchingMethod(
+    "LYouTubePlayerOverlaysLayout;", "onFinishInflate"
+)
+@DirectPatternScanMethod
+@PlayerOverlaysHookCompatibility
+@Version("0.0.1")
+object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint(
+    null, null, null, null, null, { methodDef ->
+        methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;") && methodDef.name == "onFinishInflate"
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt

@@ -0,0 +1,35 @@
+package app.revanced.patches.youtube.misc.playeroverlay.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlaysHookCompatibility
+import app.revanced.patches.youtube.misc.playeroverlay.fingerprint.PlayerOverlaysOnFinishInflateFingerprint
+
+@Name("player-overlays-hook")
+@Description("hook for adding custom overlays to the video player.")
+@PlayerOverlaysHookCompatibility
+@Version("0.0.1")
+@Dependencies(dependencies = [IntegrationsPatch::class])
+class PlayerOverlaysHookPatch : BytecodePatch(
+    listOf(
+        PlayerOverlaysOnFinishInflateFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        // hook YouTubePlayerOverlaysLayout.onFinishInflate()
+        val method = PlayerOverlaysOnFinishInflateFingerprint.result!!.mutableMethod
+        method.addInstruction(
+            method.implementation!!.instructions.size - 2,
+            "invoke-static { p0 }, Lapp/revanced/integrations/patches/PlayerOverlaysHookPatch;->YouTubePlayerOverlaysLayout_onFinishInflateHook(Ljava/lang/Object;)V"
+        )
+        return PatchResultSuccess()
+    }
+}