chore: Release v4.17.0-dev.12 [skip ci]

# [4.17.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.11...v4.17.0-dev.12) (2024-10-19) ### Features * **YouTube - Hide Shorts components:** Hide `Hashtag` button ([#3787](https://github.com/ReVanced/revanced-patches/issues/3787)) ([d9a70a3](d9a70a3ae0))
feat(YouTube - Hide Shorts components): Hide Hashtag button (#3787 )
2025-12-25 18:34:07 +01:00 · 2024-10-19 12:41:16 +00:00 · 2024-10-19 08:39:08 -04:00 · 2024-10-19 12:29:04 +00:00 · 2024-10-19 08:26:39 -04:00 · 2024-10-17 15:39:04 +00:00
216 changed files with 3987 additions and 3211 deletions
--- a/.github/workflows/open_pull_request.yml
+++ b/.github/workflows/open_pull_request.yml
@@ -25,7 +25,8 @@ jobs:
          pr_body: |
            This pull request will ${{ env.MESSAGE }}.

-            ## Dependencies before merge
+            ## Before merging this PR

-            - [ ] https://github.com/revanced/revanced-integrations
+            - [ ] Remember about https://github.com/revanced/revanced-integrations
+            - [ ] Pull translations from Crowdin
          pr_draft: true
--- a/.github/workflows/pull_strings.yml
+++ b/.github/workflows/pull_strings.yml
@@ -8,6 +8,8 @@ on:
 jobs:
  pull:
    name: Pull strings
+    permissions:
+      contents: write
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -30,6 +32,6 @@ jobs:
          github_user_name: revanced-bot
          github_user_email: github@revanced.app
        env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/push_strings.yml
+++ b/.github/workflows/push_strings.yml
@@ -24,6 +24,5 @@ jobs:
          config: crowdin.yml
          upload_sources: true
        env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,6 +10,9 @@ on:
 jobs:
  release:
    name: Release
+    permissions:
+      contents: write
+      packages: write
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -46,5 +49,5 @@ jobs:

      - name: Release
        env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: npm exec semantic-release
--- a/.releaserc
+++ b/.releaserc
@@ -21,11 +21,11 @@
      "@semantic-release/git",
      {
        "assets": [
-          "README.md",
          "CHANGELOG.md",
          "gradle.properties",
          "patches.json"
-        ]
+        ],
+        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
      }
    ],
    [
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,144 @@
+# [4.17.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.11...v4.17.0-dev.12) (2024-10-19)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Hide `Hashtag` button ([#3787](https://github.com/ReVanced/revanced-patches/issues/3787)) ([828a634](https://github.com/ReVanced/revanced-patches/commit/828a634667c4005a90f3e469ad2c5d69387f0760))
+
+# [4.17.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.10...v4.17.0-dev.11) (2024-10-19)
+
+
+### Features
+
+* **YouTube:** Support versions `19.25` and `19.34` ([#3629](https://github.com/ReVanced/revanced-patches/issues/3629)) ([049e7f0](https://github.com/ReVanced/revanced-patches/commit/049e7f081358d2e1bf87d30e87b01c61b5eeafcc))
+
+# [4.17.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.9...v4.17.0-dev.10) (2024-10-17)
+
+
+### Features
+
+* **Facebook:** Add `Hide sponsored stories` patch ([#3627](https://github.com/ReVanced/revanced-patches/issues/3627)) ([214c72b](https://github.com/ReVanced/revanced-patches/commit/214c72baeb7f87f21cd2ca34301ab11fa0ff1a4f))
+
+# [4.17.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.8...v4.17.0-dev.9) (2024-10-17)
+
+
+### Features
+
+* **Sync for Reddit:** Add `Fix video downloads` patch ([#3739](https://github.com/ReVanced/revanced-patches/issues/3739)) ([a47ee38](https://github.com/ReVanced/revanced-patches/commit/a47ee38b1cdd974a959008006ecaf58917addc60))
+
+# [4.17.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.7...v4.17.0-dev.8) (2024-10-17)
+
+
+### Features
+
+* **Twitter:** Add `Change link sharing domain` patch ([#3753](https://github.com/ReVanced/revanced-patches/issues/3753)) ([9269a07](https://github.com/ReVanced/revanced-patches/commit/9269a076b674ecdcf478bca842238f6e30869f44))
+
+# [4.17.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.6...v4.17.0-dev.7) (2024-10-17)
+
+
+### Bug Fixes
+
+* **Twitter - Unlock downloads:** Make it work with latest versions ([#3782](https://github.com/ReVanced/revanced-patches/issues/3782)) ([5189122](https://github.com/ReVanced/revanced-patches/commit/5189122006b0f72d5bfb50422021c3b0f3a9ae4a))
+* **YouTube - Spoof video streams:** Fix playback for Android VR by removing invalid body as well ([#3769](https://github.com/ReVanced/revanced-patches/issues/3769)) ([5150a15](https://github.com/ReVanced/revanced-patches/commit/5150a15ad4ca73a747f0a89f933db7f2d686ec2d))
+
+# [4.17.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.5...v4.17.0-dev.6) (2024-10-14)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Add option to hide `Use template`, `Upcoming`, `Green screen` buttons ([#3752](https://github.com/ReVanced/revanced-patches/issues/3752)) ([f71c406](https://github.com/ReVanced/revanced-patches/commit/f71c4068bc646d02954b59fac4756f1419c55dbe))
+
+# [4.17.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.4...v4.17.0-dev.5) (2024-10-07)
+
+
+### Features
+
+* **Backdrops - Pro unlock:** Support latest versions by removing version constraint ([a62b506](https://github.com/ReVanced/revanced-patches/commit/a62b50691c49d1ce529a7c9c4e49da0d0dd46df2))
+
+# [4.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.3...v4.17.0-dev.4) (2024-10-06)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Adjust settings text ([#3745](https://github.com/ReVanced/revanced-patches/issues/3745)) ([13998bb](https://github.com/ReVanced/revanced-patches/commit/13998bbf95ac3cde8bf24754d60258d0ff9bc4f4))
+
+# [4.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.2...v4.17.0-dev.3) (2024-10-06)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add option to hide Yoodles (YouTube Doodles) ([#3743](https://github.com/ReVanced/revanced-patches/issues/3743)) ([b8c8916](https://github.com/ReVanced/revanced-patches/commit/b8c89164cf3911ac3842df9b0d2ec42b52213505))
+
+# [4.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.1...v4.17.0-dev.2) (2024-10-05)
+
+
+### Features
+
+* **Willhaben:** Add `Hide ads` patch ([#3740](https://github.com/ReVanced/revanced-patches/issues/3740)) ([1fe3a52](https://github.com/ReVanced/revanced-patches/commit/1fe3a523e99ccfe556d88800686e34ac6ed77b2c))
+
+# [4.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.16.1-dev.1...v4.17.0-dev.1) (2024-10-02)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Add option to hide like fountain ([#3731](https://github.com/ReVanced/revanced-patches/issues/3731)) ([00a99dd](https://github.com/ReVanced/revanced-patches/commit/00a99dd13be6e5c44fa691d74c92b23ce6ba659d))
+
+## [4.16.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.16.0...v4.16.1-dev.1) (2024-10-01)
+
+# [4.16.0](https://github.com/ReVanced/revanced-patches/compare/v4.15.0...v4.16.0) (2024-09-30)
+
+
+### Bug Fixes
+
+* **Soundcloud:** Support latest versions ([#3702](https://github.com/ReVanced/revanced-patches/issues/3702)) ([099ac5e](https://github.com/ReVanced/revanced-patches/commit/099ac5ea2cf55633a7c6a7e6f8e963599bcd5784))
+* **Twitter - Open links with app chooser:** Fix incorrect version in compatibility list ([#3683](https://github.com/ReVanced/revanced-patches/issues/3683)) ([adafe85](https://github.com/ReVanced/revanced-patches/commit/adafe85d77f6a0031a5523b9b7da69475959d78d))
+* **YouTube - SponsorBlock:** Fade out SB buttons without overlapping other buttons ([#3719](https://github.com/ReVanced/revanced-patches/issues/3719)) ([bf96108](https://github.com/ReVanced/revanced-patches/commit/bf9610894f0a9f9e751e2eed5b825c5d327a722c))
+* **YouTube:** Show video chapter titles without clipping when overlay buttons are enabled ([#3674](https://github.com/ReVanced/revanced-patches/issues/3674)) ([4b88c31](https://github.com/ReVanced/revanced-patches/commit/4b88c316ed90c56e83e2aee266561833b36fc37d))
+
+
+### Features
+
+* **Google Photos:** Restore hidden 'Back up while charging' toggle ([#3678](https://github.com/ReVanced/revanced-patches/issues/3678)) ([f9e19ce](https://github.com/ReVanced/revanced-patches/commit/f9e19ce6e9185fdf31b2b0d5f2934f6e8a544b8e))
+* **YouTube - Disable precise seeking gesture:** Hide "pull up" label that shows up when swiping ([#3668](https://github.com/ReVanced/revanced-patches/issues/3668)) ([3fa8af9](https://github.com/ReVanced/revanced-patches/commit/3fa8af9fe534b59ad093c36f1927f56f549a330d))
+* **YouTube - Hide Shorts components:** Add `Hide save music`, `Hide stickers` ([#3710](https://github.com/ReVanced/revanced-patches/issues/3710)) ([8c99321](https://github.com/ReVanced/revanced-patches/commit/8c99321df4db696156330fc90dd547c1345d880e))
+* **YouTube - Hide Shorts components:** Add patch option to hide Shorts app shortcut (long press app icon) ([#3699](https://github.com/ReVanced/revanced-patches/issues/3699)) ([0d4e1f5](https://github.com/ReVanced/revanced-patches/commit/0d4e1f5d03cf3dcc06fd41165e26a1ce901b976b))
+* **YouTube - Hide Shorts components:** Add patch option to hide Shorts from app launcher widget Beta ([#3707](https://github.com/ReVanced/revanced-patches/issues/3707)) ([838f183](https://github.com/ReVanced/revanced-patches/commit/838f1834a5df547ce2c3217b874c0594b6878a67))
+
+# [4.16.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.6...v4.16.0-dev.7) (2024-09-29)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Fade out SB buttons without overlapping other buttons ([#3719](https://github.com/ReVanced/revanced-patches/issues/3719)) ([bf96108](https://github.com/ReVanced/revanced-patches/commit/bf9610894f0a9f9e751e2eed5b825c5d327a722c))
+
+# [4.16.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.5...v4.16.0-dev.6) (2024-09-29)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Add `Hide save music`, `Hide stickers` ([#3710](https://github.com/ReVanced/revanced-patches/issues/3710)) ([8c99321](https://github.com/ReVanced/revanced-patches/commit/8c99321df4db696156330fc90dd547c1345d880e))
+
+# [4.16.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.4...v4.16.0-dev.5) (2024-09-29)
+
+
+### Features
+
+* **YouTube - Disable precise seeking gesture:** Hide "pull up" label that shows up when swiping ([#3668](https://github.com/ReVanced/revanced-patches/issues/3668)) ([3fa8af9](https://github.com/ReVanced/revanced-patches/commit/3fa8af9fe534b59ad093c36f1927f56f549a330d))
+
+# [4.16.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.3...v4.16.0-dev.4) (2024-09-29)
+
+
+### Bug Fixes
+
+* **Soundcloud:** Support latest versions ([#3702](https://github.com/ReVanced/revanced-patches/issues/3702)) ([099ac5e](https://github.com/ReVanced/revanced-patches/commit/099ac5ea2cf55633a7c6a7e6f8e963599bcd5784))
+
+# [4.16.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.2...v4.16.0-dev.3) (2024-09-29)
+
+
+### Features
+
+* **Google Photos:** Restore hidden 'Back up while charging' toggle ([#3678](https://github.com/ReVanced/revanced-patches/issues/3678)) ([f9e19ce](https://github.com/ReVanced/revanced-patches/commit/f9e19ce6e9185fdf31b2b0d5f2934f6e8a544b8e))
+
 # [4.16.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.1...v4.16.0-dev.2) (2024-09-28)


--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -263,6 +263,12 @@ public final class app/revanced/patches/duolingo/debug/EnableDebugMenuPatch : ap
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

+public final class app/revanced/patches/facebook/ads/mainfeed/HideSponsoredStoriesPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/facebook/ads/mainfeed/HideSponsoredStoriesPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/facebook/ads/story/HideStoryAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/facebook/ads/story/HideStoryAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -321,6 +327,12 @@ public final class app/revanced/patches/googlephotos/misc/integrations/Integrati
 	public static final field INSTANCE Lapp/revanced/patches/googlephotos/misc/integrations/IntegrationsPatch;
 }

+public final class app/revanced/patches/googlephotos/preferences/RestoreHiddenBackUpWhileChargingTogglePatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/googlephotos/preferences/RestoreHiddenBackUpWhileChargingTogglePatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/googlerecorder/restrictions/RemoveDeviceRestrictions : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/googlerecorder/restrictions/RemoveDeviceRestrictions;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -834,6 +846,12 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/u
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

+public final class app/revanced/patches/reddit/customclients/syncforreddit/fix/video/FixVideoDownloadsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/fix/video/FixVideoDownloadsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch : app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch {
 	public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/misc/integrations/IntegrationsPatch;
 }
@@ -1484,6 +1502,12 @@ public final class app/revanced/patches/twitter/misc/hook/patch/recommendation/H
 	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/hook/patch/recommendation/HideRecommendedUsersPatch;
 }

+public final class app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1514,6 +1538,12 @@ public final class app/revanced/patches/warnwetter/misc/promocode/PromoCodeUnloc
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

+public final class app/revanced/patches/willhaben/ads/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/willhaben/ads/HideAdsPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/windyapp/misc/unlockpro/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/windyapp/misc/unlockpro/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1820,10 +1850,6 @@ public final class app/revanced/patches/youtube/layout/startpage/ChangeStartPage
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

-public final class app/revanced/patches/youtube/layout/startpage/fingerprints/StartActivityFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/startpage/fingerprints/StartActivityFingerprint;
-}
-
 public final class app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -2172,12 +2198,28 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun containsWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)Z
 	public static final fun findMutableMethodOf (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
 	public static final fun findOpcodeIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)Ljava/util/List;
+	public static final fun findOpcodeIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
+	public static final fun forEachLiteralValueInstruction (Lapp/revanced/patcher/data/BytecodeContext;JLkotlin/jvm/functions/Function2;)V
 	public static final fun getException (Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lapp/revanced/patcher/patch/PatchException;
+	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;ILcom/android/tools/smali/dexlib2/Opcode;)I
 	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;)I
+	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)I
 	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)I
+	public static synthetic fun indexOfFirstInstruction$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILcom/android/tools/smali/dexlib2/Opcode;ILjava/lang/Object;)I
 	public static synthetic fun indexOfFirstInstruction$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
+	public static final fun indexOfFirstInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;ILcom/android/tools/smali/dexlib2/Opcode;)I
 	public static final fun indexOfFirstInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;)I
+	public static final fun indexOfFirstInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)I
+	public static synthetic fun indexOfFirstInstructionOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILcom/android/tools/smali/dexlib2/Opcode;ILjava/lang/Object;)I
 	public static synthetic fun indexOfFirstInstructionOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
+	public static final fun indexOfFirstInstructionReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lcom/android/tools/smali/dexlib2/Opcode;)I
+	public static final fun indexOfFirstInstructionReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lkotlin/jvm/functions/Function1;)I
+	public static synthetic fun indexOfFirstInstructionReversed$default (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lcom/android/tools/smali/dexlib2/Opcode;ILjava/lang/Object;)I
+	public static synthetic fun indexOfFirstInstructionReversed$default (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
+	public static final fun indexOfFirstInstructionReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lcom/android/tools/smali/dexlib2/Opcode;)I
+	public static final fun indexOfFirstInstructionReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lkotlin/jvm/functions/Function1;)I
+	public static synthetic fun indexOfFirstInstructionReversedOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lcom/android/tools/smali/dexlib2/Opcode;ILjava/lang/Object;)I
+	public static synthetic fun indexOfFirstInstructionReversedOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
 	public static final fun indexOfFirstWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun indexOfFirstWideLiteralInstructionValueOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun indexOfFirstWideLiteralInstructionValueReversed (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.16.0-dev.2
+version = 4.17.0-dev.12
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,8 +8,8 @@
        "@saithodev/semantic-release-backmerge": "^4.0.1",
        "@semantic-release/changelog": "^6.0.3",
        "@semantic-release/git": "^10.0.1",
-        "gradle-semantic-release-plugin": "^1.9.2",
-        "semantic-release": "^24.0.0"
+        "gradle-semantic-release-plugin": "^1.10.1",
+        "semantic-release": "^24.1.2"
      }
    },
    "node_modules/@babel/code-frame": {
@@ -235,13 +235,13 @@
      "license": "MIT"
    },
    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.3.tgz",
-      "integrity": "sha512-o4WRoOJZlKqEEgj+i9CpcmnByvtzoUYC6I8PD2SA95M+BJ2x8h7oLcVOg9qcowWXBOdcTRsMZiwvM3EyLm9AfA==",
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.5.tgz",
+      "integrity": "sha512-cgwIRtKrpwhLoBi0CUNuY83DPGRMaWVjqVI/bGKsLJ4PzyWZNaEmhHroI2xlrVXkk6nFv0IsZpOp+ZWSWUS2AQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@octokit/types": "^13.5.0"
+        "@octokit/types": "^13.6.0"
      },
      "engines": {
        "node": ">= 18"
@@ -251,9 +251,9 @@
      }
    },
    "node_modules/@octokit/plugin-retry": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-7.1.1.tgz",
-      "integrity": "sha512-G9Ue+x2odcb8E1XIPhaFBnTTIrrUDfXN05iFXiqhR+SeeeDMMILcAnysOsxUpEWcQp2e5Ft397FCXTcPkiPkLw==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-7.1.2.tgz",
+      "integrity": "sha512-XOWnPpH2kJ5VTwozsxGurw+svB2e61aWlmk5EVIYZPwFK5F9h4cyPyj9CIKRyMXMHSwpIsI3mPOdpMmrRhe7UQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -302,9 +302,9 @@
      }
    },
    "node_modules/@octokit/request-error": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz",
-      "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==",
+      "version": "6.1.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz",
+      "integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -315,9 +315,9 @@
      }
    },
    "node_modules/@octokit/types": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
-      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz",
+      "integrity": "sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -355,9 +355,9 @@
      "license": "ISC"
    },
    "node_modules/@pnpm/npm-conf": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz",
-      "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz",
+      "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -977,6 +977,19 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/@saithodev/semantic-release-backmerge/node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
    "node_modules/@saithodev/semantic-release-backmerge/node_modules/human-signals": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
@@ -1372,9 +1385,9 @@
      }
    },
    "node_modules/@semantic-release/github": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-10.1.1.tgz",
-      "integrity": "sha512-sSmsBKGpAlTtXf9rUJf/si16p+FwPEsvsJRjl3KCwFP0WywaSpynvUhlYvE18n5rzkQNbGJnObAKIoo3xFMSjA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-11.0.0.tgz",
+      "integrity": "sha512-Uon6G6gJD8U1JNvPm7X0j46yxNRJ8Ui6SgK4Zw5Ktu8RgjEft3BGn+l/RX1TTzhhO3/uUcKuqM+/9/ETFxWS/Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1399,7 +1412,7 @@
        "node": ">=20.8.1"
      },
      "peerDependencies": {
-        "semantic-release": ">=20.1.0"
+        "semantic-release": ">=24.1.0"
      }
    },
    "node_modules/@semantic-release/github/node_modules/@semantic-release/error": {
@@ -1569,9 +1582,9 @@
      }
    },
    "node_modules/@semantic-release/npm/node_modules/execa": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz",
-      "integrity": "sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz",
+      "integrity": "sha512-yKHlle2YGxZE842MERVIplWwNH5VYmqqcPFgtnlU//K8gxuFFXu0pwd/CrfXTumFpeEiufsP7+opT/bPJa1yVw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1579,10 +1592,10 @@
        "cross-spawn": "^7.0.3",
        "figures": "^6.1.0",
        "get-stream": "^9.0.0",
-        "human-signals": "^7.0.0",
+        "human-signals": "^8.0.0",
        "is-plain-obj": "^4.1.0",
        "is-stream": "^4.0.1",
-        "npm-run-path": "^5.2.0",
+        "npm-run-path": "^6.0.0",
        "pretty-ms": "^9.0.0",
        "signal-exit": "^4.1.0",
        "strip-final-newline": "^4.0.0",
@@ -1613,9 +1626,9 @@
      }
    },
    "node_modules/@semantic-release/npm/node_modules/human-signals": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-7.0.0.tgz",
-      "integrity": "sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
+      "integrity": "sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -1649,16 +1662,17 @@
      }
    },
    "node_modules/@semantic-release/npm/node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "path-key": "^4.0.0"
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
      },
      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
      },
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
@@ -1703,6 +1717,19 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/@semantic-release/npm/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/@semantic-release/release-notes-generator": {
      "version": "14.0.1",
      "resolved": "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-14.0.1.tgz",
@@ -2273,13 +2300,13 @@
      }
    },
    "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
      },
      "engines": {
        "node": ">=6.0"
@@ -2358,9 +2385,9 @@
      "license": "MIT"
    },
    "node_modules/env-ci": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/env-ci/-/env-ci-11.0.0.tgz",
-      "integrity": "sha512-apikxMgkipkgTvMdRT9MNqWx5VLOci79F4VBd7Op/7OPjjoanjdAvn6fglMCCEf/1bAh8eOiuEVCUs4V3qP3nQ==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/env-ci/-/env-ci-11.1.0.tgz",
+      "integrity": "sha512-Z8dnwSDbV1XYM9SBF2J0GcNVvmfmfh3a49qddGIROhBoVro6MZVTji15z/sJbQ2ko2ei8n988EU1wzoLU/tF+g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2549,9 +2576,9 @@
      }
    },
    "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -2847,9 +2874,9 @@
      "license": "ISC"
    },
    "node_modules/gradle-semantic-release-plugin": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/gradle-semantic-release-plugin/-/gradle-semantic-release-plugin-1.9.2.tgz",
