chore(release): 2.104.2 [skip ci]

## [2.104.2](https://github.com/revanced/revanced-patches/compare/v2.104.1...v2.104.2) (2022-11-08)

### Bug Fixes

* **youtube/hide-endscreen-cards:** restore functionality ([#993](https://github.com/revanced/revanced-patches/issues/993)) ([38eceb7](be4de62c8f))

.github/workflows/release.yml

@@ -19,10 +19,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: gradle
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2

CHANGELOG.md

@@ -1,3 +1,66 @@
+## [2.104.2](https://github.com/revanced/revanced-patches/compare/v2.104.1...v2.104.2) (2022-11-08)
+
+
+### Bug Fixes
+
+* **youtube/hide-endscreen-cards:** restore functionality ([#993](https://github.com/revanced/revanced-patches/issues/993)) ([eb1bae2](https://github.com/revanced/revanced-patches/commit/eb1bae2c55e65ad29030dce6746a18662dd0fe25))
+
+## [2.104.1](https://github.com/revanced/revanced-patches/compare/v2.104.0...v2.104.1) (2022-11-07)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** incorrect description for info panels ([77b029e](https://github.com/revanced/revanced-patches/commit/77b029e82e481a13516b1c8a888c42817507cdea))
+* **youtube/hide-info-cards:** remove initial popup of info-cards ([#992](https://github.com/revanced/revanced-patches/issues/992)) ([19f3f03](https://github.com/revanced/revanced-patches/commit/19f3f038585c313a969adf3d4095a60ab4c83ede))
+
+# [2.104.0](https://github.com/revanced/revanced-patches/compare/v2.103.0...v2.104.0) (2022-11-06)
+
+
+### Features
+
+* **hexeditor:** `disable-ads` patch ([#973](https://github.com/revanced/revanced-patches/issues/973)) ([a48e5fd](https://github.com/revanced/revanced-patches/commit/a48e5fd50dcf9ee061ffd5c5ed0b997067f40652))
+
+# [2.103.0](https://github.com/revanced/revanced-patches/compare/v2.102.1...v2.103.0) (2022-11-05)
+
+
+### Bug Fixes
+
+* apply multiple changes from integrations, refactor package structure, class names and implementations ([e756fac](https://github.com/revanced/revanced-patches/commit/e756face362e4abf2c7b17afa536feed9b0cd631))
+* **youtube/video-information:** use correct compatibility annotation ([b42e048](https://github.com/revanced/revanced-patches/commit/b42e04884bb9a60c3df30b668bfba55b1cf8eaa4))
+
+
+### Features
+
+* **debugging:** simplify patch name and description ([61762f7](https://github.com/revanced/revanced-patches/commit/61762f76c457f348ef599e146f3853e941d4c45c))
+
+## [2.102.1](https://github.com/revanced/revanced-patches/compare/v2.102.0...v2.102.1) (2022-11-04)
+
+
+### Bug Fixes
+
+* use original app name ([#977](https://github.com/revanced/revanced-patches/issues/977)) ([ffc3c08](https://github.com/revanced/revanced-patches/commit/ffc3c08d96734893121397d506a97bd50b06bc1d))
+
+# [2.102.0](https://github.com/revanced/revanced-patches/compare/v2.101.0...v2.102.0) (2022-11-03)
+
+
+### Features
+
+* **youtube-music:** bump patches compatibility to v5.31.50 ([#962](https://github.com/revanced/revanced-patches/issues/962)) ([476fcc8](https://github.com/revanced/revanced-patches/commit/476fcc87ca0d33cfbf251e4307755f02ed8f8baa))
+
+# [2.101.0](https://github.com/revanced/revanced-patches/compare/v2.100.3...v2.101.0) (2022-11-01)
+
+
+### Features
+
+* **youtube:** bump patches compatibility to v17.43.36 ([#924](https://github.com/revanced/revanced-patches/issues/924)) ([3867514](https://github.com/revanced/revanced-patches/commit/38675144dcb616474a047bcf8f7e1bf1f668ea46))
+
+## [2.100.3](https://github.com/revanced/revanced-patches/compare/v2.100.2...v2.100.3) (2022-11-01)
+
+
+### Bug Fixes
+
+* **youtube/video-ads:** add switch to temporarily fix buffering issues ([7aa3bce](https://github.com/revanced/revanced-patches/commit/7aa3bce6ccd669a66de10ef6ffe2151f27b40365))
+
 ## [2.100.2](https://github.com/revanced/revanced-patches/compare/v2.100.1...v2.100.2) (2022-10-31)
 
 

README.md

@@ -50,6 +50,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>
 
+### 📦 `com.myprog.hexedit`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-ads` | Disables ads in HexEditor. | all |
+</details>
+
 ### 📦 `com.spotify.music`
 <details>
 
@@ -65,49 +73,50 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.41.37 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.43.36 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.41.37 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.43.36 |
-| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.41.37 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.43.36 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.41.37 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.43.36 |
-| `hide-captions-button` | Hides the captions button on video player. | 17.41.37 |
+| `hide-captions-button` | Hides the captions button on video player. | 17.43.36 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.41.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.43.36 |
-| `hide-create-button` | Hides the create button in the navigation bar. | 17.41.37 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.43.36 |
-| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.41.37 |
+| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.43.36 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.43.36 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `sponsorblock` | Integrate SponsorBlock. | 17.41.37 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.43.36 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.41.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.43.36 |
-| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.41.37 |
+| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.43.36 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 17.41.37 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 17.43.36 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.41.37 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.43.36 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.41.37 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.43.36 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.41.37 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.43.36 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 17.41.37 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 17.43.36 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.41.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.43.36 |
-| `comments` | Hides components related to comments. | 17.41.37 |
+| `comments` | Hides components related to comments. | 17.43.36 |
 | `theme` | Applies a custom theme. | all |
-| `hide-email-address` | Hides the email address in the account switcher. | 17.41.37 |
+| `hide-email-address` | Hides the email address in the account switcher. | 17.43.36 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.41.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.43.36 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.41.37 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.43.36 |
-| `hide-my-mix` | Hides mix playlists. | 17.41.37 |
+| `hide-info-cards` | Hides info-cards in videos. | 17.43.36 |
+| `hide-my-mix` | Hides mix playlists. | 17.43.36 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
 | `premium-heading` | Shows premium branding on the home screen. | all |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.41.37 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.43.36 |
-| `general-ads` | Removes general ads. | 17.41.37 |
+| `general-ads` | Removes general ads. | 17.43.36 |
-| `video-ads` | Removes ads in the video player. | 17.41.37 |
+| `video-ads` | Removes ads in the video player. | 17.43.36 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.41.37 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.43.36 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.41.37 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.43.36 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.41.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.43.36 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.41.37 |
 | `settings` | Adds settings for ReVanced to YouTube. | all |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.41.37 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.43.36 |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.41.37 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.43.36 |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `always-autorepeat` | Always repeats the playing video again. | 17.41.37 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.43.36 |
-| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
+| `debugging` | Adds debugging options. | all |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.41.37 |
+| `minimized-playback` | Enables minimized and background playback. | 17.43.36 |
-| `minimized-playback` | Enables minimized and background playback. | 17.41.37 |
+| `custom-video-speed` | Adds more video speed options. | 17.43.36 |
-| `custom-playback-speed` | Adds more video playback speed options. | 17.41.37 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.43.36 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.41.37 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.43.36 |
 </details>
 
 ### 📦 `com.vanced.android.youtube`
@@ -131,16 +140,16 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.29.52 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.31.50 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.29.52 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.31.50 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.29.52 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.31.50 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.29.52 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.31.50 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.29.52 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.31.50 |
-| `music-video-ads` | Removes ads in the music player. | 5.29.52 |
+| `music-video-ads` | Removes ads in the music player. | 5.31.50 |
-| `background-play` | Enables playing music in the background. | 5.29.52 |
+| `background-play` | Enables playing music in the background. | 5.31.50 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.29.52 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.31.50 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.29.52 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.31.50 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.29.52 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.31.50 |
 </details>
 
 ### 📦 `com.reddit.frontpage`

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.100.2
+version = 2.104.2

src/main/kotlin/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.hexeditor.ad.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.myprog.hexedit")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HexEditorAdsCompatibility

src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.hexeditor.ad.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
+
+@Name("ads-fingerprint-primary")
+@HexEditorAdsCompatibility
+@Version("0.0.1")
+object PrimaryAdsFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("PreferencesHelper;") && methodDef.name == "isAdsDisabled"
+    }
+)

src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.hexeditor.ad.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.extensions.replaceInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
+import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
+
+@Patch
+@Name("disable-ads")
+@Description("Disables ads in HexEditor.")
+@HexEditorAdsCompatibility
+@Version("0.0.1")
+class HexEditorAdsPatch : BytecodePatch(
+    listOf(
+        PrimaryAdsFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = PrimaryAdsFingerprint.result!!.mutableMethod
+        
+        method.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -10,7 +10,7 @@ import app.revanced.patcher.annotation.Package
  */
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @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.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,9 +1,9 @@
 package app.revanced.patches.music.misc.microg.shared
 
 object Constants {
-    internal const val REVANCED_MUSIC_APP_NAME = "YouTube Music ReVanced"
+    internal const val REVANCED_MUSIC_APP_NAME = "YT Music ReVanced"
     internal const val REVANCED_MUSIC_PACKAGE_NAME = "app.revanced.android.apps.youtube.music"
     internal const val MUSIC_PACKAGE_NAME = "com.google.android.apps.youtube.music"
     internal const val SPOOFED_PACKAGE_NAME = MUSIC_PACKAGE_NAME
     internal const val SPOOFED_PACKAGE_SIGNATURE = "afb0fed5eeaebdd86f56a97742f4b6b33ef59875"
-}
+}

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.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -29,11 +29,9 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Stri
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction10x
+import org.jf.dexlib2.dexbacked.instruction.DexBackedInstruction21c
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.instruction.formats.*
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-import org.jf.dexlib2.iface.instruction.formats.Instruction31i
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.StringReference
@@ -53,11 +51,6 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
         "ad_attribution",
         "reel_multiple_items_shelf",
         "info_cards_drawer_header",
-        "endscreen_element_layout_video",
-        "endscreen_element_layout_circle",
-        "endscreen_element_layout_icon",
-        "promoted_video_item_land",
-        "promoted_video_item_full_bleed",
     ).map { name ->
         ResourceMappingResourcePatch.resourceMappings.single { it.name == name }.id
     }
@@ -144,8 +137,8 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                 "revanced_adremover_info_panel",
                 StringResource("revanced_adremover_info_panel_enabled_title", "Remove info panels"),
                 true,
-                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Merchandise banners are hidden"),
+                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Info panels are hidden"),
-                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Merchandise banners are shown")
+                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Info panels are shown")
             ),
             SwitchPreference(
                 "revanced_adremover_medical_panel",
@@ -246,46 +239,6 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     //ToDo: Add Settings toggle for whatever this is
                                     mutableMethod!!.implementation!!.removeInstruction(removeIndex)
                                 }
-
-                                resourceIds[3], resourceIds[4], resourceIds[5] -> { // end screen ads
-                                    //  and is followed by an instruction with the mnemonic IPUT_OBJECT
-                                    val insertIndex = index + 7
-                                    val invokeInstruction = instructions.elementAt(insertIndex)
-                                    if (invokeInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
-
-                                    // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
-                                    if (mutableMethod == null) mutableMethod =
-                                        mutableClass!!.findMutableMethodOf(method)
-
-                                    // TODO: dynamically get registers
-                                    mutableMethod!!.addInstructions(
-                                        insertIndex, """
-                                                const/16 v1, 0x8
-                                                invoke-virtual {v0,v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
-                                            """
-                                    )
-                                }
-
-                                resourceIds[6] -> {
-                                    //  and is followed by an instruction with the mnemonic INVOKE_DIRECT
-                                    val insertIndex = index + 3
-                                    val invokeInstruction = instructions.elementAt(insertIndex)
-                                    if (invokeInstruction.opcode != Opcode.INVOKE_DIRECT) return@forEachIndexed
-
-                                    // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
-                                    if (mutableMethod == null) mutableMethod =
-                                        mutableClass!!.findMutableMethodOf(method)
-
-                                    // insert hide call to hide the view corresponding to the resource
-                                    val viewRegister = (invokeInstruction as Instruction35c).registerE
-                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
-                                }
-
-                                resourceIds[7] -> {
-                                    // TODO, go to class, hide the inflated view
-                                }
                             }
                         }
 
@@ -380,4 +333,4 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
             instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
         } ?: false
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/annotations/HideInfocardSuggestionsCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.ad.infocardsuggestions.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class HideInfocardSuggestionsCompatibility

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt

@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.ad.infocardsuggestions.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.impl.MethodFingerprint
-import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
-import org.jf.dexlib2.AccessFlags
-
-@Name("hide-infocard-suggestions-fingerprint")
-@FuzzyPatternScanMethod(2)
-@HideInfocardSuggestionsCompatibility
-@Version("0.0.1")
-object HideInfocardSuggestionsFingerprint : MethodFingerprint(
-    "Ljava/lang/Boolean;",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf("vibrator")
-)

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt

@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.ad.infocardsuggestions.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.impl.MethodFingerprint
-import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
-import org.jf.dexlib2.AccessFlags
-
-@Name("hide-infocard-suggestions-parent-fingerprint")
-@FuzzyPatternScanMethod(2)
-@HideInfocardSuggestionsCompatibility
-@Version("0.0.1")
-object HideInfocardSuggestionsParentFingerprint : MethodFingerprint(
-    "Ljava/lang/String;",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    strings = listOf("player_overlay_info_card_teaser"),
-)

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/patch/HideInfocardSuggestionsPatch.kt

@@ -1,67 +0,0 @@
-package app.revanced.patches.youtube.ad.infocardsuggestions.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
-import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsFingerprint
-import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsParentFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Name("hide-infocard-suggestions")
-@Description("Hides infocards in videos.")
-@HideInfocardSuggestionsCompatibility
-@Version("0.0.1")
-class HideInfocardSuggestionsPatch : BytecodePatch(
-    listOf(
-        HideInfocardSuggestionsParentFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.ADS.addPreferences(
-            SwitchPreference(
-                "revanced_info_cards_enabled",
-                StringResource("revanced_info_cards_enabled_title", "Show info-cards"),
-                false,
-                StringResource("revanced_info_cards_enabled_summary_on", "Info-cards are shown"),
-                StringResource("revanced_info_cards_enabled_summary_off", "Info-cards are hidden")
-            )
-        )
-
-        val parentResult = HideInfocardSuggestionsParentFingerprint.result
-            ?: return PatchResultError("Parent fingerprint not resolved!")
-
-
-        HideInfocardSuggestionsFingerprint.resolve(context, parentResult.classDef)
-        val result = HideInfocardSuggestionsFingerprint.result
-            ?: return PatchResultError("Required parent method could not be found.")
-
-        val method = result.mutableMethod
-        val implementation = method.implementation
-            ?: return PatchResultError("Implementation not found.")
-
-        val index = implementation.instructions.indexOfFirst { ((it as? BuilderInstruction35c)?.reference.toString() == "Landroid/view/View;->setVisibility(I)V") }
-
-        method.replaceInstruction(index, """
-            invoke-static {p1}, Lapp/revanced/integrations/patches/HideInfoCardSuggestionsPatch;->hideInfoCardSuggestions(Landroid/view/View;)V
-        """)
-
-        return PatchResultSuccess()
-    }
-
-}

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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt

@@ -15,12 +15,13 @@ import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
 import app.revanced.patches.youtube.ad.video.fingerprints.LoadVideoAdsFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playback.fix.patch.FixPlaybackPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, FixPlaybackPatch::class])
 @Name("video-ads")
 @Description("Removes ads in the video player.")
 @VideoAdsCompatibility

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.27.39", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/DownloadsBytecodePatch.kt

@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.interaction.downloads.annotation.DownloadsCompatibility
 import app.revanced.patches.youtube.interaction.downloads.resource.patch.DownloadsResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 
 @Patch
 @Name("downloads")

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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/annotations/AutoplayButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/annotations/HideButtonsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/comments/annotations/CommentsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/annotations/FullscreenPanelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidealbumcards/annotations/AlbumCardsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidealbumcards/bytecode/fingerprints/AlbumCardsFingerprint.kt

@@ -1,29 +1,29 @@
-package app.revanced.patches.youtube.layout.hidealbumcards.fingerprints
+package app.revanced.patches.youtube.layout.hidealbumcards.bytecode.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.patches.youtube.layout.hidealbumcards.annotations.AlbumCardsCompatibility
-import org.jf.dexlib2.AccessFlags
+import app.revanced.patches.youtube.layout.hidealbumcards.resource.patch.AlbumCardsResourcePatch
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
 @Name("album-cards-view-fingerprint")
 @AlbumCardsCompatibility
 @Version("0.0.1")
 object AlbumCardsFingerprint : MethodFingerprint(
-    "V",
+    opcodes = listOf(
-    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L", "L", "L", "L", "L", "L", "[B"),
-    listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CONST,
         Opcode.CONST_4,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CHECK_CAST,
-    )
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
+            (instruction as? WideLiteralInstruction)?.wideLiteral == AlbumCardsResourcePatch.albumCardId
+        } == true
+    }
 )

src/main/kotlin/app/revanced/patches/youtube/layout/hidealbumcards/bytecode/patch/AlbumCardsPatch.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.youtube.layout.hidealbumcards.bytecode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.layout.hidealbumcards.annotations.AlbumCardsCompatibility
+import app.revanced.patches.youtube.layout.hidealbumcards.bytecode.fingerprints.AlbumCardsFingerprint
+import app.revanced.patches.youtube.layout.hidealbumcards.resource.patch.AlbumCardsResourcePatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([IntegrationsPatch::class, AlbumCardsResourcePatch::class])
+@Name("hide-album-cards")
+@Description("Hides the album cards below the artist description.")
+@AlbumCardsCompatibility
+@Version("0.0.1")
+class AlbumCardsPatch : BytecodePatch(
+    listOf(
+        AlbumCardsFingerprint,
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val albumCardsResult = AlbumCardsFingerprint.result!!
+        val albumCardsMethod = albumCardsResult.mutableMethod
+
+        val checkCastAnchorIndex = albumCardsResult.scanResult.patternScanResult!!.endIndex
+
+        albumCardsMethod.addInstruction(
+            checkCastAnchorIndex + 1, """
+            invoke-static {v${(albumCardsMethod.instruction(checkCastAnchorIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideAlbumCardsPatch;->hideAlbumCards(Landroid/view/View;)V
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hidealbumcards/patch/AlbumCardsPatch.kt

@@ -1,59 +0,0 @@
-package app.revanced.patches.youtube.layout.hidealbumcards.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hidealbumcards.annotations.AlbumCardsCompatibility
-import app.revanced.patches.youtube.layout.hidealbumcards.fingerprints.AlbumCardsFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
-@Name("hide-album-cards")
-@Description("Hides the album cards below the artist description.")
-@AlbumCardsCompatibility
-@Version("0.0.1")
-class AlbumCardsPatch : BytecodePatch(
-    listOf(
-        AlbumCardsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_album_cards",
-                StringResource("revanced_hide_album_cards_title", "Hide the album cards"),
-                false,
-                StringResource("revanced_hide_album_cards_summary_on", "Album cards is hidden"),
-                StringResource("revanced_hide_album_cards_summary_off", "Album cards is visible")
-            )
-        )
-
-        val albumCardsResult = AlbumCardsFingerprint.result!!
-        val albumCardsMethod = albumCardsResult.mutableMethod
-
-        val checkCastIndex = albumCardsResult.scanResult.patternScanResult!!.endIndex
-        val patchIndex = checkCastIndex + 1
-
-        albumCardsMethod.addInstruction(
-            patchIndex, """
-            invoke-static {v${(albumCardsMethod.instruction(checkCastIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideAlbumCardsPatch;->hideAlbumCards(Landroid/view/View;)V
-        """
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/hidealbumcards/resource/patch/AlbumCardsResourcePatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.youtube.layout.hidealbumcards.resource.patch
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.youtube.layout.hidealbumcards.annotations.AlbumCardsCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Name("hide-album-cards-resource-patch")
+@AlbumCardsCompatibility
+@DependsOn([SettingsPatch::class, ResourceMappingResourcePatch::class])
+@Version("0.0.1")
+class AlbumCardsResourcePatch : ResourcePatch {
+    companion object {
+        internal var albumCardId: Long = -1
+    }
+
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_album_cards",
+                StringResource("revanced_hide_album_cards_title", "Hide the album cards"),
+                false,
+                StringResource("revanced_hide_album_cards_summary_on", "Album cards is hidden"),
+                StringResource("revanced_hide_album_cards_summary_off", "Album cards is visible")
+            )
+        )
+
+        albumCardId = ResourceMappingResourcePatch.resourceMappings.single {
+            it.type == "layout" && it.name == "album_card"
+        }.id
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hideartistcard/annotations/HideArtistCardCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidecrowdfundingbox/annotations/CrowdfundingBoxCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidecrowdfundingbox/bytecode/fingerprints/CrowdfundingBoxFingerprint.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.youtube.layout.hidecrowdfundingbox.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hidecrowdfundingbox.annotations.CrowdfundingBoxCompatibility
+import app.revanced.patches.youtube.layout.hidecrowdfundingbox.resource.patch.CrowdfundingBoxResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("crowdfunding-box-view-parent-fingerprint")
+@CrowdfundingBoxCompatibility
+@Version("0.0.1")
+object CrowdfundingBoxFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.CONST_4,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
+                    (instruction as? WideLiteralInstruction)?.wideLiteral == CrowdfundingBoxResourcePatch.crowdfundingBoxId
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hidecrowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.hidecrowdfundingbox.patch
+package app.revanced.patches.youtube.layout.hidecrowdfundingbox.bytecode.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -11,45 +11,32 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.layout.hidecrowdfundingbox.resource.patch.CrowdfundingBoxResourcePatch
 import app.revanced.patches.youtube.layout.hidecrowdfundingbox.annotations.CrowdfundingBoxCompatibility
-import app.revanced.patches.youtube.layout.hidecrowdfundingbox.fingerprints.CrowdfundingBoxFingerprint
+import app.revanced.patches.youtube.layout.hidecrowdfundingbox.bytecode.fingerprints.CrowdfundingBoxFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
+@DependsOn([IntegrationsPatch::class, CrowdfundingBoxResourcePatch::class])
 @Name("hide-crowdfunding-box")
 @Description("Hides the crowdfunding box between the player and video description.")
 @CrowdfundingBoxCompatibility
 @Version("0.0.1")
 class CrowdfundingBoxPatch : BytecodePatch(
     listOf(
-        CrowdfundingBoxFingerprint
+        CrowdfundingBoxFingerprint,
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_crowdfunding_box",
-                StringResource("revanced_hide_crowdfunding_box_title", "Hide the crowdfunding box"),
-                false,
-                StringResource("revanced_hide_crowdfunding_box_summary_on", "Crowdfunding box is hidden"),
-                StringResource("revanced_hide_crowdfunding_box_summary_off", "Crowdfunding box is visible")
-            )
-        )
-
         val crowdfundingBoxResult = CrowdfundingBoxFingerprint.result!!
         val crowdfundingBoxMethod = crowdfundingBoxResult.mutableMethod
 
-        val moveResultObjectIndex = crowdfundingBoxResult.scanResult.patternScanResult!!.endIndex
+        val moveResultObjectIndex =
-        val patchIndex = moveResultObjectIndex + 1
+            crowdfundingBoxResult.scanResult.patternScanResult!!.endIndex - 2
 
         crowdfundingBoxMethod.addInstruction(
-            patchIndex, """
+            moveResultObjectIndex + 1, """
             invoke-static {v${(crowdfundingBoxMethod.instruction(moveResultObjectIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideCrowdfundingBoxPatch;->hideCrowdfundingBox(Landroid/view/View;)V
         """
         )

src/main/kotlin/app/revanced/patches/youtube/layout/hidecrowdfundingbox/fingerprints/CrowdfundingBoxFingerprint.kt

@@ -1,37 +0,0 @@
-package app.revanced.patches.youtube.layout.hidecrowdfundingbox.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.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.hidecrowdfundingbox.annotations.CrowdfundingBoxCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("crowdfunding-box-view-fingerprint")
-@FuzzyPatternScanMethod(3)
-@CrowdfundingBoxCompatibility
-@Version("0.0.1")
-object CrowdfundingBoxFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    listOf("L", "L", "L", "L", "L", "L", "L", "[B", "[B"),
-    listOf(
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.INVOKE_DIRECT,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.IPUT_OBJECT,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/layout/hidecrowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.youtube.layout.hidecrowdfundingbox.resource.patch
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.youtube.layout.hidecrowdfundingbox.annotations.CrowdfundingBoxCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Name("crowdfunding-box-resource-patch")
+@CrowdfundingBoxCompatibility
+@DependsOn([SettingsPatch::class, ResourceMappingResourcePatch::class])
+@Version("0.0.1")
+class CrowdfundingBoxResourcePatch : ResourcePatch {
+    companion object {
+        internal var crowdfundingBoxId: Long = -1
+    }
+
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_crowdfunding_box",
+                StringResource("revanced_hide_crowdfunding_box_title", "Hide the crowdfunding box"),
+                false,
+                StringResource("revanced_hide_crowdfunding_box_summary_on", "Crowdfunding box is hidden"),
+                StringResource("revanced_hide_crowdfunding_box_summary_off", "Crowdfunding box is visible")
+            )
+        )
+
+        crowdfundingBoxId = ResourceMappingResourcePatch.resourceMappings.single {
+            it.type == "layout" && it.name == "donation_companion"
+        }.id
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/annotations/HideEndScreenCardsCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/bytecode/fingerprints/LayoutCircleFingerprint.kt

@@ -0,0 +1,28 @@
+package app.revanced.patches.youtube.layout.hideendscreencards.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hideendscreencards.annotations.HideEndscreenCardsCompatibility
+import app.revanced.patches.youtube.layout.hideendscreencards.resource.patch.HideEndscreenCardsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("layout-circle-fingerprint")
+@HideEndscreenCardsCompatibility
+@Version("0.0.1")
+object LayoutCircleFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.CONST,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
+                    (instruction as? WideLiteralInstruction)?.wideLiteral == HideEndscreenCardsResourcePatch.layoutCircle
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/bytecode/fingerprints/LayoutIconFingerprint.kt

@@ -0,0 +1,28 @@
+package app.revanced.patches.youtube.layout.hideendscreencards.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hideendscreencards.annotations.HideEndscreenCardsCompatibility
+import app.revanced.patches.youtube.layout.hideendscreencards.resource.patch.HideEndscreenCardsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("layout-icon-fingerprint")
+@HideEndscreenCardsCompatibility
+@Version("0.0.1")
+object LayoutIconFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.CONST_4,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
+                    (instruction as? WideLiteralInstruction)?.wideLiteral == HideEndscreenCardsResourcePatch.layoutIcon
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/bytecode/fingerprints/LayoutVideoFingerprint.kt

@@ -0,0 +1,28 @@
+package app.revanced.patches.youtube.layout.hideendscreencards.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hideendscreencards.annotations.HideEndscreenCardsCompatibility
+import app.revanced.patches.youtube.layout.hideendscreencards.resource.patch.HideEndscreenCardsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("layout-video-fingerprint")
+@HideEndscreenCardsCompatibility
+@Version("0.0.1")
+object LayoutVideoFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.CONST,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
+                    (instruction as? WideLiteralInstruction)?.wideLiteral == HideEndscreenCardsResourcePatch.layoutVideo
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/bytecode/patch/HideEndscreenCardsPatch.kt

@@ -0,0 +1,57 @@
+package app.revanced.patches.youtube.layout.hideendscreencards.bytecode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.Fingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.youtube.layout.hideendscreencards.annotations.HideEndscreenCardsCompatibility
+import app.revanced.patches.youtube.layout.hideendscreencards.bytecode.fingerprints.LayoutCircleFingerprint
+import app.revanced.patches.youtube.layout.hideendscreencards.bytecode.fingerprints.LayoutIconFingerprint
+import app.revanced.patches.youtube.layout.hideendscreencards.bytecode.fingerprints.LayoutVideoFingerprint
+import app.revanced.patches.youtube.layout.hideendscreencards.resource.patch.HideEndscreenCardsResourcePatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+
+@Patch
+@DependsOn([IntegrationsPatch::class, HideEndscreenCardsResourcePatch::class])
+@Name("hide-endscreen-cards")
+@Description("Hides the suggested video cards at the end of a video in fullscreen.")
+@HideEndscreenCardsCompatibility
+@Version("0.0.1")
+class HideEndscreenCardsPatch : BytecodePatch(
+    listOf(
+        LayoutCircleFingerprint,
+        LayoutIconFingerprint,
+        LayoutVideoFingerprint,
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        fun MethodFingerprint.injectHideCall() {
+            val layoutResult = result!!
+            val layoutMethod = layoutResult.mutableMethod
+
+            val checkCastIndex = layoutResult.scanResult.patternScanResult!!.endIndex
+            val viewRegister = (layoutMethod.instruction(checkCastIndex) as Instruction21c).registerA
+
+            layoutMethod.addInstruction(
+                checkCastIndex + 1,
+                "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideEndscreenCardsPatch;->hideEndscreen(Landroid/view/View;)V"
+            )
+        }
+        
+        listOf(LayoutCircleFingerprint, LayoutIconFingerprint, LayoutVideoFingerprint).forEach(MethodFingerprint::injectHideCall)
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hideendscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt

@@ -0,0 +1,48 @@
+package app.revanced.patches.youtube.layout.hideendscreencards.resource.patch
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.youtube.layout.hideendscreencards.annotations.HideEndscreenCardsCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Name("hide-endscreen-cards-resource-patch")
+@HideEndscreenCardsCompatibility
+@DependsOn([SettingsPatch::class, ResourceMappingResourcePatch::class])
+@Version("0.0.1")
+class HideEndscreenCardsResourcePatch : ResourcePatch {
+    internal companion object {
+        var layoutCircle: Long = -1
+        var layoutIcon: Long = -1
+        var layoutVideo: Long = -1
+    }
+
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_endscreen_cards",
+                StringResource("revanced_hide_endscreen_cards_title", "Hide end-screen cards"),
+                true,
+                StringResource("revanced_hide_endscreen_cards_summary_on", "End-screen cards are hidden"),
+                StringResource("revanced_hide_endscreen_cards_summary_off", "End-screen cards are shown")
+            ),
+        )
+
+        fun findEndscreenResourceId(name: String) = ResourceMappingResourcePatch.resourceMappings.single {
+            it.type == "layout" && it.name == "endscreen_element_layout_$name"
+        }.id
+
+        layoutCircle = findEndscreenResourceId("circle")
+        layoutIcon = findEndscreenResourceId("icon")
+        layoutVideo = findEndscreenResourceId("video")
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/annotations/HideInfocardsCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/fingerprints/InfocardsIncognitoFingerprint.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.youtube.layout.hideinfocards.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.patches.youtube.layout.hideinfocards.annotations.HideInfocardsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("infocards-incognito-fingerprint")
+@HideInfocardsCompatibility
+@Version("0.0.1")
+object InfocardsIncognitoFingerprint : MethodFingerprint(
+    "Ljava/lang/Boolean;",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf("vibrator")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/fingerprints/InfocardsIncognitoParentFingerprint.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.youtube.layout.hideinfocards.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.patches.youtube.layout.hideinfocards.annotations.HideInfocardsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("infocards-incognito-parent-fingerprint")
+@HideInfocardsCompatibility
+@Version("0.0.1")
+object InfocardsIncognitoParentFingerprint : MethodFingerprint(
+    "Ljava/lang/String;",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf("player_overlay_info_card_teaser"),
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/fingerprints/InfocardsMethodCallFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.youtube.layout.hideinfocards.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.hideinfocards.annotations.HideInfocardsCompatibility
+import app.revanced.patches.youtube.layout.hideinfocards.resource.patch.HideInfocardsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("infocards-method-call-fingerprint")
+@HideInfocardsCompatibility
+@Version("0.0.1")
+object InfocardsMethodCallFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            (instruction as? WideLiteralInstruction)?.wideLiteral == HideInfocardsResourcePatch.drawerResourceId
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/patch/HideInfocardsPatch.kt

@@ -0,0 +1,71 @@
+package app.revanced.patches.youtube.layout.hideinfocards.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.layout.hideinfocards.annotations.HideInfocardsCompatibility
+import app.revanced.patches.youtube.layout.hideinfocards.fingerprints.InfocardsIncognitoFingerprint
+import app.revanced.patches.youtube.layout.hideinfocards.fingerprints.InfocardsMethodCallFingerprint
+import app.revanced.patches.youtube.layout.hideinfocards.fingerprints.InfocardsIncognitoParentFingerprint
+import app.revanced.patches.youtube.layout.hideinfocards.resource.patch.HideInfocardsResourcePatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+
+@Patch
+@DependsOn([IntegrationsPatch::class, HideInfocardsResourcePatch::class])
+@Name("hide-info-cards")
+@Description("Hides info-cards in videos.")
+@HideInfocardsCompatibility
+@Version("0.0.1")
+class HideInfocardsPatch : BytecodePatch(
+    listOf(
+        InfocardsIncognitoParentFingerprint,
+        InfocardsMethodCallFingerprint,
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        with(InfocardsIncognitoFingerprint.also {
+            it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
+        }.result!!.mutableMethod) {
+                val invokeInstructionIndex = implementation!!.instructions.indexOfFirst {
+                    it.opcode.ordinal == Opcode.INVOKE_VIRTUAL.ordinal &&
+                    ((it as? BuilderInstruction35c)?.reference.toString() ==
+                        "Landroid/view/View;->setVisibility(I)V")
+                }
+
+                replaceInstruction(invokeInstructionIndex, """
+                    invoke-static {v${(instruction(invokeInstructionIndex) as? BuilderInstruction35c)?.registerC}}, Lapp/revanced/integrations/patches/HideInfocardsPatch;->hideInfocardsIncognito(Landroid/view/View;)V
+                    """
+                )
+        }
+
+        with(InfocardsMethodCallFingerprint.result!!) {
+            val hideInfocardsCallMethod = mutableMethod
+
+            val invokeInterfaceIndex = scanResult.patternScanResult!!.endIndex
+            val toggleRegister = hideInfocardsCallMethod.implementation!!.registerCount - 1
+
+            hideInfocardsCallMethod.addInstructions(
+                invokeInterfaceIndex, """
+                    invoke-static {}, Lapp/revanced/integrations/patches/HideInfocardsPatch;->hideInfocardsMethodCall()Z
+                    move-result v$toggleRegister
+                    if-nez v$toggleRegister, :hide_info_cards
+                """, listOf(ExternalLabel("hide_info_cards", hideInfocardsCallMethod.instruction(invokeInterfaceIndex + 1)))
+            )
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hideinfocards/resource/patch/HideInfocardsResourcePatch.kt

@@ -0,0 +1,40 @@
+package app.revanced.patches.youtube.layout.hideinfocards.resource.patch
+
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.youtube.layout.hideinfocards.annotations.HideInfocardsCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@HideInfocardsCompatibility
+@DependsOn([SettingsPatch::class, ResourceMappingResourcePatch::class])
+@Version("0.0.1")
+class HideInfocardsResourcePatch : ResourcePatch {
+    internal companion object {
+        var drawerResourceId: Long = -1
+    }
+
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_infocards",
+                StringResource("revanced_hide_infocards_title", "Hide info-cards"),
+                true,
+                StringResource("revanced_hide_infocards_summary_on", "Info-cards are hidden"),
+                StringResource("revanced_hide_infocards_summary_off", "Info-cards are shown")
+            )
+        )
+
+        drawerResourceId = ResourceMappingResourcePatch.resourceMappings.single {
+            it.type == "id" && it.name == "info_cards_drawer_header"
+        }.id
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/hidemixplaylists/annotations/MixPlaylistsPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.32.39", "17.34.36", "17.36.37", "17.36.39", "17.37.35", "17.38.36", "17.39.35", "17.40.41", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.36.39", "17.37.35", "17.38.36", "17.39.35", "17.40.41", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/annotations/HideTimeAndSeekbarCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -51,7 +51,7 @@ class OldQualityLayoutPatch : BytecodePatch(
         // insert the integrations method
         method.addInstruction(
             listenerInvokeRegister, // insert the integrations instructions right before the listener
-            "invoke-static { v$onItemClickViewRegister }, Lapp/revanced/integrations/patches/OldQualityLayoutPatch;->showOldQualityMenu(Landroid/widget/ListView;)V"
+            "invoke-static { v$onItemClickViewRegister }, Lapp/revanced/integrations/patches/playback/quality/OldQualityLayoutPatch;->showOldQualityMenu(Landroid/widget/ListView;)V"
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/annotations/HideEmailAddressCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/bytecode/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt

@@ -0,0 +1,30 @@
+package app.revanced.patches.youtube.layout.personalinformation.bytecode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
+import app.revanced.patches.youtube.layout.personalinformation.resource.patch.HideEmailAddressResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("account-switcher-accessibility-label-fingerprint")
+@HideEmailAddressCompatibility
+@Version("0.0.1")
+object AccountSwitcherAccessibilityLabelFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.NEW_ARRAY,
+        Opcode.CONST_4,
+        Opcode.APUT_OBJECT,
+        Opcode.CONST,
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
+            (instruction as? WideLiteralInstruction)?.wideLiteral == HideEmailAddressResourcePatch.accountSwitcherAccessibilityLabelId
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/bytecode/patch/HideEmailAddressPatch.kt

@@ -0,0 +1,53 @@
+package app.revanced.patches.youtube.layout.personalinformation.bytecode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
+import app.revanced.patches.youtube.layout.personalinformation.bytecode.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
+import app.revanced.patches.youtube.layout.personalinformation.resource.patch.HideEmailAddressResourcePatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([IntegrationsPatch::class, HideEmailAddressResourcePatch::class])
+@Name("hide-email-address")
+@Description("Hides the email address in the account switcher.")
+@HideEmailAddressCompatibility
+@Version("0.0.1")
+class HideEmailAddressPatch : BytecodePatch(
+    listOf(
+        AccountSwitcherAccessibilityLabelFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val accountSwitcherAccessibilityLabelResult = AccountSwitcherAccessibilityLabelFingerprint.result!!
+        val accountSwitcherAccessibilityLabelMethod = accountSwitcherAccessibilityLabelResult.mutableMethod
+
+        val setVisibilityConstIndex =
+            accountSwitcherAccessibilityLabelResult.scanResult.patternScanResult!!.endIndex
+
+        val setVisibilityConstRegister = (
+                accountSwitcherAccessibilityLabelMethod.instruction
+                (setVisibilityConstIndex - 2) as OneRegisterInstruction
+            ).registerA
+
+        accountSwitcherAccessibilityLabelMethod.addInstructions(
+            setVisibilityConstIndex, """
+            invoke-static {v$setVisibilityConstRegister}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress(I)I
+            move-result v$setVisibilityConstRegister
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt

@@ -1,44 +0,0 @@
-package app.revanced.patches.youtube.layout.personalinformation.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.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("account-switcher-accessibility-label-fingerprint")
-@FuzzyPatternScanMethod(3)
-@HideEmailAddressCompatibility
-@Version("0.0.1")
-object AccountSwitcherAccessibilityLabelFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-    listOf("L", "L"),
-    listOf(
-        Opcode.CHECK_CAST,
-        Opcode.IGET_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST_4,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IGET,
-        Opcode.CONST_4,
-        Opcode.ADD_INT_2ADDR,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.GOTO,
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/patch/HideEmailAddressPatch.kt

@@ -1,73 +0,0 @@
-package app.revanced.patches.youtube.layout.personalinformation.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
-import app.revanced.patches.youtube.layout.personalinformation.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
-
-@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
-@Name("hide-email-address")
-@Description("Hides the email address in the account switcher.")
-@HideEmailAddressCompatibility
-@Version("0.0.1")
-class HideEmailAddressPatch : BytecodePatch(
-    listOf(
-        AccountSwitcherAccessibilityLabelFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
-            SwitchPreference(
-                "revanced_hide_email_address",
-                StringResource("revanced_hide_email_address_title", "Hide the email address"),
-                false,
-                StringResource("revanced_hide_email_address_summary_on", "Email address is hidden"),
-                StringResource("revanced_hide_email_address_summary_off", "Email address is visible")
-            )
-        )
-
-        val accountSwitcherAccessibilityLabelId =
-            ResourceMappingResourcePatch.resourceMappings.single {
-                it.type == "string" && it.name == "account_switcher_accessibility_label"
-            }.id
-
-        val accountSwitcherAccessibilityLabelMethod = AccountSwitcherAccessibilityLabelFingerprint.result!!.mutableMethod
-        val accountSwitcherAccessibilityLabelInstruction = accountSwitcherAccessibilityLabelMethod.implementation!!.instructions
-
-        val setVisibilityConstIndex = accountSwitcherAccessibilityLabelInstruction.indexOfFirst {
-            (it as? WideLiteralInstruction)?.wideLiteral == accountSwitcherAccessibilityLabelId
-        } - 1
-
-        val setVisibilityConstRegister = (accountSwitcherAccessibilityLabelInstruction[setVisibilityConstIndex] as OneRegisterInstruction).registerA
-        val toggleRegister = (setVisibilityConstRegister + 1)
-
-        accountSwitcherAccessibilityLabelMethod.addInstructions(
-            setVisibilityConstIndex + 1, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress()Z
-            move-result v$toggleRegister
-            if-eqz v$toggleRegister, :hide
-            const/16 v$setVisibilityConstRegister, 0x8
-            :hide
-            nop
-        """
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.youtube.layout.personalinformation.resource.patch
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.youtube.layout.personalinformation.annotations.HideEmailAddressCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Name("hide-email-address-resource-patch")
+@HideEmailAddressCompatibility
+@DependsOn([SettingsPatch::class, ResourceMappingResourcePatch::class])
+@Version("0.0.1")
+class HideEmailAddressResourcePatch : ResourcePatch {
+    companion object {
+        internal var accountSwitcherAccessibilityLabelId: Long = -1
+    }
+
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+            SwitchPreference(
+                "revanced_hide_email_address",
+                StringResource("revanced_hide_email_address_title", "Hide the email address"),
+                false,
+                StringResource("revanced_hide_email_address_summary_on", "Email address is hidden"),
+                StringResource("revanced_hide_email_address_summary_off", "Email address is visible")
+            )
+        )
+
+        accountSwitcherAccessibilityLabelId = ResourceMappingResourcePatch.resourceMappings.single {
+            it.type == "string" && it.name == "account_switcher_accessibility_label"
+        }.id
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/playerpopuppanels/annotations/PlayerPopupPanelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.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.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/annotations/ReturnYouTubeDislikeCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt

@@ -18,7 +18,7 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.Retu
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.*
 import app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch.ReturnYouTubeDislikeResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 
 @Patch
 @DependsOn([IntegrationsPatch::class, VideoIdPatch::class, ReturnYouTubeDislikeResourcePatch::class])

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/annotations/SponsorBlockCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.22.36", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt

@@ -39,6 +39,7 @@ object ShortsPlayerConstructorFingerprint : MethodFingerprint(
     ),
     customFingerprint = { methodDef ->
         methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
             (instruction as? WideLiteralInstruction)?.wideLiteral == SponsorBlockResourcePatch.reelButtonGroupResourceId
         } == true
     }

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt

@@ -7,17 +7,15 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.youtube.layout.autocaptions.fingerprints.StartVideoInformerFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
@@ -25,22 +23,24 @@ import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBl
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
-import org.jf.dexlib2.AccessFlags
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.iface.instruction.*
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.ImmutableMethod
-import org.jf.dexlib2.immutable.ImmutableMethodParameter
-import org.jf.dexlib2.util.MethodUtil
 
 @Patch
 @DependsOn(
-    dependencies = [PlayerControlsBytecodePatch::class, IntegrationsPatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
+    dependencies = [
+        VideoInformationPatch::class, // updates video information and adds method to seek in video
+        PlayerControlsBytecodePatch::class,
+        IntegrationsPatch::class,
+        SponsorBlockResourcePatch::class,
+        VideoIdPatch::class
+    ]
 )
 @Name("sponsorblock")
 @Description("Integrate SponsorBlock.")
@@ -48,47 +48,39 @@ import org.jf.dexlib2.util.MethodUtil
 @Version("0.0.1")
 class SponsorBlockBytecodePatch : BytecodePatch(
     listOf(
-        PlayerControllerSetTimeReferenceFingerprint,
         CreateVideoPlayerSeekbarFingerprint,
-        VideoTimeFingerprint,
         NextGenWatchLayoutFingerprint,
         AppendTimeFingerprint,
-        PlayerInitFingerprint,
         PlayerOverlaysLayoutInitFingerprint,
         ShortsPlayerConstructorFingerprint,
         StartVideoInformerFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {/*
-        Set current video time
-        */
-        val referenceResult = PlayerControllerSetTimeReferenceFingerprint.result!!
-        val playerControllerSetTimeMethod =
-            context.toMethodWalker(referenceResult.method)
-                .nextMethod(referenceResult.scanResult.patternScanResult!!.startIndex, true)
-                .getMethod() as MutableMethod
-        playerControllerSetTimeMethod.addInstruction(
-            2,
-            "invoke-static {p1, p2}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setCurrentVideoTime(J)V"
-        )
 
+    private companion object {
+        const val INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR =
+            "Lapp/revanced/integrations/sponsorblock/PlayerController;"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
         /*
-        Set current video time high precision
+        Hook the video time methods
          */
-        val constructorFingerprint =
+        with(VideoInformationPatch) {
-            object : MethodFingerprint("V", null, listOf("J", "J", "J", "J", "I", "L"), null) {}
+            videoTimeHook(
-        constructorFingerprint.resolve(context, VideoTimeFingerprint.result!!.classDef)
+                INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
-
+                "setVideoTime"
-        val constructor = constructorFingerprint.result!!.mutableMethod
+            )
-        constructor.addInstruction(
+            highPrecisionTimeHook(
-            0,
+                INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
-            "invoke-static {p1, p2}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setCurrentVideoTimeHighPrecision(J)V"
+                "setHighPrecisionVideoTime"
-        )
+            )
+        }
 
         /*
          Set current video id
          */
-        VideoIdPatch.injectCall("Lapp/revanced/integrations/sponsorblock/PlayerController;->setCurrentVideoId(Ljava/lang/String;)V")
+        VideoIdPatch.injectCall("$INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
 
         /*
          Seekbar drawing
@@ -104,7 +96,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue
             seekbarMethod.addInstruction(
                 index + 1,
-                "invoke-static {v0}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarRect(Ljava/lang/Object;)V"
+                "invoke-static {v0}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
             )
             break
         }
@@ -120,7 +112,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             // set the thickness of the segment
             seekbarMethod.addInstruction(
                 insertIndex,
-                "invoke-static {v${invokeInstruction.registerC}}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarThickness(I)V"
+                "invoke-static {v${invokeInstruction.registerC}}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarThickness(I)V"
             )
             break
         }
@@ -141,11 +133,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         // the reason for that is that we get the index, add instructions and then the offset would be wrong
         seekbarMethod.addInstruction(
             indexLeft + 1,
-            "invoke-static {v$rectangleLeftRegister}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarAbsoluteLeft(Landroid/graphics/Rect;)V"
+            "invoke-static {v$rectangleLeftRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteLeft(Landroid/graphics/Rect;)V"
         )
         seekbarMethod.addInstruction(
             indexRight + 1,
-            "invoke-static {v$rectangleRightRegister}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarAbsoluteRight(Landroid/graphics/Rect;)V"
+            "invoke-static {v$rectangleRightRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteRight(Landroid/graphics/Rect;)V"
         )
 
         /*
@@ -157,24 +149,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         }
         seekbarMethod.addInstruction(
             drawSegmentInstructionInsertIndex,
-            "invoke-static {v$canvasInstance, v$centerY}, Lapp/revanced/integrations/sponsorblock/PlayerController;->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
+            "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
-        )
-
-        /*
-        Set video length
-         */
-        VideoLengthFingerprint.resolve(context, seekbarSignatureResult.classDef)
-        val videoLengthMethodResult = VideoLengthFingerprint.result!!
-        val videoLengthMethod = videoLengthMethodResult.mutableMethod
-        val videoLengthMethodInstructions = videoLengthMethod.implementation!!.instructions
-
-        val videoLengthRegister =
-            (videoLengthMethodInstructions[videoLengthMethodResult.scanResult.patternScanResult!!.endIndex - 2] as OneRegisterInstruction).registerA
-        val dummyRegisterForLong =
-            videoLengthRegister + 1 // this is required for long values since they are 64 bit wide
-        videoLengthMethod.addInstruction(
-            videoLengthMethodResult.scanResult.patternScanResult!!.endIndex,
-            "invoke-static {v$videoLengthRegister, v$dummyRegisterForLong}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setVideoLength(J)V"
         )
 
         /*
@@ -232,7 +207,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         val instanceRegister = 0
         NextGenWatchLayoutFingerprint.result!!.mutableMethod.addInstruction(
             3, // after super call
-            "invoke-static/range {p$instanceRegister}, Lapp/revanced/integrations/sponsorblock/PlayerController;->addSkipSponsorView15(Landroid/view/View;)V"
+            "invoke-static/range {p$instanceRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->addSkipSponsorView15(Landroid/view/View;)V"
         )
 
         // append the new time to the player layout
@@ -249,12 +224,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         )
 
         // initialize the player controller
-        val initFingerprintResult = PlayerInitFingerprint.result!!
+        VideoInformationPatch.onCreateHook(INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR, "initialize")
-        val initInstanceRegister = 0
-        initFingerprintResult.mutableClass.methods.first { MethodUtil.isConstructor(it) }.addInstruction(
-            4, // after super class invoke
-            "invoke-static {v$initInstanceRegister}, Lapp/revanced/integrations/sponsorblock/PlayerController;->onCreate(Ljava/lang/Object;)V"
-        )
 
         // initialize the sponsorblock view
         PlayerOverlaysLayoutInitFingerprint.result!!.mutableMethod.addInstruction(
@@ -262,39 +232,6 @@ class SponsorBlockBytecodePatch : BytecodePatch(
             "invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/player/ui/SponsorBlockView;->initialize(Ljava/lang/Object;)V"
         )
 
-        // lastly create hooks for the player controller
-
-        // get original seek method
-        SeekFingerprint.resolve(context, initFingerprintResult.classDef)
-        val seekFingerprintResultMethod = SeekFingerprint.result!!.method
-        // get enum type for the seek helper method
-        val seekSourceEnumType = seekFingerprintResultMethod.parameterTypes[1].toString()
-
-        // create helper method
-        val seekHelperMethod = ImmutableMethod(
-            seekFingerprintResultMethod.definingClass,
-            "seekHelper",
-            listOf(ImmutableMethodParameter("J", null, "time")),
-            "Z",
-            AccessFlags.PUBLIC or AccessFlags.FINAL,
-            null, null,
-            MutableMethodImplementation(4)
-        ).toMutable()
-
-        // insert helper method instructions
-        seekHelperMethod.addInstructions(
-            0,
-            """
-                sget-object v0, $seekSourceEnumType->a:$seekSourceEnumType
-                invoke-virtual {p0, p1, p2, v0}, ${seekFingerprintResultMethod.definingClass}->${seekFingerprintResultMethod.name}(J$seekSourceEnumType)Z
-                move-result p1
-                return p1
-            """
-        )
-
-        // add the helper method to the original class
-        initFingerprintResult.mutableClass.methods.add(seekHelperMethod)
-
         // get rectangle field name
         RectangleFieldInvalidatorFingerprint.resolve(context, seekbarSignatureResult.classDef)
         val rectangleFieldInvalidatorInstructions =
@@ -302,41 +239,37 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         val rectangleFieldName =
             ((rectangleFieldInvalidatorInstructions.elementAt(rectangleFieldInvalidatorInstructions.count() - 3) as ReferenceInstruction).reference as FieldReference).name
 
-        // get the player controller class from the integrations
-        val playerControllerMethods =
-            context.proxy(context.classes.first { it.type.endsWith("PlayerController;") }).mutableClass.methods
-
-        // get the method which contain the "replaceMe" strings
-        val replaceMeMethods =
-            playerControllerMethods.filter { it.name == "onCreate" || it.name == "setSponsorBarRect" }
-
-        fun MutableMethod.replaceStringInstruction(index: Int, instruction: Instruction, with: String) {
-            val register = (instruction as OneRegisterInstruction).registerA
-            this.replaceInstruction(
-                index, "const-string v$register, \"$with\""
-            )
-        }
-
         // replace the "replaceMeWith*" strings
-        for (method in replaceMeMethods) {
+        context
-            for ((index, it) in method.implementation!!.instructions.withIndex()) {
+            .proxy(context.classes.first { it.type.endsWith("PlayerController;") })
-                if (it.opcode.ordinal != Opcode.CONST_STRING.ordinal) continue
+            .mutableClass
-
+            .methods
-                when (((it as ReferenceInstruction).reference as StringReference).string) {
+            .find { it.name == "setSponsorBarRect" }
-                    "replaceMeWithsetSponsorBarRect" ->
+            ?.let { method ->
-                        method.replaceStringInstruction(index, it, rectangleFieldName)
+                fun MutableMethod.replaceStringInstruction(index: Int, instruction: Instruction, with: String) {
-
+                    val register = (instruction as OneRegisterInstruction).registerA
-                    "replaceMeWithsetMillisecondMethod" ->
+                    this.replaceInstruction(
-                        method.replaceStringInstruction(index, it, "seekHelper")
+                        index, "const-string v$register, \"$with\""
+                    )
                 }
-            }
+                for ((index, it) in method.implementation!!.instructions.withIndex()) {
-        }
+                    if (it.opcode.ordinal != Opcode.CONST_STRING.ordinal) continue
+
+                    when (((it as ReferenceInstruction).reference as StringReference).string) {
+                        "replaceMeWithsetSponsorBarRect" ->
+                            method.replaceStringInstruction(index, it, rectangleFieldName)
+
+                        "replaceMeWithsetMillisecondMethod" ->
+                            method.replaceStringInstruction(index, it, "seekHelper")
+                    }
+                }
+            } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
 
         val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
         startVideoInformerMethod.addInstructions(
             0, """
             const/4 v0, 0x0
-            sput-boolean v0, Lapp/revanced/integrations/sponsorblock/PlayerController;->shorts_playing:Z
+            sput-boolean v0, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->shorts_playing:Z
         """
         )
 
@@ -345,7 +278,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         shortsPlayerConstructorMethod.addInstructions(
             0, """
             const/4 v0, 0x1
-            sput-boolean v0, Lapp/revanced/integrations/sponsorblock/PlayerController;->shorts_playing:Z
+            sput-boolean v0, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->shorts_playing:Z
         """
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/annotations/StartupShortsResetCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.33.42", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/annotations/TabletMiniPlayerCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.26.35", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt

@@ -16,17 +16,11 @@ object MiniPlayerResponseModelSizeCheckFingerprint : MethodFingerprint(
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("L", "L"),
     listOf(
-        Opcode.OR_INT_LIT8,
-        Opcode.IPUT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.RETURN_OBJECT,
         Opcode.RETURN_OBJECT,
         Opcode.CHECK_CAST,
         Opcode.CHECK_CAST,
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT,
         Opcode.IF_NEZ,
-        )
+    )
 )

src/main/kotlin/app/revanced/patches/youtube/layout/watchinvr/annotations/WatchinVRCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.33.42", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/annotations/HideWaterwarkCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/annotations/WideSearchbarCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/annotations/AutoRepeatCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/patch/EnableDebuggingPatch.kt

@@ -17,9 +17,9 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Swit
 import org.w3c.dom.Element
 
 @Patch(false)
-@Name("enable-debugging")
+@Name("debugging")
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
-@Description("Enables app debugging by patching the manifest file.")
+@Description("Adds debugging options.")
 @EnableDebuggingCompatibility
 @Version("0.0.1")
 class EnableDebuggingPatch : ResourcePatch {

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.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", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/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", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/playback/fix/annotations/FixPlaybackCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/misc/playback/fix/patch/FixPlaybackPatch.kt

@@ -0,0 +1,52 @@
+package app.revanced.patches.youtube.misc.playback.fix.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playback.fix.annotations.FixPlaybackCompatibility
+import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
+
+@DependsOn([
+    IntegrationsPatch::class,
+    VideoInformationPatch::class, // updates video length and adds method to seek in video, necessary for this patch
+    SettingsPatch::class,
+    VideoIdPatch::class
+])
+@Name("fix-playback")
+@Description("Fixes the issue with videos not playing when video ads are removed.")
+@FixPlaybackCompatibility
+@Version("0.0.1")
+class FixPlaybackPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+            SwitchPreference(
+                "revanced_fix_playback",
+                StringResource("revanced_fix_playback_title", "Fix video playback issues"),
+                false,
+                StringResource(
+                    "revanced_fix_playback_summary_on",
+                    "The fix is enabled"
+                ),
+                StringResource(
+                    "revanced_fix_playback_summary_off",
+                    "The fix is disabled"
+                )
+            )
+        )
+
+        // If a new video loads, fix the playback issue
+        VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/FixPlaybackPatch;->newVideoLoaded(Ljava/lang/String;)V")
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/annotation/PlayerControlsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.27.39", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt

@@ -20,6 +20,7 @@ object BottomControlsInflateFingerprint : MethodFingerprint(
     ),
     customFingerprint = { methodDef ->
         methodDef.implementation?.instructions?.any { instruction ->
+            instruction.opcode.ordinal == Opcode.CONST.ordinal &&
             (instruction as? WideLiteralInstruction)?.wideLiteral == PlayerControlsBytecodePatch.bottomUiContainerResourceId
         } == true
     }

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/annotation/PlayerTypeHookCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.24.34", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/quality/annotations/DefaultVideoQualityCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.quality.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf("17.22.36", "17.24.35", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42", "17.34.35", "17.34.36", "17.36.37", "17.41.37")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class DefaultVideoQualityCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/video/information/annotation/VideoInformationCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.youtube.misc.video.information.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility
+
+@Name("create-video-player-seekbar-fingerprint")
+@VideoInformationCompatibility
+@Version("0.0.1")
+object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint(
+    "V",
+    strings = listOf("timed_markers_width")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt

@@ -1,15 +1,15 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
+package app.revanced.patches.youtube.misc.video.information.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility
 import org.jf.dexlib2.Opcode
 
 @Name("player-controller-set-time-reference-fingerprint")
-
+@VideoInformationCompatibility
-@SponsorBlockCompatibility
 @Version("0.0.1")
 object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(
     opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),