-      "integrity": "sha512-8qpf4GYFPQ+UMUymYBy/VchOOwLILAWzZMrZX1R0RR3JMgJBMN2R0tJn92R/3rXmxx4OAqwUFH6Np51eFoxr3w==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/gradle-semantic-release-plugin/-/gradle-semantic-release-plugin-1.10.1.tgz",
+      "integrity": "sha512-Q4dLAFICjPouUyRRHEKK8cXNB75nraXoioYZDZlVQOg4sYKudnTDZ3ohLmV3k4cPGiiMCh1ckXETkx9JnuyKmA==",
      "dev": true,
      "funding": [
        {
@@ -2925,16 +2952,16 @@
      }
    },
    "node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.0.0.tgz",
+      "integrity": "sha512-4nw3vOVR+vHUOT8+U4giwe2tcGv+R3pwwRidUe67DoMBTjhrfr6rZYJVVwdkBE+Um050SG+X9tf0Jo4fOpn01w==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
        "lru-cache": "^10.0.1"
      },
      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
      }
    },
    "node_modules/http-proxy-agent": {
@@ -2976,9 +3003,9 @@
      }
    },
    "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3191,9 +3218,9 @@
      }
    },
    "node_modules/is-unicode-supported": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz",
-      "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
+      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3497,9 +3524,9 @@
      }
    },
    "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3547,9 +3574,9 @@
      }
    },
    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
      "dev": true,
      "license": "MIT"
    },
@@ -3610,6 +3637,19 @@
        "node": "^16.14.0 || >=18.0.0"
      }
    },
+    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
    "node_modules/normalize-url": {
      "version": "8.0.1",
      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
@@ -3624,9 +3664,9 @@
      }
    },
    "node_modules/npm": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-10.8.2.tgz",
-      "integrity": "sha512-x/AIjFIKRllrhcb48dqUNAAZl0ig9+qMuN91RpZo3Cb2+zuibfh+KISl6+kVVyktDz230JKc208UkQwwMqyB+w==",
+      "version": "10.8.3",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz",
+      "integrity": "sha512-0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg==",
      "bundleDependencies": [
        "@isaacs/string-locale-compare",
        "@npmcli/arborist",
@@ -3719,13 +3759,13 @@
        "@sigstore/tuf": "^2.3.4",
        "abbrev": "^2.0.0",
        "archy": "~1.0.0",
-        "cacache": "^18.0.3",
+        "cacache": "^18.0.4",
        "chalk": "^5.3.0",
        "ci-info": "^4.0.0",
        "cli-columns": "^4.0.0",
        "fastest-levenshtein": "^1.0.16",
        "fs-minipass": "^3.0.3",
-        "glob": "^10.4.2",
+        "glob": "^10.4.5",
        "graceful-fs": "^4.2.11",
        "hosted-git-info": "^7.0.2",
        "ini": "^4.1.3",
@@ -3734,7 +3774,7 @@
        "json-parse-even-better-errors": "^3.0.2",
        "libnpmaccess": "^8.0.6",
        "libnpmdiff": "^6.1.4",
-        "libnpmexec": "^8.1.3",
+        "libnpmexec": "^8.1.4",
        "libnpmfund": "^5.0.12",
        "libnpmhook": "^10.0.5",
        "libnpmorg": "^6.0.6",
@@ -3748,12 +3788,12 @@
        "minipass": "^7.1.1",
        "minipass-pipeline": "^1.2.4",
        "ms": "^2.1.2",
-        "node-gyp": "^10.1.0",
+        "node-gyp": "^10.2.0",
        "nopt": "^7.2.1",
        "normalize-package-data": "^6.0.2",
        "npm-audit-report": "^5.0.0",
        "npm-install-checks": "^6.3.0",
-        "npm-package-arg": "^11.0.2",
+        "npm-package-arg": "^11.0.3",
        "npm-pick-manifest": "^9.1.0",
        "npm-profile": "^10.0.0",
        "npm-registry-fetch": "^17.1.0",
@@ -3764,7 +3804,7 @@
        "proc-log": "^4.2.0",
        "qrcode-terminal": "^0.12.0",
        "read": "^3.0.1",
-        "semver": "^7.6.2",
+        "semver": "^7.6.3",
        "spdx-expression-parse": "^4.0.0",
        "ssri": "^10.0.6",
        "supports-color": "^9.4.0",
@@ -4335,7 +4375,7 @@
      }
    },
    "node_modules/npm/node_modules/cacache": {
-      "version": "18.0.3",
+      "version": "18.0.4",
      "dev": true,
      "inBundle": true,
      "license": "ISC",
@@ -4502,7 +4542,7 @@
      }
    },
    "node_modules/npm/node_modules/debug": {
-      "version": "4.3.5",
+      "version": "4.3.6",
      "dev": true,
      "inBundle": true,
      "license": "MIT",
@@ -4586,7 +4626,7 @@
      }
    },
    "node_modules/npm/node_modules/foreground-child": {
-      "version": "3.2.1",
+      "version": "3.3.0",
      "dev": true,
      "inBundle": true,
      "license": "ISC",
@@ -4614,7 +4654,7 @@
      }
    },
    "node_modules/npm/node_modules/glob": {
-      "version": "10.4.2",
+      "version": "10.4.5",
      "dev": true,
      "inBundle": true,
      "license": "ISC",
@@ -4629,9 +4669,6 @@
      "bin": {
        "glob": "dist/esm/bin.mjs"
      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      }
@@ -4815,16 +4852,13 @@
      "license": "ISC"
    },
    "node_modules/npm/node_modules/jackspeak": {
-      "version": "3.4.0",
+      "version": "3.4.3",
      "dev": true,
      "inBundle": true,
      "license": "BlueOak-1.0.0",
      "dependencies": {
        "@isaacs/cliui": "^8.0.2"
      },
-      "engines": {
-        "node": ">=14"
-      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      },
@@ -4910,7 +4944,7 @@
      }
    },
    "node_modules/npm/node_modules/libnpmexec": {
-      "version": "8.1.3",
+      "version": "8.1.4",
      "dev": true,
      "inBundle": true,
      "license": "ISC",
@@ -5044,13 +5078,10 @@
      }
    },
    "node_modules/npm/node_modules/lru-cache": {
-      "version": "10.2.2",
+      "version": "10.4.3",
      "dev": true,
      "inBundle": true,
-      "license": "ISC",
-      "engines": {
-        "node": "14 || >=16.14"
-      }
+      "license": "ISC"
    },
    "node_modules/npm/node_modules/make-fetch-happen": {
      "version": "13.0.1",
@@ -5262,7 +5293,7 @@
      }
    },
    "node_modules/npm/node_modules/node-gyp": {
-      "version": "10.1.0",
+      "version": "10.2.0",
      "dev": true,
      "inBundle": true,
      "license": "MIT",
@@ -5273,9 +5304,9 @@
        "graceful-fs": "^4.2.6",
        "make-fetch-happen": "^13.0.0",
        "nopt": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "proc-log": "^4.1.0",
        "semver": "^7.3.5",
-        "tar": "^6.1.2",
+        "tar": "^6.2.1",
        "which": "^4.0.0"
      },
      "bin": {
@@ -5285,15 +5316,6 @@
        "node": "^16.14.0 || >=18.0.0"
      }
    },
-    "node_modules/npm/node_modules/node-gyp/node_modules/proc-log": {
-      "version": "3.0.0",
-      "dev": true,
-      "inBundle": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
    "node_modules/npm/node_modules/nopt": {
      "version": "7.2.1",
      "dev": true,
@@ -5366,7 +5388,7 @@
      }
    },
    "node_modules/npm/node_modules/npm-package-arg": {
-      "version": "11.0.2",
+      "version": "11.0.3",
      "dev": true,
      "inBundle": true,
      "license": "ISC",
@@ -5540,7 +5562,7 @@
      }
    },
    "node_modules/npm/node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
+      "version": "6.1.2",
      "dev": true,
      "inBundle": true,
      "license": "MIT",
@@ -5678,7 +5700,7 @@
      "optional": true
    },
    "node_modules/npm/node_modules/semver": {
-      "version": "7.6.2",
+      "version": "7.6.3",
      "dev": true,
      "inBundle": true,
      "license": "ISC",
@@ -6437,9 +6459,9 @@
      }
    },
    "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
      "dev": true,
      "license": "ISC"
    },
@@ -6481,9 +6503,9 @@
      }
    },
    "node_modules/pretty-ms": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
-      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz",
+      "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -6738,15 +6760,15 @@
      "license": "MIT"
    },
    "node_modules/semantic-release": {
-      "version": "24.0.0",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-24.0.0.tgz",
-      "integrity": "sha512-v46CRPw+9eI3ZuYGF2oAjqPqsfbnfFTwLBgQsv/lch4goD09ytwOTESMN4QIrx/wPLxUGey60/NMx+ANQtWRsA==",
+      "version": "24.1.2",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-24.1.2.tgz",
+      "integrity": "sha512-hvEJ7yI97pzJuLsDZCYzJgmRxF8kiEJvNZhf0oiZQcexw+Ycjy4wbdsn/sVMURgNCu8rwbAXJdBRyIxM4pe32g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@semantic-release/commit-analyzer": "^13.0.0-beta.1",
        "@semantic-release/error": "^4.0.0",
-        "@semantic-release/github": "^10.0.0",
+        "@semantic-release/github": "^11.0.0",
        "@semantic-release/npm": "^12.0.0",
        "@semantic-release/release-notes-generator": "^14.0.0-beta.1",
        "aggregate-error": "^5.0.0",
@@ -6759,7 +6781,7 @@
        "get-stream": "^6.0.0",
        "git-log-parser": "^1.2.0",
        "hook-std": "^3.0.0",
-        "hosted-git-info": "^7.0.0",
+        "hosted-git-info": "^8.0.0",
        "import-from-esm": "^1.3.1",
        "lodash-es": "^4.17.21",
        "marked": "^12.0.0",
@@ -6851,9 +6873,9 @@
      }
    },
    "node_modules/semantic-release/node_modules/execa": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz",
-      "integrity": "sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz",
+      "integrity": "sha512-yKHlle2YGxZE842MERVIplWwNH5VYmqqcPFgtnlU//K8gxuFFXu0pwd/CrfXTumFpeEiufsP7+opT/bPJa1yVw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -6861,10 +6883,10 @@
        "cross-spawn": "^7.0.3",
        "figures": "^6.1.0",
        "get-stream": "^9.0.0",
-        "human-signals": "^7.0.0",
+        "human-signals": "^8.0.0",
        "is-plain-obj": "^4.1.0",
        "is-stream": "^4.0.1",
-        "npm-run-path": "^5.2.0",
+        "npm-run-path": "^6.0.0",
        "pretty-ms": "^9.0.0",
        "signal-exit": "^4.1.0",
        "strip-final-newline": "^4.0.0",
@@ -6895,9 +6917,9 @@
      }
    },
    "node_modules/semantic-release/node_modules/human-signals": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-7.0.0.tgz",
-      "integrity": "sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
+      "integrity": "sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -6931,16 +6953,17 @@
      }
    },
    "node_modules/semantic-release/node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "path-key": "^4.0.0"
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
      },
      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
      },
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
@@ -6998,6 +7021,19 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/semantic-release/node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/semver": {
      "version": "7.6.3",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -7239,9 +7275,9 @@
      }
    },
    "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "version": "3.0.20",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
      "dev": true,
      "license": "CC0-1.0"
    },
@@ -7365,9 +7401,9 @@
      }
    },
    "node_modules/supports-hyperlinks": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
-      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
+      "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -7376,6 +7412,9 @@
      },
      "engines": {
        "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
    "node_modules/temp-dir": {
@@ -7530,9 +7569,9 @@
      }
    },
    "node_modules/type-fest": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.22.1.tgz",
-      "integrity": "sha512-9tHNEa0Ov81YOopiVkcCJVz5TM6AEQ+CHHjFIktqPnE3NV0AHIkx+gh9tiCl58m/66wWxkOC9eltpa75J4lQPA==",
+      "version": "4.26.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
+      "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
      "dev": true,
      "license": "(MIT OR CC0-1.0)",
      "engines": {
@@ -7543,9 +7582,9 @@
      }
    },
    "node_modules/uglify-js": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.0.tgz",
-      "integrity": "sha512-wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q==",
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
      "dev": true,
      "license": "BSD-2-Clause",
      "optional": true,
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
    "@saithodev/semantic-release-backmerge": "^4.0.1",
    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.9.2",
-    "semantic-release": "^24.0.0"
+    "gradle-semantic-release-plugin": "^1.10.1",
+    "semantic-release": "^24.1.2"
  }
 }
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/ProUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/ProUnlockPatch.kt
@@ -12,7 +12,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch(
    name = "Pro unlock",
-    compatiblePackages = [CompatiblePackage("com.backdrops.wallpapers", ["4.52"])]
+    compatiblePackages = [CompatiblePackage("com.backdrops.wallpapers")]
 )
@Suppress("unused")
 object ProUnlockPatch : BytecodePatch(
@@ -34,4 +34,4 @@ object ProUnlockPatch : BytecodePatch(

        } ?: throw ProUnlockFingerprint.exception
    }
-}
+}
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/HideSponsoredStoriesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/HideSponsoredStoriesPatch.kt
@@ -0,0 +1,96 @@
+package app.revanced.patches.facebook.ads.mainfeed
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.facebook.ads.mainfeed.fingerprints.BaseModelMapperFingerprint
+import app.revanced.patches.facebook.ads.mainfeed.fingerprints.GetSponsoredDataModelTemplateFingerprint
+import app.revanced.patches.facebook.ads.mainfeed.fingerprints.GetStoryVisibilityFingerprint
+import app.revanced.util.exception
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction31i
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
+
+@Patch(
+    name = "Hide 'Sponsored Stories'",
+    compatiblePackages = [CompatiblePackage("com.facebook.katana")],
+)
+@Suppress("unused")
+object HideSponsoredStoriesPatch : BytecodePatch(
+    setOf(GetStoryVisibilityFingerprint, GetSponsoredDataModelTemplateFingerprint, BaseModelMapperFingerprint),
+) {
+    private const val GRAPHQL_STORY_TYPE = "Lcom/facebook/graphql/model/GraphQLStory;"
+
+    override fun execute(context: BytecodeContext) {
+        GetStoryVisibilityFingerprint.result?.apply {
+            val sponsoredDataModelTemplateMethod = GetSponsoredDataModelTemplateFingerprint.resultOrThrow().method
+            val baseModelMapperMethod = BaseModelMapperFingerprint.resultOrThrow().method
+            val baseModelWithTreeType = baseModelMapperMethod.returnType
+
+            // The "SponsoredDataModelTemplate" methods has the ids in its body to extract sponsored data
+            // from GraphQL models, but targets the wrong derived type of "BaseModelWithTree". Since those ids
+            // could change in future version, we need to extract them and call the base implementation directly.
+            val getSponsoredDataHelperMethod = ImmutableMethod(
+                classDef.type,
+                "getSponsoredData",
+                listOf(ImmutableMethodParameter(GRAPHQL_STORY_TYPE, null, null)),
+                baseModelWithTreeType,
+                AccessFlags.PRIVATE or AccessFlags.STATIC,
+                null,
+                null,
+                MutableMethodImplementation(4),
+            ).toMutable().apply {
+                // Extract the ids of the original method. These ids seem to correspond to model types for
+                // GraphQL data structure. They are then fed to a method of BaseModelWithTree that populate
+                // and cast the requested GraphQL subtype. The Ids are found in the two first "CONST" instructions.
+                val constInstructions = sponsoredDataModelTemplateMethod.implementation!!.instructions
+                    .asSequence()
+                    .filterIsInstance<Instruction31i>()
+                    .take(2)
+                    .toList()
+
+                val storyTypeId = constInstructions[0].narrowLiteral
+                val sponsoredDataTypeId = constInstructions[1].narrowLiteral
+
+                addInstructions(
+                    """ 
+                        const-class v2, $baseModelWithTreeType
+                        const v1, $storyTypeId
+                        const v0, $sponsoredDataTypeId
+                        invoke-virtual {p0, v2, v1, v0}, $baseModelMapperMethod
+                        move-result-object v0
+                        check-cast v0, $baseModelWithTreeType
+                        return-object v0
+                    """,
+                )
+            }
+
+            mutableClass.methods.add(getSponsoredDataHelperMethod)
+
+            // Check if the parameter type is GraphQLStory and if sponsoredDataModelGetter returns a non-null value.
+            // If so, hide the story by setting the visibility to StoryVisibility.GONE.
+            mutableMethod.addInstructionsWithLabels(
+                scanResult.patternScanResult!!.startIndex,
+                """
+                    instance-of v0, p0, $GRAPHQL_STORY_TYPE
+                    if-eqz v0, :resume_normal
+                    invoke-static {p0}, $getSponsoredDataHelperMethod
+                    move-result-object v0 
+                    if-eqz v0, :resume_normal
+                    const-string v0, "GONE"
+                    return-object v0
+                    :resume_normal
+                    nop
+                """,
+            )
+        } ?: throw GetStoryVisibilityFingerprint.exception
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/fingerprints/BaseModelMapperFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/fingerprints/BaseModelMapperFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.facebook.ads.mainfeed.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object BaseModelMapperFingerprint : MethodFingerprint(
+
+    accessFlags = (AccessFlags.PUBLIC or AccessFlags.FINAL),
+    parameters = listOf("Ljava/lang/Class","I","I"),
+    returnType = "Lcom/facebook/graphql/modelutil/BaseModelWithTree;",
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IF_EQ
+    )
+
+)
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/fingerprints/GetSponsoredDataModelTemplateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/fingerprints/GetSponsoredDataModelTemplateFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.facebook.ads.mainfeed.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object GetSponsoredDataModelTemplateFingerprint : MethodFingerprint(
+
+    accessFlags = (AccessFlags.PUBLIC or AccessFlags.FINAL),
+    parameters = listOf(),
+    returnType = "L",
+    opcodes = listOf(
+        Opcode.CONST,
+        Opcode.CONST,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.RETURN_OBJECT
+    ),
+    customFingerprint = { methodDef, classDef ->
+        classDef.type == "Lcom/facebook/graphql/model/GraphQLFBMultiAdsFeedUnit;"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/fingerprints/GetStoryVisibilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/fingerprints/GetStoryVisibilityFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.facebook.ads.mainfeed.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Annotation
+import com.android.tools.smali.dexlib2.iface.value.StringEncodedValue
+
+internal object GetStoryVisibilityFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/String;",
+    accessFlags = (AccessFlags.PUBLIC or AccessFlags.STATIC),
+    opcodes = listOf(
+        Opcode.INSTANCE_OF,
+        Opcode.IF_NEZ,
+        Opcode.INSTANCE_OF,
+        Opcode.IF_NEZ,
+        Opcode.INSTANCE_OF,
+        Opcode.IF_NEZ,
+        Opcode.CONST
+    ),
+    strings = listOf("This should not be called for base class object"),
+)
--- a/src/main/kotlin/app/revanced/patches/googlephotos/preferences/RestoreHiddenBackUpWhileChargingTogglePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/googlephotos/preferences/RestoreHiddenBackUpWhileChargingTogglePatch.kt
@@ -0,0 +1,33 @@
+package app.revanced.patches.googlephotos.preferences
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.googlephotos.preferences.fingerprints.BackupPreferencesFingerprint
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch(
+    name = "Restore hidden 'Back up while charging' toggle",
+    description = "Restores a hidden toggle to only run backups when the device is charging.",
+    compatiblePackages = [CompatiblePackage("com.google.android.apps.photos")],
+)
+@Suppress("unused")
+object RestoreHiddenBackUpWhileChargingTogglePatch : BytecodePatch(
+    setOf(BackupPreferencesFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        // Patches 'backup_prefs_had_backup_only_when_charging_enabled' to always be true.
+        BackupPreferencesFingerprint.result?.let {
+            val chargingPrefStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
+            it.mutableMethod.apply {
+                // Get the register of move-result.
+                val resultRegister = getInstruction<OneRegisterInstruction>(chargingPrefStringIndex + 2).registerA
+                // Insert const after move-result to override register as true.
+                addInstruction(chargingPrefStringIndex + 3, "const/4 v$resultRegister, 0x1")
+            }
+        } ?: throw Exception("BackupPreferencesFingerprint result not found")
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/googlephotos/preferences/fingerprints/BackupPreferencesFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/googlephotos/preferences/fingerprints/BackupPreferencesFingerprint.kt
@@ -0,0 +1,10 @@
+package app.revanced.patches.googlephotos.preferences.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object BackupPreferencesFingerprint : MethodFingerprint(
+    returnType = "Lcom/google/android/apps/photos/backup/data/BackupPreferences;",
+    strings = listOf(
+        "backup_prefs_had_backup_only_when_charging_enabled",
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/video/FixVideoDownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/video/FixVideoDownloadsPatch.kt
@@ -0,0 +1,62 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.video
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.customclients.syncforreddit.fix.video.fingerprints.ParseRedditVideoNetworkResponseFingerprint
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+
+@Patch(
+    name = "Fix video downloads",
+    description = "Fixes a bug in Sync's MPD parser resulting in only the audio-track being saved.",
+    compatiblePackages = [
+        CompatiblePackage("com.laurencedawson.reddit_sync"),
+        CompatiblePackage("com.laurencedawson.reddit_sync.pro"),
+        CompatiblePackage("com.laurencedawson.reddit_sync.dev"),
+    ],
+    requiresIntegrations = true,
+)
+@Suppress("unused")
+object FixVideoDownloadsPatch : BytecodePatch(
+    fingerprints = setOf(ParseRedditVideoNetworkResponseFingerprint),
+) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/syncforreddit/FixRedditVideoDownloadPatch;"
+    private const val GET_LINKS_METHOD = "getLinks([B)[Ljava/lang/String;"
+
+    override fun execute(context: BytecodeContext) {
+        ParseRedditVideoNetworkResponseFingerprint.resultOrThrow().let {
+            val scanResult = it.scanResult.patternScanResult!!
+            val newInstanceIndex = scanResult.startIndex
+            val invokeDirectIndex = scanResult.endIndex - 1
+
+            val buildResponseInstruction = it.mutableMethod.getInstruction<Instruction35c>(invokeDirectIndex)
+
+            it.mutableMethod.addInstructions(
+                newInstanceIndex + 1,
+                """
+                    # Get byte array from response.
+                    iget-object v2, p1, Lcom/android/volley/NetworkResponse;->data:[B
+                        
+                    # Parse the videoUrl and audioUrl from the byte array.
+                    invoke-static { v2 }, $INTEGRATIONS_CLASS_DESCRIPTOR->$GET_LINKS_METHOD
+                    move-result-object v2
+            
+                    # Get videoUrl (Index 0).
+                    const/4 v5, 0x0
+                    aget-object v${buildResponseInstruction.registerE}, v2, v5
+            
+                    # Get audioUrl (Index 1).
+                    const/4 v6, 0x1
+                    aget-object v${buildResponseInstruction.registerF}, v2, v6
+    
+                    # Register E and F are used to build the response.
+                """,
+            )
+        }
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/video/fingerprints/ParseRedditVideoNetworkResponseFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/video/fingerprints/ParseRedditVideoNetworkResponseFingerprint.kt
@@ -0,0 +1,16 @@
+package app.revanced.patches.reddit.customclients.syncforreddit.fix.video.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object ParseRedditVideoNetworkResponseFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.NEW_INSTANCE,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_DIRECT,
+        Opcode.CONST_WIDE_32
+    ),
+    customFingerprint = { methodDef, classDef ->
+        classDef.sourceFile == "RedditVideoRequest.java" && methodDef.name == "parseNetworkResponse"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/soundcloud/ad/fingerprints/InterceptFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/soundcloud/ad/fingerprints/InterceptFingerprint.kt
@@ -14,8 +14,4 @@ internal object InterceptFingerprint : MethodFingerprint(
        Opcode.MOVE_RESULT_OBJECT
    ),
    strings = listOf("SC-Mob-UserPlan", "Configuration"),
-    customFingerprint = { _, classDef ->
-        classDef.sourceFile == "ApiUserPlanInterceptor.java" ||
-        classDef.sourceFile == "ApiUserPlanInterceptor.kt"
-    },
 )
--- a/src/main/kotlin/app/revanced/patches/soundcloud/ad/fingerprints/UserConsumerPlanConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/soundcloud/ad/fingerprints/UserConsumerPlanConstructorFingerprint.kt
@@ -8,7 +8,4 @@ internal object UserConsumerPlanConstructorFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    parameters = listOf("Ljava/lang/String;", "Z", "Ljava/lang/String;", "Ljava/util/List;", "Ljava/lang/String;", "Ljava/lang/String;"),
-    customFingerprint = { _, classDef ->
-        classDef.sourceFile == "UserConsumerPlan.kt"
-    },
 )
--- a/src/main/kotlin/app/revanced/patches/soundcloud/analytics/fingerprints/CreateTrackingApiFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/soundcloud/analytics/fingerprints/CreateTrackingApiFingerprint.kt
@@ -7,6 +7,7 @@ internal object CreateTrackingApiFingerprint : MethodFingerprint(
    returnType = "L",
    accessFlags = AccessFlags.PUBLIC.value,
    customFingerprint = { methodDef, classDef ->
-        classDef.sourceFile == "DefaultTrackingApiFactory.kt" && methodDef.name == "create"
+        methodDef.name == "create"
    },
+    strings = listOf("backend", "boogaloo")
 )
--- a/src/main/kotlin/app/revanced/patches/soundcloud/offlinesync/fingerprints/DownloadOperationsHeaderVerificationFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/soundcloud/offlinesync/fingerprints/DownloadOperationsHeaderVerificationFingerprint.kt
@@ -15,7 +15,5 @@ internal object DownloadOperationsHeaderVerificationFingerprint : MethodFingerpr
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.CONST_STRING
    ),
-    customFingerprint = { _, classDef ->
-        classDef.sourceFile == "DownloadOperations.kt"
-    }
+    strings = listOf("X-SC-Mime-Type", "X-SC-Preset", "X-SC-Quality")
 )
--- a/src/main/kotlin/app/revanced/patches/soundcloud/offlinesync/fingerprints/DownloadOperationsURLBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/soundcloud/offlinesync/fingerprints/DownloadOperationsURLBuilderFingerprint.kt
@@ -14,7 +14,4 @@ internal object DownloadOperationsURLBuilderFingerprint : MethodFingerprint(
        Opcode.SGET_OBJECT,
        Opcode.FILLED_NEW_ARRAY
    ),
-    customFingerprint = { _, classDef ->
-        classDef.sourceFile == "DownloadOperations.kt"
-    }
 )
--- a/src/main/kotlin/app/revanced/patches/soundcloud/shared/fingerprints/FeatureConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/soundcloud/shared/fingerprints/FeatureConstructorFingerprint.kt
@@ -3,12 +3,16 @@ package app.revanced.patches.soundcloud.shared.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+

 internal object FeatureConstructorFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    parameters = listOf("Ljava/lang/String;", "Z", "Ljava/util/List;"),
-    customFingerprint = { _, classDef ->
-        classDef.sourceFile == "Feature.kt"
-    },
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_VIRTUAL
+    )
 )
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/RememberClearDisplayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/RememberClearDisplayPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.patches.tiktok.shared.fingerprints.OnRenderFirstFrameFingerp
 import app.revanced.util.exception
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction

@Patch(
    name = "Remember clear display",
@@ -34,8 +34,8 @@ object RememberClearDisplayPatch : BytecodePatch(
        OnClearDisplayEventFingerprint.result?.mutableMethod?.let {
            // region Hook the "Clear display" configuration save event to remember the state of clear display.

-            val isEnabledIndex = it.indexOfFirstInstructionOrThrow { opcode == Opcode.IGET_BOOLEAN } + 1
-            val isEnabledRegister = it.getInstruction<Instruction22c>(isEnabledIndex - 1).registerA
+            val isEnabledIndex = it.indexOfFirstInstructionOrThrow(Opcode.IGET_BOOLEAN) + 1
+            val isEnabledRegister = it.getInstruction<TwoRegisterInstruction>(isEnabledIndex - 1).registerA

            it.addInstructions(
                isEnabledIndex,
--- a/src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/BuildMediaOptionsSheetFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/BuildMediaOptionsSheetFingerprint.kt
@@ -10,5 +10,5 @@ internal object BuildMediaOptionsSheetFingerprint : MethodFingerprint(
        Opcode.GOTO_16,
        Opcode.NEW_INSTANCE,
    ),
-    strings = listOf("resources.getString(R.string.post_video)"),
+    strings = listOf("mediaEntity", "media_options_sheet"),
 )
--- a/src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/ShowDownloadVideoUpsellBottomSheetFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/interaction/downloads/fingerprints/ShowDownloadVideoUpsellBottomSheetFingerprint.kt
@@ -5,6 +5,6 @@ import com.android.tools.smali.dexlib2.Opcode

 internal object ShowDownloadVideoUpsellBottomSheetFingerprint : MethodFingerprint(
    returnType = "Z",
-    strings = listOf("variantToDownload.url"),
+    strings = listOf("mediaEntity", "url"),
    opcodes = listOf(Opcode.IF_EQZ)
 )
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt
@@ -0,0 +1,93 @@
+package app.revanced.patches.twitter.misc.links
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+import app.revanced.patches.twitter.misc.links.fingerprints.LinkBuilderFingerprint
+import app.revanced.patches.twitter.misc.links.fingerprints.LinkResourceGetterFingerprint
+import app.revanced.patches.twitter.misc.links.fingerprints.LinkSharingDomainFingerprint
+import app.revanced.util.exception
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+
+@Patch(
+    name = "Change link sharing domain",
+    description = "Replaces the domain name of Twitter links when sharing them.",
+    compatiblePackages = [CompatiblePackage("com.twitter.android")],
+)
+@Suppress("unused")
+object ChangeLinkSharingDomainPatch : BytecodePatch(
+    setOf(
+        LinkBuilderFingerprint,
+        LinkResourceGetterFingerprint,
+        LinkSharingDomainFingerprint,
+    ),
+) {
+    private var domainName by stringPatchOption(
+        key = "domainName",
+        default = "fxtwitter.com",
+        title = "Domain name",
+        description = "The domain name to use when sharing links.",
+        required = true,
+    )
+
+    // This method is used to build the link that is shared when the "Share via..." button is pressed.
+    private const val FORMAT_METHOD_RESOURCE_REFERENCE =
+        "Lapp/revanced/integrations/twitter/patches/links/ChangeLinkSharingDomainPatch;->" +
+            "formatResourceLink([Ljava/lang/Object;)Ljava/lang/String;"
+
+    // This method is used to build the link that is shared when the "Copy link" button is pressed.
+    private const val FORMAT_METHOD_REFERENCE =
+        "Lapp/revanced/integrations/twitter/patches/links/ChangeLinkSharingDomainPatch;->" +
+            "formatLink(JLjava/lang/String;)Ljava/lang/String;"
+
+    override fun execute(context: BytecodeContext) {
+        LinkSharingDomainFingerprint.result?.let {
+            val replacementIndex = it.scanResult.stringsScanResult!!.matches.first().index
+            val domainRegister = it.mutableMethod.getInstruction<OneRegisterInstruction>(replacementIndex).registerA
+            it.mutableMethod.replaceInstruction(
+                replacementIndex,
+                "const-string v$domainRegister, \"https://$domainName\"",
+            )
+        } ?: throw LinkSharingDomainFingerprint.exception
+
+        // Replace the domain name when copying a link with "Copy link" button.
+        LinkBuilderFingerprint.result?.let {
+            it.mutableMethod.apply {
+                addInstructions(
+                    0,
+                    """
+                        invoke-static { p0, p1, p2 }, $FORMAT_METHOD_REFERENCE
+                        move-result-object p0
+                        return-object p0
+                    """,
+                )
+            }
+        } ?: throw LinkBuilderFingerprint.exception
+
+        // Used in the Share via... dialog.
+        LinkResourceGetterFingerprint.result?.mutableMethod?.apply {
+            val constWithParameterName = indexOfFirstInstructionOrThrow {
+                getReference<StringReference>()?.string?.contains("id.toString()") == true
+            }
+
+            // Format the link with the new domain name register (2 instructions above the const-string).
+            val formatLinkCallIndex = constWithParameterName - 2
+            val formatLinkCall = getInstruction<Instruction35c>(formatLinkCallIndex)
+
+            // Replace the original method call with the new method call.
+            replaceInstruction(
+                formatLinkCallIndex,
+                "invoke-static { v${formatLinkCall.registerE} }, $FORMAT_METHOD_RESOURCE_REFERENCE",
+            )
+        } ?: throw LinkResourceGetterFingerprint.exception
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/LinkBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/LinkBuilderFingerprint.kt
@@ -0,0 +1,8 @@
+package app.revanced.patches.twitter.misc.links.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+// Returns a shareable link string based on a tweet ID and a username.
+internal object LinkBuilderFingerprint : MethodFingerprint(
+    strings = listOf("/%1\$s/status/%2\$d"),
+)
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/LinkResourceGetterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/LinkResourceGetterFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.twitter.misc.links.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+// Gets Resource string for share link view available by pressing "Share via" button.
+internal object LinkResourceGetterFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Landroid/content/res/Resources;"),
+    strings = listOf("res.getString(R.string.t…lUsername, id.toString())"),
+)
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/LinkSharingDomainFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/links/fingerprints/LinkSharingDomainFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.twitter.misc.links.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object LinkSharingDomainFingerprint : MethodFingerprint(
+    strings = listOf("https://fxtwitter.com"),
+)
--- a/src/main/kotlin/app/revanced/patches/willhaben/ads/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/willhaben/ads/HideAdsPatch.kt
@@ -0,0 +1,28 @@
+package app.revanced.patches.willhaben.ads
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.willhaben.ads.fingerprints.AdResolverFingerprint
+import app.revanced.patches.willhaben.ads.fingerprints.WHAdViewInjectorFingerprint
+import app.revanced.util.returnEarly
+
+@Patch(
+    name = "Hide ads",
+    description = "Hides all in-app ads.",
+    compatiblePackages = [CompatiblePackage("at.willhaben")]
+)
+@Suppress("unused")
+object HideAdsPatch : BytecodePatch(
+    fingerprints = setOf(
+        AdResolverFingerprint,
+        WHAdViewInjectorFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext) {
+        arrayOf(AdResolverFingerprint, WHAdViewInjectorFingerprint).forEach {
+            it.returnEarly()
+        }
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/willhaben/ads/fingerprints/AdResolverFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/willhaben/ads/fingerprints/AdResolverFingerprint.kt
@@ -0,0 +1,17 @@
+package app.revanced.patches.willhaben.ads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object AdResolverFingerprint : MethodFingerprint(
+    "L",
+    parameters = listOf("L", "L"),
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf(
+        "Google Ad is invalid ",
+        "Google Native Ad is invalid ",
+        "Criteo Ad is invalid ",
+        "Amazon Ad is invalid "
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/willhaben/ads/fingerprints/WHAdViewInjectorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/willhaben/ads/fingerprints/WHAdViewInjectorFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.willhaben.ads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object WHAdViewInjectorFingerprint : MethodFingerprint(
+    "V",
+    parameters = listOf("L", "L", "L", "Z"),
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf("successfulAdView"),
+    customFingerprint = { _, classDef ->
+        classDef.type == "Lat/willhaben/advertising/WHAdView;"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -26,30 +26,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
@@ -20,30 +20,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -25,30 +25,11 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
@@ -19,24 +19,11 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.48.39",
+                "18.38.44",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
@@ -22,30 +22,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
@@ -25,24 +25,11 @@ import app.revanced.util.resultOrThrow
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.48.39",
+                "18.38.44",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
@@ -1,18 +1,20 @@
 package app.revanced.patches.youtube.interaction.seekbar

 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.interaction.seekbar.fingerprints.IsSwipingUpFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.AllowSwipingUpGestureFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.ShowSwipingUpGuideFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SwipingUpGestureParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.exception
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import app.revanced.util.alsoResolve

@Patch(
    name = "Disable precise seeking gesture",
@@ -22,41 +24,21 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
 )
@Suppress("unused")
 object DisablePreciseSeekingGesturePatch : BytecodePatch(
-    setOf(IsSwipingUpFingerprint)
+    setOf(SwipingUpGestureParentFingerprint)
 ) {
-    private const val INTEGRATIONS_METHOD_DESCRIPTOR =
-        "Lapp/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch;->" +
-                "disableGesture(Landroid/view/VelocityTracker;Landroid/view/MotionEvent;)V"
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch;"

    override fun execute(context: BytecodeContext) {
        AddResourcesPatch(this::class)
@@ -65,19 +47,37 @@ object DisablePreciseSeekingGesturePatch : BytecodePatch(
            SwitchPreference("revanced_disable_precise_seeking_gesture")
        )

-        IsSwipingUpFingerprint.result?.let {
-            val addMovementIndex = it.scanResult.patternScanResult!!.startIndex - 1
+        AllowSwipingUpGestureFingerprint.alsoResolve(
+            context,
+            SwipingUpGestureParentFingerprint
+        ).mutableMethod.apply {
+            addInstructionsWithLabels(
+                0,
+                """
+                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isGestureDisabled()Z
+                    move-result v0
+                    if-eqz v0, :disabled
+                    return-void
+                """,
+                ExternalLabel("disabled", getInstruction(0))
+            )
+        }

-            it.mutableMethod.apply {
-                val addMovementInstruction = getInstruction<FiveRegisterInstruction>(addMovementIndex)
-                val trackerRegister = addMovementInstruction.registerC
-                val eventRegister = addMovementInstruction.registerD
-
-                replaceInstruction(
-                    addMovementIndex,
-                    "invoke-static {v$trackerRegister, v$eventRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR"
-                )
-            }
-        } ?: throw IsSwipingUpFingerprint.exception
+        ShowSwipingUpGuideFingerprint.alsoResolve(
+            context,
+            SwipingUpGestureParentFingerprint
+        ).mutableMethod.apply {
+            addInstructionsWithLabels(
+                0,
+                """
+                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isGestureDisabled()Z
+                    move-result v0
+                    if-eqz v0, :disabled
+                    const/4 v0, 0x0
+                    return v0
+                """,
+                ExternalLabel("disabled", getInstruction(0))
+            )
+        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -27,27 +27,11 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
+                // 18.38.44 patches but crashes on startup.
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
@@ -4,46 +4,37 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.interaction.seekbar.fingerprints.DoubleSpeedSeekNoticeFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.DisableFastForwardLegacyFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.DisableFastForwardGestureFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.DisableFastForwardNoticeFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SlideToSeekFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playservice.VersionCheckPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.exception
+import app.revanced.util.getReference
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@Patch(
    name = "Enable slide to seek",
-    description = "Adds an option to enable slide to seek instead of playing at 2x speed when pressing and holding in the video player. Including this patch may cause issues with tapping or double tapping the video player overlay.",
+    description = "Adds an option to enable slide to seek instead of playing at 2x speed when pressing and holding in the video player. Including this patch may cause issues with the video player overlay, such as missing buttons and ignored taps and double taps.",
    dependencies = [IntegrationsPatch::class, SettingsPatch::class, AddResourcesPatch::class],
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
+                "18.38.44",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ],
@@ -53,10 +44,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 object EnableSlideToSeekPatch : BytecodePatch(
    setOf(
        SlideToSeekFingerprint,
-        DoubleSpeedSeekNoticeFingerprint
+        DisableFastForwardLegacyFingerprint,
+        DisableFastForwardGestureFingerprint,
+        DisableFastForwardNoticeFingerprint
    )
 ) {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/youtube/patches/SlideToSeekPatch;"
+    private const val INTEGRATIONS_METHOD_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/SlideToSeekPatch;->isSlideToSeekDisabled(Z)Z"

    override fun execute(context: BytecodeContext) {
        AddResourcesPatch(this::class)
@@ -65,27 +59,74 @@ object EnableSlideToSeekPatch : BytecodePatch(
            SwitchPreference("revanced_slide_to_seek")
        )

-        arrayOf(
-            // Restore the behaviour to slide to seek.
-            SlideToSeekFingerprint,
-            // Disable the double speed seek notice.
-            DoubleSpeedSeekNoticeFingerprint
-        ).map {
-            it.result ?: throw it.exception
-        }.forEach {
-            val insertIndex = it.scanResult.patternScanResult!!.endIndex + 1
+        var modifiedMethods = false

-            it.mutableMethod.apply {
-                val isEnabledRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+        // Restore the behaviour to slide to seek.
+        SlideToSeekFingerprint.resultOrThrow().let {
+            val checkIndex = it.scanResult.patternScanResult!!.startIndex
+            val checkReference = it.mutableMethod
+                .getInstruction(checkIndex).getReference<MethodReference>()!!

-                addInstructions(
-                    insertIndex,
-                    """
-                        invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isSlideToSeekDisabled()Z
-                        move-result v$isEnabledRegister
-                    """
-                )
+            // A/B check method was only called on this class.
+            it.mutableClass.methods.forEach { method ->
+                method.implementation!!.instructions.forEachIndexed { index, instruction ->
+                    if (instruction.opcode == Opcode.INVOKE_VIRTUAL &&
+                        instruction.getReference<MethodReference>() == checkReference
+                    ) {
+                        method.apply {
+                            val targetRegister = getInstruction<OneRegisterInstruction>(index + 1).registerA
+
+                            addInstructions(
+                                index + 2,
+                                """
+                                    invoke-static { v$targetRegister }, $INTEGRATIONS_METHOD_DESCRIPTOR
+                                    move-result v$targetRegister
+                               """
+                            )
+                        }
+
+                        modifiedMethods = true
+                    }
+                }
            }
        }
+
+        if (!modifiedMethods) throw PatchException("Could not find methods to modify")
+
+        // Disable the double speed seek gesture.
+        if (!VersionCheckPatch.is_19_17_or_greater) {
+            DisableFastForwardLegacyFingerprint.resultOrThrow().let {
+                it.mutableMethod.apply {
+                    val insertIndex = it.scanResult.patternScanResult!!.endIndex + 1
+                    val targetRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+
+                    addInstructions(
+                        insertIndex,
+                        """
+                            invoke-static { v$targetRegister }, $INTEGRATIONS_METHOD_DESCRIPTOR
+                            move-result v$targetRegister
+                        """
+                    )
+                }
+            }
+        } else {
+            arrayOf(
+                DisableFastForwardGestureFingerprint,
+                DisableFastForwardNoticeFingerprint
+            ).forEach { it.resultOrThrow().let {
+                it.mutableMethod.apply {
+                    val targetIndex = it.scanResult.patternScanResult!!.endIndex
+                    val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+
+                    addInstructions(
+                        targetIndex + 1,
+                        """
+                            invoke-static { v$targetRegister }, $INTEGRATIONS_METHOD_DESCRIPTOR
+                            move-result v$targetRegister
+                        """
+                    )
+                }
+            }}
+        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/AllowSwipingUpGestureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/AllowSwipingUpGestureFingerprint.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+/**
+ * Resolves using the class found in [SwipingUpGestureParentFingerprint].
+ */
+internal object AllowSwipingUpGestureFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("L"),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DisableFastForwardGestureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DisableFastForwardGestureFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object DisableFastForwardGestureFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "Z",
+    parameters = emptyList(),
+    opcodes = listOf(
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT
+    ),
+    customFingerprint = { methodDef, classDef ->
+        methodDef.implementation!!.instructions.count() > 30 &&
+                classDef.type.endsWith("/NextGenWatchLayout;")
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DisableFastForwardLegacyFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DisableFastForwardLegacyFingerprint.kt
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.interaction.seekbar.fingerprints
 import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-internal object DoubleSpeedSeekNoticeFingerprint : LiteralValueFingerprint(
+internal object DisableFastForwardLegacyFingerprint : LiteralValueFingerprint(
    returnType = "Z",
    parameters = emptyList(),
    opcodes = listOf(Opcode.MOVE_RESULT),
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DisableFastForwardNoticeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DisableFastForwardNoticeFingerprint.kt
@@ -0,0 +1,19 @@
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object DisableFastForwardNoticeFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = emptyList(),
+    opcodes = listOf(
+        Opcode.CHECK_CAST,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT
+    ),
+    strings = listOf("Failed to easy seek haptics vibrate")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/IsSwipingUpFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/IsSwipingUpFingerprint.kt
@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.interaction.seekbar.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object IsSwipingUpFingerprint : MethodFingerprint(
-    returnType = "Z",
-    parameters = listOf("Landroid/view/MotionEvent;", "J"),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt
@@ -2,10 +2,9 @@ package app.revanced.patches.youtube.interaction.seekbar.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.containsWideLiteralInstructionValue
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
-

 internal object SeekbarTappingFingerprint : MethodFingerprint(
    returnType = "Z",
@@ -21,14 +20,6 @@ internal object SeekbarTappingFingerprint : MethodFingerprint(
    customFingerprint = custom@{ methodDef, _ ->
        if (methodDef.name != "onTouchEvent") return@custom false

-        methodDef.implementation!!.instructions.any { instruction ->
-            if (instruction.opcode != Opcode.CONST) return@any false
-
-            val literal = (instruction as NarrowLiteralInstruction).narrowLiteral
-
-            // onTouchEvent method contains a CONST instruction
-            // with this literal making it unique with the rest of the properties of this fingerprint.
-            literal == Integer.MAX_VALUE
-        }
+        methodDef.containsWideLiteralInstructionValue(Integer.MAX_VALUE.toLong())
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/ShowSwipingUpGuideFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/ShowSwipingUpGuideFingerprint.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
+
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+/**
+ * Resolves using the class found in [SwipingUpGestureParentFingerprint].
+ */
+internal object ShowSwipingUpGuideFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.FINAL.value,
+    returnType = "Z",
+    parameters = emptyList(),
+    literalSupplier = { 1L }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SlideToSeekFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SlideToSeekFingerprint.kt
@@ -1,11 +1,19 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints

+import app.revanced.patcher.extensions.or
 import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

 internal object SlideToSeekFingerprint : LiteralValueFingerprint(
-    returnType = "Z",
-    parameters = emptyList(),
-    opcodes = listOf(Opcode.MOVE_RESULT),
-    literalSupplier = { 45411329 }
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("Landroid/view/View;", "F"),
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.GOTO_16
+    ),
+    literalSupplier = { 67108864 }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SwipingUpGestureParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SwipingUpGestureParentFingerprint.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
+
+import app.revanced.util.patch.LiteralValueFingerprint
+
+internal object SwipingUpGestureParentFingerprint : LiteralValueFingerprint(
+    returnType = "Z",
+    parameters = listOf(),
+    literalSupplier = { 45379021 }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
@@ -26,30 +26,11 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -24,30 +24,11 @@ import app.revanced.util.exception
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -23,30 +23,11 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
@@ -34,30 +34,11 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
@@ -24,30 +24,11 @@ import com.android.tools.smali.dexlib2.Opcode
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -37,30 +37,11 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
@@ -1,20 +1,23 @@
 package app.revanced.patches.youtube.layout.buttons.player.hide

 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.layout.buttons.player.hide.HidePlayerButtonsPatch.ParameterOffsets.HAS_NEXT
-import app.revanced.patches.youtube.layout.buttons.player.hide.HidePlayerButtonsPatch.ParameterOffsets.HAS_PREVIOUS
-import app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints.PlayerControlsVisibilityModelFingerprint
+import app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints.PlayerControlsPreviousNextOverlayTouchFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.exception
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstWideLiteralInstructionValueOrThrow
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@Patch(
    name = "Hide player buttons",
@@ -22,43 +25,25 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
    dependencies = [
        IntegrationsPatch::class,
        SettingsPatch::class,
-        AddResourcesPatch::class
+        AddResourcesPatch::class,
+        HidePlayerButtonsResourcePatch::class,
    ],
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
 )
@Suppress("unused")
 object HidePlayerButtonsPatch : BytecodePatch(
-    setOf(PlayerControlsVisibilityModelFingerprint)
+    setOf(PlayerControlsPreviousNextOverlayTouchFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        AddResourcesPatch(this::class)
@@ -67,29 +52,23 @@ object HidePlayerButtonsPatch : BytecodePatch(
            SwitchPreference("revanced_hide_player_buttons")
        )

-        PlayerControlsVisibilityModelFingerprint.result?.apply {
-            val callIndex = scanResult.patternScanResult!!.endIndex
-            val callInstruction = mutableMethod.getInstruction<Instruction3rc>(callIndex)
-
-            // overriding this parameter register hides the previous and next buttons
-            val hasNextParameterRegister = callInstruction.startRegister + HAS_NEXT
-            val hasPreviousParameterRegister = callInstruction.startRegister + HAS_PREVIOUS
-
-            mutableMethod.addInstructions(
-                callIndex,
-                """
-                    invoke-static { v$hasNextParameterRegister }, Lapp/revanced/integrations/youtube/patches/HidePlayerButtonsPatch;->previousOrNextButtonIsVisible(Z)Z
-                    move-result v$hasNextParameterRegister
-                    
-                    invoke-static { v$hasPreviousParameterRegister }, Lapp/revanced/integrations/youtube/patches/HidePlayerButtonsPatch;->previousOrNextButtonIsVisible(Z)Z
-                    move-result v$hasPreviousParameterRegister
-                """
+        PlayerControlsPreviousNextOverlayTouchFingerprint.resultOrThrow().mutableMethod.apply {
+            val resourceIndex = indexOfFirstWideLiteralInstructionValueOrThrow(
+                HidePlayerButtonsResourcePatch.playerControlPreviousButtonTouchArea
            )
-        } ?: throw PlayerControlsVisibilityModelFingerprint.exception
-    }

-    private object ParameterOffsets {
-        const val HAS_NEXT = 5
-        const val HAS_PREVIOUS = 6
+            val insertIndex = indexOfFirstInstructionOrThrow(resourceIndex) {
+                opcode == Opcode.INVOKE_STATIC
+                        && getReference<MethodReference>()?.parameterTypes?.firstOrNull() == "Landroid/view/View;"
+            }
+
+            val viewRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerC
+
+            addInstruction(
+                insertIndex,
+                "invoke-static { v$viewRegister }, Lapp/revanced/integrations/youtube/patches/HidePlayerButtonsPatch;" +
+                        "->hidePreviousNextButtons(Landroid/view/View;)V"
+            )
+        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsResourcePatch.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.layout.buttons.player.hide
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+
+@Patch(dependencies = [ResourceMappingPatch::class])
+internal object HidePlayerButtonsResourcePatch : ResourcePatch() {
+    var playerControlPreviousButtonTouchArea = -1L
+    var playerControlNextButtonTouchArea = -1L
+
+    override fun execute(context: ResourceContext) {
+        playerControlPreviousButtonTouchArea = ResourceMappingPatch[
+            "id",
+            "player_control_previous_button_touch_area"
+        ]
+
+        playerControlNextButtonTouchArea = ResourceMappingPatch[
+            "id",
+            "player_control_next_button_touch_area"
+        ]
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsPreviousNextOverlayTouchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsPreviousNextOverlayTouchFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patches.youtube.layout.buttons.player.hide.HidePlayerButtonsResourcePatch
+import app.revanced.util.containsWideLiteralInstructionValue
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object PlayerControlsPreviousNextOverlayTouchFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    strings = listOf("1.0x"),
+    customFingerprint = { methodDef, _ ->
+        methodDef.containsWideLiteralInstructionValue(
+            HidePlayerButtonsResourcePatch.playerControlPreviousButtonTouchArea
+        ) && methodDef.containsWideLiteralInstructionValue(
+            HidePlayerButtonsResourcePatch.playerControlNextButtonTouchArea
+        )
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsVisibilityModelFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/fingerprints/PlayerControlsVisibilityModelFingerprint.kt
@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.buttons.player.hide.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object PlayerControlsVisibilityModelFingerprint : MethodFingerprint(
-    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE),
-    strings = listOf("Missing required properties:", "hasNext", "hasPrevious")
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
@@ -22,30 +22,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
@@ -22,30 +22,11 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
@@ -22,30 +22,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -25,30 +25,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
@@ -22,30 +22,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
@@ -18,30 +18,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
@@ -19,29 +19,11 @@ import app.revanced.util.exception
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -18,13 +18,19 @@ import app.revanced.patches.youtube.layout.hide.general.fingerprints.HideShowMor
 import app.revanced.patches.youtube.layout.hide.general.fingerprints.ParseElementFromBufferFingerprint
 import app.revanced.patches.youtube.layout.hide.general.fingerprints.PlayerOverlayFingerprint
 import app.revanced.patches.youtube.layout.hide.general.fingerprints.ShowWatermarkFingerprint
+import app.revanced.patches.youtube.layout.hide.general.fingerprints.YoodlesImageViewFingerprint
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.navigation.NavigationBarHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.util.findOpcodeIndicesReversed
+import app.revanced.util.getReference
+import app.revanced.util.alsoResolve
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@Patch(
    name = "Hide layout components",
@@ -40,37 +46,23 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
 )
@Suppress("unused")
 object HideLayoutComponentsPatch : BytecodePatch(
-    setOf(ParseElementFromBufferFingerprint, PlayerOverlayFingerprint, HideShowMoreButtonFingerprint),
+    setOf(
+        ParseElementFromBufferFingerprint,
+        PlayerOverlayFingerprint,
+        HideShowMoreButtonFingerprint,
+        YoodlesImageViewFingerprint,
+    ),
 ) {
    private const val LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR =
        "Lapp/revanced/integrations/youtube/patches/components/LayoutComponentsFilter;"
@@ -89,7 +81,6 @@ object HideLayoutComponentsPatch : BytecodePatch(
            SwitchPreference("revanced_hide_channel_guidelines"),
            SwitchPreference("revanced_hide_channel_member_shelf"),
            SwitchPreference("revanced_hide_channel_watermark"),
-            SwitchPreference("revanced_hide_chips_shelf"),
            SwitchPreference("revanced_hide_community_guidelines"),
            PreferenceScreen(
                key = "revanced_hide_description_components_screen",
@@ -129,6 +120,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
            SwitchPreference("revanced_hide_search_result_recommendations"),
            SwitchPreference("revanced_hide_search_result_shelf_header"),
            SwitchPreference("revanced_hide_show_more_button"),
+            SwitchPreference("revanced_hide_doodles"),
            PreferenceScreen(
                key = "revanced_hide_keyword_content_screen",
                sorting = Sorting.UNSORTED,
@@ -145,6 +137,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
        )

        SettingsPatch.PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            SwitchPreference("revanced_hide_chips_shelf"),
            SwitchPreference("revanced_hide_expandable_chip"),
            SwitchPreference("revanced_hide_gray_separator"),
            PreferenceScreen(
@@ -191,9 +184,10 @@ object HideLayoutComponentsPatch : BytecodePatch(

        // region Watermark (legacy code for old versions of YouTube)

-        ShowWatermarkFingerprint.also {
-            it.resolve(context, PlayerOverlayFingerprint.resultOrThrow().classDef)
-        }.resultOrThrow().mutableMethod.apply {
+        ShowWatermarkFingerprint.alsoResolve(
+            context,
+            PlayerOverlayFingerprint
+        ).mutableMethod.apply {
            val index = implementation!!.instructions.size - 5

            removeInstruction(index)
@@ -226,5 +220,28 @@ object HideLayoutComponentsPatch : BytecodePatch(
        }

        // endregion
+
+        // region 'Yoodles'
+
+        YoodlesImageViewFingerprint.resultOrThrow().mutableMethod.apply {
+            findOpcodeIndicesReversed{
+                opcode == Opcode.INVOKE_VIRTUAL
+                        && getReference<MethodReference>()?.name == "setImageDrawable"
+            }.forEach { insertIndex ->
+                val register = getInstruction<FiveRegisterInstruction>(insertIndex).registerD
+
+                addInstructionsWithLabels(
+                    insertIndex,
+                    """
+                        invoke-static { v$register }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideYoodles(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+                        move-result-object v$register
+                        if-eqz v$register, :hide
+                    """,
+                    ExternalLabel("hide", getInstruction(insertIndex + 1)),
+                )
+            }
+        }
+
+        // endregion
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsResourcePatch.kt
@@ -17,10 +17,17 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
 internal object HideLayoutComponentsResourcePatch : ResourcePatch() {
    internal var expandButtonDownId: Long = -1

+    var youTubeLogo = -1L
+
    override fun execute(context: ResourceContext) {
        expandButtonDownId = ResourceMappingPatch[
            "layout",
            "expand_button_down",
        ]
+
+        youTubeLogo = ResourceMappingPatch[
+            "id",
+            "youtube_logo"
+        ]
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/fingerprints/YoodlesImageViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/fingerprints/YoodlesImageViewFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.hide.general.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.layout.hide.general.HideLayoutComponentsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object YoodlesImageViewFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L", "L"),
+    returnType = "Landroid/view/View;",
+    literalSupplier = { HideLayoutComponentsResourcePatch.youTubeLogo }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -13,6 +13,7 @@ import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.Infocards
 import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.InfocardsMethodCallFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
+import app.revanced.util.alsoResolve
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -29,30 +30,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
@@ -68,9 +50,7 @@ object HideInfoCardsPatch : BytecodePatch(
        "Lapp/revanced/integrations/youtube/patches/components/HideInfoCardsFilterPatch;"

    override fun execute(context: BytecodeContext) {
-        InfocardsIncognitoFingerprint.also {
-            it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
-        }.result!!.mutableMethod.apply {
+        InfocardsIncognitoFingerprint.alsoResolve(context, InfocardsIncognitoParentFingerprint).mutableMethod.apply {
            val invokeInstructionIndex = implementation!!.instructions.indexOfFirst {
                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL.ordinal &&
                        ((it as ReferenceInstruction).reference.toString() == "Landroid/view/View;->setVisibility(I)V")
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
@@ -23,30 +23,11 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -23,27 +23,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
+                // 18.43 is the earliest target this patch works.
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.patches.youtube.shared.fingerprints.SeekbarFingerprint
 import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
+import app.revanced.util.alsoResolve

@Patch(
    name = "Hide seekbar",
@@ -25,30 +26,11 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
@@ -65,9 +47,10 @@ object HideSeekbarPatch : BytecodePatch(
            SwitchPreference("revanced_hide_seekbar_thumbnail")
        )

-        SeekbarFingerprint.result!!.let {
-            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
-        }.result!!.mutableMethod.addInstructionsWithLabels(
+        SeekbarOnDrawFingerprint.alsoResolve(
+            context,
+            SeekbarFingerprint
+        ).mutableMethod.addInstructionsWithLabels(
            0,
            """
                const/4 v0, 0x0
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -2,6 +2,7 @@ package app.revanced.patches.youtube.layout.hide.shorts

 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -13,10 +14,15 @@ import app.revanced.patches.youtube.layout.hide.shorts.fingerprints.*
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.navigation.NavigationBarHookPatch
-import app.revanced.util.exception
+import app.revanced.patches.youtube.misc.playservice.VersionCheckPatch
+import app.revanced.util.forEachLiteralValueInstruction
+import app.revanced.util.alsoResolve
 import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstWideLiteralInstructionValue
 import app.revanced.util.indexOfIdResourceOrThrow
 import app.revanced.util.injectHideViewCall
+import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -32,35 +38,17 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
        HideShortsComponentsResourcePatch::class,
        ResourceMappingPatch::class,
        NavigationBarHookPatch::class,
+        VersionCheckPatch::class
    ],
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
@@ -70,7 +58,8 @@ object HideShortsComponentsPatch : BytecodePatch(
    setOf(
        CreateShortsButtonsFingerprint,
        ReelConstructorFingerprint,
-        BottomNavigationBarFingerprint,
+        ShortsBottomBarContainerFingerprint,
+        LegacyRenderBottomNavigationBarParentFingerprint,
        RenderBottomNavigationBarParentFingerprint,
        SetPivotBarVisibilityParentFingerprint,
    ),
@@ -95,29 +84,30 @@ object HideShortsComponentsPatch : BytecodePatch(
        // region Hide the Shorts shelf.

        // This patch point is not present in 19.03.x and greater.
-        // If 19.02.x and lower is dropped, then this section of code and the fingerprint should be removed.
-        ReelConstructorFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
-                val viewRegister = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
+        if (!VersionCheckPatch.is_19_03_or_greater) {
+            ReelConstructorFingerprint.result?.let {
+                it.mutableMethod.apply {
+                    val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
+                    val viewRegister = getInstruction<TwoRegisterInstruction>(insertIndex).registerA

-                injectHideViewCall(
-                    insertIndex,
-                    viewRegister,
-                    FILTER_CLASS_DESCRIPTOR,
-                    "hideShortsShelf",
-                )
+                    injectHideViewCall(
+                        insertIndex,
+                        viewRegister,
+                        FILTER_CLASS_DESCRIPTOR,
+                        "hideShortsShelf",
+                    )
+                }
            }
-        } // Do not throw an exception if not resolved.
+        }

        // endregion

        // region Hide the Shorts buttons in older versions of YouTube.

        // Some Shorts buttons are views, hide them by setting their visibility to GONE.
-        CreateShortsButtonsFingerprint.result?.let {
+        CreateShortsButtonsFingerprint.resultOrThrow().let {
            ShortsButtons.entries.forEach { button -> button.injectHideCall(it.mutableMethod) }
-        } ?: throw CreateShortsButtonsFingerprint.exception
+        }

        // endregion

@@ -125,54 +115,68 @@ object HideShortsComponentsPatch : BytecodePatch(

        LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)

+        context.forEachLiteralValueInstruction(
+            HideShortsComponentsResourcePatch.reelPlayerRightPivotV2Size
+        ) { literalInstructionIndex ->
+            val targetIndex = indexOfFirstInstructionOrThrow(literalInstructionIndex) {
+                getReference<MethodReference>()?.name == "getDimensionPixelSize"
+            } + 1
+
+            val sizeRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+
+            addInstructions(targetIndex + 1, """
+                    invoke-static { v$sizeRegister }, $FILTER_CLASS_DESCRIPTOR->getSoundButtonSize(I)I
+                    move-result v$sizeRegister
+                """
+            )
+        }
+
        // endregion

        // region Hide the navigation bar.

        // Hook to get the pivotBar view.
-        SetPivotBarVisibilityParentFingerprint.result?.let {
-            if (!SetPivotBarVisibilityFingerprint.resolve(context, it.classDef)) {
-                throw SetPivotBarVisibilityFingerprint.exception
-            }
-
-            SetPivotBarVisibilityFingerprint.result!!.let { result ->
-                result.mutableMethod.apply {
-                    val insertIndex = result.scanResult.patternScanResult!!.endIndex
-                    val viewRegister = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
-                    addInstruction(
-                        insertIndex,
-                        "sput-object v$viewRegister, $FILTER_CLASS_DESCRIPTOR->pivotBar:" +
-                            "Lcom/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar;",
-                    )
-                }
-            }
-        } ?: throw SetPivotBarVisibilityParentFingerprint.exception
-
-        // Hook to hide the navigation bar when Shorts are being played.
-        RenderBottomNavigationBarParentFingerprint.result?.let {
-            if (!RenderBottomNavigationBarFingerprint.resolve(context, it.classDef)) {
-                throw RenderBottomNavigationBarFingerprint.exception
-            }
-
-            RenderBottomNavigationBarFingerprint.result!!.mutableMethod.apply {
-                addInstruction(0, "invoke-static { }, $FILTER_CLASS_DESCRIPTOR->hideNavigationBar()V")
-            }
-        } ?: throw RenderBottomNavigationBarParentFingerprint.exception
-
-        // Required to prevent a black bar from appearing at the bottom of the screen.
-        BottomNavigationBarFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val moveResultIndex = it.scanResult.patternScanResult!!.startIndex + 2
-                val viewRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-                val insertIndex = moveResultIndex + 1
-
-                addInstruction(
-                    insertIndex,
-                    "invoke-static { v$viewRegister }, $FILTER_CLASS_DESCRIPTOR->" +
-                        "hideNavigationBar(Landroid/view/View;)Landroid/view/View;",
+        SetPivotBarVisibilityFingerprint.alsoResolve(
+            context,
+            SetPivotBarVisibilityParentFingerprint
+        ).let { result->
+            result.mutableMethod.apply {
+                val insertIndex = result.scanResult.patternScanResult!!.endIndex
+                val viewRegister = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
+                addInstruction(insertIndex, "invoke-static {v$viewRegister}," +
+                        " $FILTER_CLASS_DESCRIPTOR->setNavigationBar(Lcom/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar;)V"
                )
            }
-        } ?: throw BottomNavigationBarFingerprint.exception
+        }
+
+        // Hook to hide the shared navigation bar when the Shorts player is opened.
+        RenderBottomNavigationBarFingerprint.alsoResolve(
+            context,
+            if (VersionCheckPatch.is_19_41_or_greater)
+                RenderBottomNavigationBarParentFingerprint
+            else
+                LegacyRenderBottomNavigationBarParentFingerprint
+        ).mutableMethod.addInstruction(
+            0,
+            "invoke-static { p1 }, $FILTER_CLASS_DESCRIPTOR->hideNavigationBar(Ljava/lang/String;)V"
+        )
+
+        // Hide the bottom bar container of the Shorts player.
+        ShortsBottomBarContainerFingerprint.resultOrThrow().mutableMethod.apply {
+            val resourceIndex = indexOfFirstWideLiteralInstructionValue(HideShortsComponentsResourcePatch.bottomBarContainer)
+
+            val targetIndex = indexOfFirstInstructionOrThrow(resourceIndex) {
+                getReference<MethodReference>()?.name == "getHeight"
+            } + 1
+
+            val heightRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+
+            addInstructions(targetIndex + 1, """
+                    invoke-static { v$heightRegister }, $FILTER_CLASS_DESCRIPTOR->getNavigationBarHeight(I)I
+                    move-result v$heightRegister
+                """
+            )
+        }

        // endregion
    }
@@ -187,14 +191,12 @@ object HideShortsComponentsPatch : BytecodePatch(
        fun injectHideCall(method: MutableMethod) {
            val referencedIndex = method.indexOfIdResourceOrThrow(resourceName)

-            val instruction = method.implementation!!.instructions
-                .subList(referencedIndex, referencedIndex + 20)
-                .first {
-                    it.opcode == Opcode.INVOKE_VIRTUAL && it.getReference<MethodReference>()?.name == "setId"
-                }
+            val setIdIndex = method.indexOfFirstInstructionOrThrow(referencedIndex) {
+                opcode == Opcode.INVOKE_VIRTUAL && getReference<MethodReference>()?.name == "setId"
+            }

-            val setIdIndex = instruction.location.index
            val viewRegister = method.getInstruction<FiveRegisterInstruction>(setIdIndex).registerC
+
            method.injectHideViewCall(setIdIndex + 1, viewRegister, FILTER_CLASS_DESCRIPTOR, methodName)
        }
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
@@ -8,14 +8,23 @@ import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsPatch.hideShortsAppShortcut
 import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsPatch.hideShortsWidget
+import app.revanced.patches.youtube.misc.playservice.VersionCheckPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.findElementByAttributeValueOrThrow
-import org.w3c.dom.Element

-@Patch(dependencies = [SettingsPatch::class, ResourceMappingPatch::class, AddResourcesPatch::class])
+@Patch(
+    dependencies = [
+        SettingsPatch::class,
+        ResourceMappingPatch::class,
+        AddResourcesPatch::class,
+        VersionCheckPatch::class
+    ]
+)
 object HideShortsComponentsResourcePatch : ResourcePatch() {
    internal var reelMultipleItemShelfId = -1L
    internal var reelPlayerRightCellButtonHeight = -1L
+    internal var bottomBarContainer = -1L
+    internal var reelPlayerRightPivotV2Size = -1L

    override fun execute(context: ResourceContext) {
        AddResourcesPatch(this::class)
@@ -30,6 +39,7 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
            // since this Setting menu currently uses the ordering used here.

            // Vertical row of buttons on right side of the screen.
+            SwitchPreference("revanced_hide_shorts_like_fountain"),
            SwitchPreference("revanced_hide_shorts_like_button"),
            SwitchPreference("revanced_hide_shorts_dislike_button"),
            SwitchPreference("revanced_hide_shorts_comments_button"),
@@ -42,9 +52,13 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
            SwitchPreference("revanced_hide_shorts_subscribe_button"),
            SwitchPreference("revanced_hide_shorts_paused_overlay_buttons"),
            SwitchPreference("revanced_hide_shorts_save_sound_button"),
-            SwitchPreference("revanced_hide_shorts_use_this_sound_button"),
+            SwitchPreference("revanced_hide_shorts_use_template_button"),
+            SwitchPreference("revanced_hide_shorts_upcoming_button"),
+            SwitchPreference("revanced_hide_shorts_green_screen_button"),
+            SwitchPreference("revanced_hide_shorts_hashtag_button"),
            SwitchPreference("revanced_hide_shorts_shop_button"),
            SwitchPreference("revanced_hide_shorts_tagged_products"),
+            SwitchPreference("revanced_hide_shorts_stickers"),
            SwitchPreference("revanced_hide_shorts_search_suggestions"),
            SwitchPreference("revanced_hide_shorts_super_thanks_button"),
            SwitchPreference("revanced_hide_shorts_location_label"),
@@ -60,7 +74,7 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
            context.xmlEditor["res/xml/main_shortcuts.xml"].use { editor ->
                val shortsItem = editor.file.childNodes.findElementByAttributeValueOrThrow(
                    "android:shortcutId",
-                    "shorts-shortcut"
+                    "shorts-shortcut",
                )

                shortsItem.parentNode.removeChild(shortsItem)
@@ -71,7 +85,7 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
            context.xmlEditor["res/layout/appwidget_two_rows.xml"].use { editor ->
                val shortsItem = editor.file.childNodes.findElementByAttributeValueOrThrow(
                    "android:id",
-                    "@id/button_shorts_container"
+                    "@id/button_shorts_container",
                )

                shortsItem.parentNode.removeChild(shortsItem)
@@ -83,14 +97,21 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
            "reel_player_right_cell_button_height",
        ]

-        // Resource not present in new versions of the app.
-        try {
-            ResourceMappingPatch[
+        bottomBarContainer = ResourceMappingPatch[
+                "id",
+                "bottom_bar_container"
+        ]
+
+        reelPlayerRightPivotV2Size = ResourceMappingPatch[
+            "dimen",
+            "reel_player_right_pivot_v2_size"
+        ]
+
+        if (!VersionCheckPatch.is_19_03_or_greater) {
+            reelMultipleItemShelfId = ResourceMappingPatch[
                "dimen",
                "reel_player_right_cell_button_height",
            ]
-        } catch (e: NoSuchElementException) {
-            return
-        }.also { reelPlayerRightCellButtonHeight = it }
+        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/BottomNavigationBarFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/BottomNavigationBarFingerprint.kt
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.shorts.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object BottomNavigationBarFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Landroid/view/View;", "Landroid/os/Bundle;"),
-    opcodes = listOf(
-        Opcode.CONST, // R.id.app_engagement_panel_wrapper
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-    ),
-    strings = listOf(
-        "ReelWatchPaneFragmentViewModelKey"
-    ),
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/LegacyRenderBottomNavigationBarParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/LegacyRenderBottomNavigationBarParentFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.layout.hide.shorts.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+internal object LegacyRenderBottomNavigationBarParentFingerprint : MethodFingerprint(
+    parameters = listOf(
+        "I",
+        "I",
+        "L",
+        "L",
+        "J",
+        "L",
+    ),
+    strings = listOf("aa")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/ReelConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/ReelConstructorFingerprint.kt
@@ -1,19 +1,13 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsResourcePatch
-import app.revanced.util.containsWideLiteralInstructionValue
+import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

-internal object ReelConstructorFingerprint : MethodFingerprint(
+internal object ReelConstructorFingerprint : LiteralValueFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    opcodes = listOf(Opcode.INVOKE_VIRTUAL),
-    customFingerprint = { methodDef, _ ->
-        // Cannot use LiteralValueFingerprint, because the resource id may not be present.
-        val reelMultipleItemShelfId = HideShortsComponentsResourcePatch.reelMultipleItemShelfId
-        reelMultipleItemShelfId != -1L
-                && methodDef.containsWideLiteralInstructionValue(reelMultipleItemShelfId)
-    }
+    literalSupplier = { HideShortsComponentsResourcePatch.reelMultipleItemShelfId }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/RenderBottomNavigationBarFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/RenderBottomNavigationBarFingerprint.kt
@@ -4,6 +4,8 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

 internal object RenderBottomNavigationBarFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("Ljava/lang/String;"),
    opcodes = listOf(
        Opcode.IGET_OBJECT,
        Opcode.MONITOR_ENTER,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/RenderBottomNavigationBarParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/RenderBottomNavigationBarParentFingerprint.kt
@@ -1,8 +1,23 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags

+/**
+ * Identical to [LegacyRenderBottomNavigationBarParentFingerprint]
+ * except this has an extra parameter.
+ */
 internal object RenderBottomNavigationBarParentFingerprint : MethodFingerprint(
-    parameters = listOf("I", "I", "L", "L", "J", "L"),
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(
+        "I",
+        "I",
+        "L", // ReelWatchEndpointOuterClass
+        "L",
+        "J",
+        "Ljava/lang/String;",
+        "L"
+    ),
    strings = listOf("aa")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/ShortsBottomBarContainerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/fingerprints/ShortsBottomBarContainerFingerprint.kt
@@ -0,0 +1,16 @@
+package app.revanced.patches.youtube.layout.hide.shorts.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object ShortsBottomBarContainerFingerprint : LiteralValueFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Landroid/view/View;", "Landroid/os/Bundle;"),
+    strings = listOf(
+        "r_pfvc"
+    ),
+    literalSupplier = { HideShortsComponentsResourcePatch.bottomBarContainer }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
@@ -18,29 +18,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
@@ -19,29 +19,11 @@ import app.revanced.util.exception
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
@@ -1,17 +1,20 @@
+@file:Suppress("SpellCheckingInspection")
+
 package app.revanced.patches.youtube.layout.miniplayer

 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.BasePreference
 import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.ListPreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
@@ -26,6 +29,7 @@ import app.revanced.patches.youtube.layout.miniplayer.MiniplayerResourcePatch.sc
 import app.revanced.patches.youtube.layout.miniplayer.MiniplayerResourcePatch.ytOutlinePictureInPictureWhite24
 import app.revanced.patches.youtube.layout.miniplayer.MiniplayerResourcePatch.ytOutlineXWhite24
 import app.revanced.patches.youtube.layout.miniplayer.fingerprints.MiniplayerDimensionsCalculatorParentFingerprint
+import app.revanced.patches.youtube.layout.miniplayer.fingerprints.MiniplayerMinimumSizeFingerprint
 import app.revanced.patches.youtube.layout.miniplayer.fingerprints.MiniplayerModernAddViewListenerFingerprint
 import app.revanced.patches.youtube.layout.miniplayer.fingerprints.MiniplayerModernCloseButtonFingerprint
 import app.revanced.patches.youtube.layout.miniplayer.fingerprints.MiniplayerModernConstructorFingerprint
@@ -42,30 +46,32 @@ import app.revanced.patches.youtube.layout.miniplayer.fingerprints.YouTubePlayer
 import app.revanced.patches.youtube.layout.miniplayer.fingerprints.YouTubePlayerOverlaysLayoutFingerprint.YOUTUBE_PLAYER_OVERLAYS_LAYOUT_CLASS_NAME
 import app.revanced.patches.youtube.layout.tablet.fingerprints.GetFormFactorFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
+import app.revanced.patches.youtube.misc.playservice.VersionCheckPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.util.addInstructionsAtControlFlowLabel
+import app.revanced.util.alsoResolve
 import app.revanced.util.findOpcodeIndicesReversed
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstWideLiteralInstructionValueOrThrow
-import app.revanced.util.patch.LiteralValueFingerprint
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
 import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter

-// YT uses "Miniplayer" without a space between 'mini' and 'player: https://support.google.com/youtube/answer/9162927.
+// YT uses "Miniplayer" without a space between 'mini' and 'player': https://support.google.com/youtube/answer/9162927.
@Patch(
    name = "Miniplayer",
-    description = "Adds options to change the in app minimized player, " +
-            "and if patching target 19.16+ adds options to use modern miniplayers.",
+    description = "Adds options to change the in app minimized player. " +
+            "Patching target 19.16+ adds modern miniplayers.",
    dependencies = [
        IntegrationsPatch::class,
        SettingsPatch::class,
@@ -75,32 +81,28 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                // 19.14 is left out, as it has incomplete miniplayer code and missing some UI resources.
-                // It's simpler to not bother with supporting this single old version.
-                // 19.15 has a different code for handling sub title texts,
-                // and also probably not worth making changes just to support this single old version.
-                "19.16.39" // Earliest supported version with modern miniplayers.
+                // 19.14.43 // Incomplete code for modern miniplayers.
+                // 19.15.36 // Different code for handling subtitle texts and not worth supporting.
+                "19.16.39", // First with modern miniplayers.
+                // 19.17.41 // Works without issues, but no reason to recommend over 19.16.
+                // 19.18.41 // Works without issues, but no reason to recommend over 19.16.
+                // 19.19.39 // Last bug free version with smaller Modern 1 miniplayer, but no reason to recommend over 19.16.
+                // 19.20.35 // Cannot swipe to expand.
+                // 19.21.40 // Cannot swipe to expand.
+                // 19.22.43 // Cannot swipe to expand.
+                // 19.23.40 // First with Modern 1 drag and drop, Cannot swipe to expand.
+                // 19.24.45 // First with larger Modern 1, Cannot swipe to expand.
+                "19.25.37", // First with double tap, last with skip forward/back buttons, last with swipe to expand/close, and last before double tap to expand seems to be required.
+                // 19.26.42 // Modern 1 Pause/play button are always hidden. Unusable.
+                // 19.28.42 // First with custom miniplayer size, screen flickers when swiping to maximize Modern 1. Swipe to close miniplayer is broken.
+                // 19.29.42 // All modern players are broken and ignore tapping the miniplayer video.
+                // 19.30.39 // Modern 3 is less broken when double tap expand is enabled, but cannot swipe to expand when double tap is off.
+                // 19.31.36 // All Modern 1 buttons are missing. Unusable.
+                // 19.32.36 // 19.32+ and beyond all work without issues.
+                // 19.33.35
+                "19.34.42",
            ]
        )
    ]
@@ -113,6 +115,7 @@ object MiniplayerPatch : BytecodePatch(
        MiniplayerOverrideFingerprint,
        MiniplayerModernConstructorFingerprint,
        MiniplayerModernViewParentFingerprint,
+        MiniplayerMinimumSizeFingerprint,
        YouTubePlayerOverlaysLayoutFingerprint
    )
 ) {
@@ -121,48 +124,71 @@ object MiniplayerPatch : BytecodePatch(
    override fun execute(context: BytecodeContext) {
        AddResourcesPatch(this::class)

-        // Modern mini player is only present and functional in 19.15+.
-        // Resource is not present in older versions. Using it to determine, if patching an old version.
-        val isPatchingOldVersion = ytOutlinePictureInPictureWhite24 < 0
+        val preferences = mutableSetOf<BasePreference>()
+
+        if (!VersionCheckPatch.is_19_16_or_greater) {
+            preferences += ListPreference(
+                "revanced_miniplayer_type",
+                summaryKey = null,
+                entriesKey = "revanced_miniplayer_type_legacy_entries",
+                entryValuesKey = "revanced_miniplayer_type_legacy_entry_values"
+            )
+        } else {
+            preferences += ListPreference(
+                "revanced_miniplayer_type",
+                summaryKey = null,
+            )
+
+            if (VersionCheckPatch.is_19_25_or_greater) {
+                if (!VersionCheckPatch.is_19_29_or_greater) {
+                    preferences += SwitchPreference("revanced_miniplayer_double_tap_action")
+                }
+                preferences += SwitchPreference("revanced_miniplayer_drag_and_drop")
+            }
+
+            if (VersionCheckPatch.is_19_36_or_greater) {
+                preferences += SwitchPreference("revanced_miniplayer_rounded_corners")
+            }
+
+            preferences += SwitchPreference("revanced_miniplayer_hide_subtext")
+
+            preferences +=
+                if (VersionCheckPatch.is_19_26_or_greater) {
+                    SwitchPreference("revanced_miniplayer_hide_expand_close")
+                } else {
+                    SwitchPreference(
+                        key = "revanced_miniplayer_hide_expand_close",
+                        titleKey = "revanced_miniplayer_hide_expand_close_legacy_title",
+                        summaryOnKey = "revanced_miniplayer_hide_expand_close_legacy_summary_on",
+                        summaryOffKey = "revanced_miniplayer_hide_expand_close_legacy_summary_off",
+                    )
+                }
+
+            if (!VersionCheckPatch.is_19_26_or_greater) {
+                preferences += SwitchPreference("revanced_miniplayer_hide_rewind_forward")
+            }
+
+            if (VersionCheckPatch.is_19_26_or_greater) {
+                preferences += TextPreference("revanced_miniplayer_width_dip", inputType = InputType.NUMBER)
+            }
+
+            preferences += TextPreference("revanced_miniplayer_opacity", inputType = InputType.NUMBER)
+        }

        SettingsPatch.PreferenceScreen.PLAYER.addPreferences(
            PreferenceScreen(
                key = "revanced_miniplayer_screen",
                sorting = Sorting.UNSORTED,
-                preferences =
-                if (isPatchingOldVersion) {
-                    setOf(
-                        ListPreference(
-                            "revanced_miniplayer_type",
-                            summaryKey = null,
-                            entriesKey = "revanced_miniplayer_type_legacy_entries",
-                            entryValuesKey = "revanced_miniplayer_type_legacy_entry_values"
-                        )
-                    )
-                } else {
-                    setOf(
-                        ListPreference(
-                            "revanced_miniplayer_type",
-                            summaryKey = null,
-                            entriesKey = "revanced_miniplayer_type_19_15_entries",
-                            entryValuesKey = "revanced_miniplayer_type_19_15_entry_values"
-                        ),
-                        SwitchPreference("revanced_miniplayer_hide_expand_close"),
-                        SwitchPreference("revanced_miniplayer_hide_subtext"),
-                        SwitchPreference("revanced_miniplayer_hide_rewind_forward"),
-                        TextPreference("revanced_miniplayer_opacity", inputType = InputType.NUMBER)
-                    )
-                }
+                preferences = preferences
            )
        )

        // region Enable tablet miniplayer.

-        MiniplayerOverrideNoContextFingerprint.resolve(
+        MiniplayerOverrideNoContextFingerprint.alsoResolve(
            context,
-            MiniplayerDimensionsCalculatorParentFingerprint.resultOrThrow().classDef
-        )
-        MiniplayerOverrideNoContextFingerprint.resultOrThrow().mutableMethod.apply {
+            MiniplayerDimensionsCalculatorParentFingerprint
+        ).mutableMethod.apply {
            findReturnIndicesReversed().forEach { index -> insertLegacyTabletMiniplayerOverride(index) }
        }

@@ -188,8 +214,8 @@ object MiniplayerPatch : BytecodePatch(
            it.mutableMethod.insertLegacyTabletMiniplayerOverride(it.scanResult.patternScanResult!!.endIndex)
        }

-        if (isPatchingOldVersion) {
-            // Return here, as patch below is only intended for new versions of the app.
+        if (!VersionCheckPatch.is_19_16_or_greater) {
+            // Return here, as patch below is only for the current versions of the app.
            return
        }

@@ -212,59 +238,150 @@ object MiniplayerPatch : BytecodePatch(
            }
        }

+        if (VersionCheckPatch.is_19_23_or_greater) {
+            MiniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+                MiniplayerModernConstructorFingerprint.DRAG_DROP_ENABLED_FEATURE_KEY_LITERAL,
+                "enableMiniplayerDragAndDrop"
+            )
+        }
+
+        if (VersionCheckPatch.is_19_25_or_greater) {
+            MiniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+                MiniplayerModernConstructorFingerprint.MODERN_MINIPLAYER_ENABLED_OLD_TARGETS_FEATURE_KEY,
+                "getModernMiniplayerOverride"
+            )
+
+            MiniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+                MiniplayerModernConstructorFingerprint.MODERN_FEATURE_FLAGS_ENABLED_KEY_LITERAL,
+                "getModernFeatureFlagsActiveOverride"
+            )
+
+            MiniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+                MiniplayerModernConstructorFingerprint.DOUBLE_TAP_ENABLED_FEATURE_KEY_LITERAL,
+                "enableMiniplayerDoubleTapAction"
+            )
+        }
+
+        if (VersionCheckPatch.is_19_26_or_greater) {
+            MiniplayerModernConstructorFingerprint.resultOrThrow().mutableMethod.apply {
+                val literalIndex = indexOfFirstWideLiteralInstructionValueOrThrow(
+                    MiniplayerModernConstructorFingerprint.INITIAL_SIZE_FEATURE_KEY_LITERAL
+                )
+                val targetIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.LONG_TO_INT)
+
+                val register = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+
+                addInstructions(
+                    targetIndex + 1,
+                    """
+                        invoke-static { v$register }, $INTEGRATIONS_CLASS_DESCRIPTOR->setMiniplayerDefaultSize(I)I
+                        move-result v$register
+                    """
+                )
+            }
+
+            // Override a mininimum miniplayer size constant.
+            MiniplayerMinimumSizeFingerprint.resultOrThrow().mutableMethod.apply {
+                val index = indexOfFirstInstructionOrThrow {
+                    opcode == Opcode.CONST_16 && (this as NarrowLiteralInstruction).narrowLiteral == 192
+                }
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+                // Smaller sizes can be used, but the miniplayer will always start in size 170 if set any smaller.
+                // The 170 initial limit probably could be patched to allow even smaller initial sizes,
+                // but 170 is already half the horizontal space and smaller does not seem useful.
+                replaceInstruction(index, "const/16 v$register, 170")
+            }
+        }
+
+        if (VersionCheckPatch.is_19_32_or_greater) {
+            // Feature is not exposed in the settings, and currently only for debugging.
+
+            MiniplayerModernConstructorFingerprint.insertLiteralValueFloatOverride(
+                MiniplayerModernConstructorFingerprint.ANIMATION_INTERPOLATION_FEATURE_KEY,
+                "setMovementBoundFactor"
+            )
+        }
+
+        if (VersionCheckPatch.is_19_36_or_greater) {
+            MiniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+                MiniplayerModernConstructorFingerprint.DROP_SHADOW_FEATURE_KEY,
+                "setDropShadow"
+            )
+
+            MiniplayerModernConstructorFingerprint.insertLiteralValueBooleanOverride(
+                MiniplayerModernConstructorFingerprint.ROUNDED_CORNERS_FEATURE_KEY,
+                "setRoundedCorners"
+            )
+        }
+
        // endregion

        // region Fix 19.16 using mixed up drawables for tablet modern.
        // YT fixed this mistake in 19.17.
        // Fix this, by swapping the drawable resource values with each other.
-
-        MiniplayerModernExpandCloseDrawablesFingerprint.apply {
-            resolve(
+        if (ytOutlinePictureInPictureWhite24 >= 0) {
+            MiniplayerModernExpandCloseDrawablesFingerprint.alsoResolve(
                context,
-                MiniplayerModernViewParentFingerprint.resultOrThrow().classDef
-            )
-        }.resultOrThrow().mutableMethod.apply {
-            listOf(
-                ytOutlinePictureInPictureWhite24 to ytOutlineXWhite24,
-                ytOutlineXWhite24 to ytOutlinePictureInPictureWhite24,
-            ).forEach { (originalResource, replacementResource) ->
-                val imageResourceIndex = indexOfFirstWideLiteralInstructionValueOrThrow(originalResource)
-                val register = getInstruction<OneRegisterInstruction>(imageResourceIndex).registerA
+                MiniplayerModernViewParentFingerprint
+            ).mutableMethod.apply {
+                listOf(
+                    ytOutlinePictureInPictureWhite24 to ytOutlineXWhite24,
+                    ytOutlineXWhite24 to ytOutlinePictureInPictureWhite24,
+                ).forEach { (originalResource, replacementResource) ->
+                    val imageResourceIndex = indexOfFirstWideLiteralInstructionValueOrThrow(originalResource)
+                    val register = getInstruction<OneRegisterInstruction>(imageResourceIndex).registerA

-                replaceInstruction(imageResourceIndex, "const v$register, $replacementResource")
+                    replaceInstruction(imageResourceIndex, "const v$register, $replacementResource")
+                }
            }
        }

        // endregion

-
-        // region Add hooks to hide tablet modern miniplayer buttons.
+        // region Add hooks to hide modern miniplayer buttons.

        listOf(
-            Triple(MiniplayerModernExpandButtonFingerprint, modernMiniplayerExpand,"hideMiniplayerExpandClose"),
-            Triple(MiniplayerModernCloseButtonFingerprint, modernMiniplayerClose, "hideMiniplayerExpandClose"),
-            Triple(MiniplayerModernRewindButtonFingerprint, modernMiniplayerRewindButton, "hideMiniplayerRewindForward"),
-            Triple(MiniplayerModernForwardButtonFingerprint, modernMiniplayerForwardButton, "hideMiniplayerRewindForward"),
-            Triple(MiniplayerModernOverlayViewFingerprint, scrimOverlay, "adjustMiniplayerOpacity")
-        ).forEach { (fingerprint, literalValue, methodName) ->
-            fingerprint.resolve(
-                context,
-                MiniplayerModernViewParentFingerprint.resultOrThrow().classDef
+            Triple(
+                MiniplayerModernExpandButtonFingerprint,
+                modernMiniplayerExpand,
+                "hideMiniplayerExpandClose"
+            ),
+            Triple(
+                MiniplayerModernCloseButtonFingerprint,
+                modernMiniplayerClose,
+                "hideMiniplayerExpandClose"
+            ),
+            Triple(
+                MiniplayerModernRewindButtonFingerprint,
+                modernMiniplayerRewindButton,
+                "hideMiniplayerRewindForward"
+            ),
+            Triple(
+                MiniplayerModernForwardButtonFingerprint,
+                modernMiniplayerForwardButton,
+                "hideMiniplayerRewindForward"
+            ),
+            Triple(
+                MiniplayerModernOverlayViewFingerprint,
+                scrimOverlay,
+                "adjustMiniplayerOpacity"
            )
-
-            fingerprint.hookInflatedView(
+        ).forEach { (fingerprint, literalValue, methodName) ->
+            fingerprint.alsoResolve(
+                context,
+                MiniplayerModernViewParentFingerprint
+            ).mutableMethod.hookInflatedView(
                literalValue,
                "Landroid/widget/ImageView;",
                "$INTEGRATIONS_CLASS_DESCRIPTOR->$methodName(Landroid/widget/ImageView;)V"
            )
        }

-        MiniplayerModernAddViewListenerFingerprint.apply {
-            resolve(
-                context,
-                MiniplayerModernViewParentFingerprint.resultOrThrow().classDef
-            )
-        }.resultOrThrow().mutableMethod.addInstruction(
+        MiniplayerModernAddViewListenerFingerprint.alsoResolve(
+            context,
+            MiniplayerModernViewParentFingerprint
+        ).mutableMethod.addInstruction(
            0,
            "invoke-static { p1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->" +
                    "hideMiniplayerSubTexts(Landroid/view/View;)V"
@@ -275,6 +392,9 @@ object MiniplayerPatch : BytecodePatch(
        // Modern 2 uses the same overlay controls as the regular video player,
        // and the overlay views are added at runtime.
        // Add a hook to the overlay class, and pass the added views to integrations.
+        //
+        // NOTE: Modern 2 uses the same video UI as the regular player except resized to smaller.
+        // This patch code could be used to hide other player overlays that do not use Litho.
        YouTubePlayerOverlaysLayoutFingerprint.resultOrThrow().mutableClass.methods.add(
            ImmutableMethod(
                YOUTUBE_PLAYER_OVERLAYS_LAYOUT_CLASS_NAME,
@@ -319,6 +439,37 @@ object MiniplayerPatch : BytecodePatch(
        insertBooleanOverride(index, "getModernMiniplayerOverride")
    }

+    private fun MethodFingerprint.insertLiteralValueBooleanOverride(
+        literal: Long,
+        integrationsMethod: String
+    ) {
+        resultOrThrow().mutableMethod.apply {
+            val literalIndex = indexOfFirstWideLiteralInstructionValueOrThrow(literal)
+            val targetIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT)
+
+            insertBooleanOverride(targetIndex + 1, integrationsMethod)
+        }
+    }
+
+    private fun MethodFingerprint.insertLiteralValueFloatOverride(
+        literal: Long,
+        integrationsMethod: String
+    ) {
+        resultOrThrow().mutableMethod.apply {
+            val literalIndex = indexOfFirstWideLiteralInstructionValueOrThrow(literal)
+            val targetIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.DOUBLE_TO_FLOAT)
+            val register = getInstruction<OneRegisterInstruction>(targetIndex).registerA
+
+            addInstructions(
+                targetIndex + 1,
+                """
+                        invoke-static {v$register}, $INTEGRATIONS_CLASS_DESCRIPTOR->$integrationsMethod(F)F
+                        move-result v$register
+                    """
+            )
+        }
+    }
+
    private fun MutableMethod.insertBooleanOverride(index: Int, methodName: String) {
        val register = getInstruction<OneRegisterInstruction>(index).registerA
        addInstructions(
@@ -335,36 +486,30 @@ object MiniplayerPatch : BytecodePatch(
     */
    private fun MutableMethod.insertModernMiniplayerTypeOverride(iPutIndex: Int) {
        val targetInstruction = getInstruction<TwoRegisterInstruction>(iPutIndex)
-        val targetReference = (targetInstruction as ReferenceInstruction).reference

-        addInstructions(
-            iPutIndex + 1, """
+        addInstructionsAtControlFlowLabel(
+            iPutIndex, """
                invoke-static { v${targetInstruction.registerA} }, $INTEGRATIONS_CLASS_DESCRIPTOR->getModernMiniplayerOverrideType(I)I
                move-result v${targetInstruction.registerA}
-                # Original instruction
-                iput v${targetInstruction.registerA}, v${targetInstruction.registerB}, $targetReference 
            """
        )
-        removeInstruction(iPutIndex)
    }

-    private fun LiteralValueFingerprint.hookInflatedView(
+    private fun MutableMethod.hookInflatedView(
        literalValue: Long,
        hookedClassType: String,
        integrationsMethodName: String,
    ) {
-        resultOrThrow().mutableMethod.apply {
-            val imageViewIndex = indexOfFirstInstructionOrThrow(
-                indexOfFirstWideLiteralInstructionValueOrThrow(literalValue)
-            ) {
-                opcode == Opcode.CHECK_CAST && getReference<TypeReference>()?.type == hookedClassType
-            }
-
-            val register = getInstruction<OneRegisterInstruction>(imageViewIndex).registerA
-            addInstruction(
-                imageViewIndex + 1,
-                "invoke-static { v$register }, $integrationsMethodName"
-            )
+        val imageViewIndex = indexOfFirstInstructionOrThrow(
+            indexOfFirstWideLiteralInstructionValueOrThrow(literalValue)
+        ) {
+            opcode == Opcode.CHECK_CAST && getReference<TypeReference>()?.type == hookedClassType
        }
+
+        val register = getInstruction<OneRegisterInstruction>(imageViewIndex).registerA
+        addInstruction(
+            imageViewIndex + 1,
+            "invoke-static { v$register }, $integrationsMethodName"
+        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerResourcePatch.kt
@@ -1,12 +1,12 @@
 package app.revanced.patches.youtube.layout.miniplayer

 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+import app.revanced.patches.youtube.misc.playservice.VersionCheckPatch

-@Patch(dependencies = [ResourceMappingPatch::class])
+@Patch(dependencies = [ResourceMappingPatch::class, VersionCheckPatch::class])
 internal object MiniplayerResourcePatch : ResourcePatch() {
    var floatyBarButtonTopMargin = -1L

@@ -19,6 +19,7 @@ internal object MiniplayerResourcePatch : ResourcePatch() {
    var modernMiniplayerRewindButton = -1L
    var modernMiniplayerForwardButton = -1L
    var playerOverlays = -1L
+    var miniplayerMaxSize = -1L

    override fun execute(context: ResourceContext) {
        floatyBarButtonTopMargin = ResourceMappingPatch[
@@ -26,56 +27,63 @@ internal object MiniplayerResourcePatch : ResourcePatch() {
            "floaty_bar_button_top_margin"
        ]

-        try {
-            ytOutlinePictureInPictureWhite24 = ResourceMappingPatch[
-                "drawable",
-                "yt_outline_picture_in_picture_white_24"
-            ]
-        } catch (exception: PatchException) {
-            // Ignore, and assume the app is 19.14 or earlier.
-            return
-        }
-
-        ytOutlineXWhite24 = ResourceMappingPatch[
-            "drawable",
-            "yt_outline_x_white_24"
-        ]
-
        scrimOverlay = ResourceMappingPatch[
            "id",
            "scrim_overlay"
        ]

-        modernMiniplayerClose = ResourceMappingPatch[
-            "id",
-            "modern_miniplayer_close"
-        ]
-
-        modernMiniplayerExpand = ResourceMappingPatch[
-            "id",
-            "modern_miniplayer_expand"
-        ]
-
-        modernMiniplayerRewindButton = ResourceMappingPatch[
-            "id",
-            "modern_miniplayer_rewind_button"
-        ]
-
-        modernMiniplayerForwardButton = ResourceMappingPatch[
-            "id",
-            "modern_miniplayer_forward_button"
-        ]
-
        playerOverlays = ResourceMappingPatch[
            "layout",
            "player_overlays"
        ]

-        // Resource id is not used during patching, but is used by integrations.
-        // Verify the resource is present while patching.
-        ResourceMappingPatch[
-            "id",
-            "modern_miniplayer_subtitle_text"
-        ]
+        if (VersionCheckPatch.is_19_16_or_greater) {
+            modernMiniplayerClose = ResourceMappingPatch[
+                "id",
+                "modern_miniplayer_close"
+            ]
+
+            modernMiniplayerExpand = ResourceMappingPatch[
+                "id",
+                "modern_miniplayer_expand"
+            ]
+
+            modernMiniplayerRewindButton = ResourceMappingPatch[
+                "id",
+                "modern_miniplayer_rewind_button"
+            ]
+
+            modernMiniplayerForwardButton = ResourceMappingPatch[
+                "id",
+                "modern_miniplayer_forward_button"
+            ]
+
+            // Resource id is not used during patching, but is used by integrations.
+            // Verify the resource is present while patching.
+            ResourceMappingPatch[
+                "id",
+                "modern_miniplayer_subtitle_text"
+            ]
+
+            // Only required for exactly 19.16
+            if (!VersionCheckPatch.is_19_17_or_greater) {
+                ytOutlinePictureInPictureWhite24 = ResourceMappingPatch[
+                    "drawable",
+                    "yt_outline_picture_in_picture_white_24"
+                ]
+
+                ytOutlineXWhite24 = ResourceMappingPatch[
+                    "drawable",
+                    "yt_outline_x_white_24"
+                ]
+            }
+
+            if (VersionCheckPatch.is_19_26_or_greater) {
+                miniplayerMaxSize = ResourceMappingPatch[
+                    "dimen",
+                    "miniplayer_max_size"
+                ]
+            }
+        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerMinimumSizeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerMinimumSizeFingerprint.kt
@@ -0,0 +1,16 @@
+package app.revanced.patches.youtube.layout.miniplayer.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patches.youtube.layout.miniplayer.MiniplayerResourcePatch
+import app.revanced.util.containsWideLiteralInstructionValue
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object MiniplayerMinimumSizeFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    customFingerprint = { methodDef, _ ->
+        methodDef.containsWideLiteralInstructionValue(192)
+                && methodDef.containsWideLiteralInstructionValue(128)
+                && methodDef.containsWideLiteralInstructionValue(MiniplayerResourcePatch.miniplayerMaxSize)
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernConstructorFingerprint.kt
@@ -8,4 +8,14 @@ internal object MiniplayerModernConstructorFingerprint : LiteralValueFingerprint
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    parameters = listOf("L"),
    literalSupplier = { 45623000L } // Magic number found in the constructor.
-)
+) {
+    const val MODERN_FEATURE_FLAGS_ENABLED_KEY_LITERAL = 45622882L
+    // In later targets this feature flag does nothing and is dead code.
+    const val MODERN_MINIPLAYER_ENABLED_OLD_TARGETS_FEATURE_KEY = 45630429L
+    const val DOUBLE_TAP_ENABLED_FEATURE_KEY_LITERAL = 45628823L
+    const val DRAG_DROP_ENABLED_FEATURE_KEY_LITERAL = 45628752L
+    const val INITIAL_SIZE_FEATURE_KEY_LITERAL = 45640023L
+    const val ANIMATION_INTERPOLATION_FEATURE_KEY = 45647018L
+    const val DROP_SHADOW_FEATURE_KEY = 45652223L
+    const val ROUNDED_CORNERS_FEATURE_KEY = 45652224L
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerOverrideFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerOverrideFingerprint.kt
@@ -7,6 +7,5 @@ import com.android.tools.smali.dexlib2.AccessFlags
 internal object MiniplayerOverrideFingerprint : MethodFingerprint(
    returnType = "L",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("L"),
    strings = listOf("appName")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
@@ -19,30 +19,11 @@ import app.revanced.util.exception
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
@@ -14,30 +14,11 @@ import org.w3c.dom.Element
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.32.39",
-                "18.37.36",
                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
@@ -27,11 +28,14 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.Tex
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
+import app.revanced.patches.youtube.misc.playservice.VersionCheckPatch
 import app.revanced.patches.youtube.shared.fingerprints.RollingNumberTextViewAnimationUpdateFingerprint
 import app.revanced.patches.youtube.video.videoid.VideoIdPatch
+import app.revanced.util.alsoResolve
 import app.revanced.util.exception
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.addInstructionsAtControlFlowLabel
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@@ -51,27 +55,15 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
        VideoIdPatch::class,
        ReturnYouTubeDislikeResourcePatch::class,
        PlayerTypeHookPatch::class,
+        VersionCheckPatch::class
    ],
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.38",
-                "19.10.39",
-                "19.11.43",
-                "19.12.41",
-                "19.13.37",
-                "19.14.43",
-                "19.15.36",
                "19.16.39",
+                "19.25.37",
+                "19.34.42",
            ]
        )
    ]
@@ -117,7 +109,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
            DislikeFingerprint.toPatch(Vote.DISLIKE),
            RemoveLikeFingerprint.toPatch(Vote.REMOVE_LIKE)
        ).forEach { (fingerprint, vote) ->
-            fingerprint.result?.mutableMethod?.apply {
+            fingerprint.resultOrThrow().mutableMethod.apply {
                addInstructions(
                    0,
                    """
@@ -125,7 +117,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->sendVote(I)V
                    """
                )
-            } ?: throw fingerprint.exception
+            }
        }

        // endregion
@@ -136,7 +128,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
        // And it works in all situations except it fails to update the Span when the user dislikes,
        // since the underlying (likes only) text did not change.
        // This hook handles all situations, as it's where the created Spans are stored and later reused.
-        TextComponentConstructorFingerprint.result?.let { textConstructorResult ->
+        TextComponentConstructorFingerprint.resultOrThrow().let { textConstructorResult ->
            // Find the field name of the conversion context.
            val conversionContextClassType = ConversionContextFingerprint.resultOrThrow().classDef.type
            val conversionContextField = textConstructorResult.classDef.fields.find {
@@ -147,55 +139,80 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
            TextComponentLookupFingerprint.resultOrThrow().mutableMethod.apply {
                // Find the instruction for creating the text data object.
                val textDataClassType = TextComponentDataFingerprint.resultOrThrow().classDef.type
-                val insertIndex = indexOfFirstInstructionOrThrow {
-                    opcode == Opcode.NEW_INSTANCE &&
-                            getReference<TypeReference>()?.type == textDataClassType
+
+                val insertIndex : Int
+                val tempRegister : Int
+                val charSequenceRegister : Int
+
+                if (VersionCheckPatch.is_19_33_or_greater) {
+                    insertIndex = indexOfFirstInstructionOrThrow {
+                        opcode == Opcode.INVOKE_STATIC_RANGE &&
+                                getReference<MethodReference>()?.returnType == textDataClassType
+                    }
+
+                    tempRegister = getInstruction<OneRegisterInstruction>(insertIndex + 1).registerA
+
+                    // Find the instruction that sets the span to an instance field.
+                    // The instruction is only a few lines after the creation of the instance.
+                    charSequenceRegister = getInstruction<FiveRegisterInstruction>(
+                        indexOfFirstInstructionOrThrow(insertIndex) {
+                            opcode == Opcode.INVOKE_VIRTUAL &&
+                                    getReference<MethodReference>()?.parameterTypes?.firstOrNull() == "Ljava/lang/CharSequence;"
+                        }
+                    ).registerD
+                } else {
+                    insertIndex = indexOfFirstInstructionOrThrow {
+                        opcode == Opcode.NEW_INSTANCE &&
+                                getReference<TypeReference>()?.type == textDataClassType
+                    }
+
+                    tempRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+
+                    charSequenceRegister = getInstruction<TwoRegisterInstruction>(
+                        indexOfFirstInstructionOrThrow(insertIndex) {
+                            opcode == Opcode.IPUT_OBJECT &&
+                                    getReference<FieldReference>()?.type == "Ljava/lang/CharSequence;"
+                        }
+                    ).registerA
                }
-                val tempRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA

-                // Find the instruction that sets the span to an instance field.
-                // The instruction is only a few lines after the creation of the instance.
-                // The method has multiple iput-object instructions using a CharSequence,
-                // so verify the found instruction is in the expected location.
-                val putFieldInstruction = implementation!!.instructions
-                    .subList(insertIndex, insertIndex + 20)
-                    .find {
-                        it.opcode == Opcode.IPUT_OBJECT &&
-                                it.getReference<FieldReference>()?.type == "Ljava/lang/CharSequence;"
-                    } ?: throw PatchException("Could not find put object instruction")
-                val charSequenceRegister = (putFieldInstruction as TwoRegisterInstruction).registerA
-
-                addInstructions(
-                    insertIndex,
+                addInstructionsAtControlFlowLabel(insertIndex,
+                    """
+                        # Copy conversion context
+                        move-object/from16 v$tempRegister, p0
+                        iget-object v$tempRegister, v$tempRegister, $conversionContextField
+                        invoke-static { v$tempRegister, v$charSequenceRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+                        move-result-object v$charSequenceRegister
                    """
-                    # Copy conversion context
-                    move-object/from16 v$tempRegister, p0
-                    iget-object v$tempRegister, v$tempRegister, $conversionContextField
-                    invoke-static {v$tempRegister, v$charSequenceRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-                    move-result-object v$charSequenceRegister
-                """
                )
            }
-        } ?: throw TextComponentConstructorFingerprint.exception
+        }

        // endregion

        // region Hook for non-litho Short videos.

-        ShortsTextViewFingerprint.result?.let {
+        ShortsTextViewFingerprint.resultOrThrow().let {
            it.mutableMethod.apply {
-                val patternResult = it.scanResult.patternScanResult!!
+                val insertIndex = it.scanResult.patternScanResult!!.endIndex + 1

                // If the field is true, the TextView is for a dislike button.
-                val isDisLikesBooleanReference = getInstruction<ReferenceInstruction>(patternResult.endIndex).reference
+                val isDisLikesBooleanInstruction = getInstructions().first { instruction ->
+                    instruction.opcode == Opcode.IGET_BOOLEAN
+                } as ReferenceInstruction

-                val textViewFieldReference = // Like/Dislike button TextView field
-                    getInstruction<ReferenceInstruction>(patternResult.endIndex - 1).reference
+                val isDisLikesBooleanReference = isDisLikesBooleanInstruction.reference
+
+                // Like/Dislike button TextView field.
+                val textViewFieldInstruction = getInstructions().first { instruction ->
+                    instruction.opcode == Opcode.IGET_OBJECT
+                } as ReferenceInstruction
+
+                val textViewFieldReference = textViewFieldInstruction.reference

                // Check if the hooked TextView object is that of the dislike button.
                // If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
                // Otherwise, the TextView object is modified, and the execution flow is interrupted to prevent it from being changed afterward.
-                val insertIndex = patternResult.startIndex + 6
                addInstructionsWithLabels(
                    insertIndex,
                    """
@@ -216,7 +233,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                    """
                )
            }
-        } ?: throw ShortsTextViewFingerprint.exception
+        }

        // endregion

@@ -251,20 +268,14 @@ object ReturnYouTubeDislikePatch : BytecodePatch(

        // region Hook rolling numbers.

-        // Do this last to allow patching old unsupported versions (if the user really wants),
-        // On older unsupported version this will fail to resolve and throw an exception,
-        // but everything will still work correctly anyways.
-
-        RollingNumberSetterFingerprint.result?.let {
+        RollingNumberSetterFingerprint.resultOrThrow().let {
            val dislikesIndex = it.scanResult.patternScanResult!!.endIndex

            it.mutableMethod.apply {
                val insertIndex = 1

-                val charSequenceInstanceRegister =
-                    getInstruction<OneRegisterInstruction>(0).registerA
-                val charSequenceFieldReference =
-                    getInstruction<ReferenceInstruction>(dislikesIndex).reference
+                val charSequenceInstanceRegister = getInstruction<OneRegisterInstruction>(0).registerA
+                val charSequenceFieldReference = getInstruction<ReferenceInstruction>(dislikesIndex).reference

                val registerCount = implementation!!.registerCount

@@ -282,7 +293,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                    """
                )
            }
-        } ?: throw RollingNumberSetterFingerprint.exception
+        }

        // Rolling Number text views use the measured width of the raw string for layout.
        // Modify the measure text calculation to include the left drawable separator if needed.
@@ -306,9 +317,12 @@ object ReturnYouTubeDislikePatch : BytecodePatch(

        // Additional text measurement method. Used if YouTube decides not to animate the likes count
        // and sometimes used for initial video load.
-        RollingNumberMeasureStaticLabelFingerprint.resolve(context, RollingNumberMeasureStaticLabelParentFingerprint.resultOrThrow().classDef)
-        RollingNumberMeasureStaticLabelFingerprint.result?.also {
+        RollingNumberMeasureStaticLabelFingerprint.alsoResolve(
+            context,
+            RollingNumberMeasureStaticLabelParentFingerprint
+        ).let {
            val measureTextIndex = it.scanResult.patternScanResult!!.startIndex + 1
+
            it.mutableMethod.apply {
                val freeRegister = getInstruction<TwoRegisterInstruction>(0).registerA

@@ -320,19 +334,18 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                    """
                )
            }
-        } ?: throw RollingNumberMeasureStaticLabelFingerprint.exception
+        }

        // The rolling number Span is missing styling since it's initially set as a String.
        // Modify the UI text view and use the styled like/dislike Span.
-        RollingNumberTextViewFingerprint.result?.let {
+        RollingNumberTextViewFingerprint.resultOrThrow().let {
            // Initial TextView is set in this method.
            val initiallyCreatedTextViewMethod = it.mutableMethod

            // Videos less than 24 hours after uploaded, like counts will be updated in real time.
            // Whenever like counts are updated, TextView is set in this method.
            val realTimeUpdateTextViewMethod =
-                RollingNumberTextViewAnimationUpdateFingerprint.result?.mutableMethod
-                    ?: throw RollingNumberTextViewAnimationUpdateFingerprint.exception
+                RollingNumberTextViewAnimationUpdateFingerprint.resultOrThrow().mutableMethod

            arrayOf(
                initiallyCreatedTextViewMethod,
@@ -357,7 +370,7 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
                    )
                }
            }
-        } ?: throw RollingNumberTextViewFingerprint.exception
+        }

        // endregion

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ConversionContextFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ConversionContextFingerprint.kt
@@ -10,9 +10,6 @@ internal object ConversionContextFingerprint : MethodFingerprint(
        ", heightConstraint=",
        ", templateLoggerFactory=",
        ", rootDisposableContainer=",
-        // 18.37.36 and after this String is: ConversionContext{containerInternal=
-        // and before it is: ConversionContext{container=
-        // Use a partial string to match both.
-        "ConversionContext{container"
+        "ConversionContext{containerInternal="
    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberSetterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberSetterFingerprint.kt
@@ -8,5 +8,6 @@ internal object RollingNumberSetterFingerprint : MethodFingerprint(
        Opcode.INVOKE_DIRECT,
        Opcode.IGET_OBJECT
    ),
-    strings = listOf("RollingNumberType required properties missing! Need updateCount, fontName, color and fontSize.")
+    // Partial string match.
+    strings = listOf("RollingNumberType required properties missing! Need")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberTextViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberTextViewFingerprint.kt
@@ -18,6 +18,7 @@ internal object RollingNumberTextViewFingerprint : MethodFingerprint(
        Opcode.RETURN_VOID
    ),
    customFingerprint = { _, classDef ->
-        classDef.superclass == "Landroid/support/v7/widget/AppCompatTextView;"
+        classDef.superclass == "Landroid/support/v7/widget/AppCompatTextView;" ||
+                classDef.superclass == "Lcom/google/android/libraries/youtube/rendering/ui/spec/typography/YouTubeAppCompatTextView;"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/ShortsTextViewFingerprint.kt
@@ -15,18 +15,6 @@ internal object ShortsTextViewFingerprint : MethodFingerprint(
        null,
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.SGET_OBJECT,     // insertion point, must be after constructor call to parent class
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.CONST_4,
-        Opcode.IF_EQ,
-        Opcode.RETURN_VOID,
-        Opcode.IGET_OBJECT,     // TextView field
-        Opcode.IGET_BOOLEAN,    // boolean field
+        Opcode.CHECK_CAST
    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentDataFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentDataFingerprint.kt
@@ -9,8 +9,6 @@ internal object TextComponentDataFingerprint : MethodFingerprint(
    parameters = listOf("L", "L"),
    strings = listOf("text"),
    customFingerprint = { _, classDef ->
-        val fields = classDef.fields
-        fields.find { it.type == "Ljava/util/BitSet;" } != null &&
-        fields.find { it.type == "[Ljava/lang/String;" } != null
+        classDef.fields.find { it.type == "Ljava/util/BitSet;" } != null
    }
 )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	07e65d8e83	chore: Release v4.17.0-dev.12 [skip ci] # [4.17.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.11...v4.17.0-dev.12) (2024-10-19) ### Features * YouTube - Hide Shorts components: Hide `Hashtag` button ([#3787](https://github.com/ReVanced/revanced-patches/issues/3787)) ([`d9a70a3`](`d9a70a3ae0`))	2024-10-19 12:41:16 +00:00
MarcaD	d9a70a3ae0	feat(YouTube - Hide Shorts components): Hide `Hashtag` button (#3787 )	2024-10-19 08:39:08 -04:00
semantic-release-bot	945b6b0b34	chore: Release v4.17.0-dev.11 [skip ci] # [4.17.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.10...v4.17.0-dev.11) (2024-10-19) ### Features * YouTube: Support versions `19.25` and `19.34` ([#3629](https://github.com/ReVanced/revanced-patches/issues/3629)) ([`172886f`](`172886fe4b`))	2024-10-19 12:29:04 +00:00
Zain	172886fe4b	feat(YouTube): Support versions `19.25` and `19.34` (#3629 ) Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-10-19 08:26:39 -04:00
semantic-release-bot	651e34b997	chore: Release v4.17.0-dev.10 [skip ci] # [4.17.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.9...v4.17.0-dev.10) (2024-10-17) ### Features * Facebook: Add `Hide sponsored stories` patch ([#3627](https://github.com/ReVanced/revanced-patches/issues/3627)) ([`fc7644d`](`fc7644d3b7`))	2024-10-17 15:39:04 +00:00
PantlessCoding	fc7644d3b7	feat(Facebook): Add `Hide sponsored stories` patch (#3627 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-10-17 17:36:35 +02:00
semantic-release-bot	061ebcb7c6	chore: Release v4.17.0-dev.9 [skip ci] # [4.17.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.8...v4.17.0-dev.9) (2024-10-17) ### Features * Sync for Reddit: Add `Fix video downloads` patch ([#3739](https://github.com/ReVanced/revanced-patches/issues/3739)) ([`38e7884`](`38e7884d17`))	2024-10-17 15:30:41 +00:00
1fexd	38e7884d17	feat(Sync for Reddit): Add `Fix video downloads` patch (#3739 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-10-17 17:28:30 +02:00
semantic-release-bot	64680c718b	chore: Release v4.17.0-dev.8 [skip ci] # [4.17.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.7...v4.17.0-dev.8) (2024-10-17) ### Features * Twitter: Add `Change link sharing domain` patch ([#3753](https://github.com/ReVanced/revanced-patches/issues/3753)) ([`0077028`](`007702825b`))	2024-10-17 15:26:18 +00:00
Alex	007702825b	feat(Twitter): Add `Change link sharing domain` patch (#3753 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-10-17 17:24:06 +02:00
semantic-release-bot	596c2b0f8d	chore: Release v4.17.0-dev.7 [skip ci] # [4.17.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.6...v4.17.0-dev.7) (2024-10-17) ### Bug Fixes * Twitter - Unlock downloads: Make it work with latest versions ([#3782](https://github.com/ReVanced/revanced-patches/issues/3782)) ([`773fd81`](`773fd81dfd`)) * YouTube - Spoof video streams: Fix playback for Android VR by removing invalid body as well ([#3769](https://github.com/ReVanced/revanced-patches/issues/3769)) ([`68b61b4`](`68b61b4725`))	2024-10-17 15:21:25 +00:00
Alex	773fd81dfd	fix(Twitter - Unlock downloads): Make it work with latest versions (#3782 )	2024-10-17 17:18:48 +02:00
oSumAtrIX	68b61b4725	fix(YouTube - Spoof video streams): Fix playback for Android VR by removing invalid body as well (#3769 )	2024-10-17 17:16:45 +02:00
semantic-release-bot	10efb20e35	chore: Release v4.17.0-dev.6 [skip ci] # [4.17.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.5...v4.17.0-dev.6) (2024-10-14) ### Features * YouTube - Hide Shorts components: Add option to hide `Use template`, `Upcoming`, `Green screen` buttons ([#3752](https://github.com/ReVanced/revanced-patches/issues/3752)) ([`d5a1368`](`d5a13684f6`))	2024-10-14 12:13:04 +00:00
MarcaD	d5a13684f6	feat(YouTube - Hide Shorts components): Add option to hide `Use template`, `Upcoming`, `Green screen` buttons (#3752 )	2024-10-14 14:10:53 +02:00
semantic-release-bot	e2dd1bdaf3	chore: Release v4.17.0-dev.5 [skip ci] # [4.17.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.4...v4.17.0-dev.5) (2024-10-07) ### Features * Backdrops - Pro unlock: Support latest versions by removing version constraint ([`98c33f0`](`98c33f03dd`))	2024-10-07 20:58:34 +00:00
KAZI MMT	98c33f03dd	feat(Backdrops - Pro unlock): Support latest versions by removing version constraint	2024-10-07 22:56:31 +02:00
semantic-release-bot	d73e5b77df	chore: Release v4.17.0-dev.4 [skip ci] # [4.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.3...v4.17.0-dev.4) (2024-10-06) ### Bug Fixes * YouTube - Hide layout components: Adjust settings text ([#3745](https://github.com/ReVanced/revanced-patches/issues/3745)) ([`2f7e1f6`](`2f7e1f601a`))	2024-10-06 22:57:38 +00:00
LisoUseInAIKyrios	2f7e1f601a	fix(YouTube - Hide layout components): Adjust settings text (#3745 )	2024-10-06 18:55:20 -04:00
semantic-release-bot	bcdc7a4589	chore: Release v4.17.0-dev.3 [skip ci] # [4.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.2...v4.17.0-dev.3) (2024-10-06) ### Features * YouTube - Hide layout components: Add option to hide Yoodles (YouTube Doodles) ([#3743](https://github.com/ReVanced/revanced-patches/issues/3743)) ([`0679a47`](`0679a47b22`))	2024-10-06 00:11:05 +00:00
LisoUseInAIKyrios	0679a47b22	feat(YouTube - Hide layout components): Add option to hide Yoodles (YouTube Doodles) (#3743 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-10-05 20:09:06 -04:00
semantic-release-bot	5a08620356	chore: Release v4.17.0-dev.2 [skip ci] # [4.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.1...v4.17.0-dev.2) (2024-10-05) ### Features * Willhaben: Add `Hide ads` patch ([#3740](https://github.com/ReVanced/revanced-patches/issues/3740)) ([`42ed29b`](`42ed29b4c0`))	2024-10-05 23:21:37 +00:00
1fexd	42ed29b4c0	feat(Willhaben): Add `Hide ads` patch (#3740 )	2024-10-06 01:19:39 +02:00
semantic-release-bot	8475cc2b09	chore: Release v4.17.0-dev.1 [skip ci] # [4.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.16.1-dev.1...v4.17.0-dev.1) (2024-10-02) ### Features * YouTube - Hide Shorts components: Add option to hide like fountain ([#3731](https://github.com/ReVanced/revanced-patches/issues/3731)) ([`d76f4c9`](`d76f4c96a4`))	2024-10-02 00:40:56 +00:00
oSumAtrIX	d76f4c96a4	feat(YouTube - Hide Shorts components): Add option to hide like fountain (#3731 ) Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>	2024-10-02 02:38:49 +02:00
semantic-release-bot	eebe82b2f4	chore: Release v4.16.1-dev.1 [skip ci] ## [4.16.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.16.0...v4.16.1-dev.1) (2024-10-01)	2024-10-01 15:31:58 +00:00
oSumAtrIX	59273999e9	ci: Use permissions and regular GitHub token instead of PAT	2024-10-01 17:28:12 +02:00
oSumAtrIX	c3d457d7de	build(Needs bump): Update dependencies	2024-09-30 23:21:43 +02:00
oSumAtrIX	17dfc161c1	ci: Adjust release commit message	2024-09-30 22:34:23 +02:00
oSumAtrIX	e3e1efea33	chore: Adjust PR body	2024-09-30 22:08:45 +02:00
semantic-release-bot	ef8aa22779	chore(release): 4.16.0 [skip ci] # [4.16.0](https://github.com/ReVanced/revanced-patches/compare/v4.15.0...v4.16.0) (2024-09-30) ### Bug Fixes * Soundcloud: Support latest versions ([#3702](https://github.com/ReVanced/revanced-patches/issues/3702)) ([`fa94ddd`](`fa94ddd510`)) * Twitter - Open links with app chooser: Fix incorrect version in compatibility list ([#3683](https://github.com/ReVanced/revanced-patches/issues/3683)) ([`2e9142e`](`2e9142eda4`)) * YouTube - SponsorBlock: Fade out SB buttons without overlapping other buttons ([#3719](https://github.com/ReVanced/revanced-patches/issues/3719)) ([`1928e89`](`1928e89085`)) * YouTube: Show video chapter titles without clipping when overlay buttons are enabled ([#3674](https://github.com/ReVanced/revanced-patches/issues/3674)) ([`317e9a8`](`317e9a80eb`)) ### Features * Google Photos: Restore hidden 'Back up while charging' toggle ([#3678](https://github.com/ReVanced/revanced-patches/issues/3678)) ([`8a3b061`](`8a3b0610b4`)) * YouTube - Disable precise seeking gesture: Hide "pull up" label that shows up when swiping ([#3668](https://github.com/ReVanced/revanced-patches/issues/3668)) ([`1f0b4cd`](`1f0b4cdcb4`)) * YouTube - Hide Shorts components: Add `Hide save music`, `Hide stickers` ([#3710](https://github.com/ReVanced/revanced-patches/issues/3710)) ([`82d44f6`](`82d44f691d`)) * YouTube - Hide Shorts components: Add patch option to hide Shorts app shortcut (long press app icon) ([#3699](https://github.com/ReVanced/revanced-patches/issues/3699)) ([`bb0dcbe`](`bb0dcbe83d`)) * YouTube - Hide Shorts components: Add patch option to hide Shorts from app launcher widget Beta ([#3707](https://github.com/ReVanced/revanced-patches/issues/3707)) ([`4c7b018`](`4c7b018878`))	2024-09-30 19:15:42 +00:00
oSumAtrIX	fb9db0eec4	chore: Merge branch `dev` to `main` (#3681 )	2024-09-30 21:13:15 +02:00
ReVanced Bot	33adf53ef1	chore: Sync translations (#3721 )	2024-09-30 15:07:54 -04:00
semantic-release-bot	9131e387b5	chore(release): 4.16.0-dev.7 [skip ci] # [4.16.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.6...v4.16.0-dev.7) (2024-09-29) ### Bug Fixes * YouTube - SponsorBlock: Fade out SB buttons without overlapping other buttons ([#3719](https://github.com/ReVanced/revanced-patches/issues/3719)) ([`1928e89`](`1928e89085`))	2024-09-29 21:15:24 +00:00
LisoUseInAIKyrios	1928e89085	fix(YouTube - SponsorBlock): Fade out SB buttons without overlapping other buttons (#3719 )	2024-09-29 17:13:21 -04:00
ReVanced Bot	35973c721a	chore: Sync translations (#3720 )	2024-09-29 17:13:04 -04:00
LisoUseInAIKyrios	31b18fec39	chore(YouTube - Hide layout components): Move `Hide chips shelf` to general as it also appears in the feed	2024-09-28 21:28:55 -04:00
semantic-release-bot	db15b68dc8	chore(release): 4.16.0-dev.6 [skip ci] # [4.16.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.5...v4.16.0-dev.6) (2024-09-29) ### Features * YouTube - Hide Shorts components: Add `Hide save music`, `Hide stickers` ([#3710](https://github.com/ReVanced/revanced-patches/issues/3710)) ([`82d44f6`](`82d44f691d`))	2024-09-29 01:05:21 +00:00
LisoUseInAIKyrios	82d44f691d	feat(YouTube - Hide Shorts components): Add `Hide save music`, `Hide stickers` (#3710 )	2024-09-28 21:02:56 -04:00
semantic-release-bot	fee2218303	chore(release): 4.16.0-dev.5 [skip ci] # [4.16.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.4...v4.16.0-dev.5) (2024-09-29) ### Features * YouTube - Disable precise seeking gesture: Hide "pull up" label that shows up when swiping ([#3668](https://github.com/ReVanced/revanced-patches/issues/3668)) ([`1f0b4cd`](`1f0b4cdcb4`))	2024-09-29 00:34:19 +00:00
Zain	1f0b4cdcb4	feat(YouTube - Disable precise seeking gesture): Hide "pull up" label that shows up when swiping (#3668 ) Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-09-29 02:32:17 +02:00
semantic-release-bot	1fd30c1b44	chore(release): 4.16.0-dev.4 [skip ci] # [4.16.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.3...v4.16.0-dev.4) (2024-09-29) ### Bug Fixes * Soundcloud: Support latest versions ([#3702](https://github.com/ReVanced/revanced-patches/issues/3702)) ([`fa94ddd`](`fa94ddd510`))	2024-09-29 00:27:59 +00:00
FullerBread2032	fa94ddd510	fix(Soundcloud): Support latest versions (#3702 )	2024-09-29 02:25:56 +02:00
semantic-release-bot	94cf815e4a	chore(release): 4.16.0-dev.3 [skip ci] # [4.16.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.16.0-dev.2...v4.16.0-dev.3) (2024-09-29) ### Features * Google Photos: Restore hidden 'Back up while charging' toggle ([#3678](https://github.com/ReVanced/revanced-patches/issues/3678)) ([`8a3b061`](`8a3b0610b4`))	2024-09-29 00:24:39 +00:00
xob0t	8a3b0610b4	feat(Google Photos): Restore hidden 'Back up while charging' toggle (#3678 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-09-29 02:22:32 +02:00
ReVanced Bot	b920355d9c	chore: Sync translations (#3709 )	2024-09-28 19:22:19 -04:00