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

# [4.17.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.12...v4.17.0-dev.13) (2024-10-19)

### Bug Fixes

* **YouTube - GmsCore support:** Add more replacements ([6965b7d](6965b7d653))
* **YouTube - GmsCore support:** Remove unclear patch changes ([ab10b42](ab10b42388))

### Performance Improvements

* **YouTube - GmsCore support:** Improve performance by using hashsets ([6bc6ea8](6bc6ea854b))

.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

.github/workflows/pull_strings.yml

@@ -8,6 +8,9 @@ on:
 jobs:
   pull:
     name: Pull strings
+    permissions:
+      contents: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -30,6 +33,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 }}

.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 }}

.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

.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}"
       }
     ],
     [

CHANGELOG.md

@@ -1,3 +1,216 @@
+# [4.17.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v4.17.0-dev.12...v4.17.0-dev.13) (2024-10-19)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore support:** Add more replacements ([4d39770](https://github.com/ReVanced/revanced-patches/commit/4d39770602b39b6cb399eb0d8c52947b6ebafbb0))
+* **YouTube - GmsCore support:** Remove unclear patch changes ([021d858](https://github.com/ReVanced/revanced-patches/commit/021d8584a7f5a6d1a028c5d18dc91a3b988b2884))
+
+
+### Performance Improvements
+
+* **YouTube - GmsCore support:** Improve performance by using hashsets ([2c5d390](https://github.com/ReVanced/revanced-patches/commit/2c5d390fb1275dc3da5a3b912e221b7d594a1561))
+
+# [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)
+
+
+### Features
+
+* **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.1](https://github.com/ReVanced/revanced-patches/compare/v4.15.1-dev.2...v4.16.0-dev.1) (2024-09-27)
+
+
+### Features
+
+* **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))
+
+## [4.15.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.15.1-dev.1...v4.15.1-dev.2) (2024-09-23)
+
+
+### Bug Fixes
+
+* **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))
+
+## [4.15.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.15.0...v4.15.1-dev.1) (2024-09-23)
+
+
+### Bug Fixes
+
+* **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))
+
+# [4.15.0](https://github.com/ReVanced/revanced-patches/compare/v4.14.1...v4.15.0) (2024-09-23)
+
+
+### Bug Fixes
+
+* **TikTok - Playback speed:** Prevent crash by fixing invalid patch ([82d53cb](https://github.com/ReVanced/revanced-patches/commit/82d53cbc3bbfa585ba4337fdfaec9f0f19c802e6))
+* **TikTok - Settings:** Prevent crash by fixing invalid patch ([8074032](https://github.com/ReVanced/revanced-patches/commit/8074032fad3eff1c03296a882d2e2820da99b592))
+* **Twitter - Open links with app chooser:** Constrain patch to last working version `10.48.0-release` ([b9955d5](https://github.com/ReVanced/revanced-patches/commit/b9955d5ff6e456593b01f0f25d80ff660d02082a))
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([74c8637](https://github.com/ReVanced/revanced-patches/commit/74c8637943347078955f51325bc6af92a35d4463))
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([#3672](https://github.com/ReVanced/revanced-patches/issues/3672)) ([a3306f6](https://github.com/ReVanced/revanced-patches/commit/a3306f6717a09b734354f00363a96abad0ae14e7))
+
+
+### Features
+
+* **TikTok:** Bump patches to support the latest version 36.5.4 ([e5dcb72](https://github.com/ReVanced/revanced-patches/commit/e5dcb72597092fb32003f11fdf6f861ede4e7ff3))
+
+# [4.15.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.2-dev.2...v4.15.0-dev.1) (2024-09-22)
+
+
+### Features
+
+* **TikTok:** Bump patches to support the latest version 36.5.4 ([e5dcb72](https://github.com/ReVanced/revanced-patches/commit/e5dcb72597092fb32003f11fdf6f861ede4e7ff3))
+
+## [4.14.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.14.2-dev.1...v4.14.2-dev.2) (2024-09-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([74c8637](https://github.com/ReVanced/revanced-patches/commit/74c8637943347078955f51325bc6af92a35d4463))
+* **YouTube - Spoof video streams:** Change default client type to Android VR ([#3672](https://github.com/ReVanced/revanced-patches/issues/3672)) ([a3306f6](https://github.com/ReVanced/revanced-patches/commit/a3306f6717a09b734354f00363a96abad0ae14e7))
+
 ## [4.14.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.1...v4.14.2-dev.1) (2024-09-21)
 
 

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
@@ -2000,13 +2026,19 @@ public final class app/revanced/patches/youtube/misc/playercontrols/BottomContro
 
 public final class app/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/playercontrols/PlayerControlsBytecodePatch;
-	public static field showPlayerControlsFingerprintResult Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-	public final fun getShowPlayerControlsFingerprintResult ()Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
+	public final fun initializeBottomControl (Ljava/lang/String;)V
 	public final fun initializeControl (Ljava/lang/String;)V
 	public final fun injectVisibilityCheckCall (Ljava/lang/String;)V
-	public final fun setShowPlayerControlsFingerprintResult (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;)V
+}
+
+public final class app/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch : app/revanced/patcher/patch/ResourcePatch, java/io/Closeable {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/playercontrols/PlayerControlsResourcePatch;
+	public final fun addBottomControls (Ljava/lang/String;)V
+	public fun close ()V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
 public final class app/revanced/patches/youtube/misc/playeroverlay/PlayerOverlaysHookPatch : app/revanced/patcher/patch/BytecodePatch {
@@ -2166,14 +2198,32 @@ 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
+	public static final fun indexOfFirstWideLiteralInstructionValueReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun indexOfIdResource (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun indexOfIdResourceOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun injectHideViewCall (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;IILjava/lang/String;Ljava/lang/String;)V
@@ -2201,6 +2251,7 @@ public final class app/revanced/util/ResourceUtilsKt {
 	public static final fun copyXmlNode (Ljava/lang/String;Lapp/revanced/patcher/util/DomFileEditor;Lapp/revanced/patcher/util/DomFileEditor;)Ljava/lang/AutoCloseable;
 	public static final fun doRecursively (Lorg/w3c/dom/Node;Lkotlin/jvm/functions/Function1;)V
 	public static final fun forEachChildElement (Lorg/w3c/dom/Node;Lkotlin/jvm/functions/Function1;)V
+	public static final fun insertFirst (Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)V
 	public static final fun iterateXmlNodeChildren (Lapp/revanced/patcher/data/ResourceContext;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
 }
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.14.2-dev.1
+version = 4.17.0-dev.13

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",
+        "gradle-semantic-release-plugin": "^1.10.1",
-        "semantic-release": "^24.0.0"
+        "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",
+      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.5.tgz",
-      "integrity": "sha512-o4WRoOJZlKqEEgj+i9CpcmnByvtzoUYC6I8PD2SA95M+BJ2x8h7oLcVOg9qcowWXBOdcTRsMZiwvM3EyLm9AfA==",
+      "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",
+      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-7.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-7.1.2.tgz",
-      "integrity": "sha512-G9Ue+x2odcb8E1XIPhaFBnTTIrrUDfXN05iFXiqhR+SeeeDMMILcAnysOsxUpEWcQp2e5Ft397FCXTcPkiPkLw==",
+      "integrity": "sha512-XOWnPpH2kJ5VTwozsxGurw+svB2e61aWlmk5EVIYZPwFK5F9h4cyPyj9CIKRyMXMHSwpIsI3mPOdpMmrRhe7UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -302,9 +302,9 @@
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "6.1.4",
+      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz",
-      "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==",
+      "integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -315,9 +315,9 @@
       }
     },
     "node_modules/@octokit/types": {
-      "version": "13.5.0",
+      "version": "13.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.0.tgz",
-      "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==",
+      "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",
+      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz",
-      "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==",
+      "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",
+      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-10.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-11.0.0.tgz",
-      "integrity": "sha512-sSmsBKGpAlTtXf9rUJf/si16p+FwPEsvsJRjl3KCwFP0WywaSpynvUhlYvE18n5rzkQNbGJnObAKIoo3xFMSjA==",
+      "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",
+      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz",
-      "integrity": "sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==",
+      "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",
+      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
-      "integrity": "sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==",
+      "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",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+      "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",
+      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "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",
+      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/env-ci/-/env-ci-11.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/env-ci/-/env-ci-11.1.0.tgz",
-      "integrity": "sha512-apikxMgkipkgTvMdRT9MNqWx5VLOci79F4VBd7Op/7OPjjoanjdAvn6fglMCCEf/1bAh8eOiuEVCUs4V3qP3nQ==",
+      "integrity": "sha512-Z8dnwSDbV1XYM9SBF2J0GcNVvmfmfh3a49qddGIROhBoVro6MZVTji15z/sJbQ2ko2ei8n988EU1wzoLU/tF+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2549,9 +2576,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
+      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "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",
+      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/gradle-semantic-release-plugin/-/gradle-semantic-release-plugin-1.9.2.tgz",
+      "resolved": "https://registry.npmjs.org/gradle-semantic-release-plugin/-/gradle-semantic-release-plugin-1.10.1.tgz",
-      "integrity": "sha512-8qpf4GYFPQ+UMUymYBy/VchOOwLILAWzZMrZX1R0RR3JMgJBMN2R0tJn92R/3rXmxx4OAqwUFH6Np51eFoxr3w==",
+      "integrity": "sha512-Q4dLAFICjPouUyRRHEKK8cXNB75nraXoioYZDZlVQOg4sYKudnTDZ3ohLmV3k4cPGiiMCh1ckXETkx9JnuyKmA==",
       "dev": true,
       "funding": [
         {
@@ -2925,16 +2952,16 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "7.0.2",
+      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.0.0.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "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",
+      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3191,9 +3218,9 @@
       }
     },
     "node_modules/is-unicode-supported": {
-      "version": "2.0.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz",
-      "integrity": "sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==",
+      "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3497,9 +3524,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
+      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3547,9 +3574,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
+      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "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",
+      "version": "10.8.3",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-10.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-10.8.3.tgz",
-      "integrity": "sha512-x/AIjFIKRllrhcb48dqUNAAZl0ig9+qMuN91RpZo3Cb2+zuibfh+KISl6+kVVyktDz230JKc208UkQwwMqyB+w==",
+      "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",
+      "license": "ISC"
-      "engines": {
-        "node": "14 || >=16.14"
-      }
     },
     "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",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
       "dev": true,
       "license": "ISC"
     },
@@ -6481,9 +6503,9 @@
       }
     },
     "node_modules/pretty-ms": {
-      "version": "9.0.0",
+      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz",
-      "integrity": "sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==",
+      "integrity": "sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6738,15 +6760,15 @@
       "license": "MIT"
     },
     "node_modules/semantic-release": {
-      "version": "24.0.0",
+      "version": "24.1.2",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-24.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-24.1.2.tgz",
-      "integrity": "sha512-v46CRPw+9eI3ZuYGF2oAjqPqsfbnfFTwLBgQsv/lch4goD09ytwOTESMN4QIrx/wPLxUGey60/NMx+ANQtWRsA==",
+      "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",
+      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-9.4.0.tgz",
-      "integrity": "sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==",
+      "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",
+      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.0.tgz",
-      "integrity": "sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==",
+      "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",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+      "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",
+      "version": "3.0.20",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -7365,9 +7401,9 @@
       }
     },
     "node_modules/supports-hyperlinks": {
-      "version": "3.0.0",
+      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz",
-      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
+      "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",
+      "version": "4.26.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.22.1.tgz",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
-      "integrity": "sha512-9tHNEa0Ov81YOopiVkcCJVz5TM6AEQ+CHHjFIktqPnE3NV0AHIkx+gh9tiCl58m/66wWxkOC9eltpa75J4lQPA==",
+      "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",
+      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q==",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "optional": true,

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",
+    "gradle-semantic-release-plugin": "^1.10.1",
-    "semantic-release": "^24.0.0"
+    "semantic-release": "^24.1.2"
   }
 }

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(

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
+    }
+}

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
+    )
+
+)

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;"
+    }
+)

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"),
+)

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")
+    }
+}

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",
+    ),
+)

src/main/kotlin/app/revanced/patches/music/misc/gms/GmsCoreSupportPatch.kt

@@ -3,7 +3,6 @@ package app.revanced.patches.music.misc.gms
 import app.revanced.patches.music.misc.gms.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.Constants.REVANCED_MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
-import app.revanced.patches.music.misc.gms.fingerprints.CastDynamiteModuleV2Fingerprint
 import app.revanced.patches.music.misc.gms.fingerprints.MusicActivityOnCreateFingerprint
 import app.revanced.patches.music.misc.gms.fingerprints.PrimeMethodFingerprint
 import app.revanced.patches.music.misc.integrations.IntegrationsPatch
@@ -16,7 +15,6 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
     toPackageName = REVANCED_MUSIC_PACKAGE_NAME,
     primeMethodFingerprint = PrimeMethodFingerprint,
     earlyReturnFingerprints = setOf(
-        CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
     ),
     mainActivityOnCreateFingerprint = MusicActivityOnCreateFingerprint,
@@ -26,7 +24,6 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
         CompatiblePackage("com.google.android.apps.youtube.music"),
     ),
     fingerprints = setOf(
-        CastDynamiteModuleV2Fingerprint,
         CastContextFetchFingerprint,
         PrimeMethodFingerprint,
     ),

src/main/kotlin/app/revanced/patches/music/misc/gms/fingerprints/CastDynamiteModuleV2Fingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.gms.fingerprints
-
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    strings = listOf("Failed to load module via V2: ")
-)

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.
+                """,
+            )
+        }
+    }
+}

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"
+    }
+)

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch.kt

@@ -11,7 +11,6 @@ import app.revanced.patches.all.misc.packagename.ChangePackageNamePatch
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch.Constants.ACTIONS
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch.Constants.AUTHORITIES
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch.Constants.PERMISSIONS
-import app.revanced.patches.shared.misc.gms.fingerprints.CastDynamiteModuleFingerprint
 import app.revanced.patches.shared.misc.gms.fingerprints.GmsCoreSupportFingerprint
 import app.revanced.patches.shared.misc.gms.fingerprints.GmsCoreSupportFingerprint.GET_GMS_CORE_VENDOR_GROUP_ID_METHOD_NAME
 import app.revanced.patches.shared.misc.gms.fingerprints.GooglePlayUtilityFingerprint
@@ -69,7 +68,6 @@ abstract class BaseGmsCoreSupportPatch(
         GmsCoreSupportFingerprint,
         GooglePlayUtilityFingerprint,
         ServiceCheckFingerprint,
-        CastDynamiteModuleFingerprint,
         mainActivityOnCreateFingerprint,
     ) + fingerprints,
     requiresIntegrations = true,
@@ -104,10 +102,7 @@ abstract class BaseGmsCoreSupportPatch(
         // Return these methods early to prevent the app from crashing.
         earlyReturnFingerprints.returnEarly()
         ServiceCheckFingerprint.returnEarly()
-        // Not all apps have CastDynamiteModule, so we need to check if it's present.
+
-        if (CastDynamiteModuleFingerprint.result != null) {
-            CastDynamiteModuleFingerprint.returnEarly()
-        }
         // Google Play Utility is not present in all apps, so we need to check if it's present.
         if (GooglePlayUtilityFingerprint.result != null) {
             GooglePlayUtilityFingerprint.returnEarly()
@@ -236,131 +231,268 @@ abstract class BaseGmsCoreSupportPatch(
     /**
      * A collection of permissions, intents and content provider authorities
      * that are present in GmsCore which need to be transformed.
-     *
-     * NOTE: The following were present, but it seems like they are not needed to be transformed:
-     * - com.google.android.gms.chimera.GmsIntentOperationService
-     * - com.google.android.gms.phenotype.internal.IPhenotypeCallbacks
-     * - com.google.android.gms.phenotype.internal.IPhenotypeService
-     * - com.google.android.gms.phenotype.PACKAGE_NAME
-     * - com.google.android.gms.phenotype.UPDATE
-     * - com.google.android.gms.phenotype
      */
     private object Constants {
         /**
-         * A list of all permissions.
+         * All permissions.
          */
-        val PERMISSIONS = listOf(
+        val PERMISSIONS = setOf(
-            // C2DM / GCM
             "com.google.android.c2dm.permission.RECEIVE",
             "com.google.android.c2dm.permission.SEND",
-            "com.google.android.gtalkservice.permission.GTALK_SERVICE",
+            "com.google.android.gms.auth.api.phone.permission.SEND",
-
+            "com.google.android.gms.permission.AD_ID",
-            // GAuth
+            "com.google.android.gms.permission.AD_ID_NOTIFICATION",
+            "com.google.android.gms.permission.CAR_FUEL",
+            "com.google.android.gms.permission.CAR_INFORMATION",
+            "com.google.android.gms.permission.CAR_MILEAGE",
+            "com.google.android.gms.permission.CAR_SPEED",
+            "com.google.android.gms.permission.CAR_VENDOR_EXTENSION",
             "com.google.android.googleapps.permission.GOOGLE_AUTH",
             "com.google.android.googleapps.permission.GOOGLE_AUTH.cp",
             "com.google.android.googleapps.permission.GOOGLE_AUTH.local",
             "com.google.android.googleapps.permission.GOOGLE_AUTH.mail",
             "com.google.android.googleapps.permission.GOOGLE_AUTH.writely",
+            "com.google.android.gtalkservice.permission.GTALK_SERVICE",
+            "com.google.android.providers.gsf.permission.READ_GSERVICES",
         )
 
         /**
          * All intent actions.
          */
-        val ACTIONS = listOf(
+        val ACTIONS = setOf(
-            // location
+            "com.google.android.c2dm.intent.RECEIVE",
-            "com.google.android.gms.location.places.ui.PICK_PLACE",
-            "com.google.android.gms.location.places.GeoDataApi",
-            "com.google.android.gms.location.places.PlacesApi",
-            "com.google.android.gms.location.places.PlaceDetectionApi",
-            "com.google.android.gms.wearable.MESSAGE_RECEIVED",
-
-            // C2DM / GCM
             "com.google.android.c2dm.intent.REGISTER",
             "com.google.android.c2dm.intent.REGISTRATION",
             "com.google.android.c2dm.intent.UNREGISTER",
-            "com.google.android.c2dm.intent.RECEIVE",
+            "com.google.android.contextmanager.service.ContextManagerService.START",
-            "com.google.iid.TOKEN_REQUEST",
             "com.google.android.gcm.intent.SEND",
-
+            "com.google.android.gms.accounts.ACCOUNT_SERVICE",
-            // car
+            "com.google.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS",
-            "com.google.android.gms.car.service.START",
+            "com.google.android.gms.accountsettings.action.BROWSE_SETTINGS",
-
+            "com.google.android.gms.accountsettings.action.VIEW_SETTINGS",
-            // people
+            "com.google.android.gms.accountsettings.MY_ACCOUNT",
-            "com.google.android.gms.people.service.START",
+            "com.google.android.gms.accountsettings.PRIVACY_SETTINGS",
-
+            "com.google.android.gms.accountsettings.SECURITY_SETTINGS",
-            // wearable
+            "com.google.android.gms.ads.gservice.START",
-            "com.google.android.gms.wearable.BIND",
+            "com.google.android.gms.ads.identifier.service.EVENT_ATTESTATION",
-
+            "com.google.android.gms.ads.service.CACHE",
-            // auth
+            "com.google.android.gms.ads.service.CONSENT_LOOKUP",
-            "com.google.android.gsf.login",
+            "com.google.android.gms.ads.service.HTTP",
-            "com.google.android.gsf.action.GET_GLS",
+            "com.google.android.gms.analytics.service.START",
-            "com.google.android.gms.common.account.CHOOSE_ACCOUNT",
+            "com.google.android.gms.app.settings.GoogleSettingsLink",
-            "com.google.android.gms.auth.login.LOGIN",
+            "com.google.android.gms.appstate.service.START",
+            "com.google.android.gms.appusage.service.START",
+            "com.google.android.gms.asterism.service.START",
+            "com.google.android.gms.audiomodem.service.AudioModemService.START",
+            "com.google.android.gms.audit.service.START",
+            "com.google.android.gms.auth.account.authapi.START",
+            "com.google.android.gms.auth.account.authenticator.auto.service.START",
+            "com.google.android.gms.auth.account.authenticator.chromeos.START",
+            "com.google.android.gms.auth.account.authenticator.tv.service.START",
+            "com.google.android.gms.auth.account.data.service.START",
             "com.google.android.gms.auth.api.credentials.PICKER",
             "com.google.android.gms.auth.api.credentials.service.START",
-            "com.google.android.gms.auth.service.START",
+            "com.google.android.gms.auth.api.identity.service.authorization.START",
-            "com.google.firebase.auth.api.gms.service.START",
+            "com.google.android.gms.auth.api.identity.service.credentialsaving.START",
+            "com.google.android.gms.auth.api.identity.service.signin.START",
+            "com.google.android.gms.auth.api.phone.service.InternalService.START",
+            "com.google.android.gms.auth.api.signin.service.START",
             "com.google.android.gms.auth.be.appcert.AppCertService",
-
+            "com.google.android.gms.auth.blockstore.service.START",
-            // fido
+            "com.google.android.gms.auth.config.service.START",
-            "com.google.android.gms.fido.fido2.privileged.START",
+            "com.google.android.gms.auth.cryptauth.cryptauthservice.START",
-
+            "com.google.android.gms.auth.GOOGLE_SIGN_IN",
-            // gass
+            "com.google.android.gms.auth.login.LOGIN",
-            "com.google.android.gms.gass.START",
+            "com.google.android.gms.auth.proximity.devicesyncservice.START",
-
+            "com.google.android.gms.auth.proximity.securechannelservice.START",
-            // games
+            "com.google.android.gms.auth.proximity.START",
-            "com.google.android.gms.games.service.START",
+            "com.google.android.gms.auth.service.START",
-            "com.google.android.gms.games.PLAY_GAMES_UPGRADE",
+            "com.google.android.gms.backup.ACTION_BACKUP_SETTINGS",
-
+            "com.google.android.gms.backup.G1_BACKUP",
-            // chimera
+            "com.google.android.gms.backup.G1_RESTORE",
-            "com.google.android.gms.chimera",
+            "com.google.android.gms.backup.GMS_MODULE_RESTORE",
-
+            "com.google.android.gms.beacon.internal.IBleService.START",
-            // fonts
+            "com.google.android.gms.car.service.START",
-            "com.google.android.gms.fonts",
+            "com.google.android.gms.carrierauth.service.START",
-
+            "com.google.android.gms.cast.firstparty.START",
-            // phenotype
+            "com.google.android.gms.cast.remote_display.service.START",
-            "com.google.android.gms.phenotype.service.START",
+            "com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE",
-
+            "com.google.android.gms.cast_mirroring.service.START",
-            // location
+            "com.google.android.gms.checkin.BIND_TO_SERVICE",
-            "com.google.android.gms.location.reporting.service.START",
+            "com.google.android.gms.chromesync.service.START",
-
-            // misc
-            "com.google.android.gms.gmscompliance.service.START",
-            "com.google.android.gms.oss.licenses.service.START",
-            "com.google.android.gms.tapandpay.service.BIND",
-            "com.google.android.gms.measurement.START",
-            "com.google.android.gms.languageprofile.service.START",
             "com.google.android.gms.clearcut.service.START",
-            "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE",
+            "com.google.android.gms.common.account.CHOOSE_ACCOUNT",
-            "com.google.android.gms.accountsettings.action.VIEW_SETTINGS",
+            "com.google.android.gms.common.download.START",
-
+            "com.google.android.gms.common.service.START",
-            // potoken
+            "com.google.android.gms.common.telemetry.service.START",
-            "com.google.android.gms.potokens.service.START",
+            "com.google.android.gms.config.START",
-
+            "com.google.android.gms.constellation.service.START",
-            // droidguard/ safetynet
+            "com.google.android.gms.credential.manager.service.firstparty.START",
+            "com.google.android.gms.deviceconnection.service.START",
+            "com.google.android.gms.drive.ApiService.RESET_AFTER_BOOT",
+            "com.google.android.gms.drive.ApiService.START",
+            "com.google.android.gms.drive.ApiService.STOP",
+            "com.google.android.gms.droidguard.service.INIT",
+            "com.google.android.gms.droidguard.service.PING",
             "com.google.android.gms.droidguard.service.START",
+            "com.google.android.gms.enterprise.loader.service.START",
+            "com.google.android.gms.facs.cache.service.START",
+            "com.google.android.gms.facs.internal.service.START",
+            "com.google.android.gms.feedback.internal.IFeedbackService",
+            "com.google.android.gms.fido.credentialstore.internal_service.START",
+            "com.google.android.gms.fido.fido2.privileged.START",
+            "com.google.android.gms.fido.fido2.regular.START",
+            "com.google.android.gms.fido.fido2.zeroparty.START",
+            "com.google.android.gms.fido.sourcedevice.service.START",
+            "com.google.android.gms.fido.targetdevice.internal_service.START",
+            "com.google.android.gms.fido.u2f.privileged.START",
+            "com.google.android.gms.fido.u2f.thirdparty.START",
+            "com.google.android.gms.fido.u2f.zeroparty.START",
+            "com.google.android.gms.fitness.BleApi",
+            "com.google.android.gms.fitness.ConfigApi",
+            "com.google.android.gms.fitness.GoalsApi",
+            "com.google.android.gms.fitness.GoogleFitnessService.START",
+            "com.google.android.gms.fitness.HistoryApi",
+            "com.google.android.gms.fitness.InternalApi",
+            "com.google.android.gms.fitness.RecordingApi",
+            "com.google.android.gms.fitness.SensorsApi",
+            "com.google.android.gms.fitness.SessionsApi",
+            "com.google.android.gms.fonts.service.START",
+            "com.google.android.gms.freighter.service.START",
+            "com.google.android.gms.games.internal.connect.service.START",
+            "com.google.android.gms.games.PLAY_GAMES_UPGRADE",
+            "com.google.android.gms.games.service.START",
+            "com.google.android.gms.gass.START",
+            "com.google.android.gms.gmscompliance.service.START",
+            "com.google.android.gms.googlehelp.HELP",
+            "com.google.android.gms.googlehelp.service.GoogleHelpService.START",
+            "com.google.android.gms.growth.service.START",
+            "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START",
+            "com.google.android.gms.icing.INDEX_SERVICE",
+            "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE",
+            "com.google.android.gms.identity.service.BIND",
+            "com.google.android.gms.inappreach.service.START",
+            "com.google.android.gms.instantapps.START",
+            "com.google.android.gms.kids.service.START",
+            "com.google.android.gms.languageprofile.service.START",
+            "com.google.android.gms.learning.internal.dynamitesupport.START",
+            "com.google.android.gms.learning.intservice.START",
+            "com.google.android.gms.learning.predictor.START",
+            "com.google.android.gms.learning.trainer.START",
+            "com.google.android.gms.learning.training.background.START",
+            "com.google.android.gms.location.places.GeoDataApi",
+            "com.google.android.gms.location.places.PlaceDetectionApi",
+            "com.google.android.gms.location.places.PlacesApi",
+            "com.google.android.gms.location.reporting.service.START",
+            "com.google.android.gms.location.settings.LOCATION_HISTORY",
+            "com.google.android.gms.location.settings.LOCATION_REPORTING_SETTINGS",
+            "com.google.android.gms.locationsharing.api.START",
+            "com.google.android.gms.locationsharingreporter.service.START",
+            "com.google.android.gms.lockbox.service.START",
+            "com.google.android.gms.matchstick.lighter.service.START",
+            "com.google.android.gms.mdm.services.DeviceManagerApiService.START",
+            "com.google.android.gms.mdm.services.START",
+            "com.google.android.gms.mdns.service.START",
+            "com.google.android.gms.measurement.START",
+            "com.google.android.gms.nearby.bootstrap.service.NearbyBootstrapService.START",
+            "com.google.android.gms.nearby.connection.service.START",
+            "com.google.android.gms.nearby.fastpair.START",
+            "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START",
+            "com.google.android.gms.nearby.sharing.service.NearbySharingService.START",
+            "com.google.android.gms.nearby.sharing.START_SERVICE",
+            "com.google.android.gms.notifications.service.START",
+            "com.google.android.gms.ocr.service.internal.START",
+            "com.google.android.gms.ocr.service.START",
+            "com.google.android.gms.oss.licenses.service.START",
+            "com.google.android.gms.payse.service.BIND",
+            "com.google.android.gms.people.contactssync.service.START",
+            "com.google.android.gms.people.service.START",
+            "com.google.android.gms.phenotype.service.START",
+            "com.google.android.gms.photos.autobackup.service.START",
+            "com.google.android.gms.playlog.service.START",
+            "com.google.android.gms.plus.service.default.INTENT",
+            "com.google.android.gms.plus.service.image.INTENT",
+            "com.google.android.gms.plus.service.internal.START",
+            "com.google.android.gms.plus.service.START",
+            "com.google.android.gms.potokens.service.START",
+            "com.google.android.gms.pseudonymous.service.START",
+            "com.google.android.gms.rcs.START",
+            "com.google.android.gms.reminders.service.START",
+            "com.google.android.gms.romanesco.MODULE_BACKUP_AGENT",
+            "com.google.android.gms.romanesco.service.START",
             "com.google.android.gms.safetynet.service.START",
+            "com.google.android.gms.scheduler.ACTION_PROXY_SCHEDULE",
+            "com.google.android.gms.search.service.SEARCH_AUTH_START",
+            "com.google.android.gms.semanticlocation.service.START_ODLH",
+            "com.google.android.gms.sesame.service.BIND",
+            "com.google.android.gms.settings.EXPOSURE_NOTIFICATION_SETTINGS",
+            "com.google.android.gms.setup.auth.SecondDeviceAuth.START",
+            "com.google.android.gms.signin.service.START",
+            "com.google.android.gms.smartdevice.d2d.SourceDeviceService.START",
+            "com.google.android.gms.smartdevice.d2d.TargetDeviceService.START",
+            "com.google.android.gms.smartdevice.directtransfer.SourceDirectTransferService.START",
+            "com.google.android.gms.smartdevice.directtransfer.TargetDirectTransferService.START",
+            "com.google.android.gms.smartdevice.postsetup.PostSetupService.START",
+            "com.google.android.gms.smartdevice.setup.accounts.AccountsService.START",
+            "com.google.android.gms.smartdevice.wifi.START_WIFI_HELPER_SERVICE",
+            "com.google.android.gms.social.location.activity.service.START",
+            "com.google.android.gms.speech.service.START",
+            "com.google.android.gms.statementservice.EXECUTE",
+            "com.google.android.gms.stats.ACTION_UPLOAD_DROPBOX_ENTRIES",
+            "com.google.android.gms.tapandpay.service.BIND",
+            "com.google.android.gms.telephonyspam.service.START",
+            "com.google.android.gms.testsupport.service.START",
+            "com.google.android.gms.thunderbird.service.START",
+            "com.google.android.gms.trustagent.BridgeApi.START",
+            "com.google.android.gms.trustagent.StateApi.START",
+            "com.google.android.gms.trustagent.trustlet.trustletmanagerservice.BIND",
+            "com.google.android.gms.trustlet.bluetooth.service.BIND",
+            "com.google.android.gms.trustlet.connectionlessble.service.BIND",
+            "com.google.android.gms.trustlet.face.service.BIND",
+            "com.google.android.gms.trustlet.nfc.service.BIND",
+            "com.google.android.gms.trustlet.onbody.service.BIND",
+            "com.google.android.gms.trustlet.place.service.BIND",
+            "com.google.android.gms.trustlet.voiceunlock.service.BIND",
+            "com.google.android.gms.udc.service.START",
+            "com.google.android.gms.update.START_API_SERVICE",
+            "com.google.android.gms.update.START_SERVICE",
+            "com.google.android.gms.update.START_SINGLE_USER_API_SERVICE",
+            "com.google.android.gms.update.START_TV_API_SERVICE",
+            "com.google.android.gms.usagereporting.service.START",
+            "com.google.android.gms.userlocation.service.START",
+            "com.google.android.gms.vehicle.cabin.service.START",
+            "com.google.android.gms.vehicle.climate.service.START",
+            "com.google.android.gms.vehicle.info.service.START",
+            "com.google.android.gms.wallet.service.BIND",
+            "com.google.android.gms.walletp2p.service.firstparty.BIND",
+            "com.google.android.gms.walletp2p.service.zeroparty.BIND",
+            "com.google.android.gms.wearable.BIND",
+            "com.google.android.gms.wearable.BIND_LISTENER",
+            "com.google.android.gms.wearable.DATA_CHANGED",
+            "com.google.android.gms.wearable.MESSAGE_RECEIVED",
+            "com.google.android.gms.wearable.NODE_CHANGED",
+            "com.google.android.gsf.action.GET_GLS",
+            "com.google.android.location.settings.LOCATION_REPORTING_SETTINGS",
+            "com.google.android.mdd.service.START",
+            "com.google.android.mdh.service.listener.START",
+            "com.google.android.mdh.service.START",
+            "com.google.android.mobstore.service.START",
+            "com.google.firebase.auth.api.gms.service.START",
+            "com.google.firebase.dynamiclinks.service.START",
+            "com.google.iid.TOKEN_REQUEST",
+            "com.google.android.gms.location.places.ui.PICK_PLACE",
         )
 
         /**
          * All content provider authorities.
          */
-        val AUTHORITIES = listOf(
+        val AUTHORITIES = setOf(
-            // gsf
+            "com.google.android.gms.auth.accounts",
+            "com.google.android.gms.chimera",
+            "com.google.android.gms.fonts",
+            "com.google.android.gms.phenotype",
             "com.google.android.gsf.gservices",
             "com.google.settings",
-
-            // auth
-            "com.google.android.gms.auth.accounts",
-
-            // chimera
-            "com.google.android.gms.chimera",
-
-            // fonts
-            "com.google.android.gms.fonts",
-
-            // phenotype
-            "com.google.android.gms.phenotype",
         )
     }
 

src/main/kotlin/app/revanced/patches/shared/misc/gms/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.shared.misc.gms.fingerprints
-
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object CastDynamiteModuleFingerprint : MethodFingerprint(
-    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-)

src/main/kotlin/app/revanced/patches/shared/misc/settings/BaseSettingsResourcePatch.kt

@@ -9,6 +9,7 @@ import app.revanced.patches.shared.misc.settings.preference.IntentPreference
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 import app.revanced.util.getNode
+import app.revanced.util.insertFirst
 import org.w3c.dom.Node
 import java.io.Closeable
 
@@ -47,11 +48,7 @@ abstract class BaseSettingsResourcePatch(
                 //  It may be necessary to ask for the desired resourceValue in the future.
                 AddResourcesPatch("values", resource)
             }.let { preferenceNode ->
-                if (prepend && firstChild != null) {
+                insertFirst(preferenceNode)
-                    insertBefore(preferenceNode, firstChild)
-                } else {
-                    appendChild(preferenceNode)
-                }
             }
         }
 

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"
-    },
 )

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"
-    },
 )

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")
 )

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 ->
+    strings = listOf("X-SC-Mime-Type", "X-SC-Preset", "X-SC-Quality")
-        classDef.sourceFile == "DownloadOperations.kt"
-    }
 )

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"
-    }
 )

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 ->
+    opcodes = listOf(
-        classDef.sourceFile == "Feature.kt"
+        Opcode.SGET_OBJECT,
-    },
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_VIRTUAL
+    )
 )

src/main/kotlin/app/revanced/patches/tiktok/feedfilter/FeedFilterPatch.kt

@@ -20,13 +20,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
         "and videos with a specific amount of views or likes from the feed.",
     dependencies = [IntegrationsPatch::class, SettingsPatch::class],
     compatiblePackages = [
-        CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
+        CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
+        CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
-    ]
+    ],
 )
 @Suppress("unused")
 object FeedFilterPatch : BytecodePatch(
-    setOf(FeedApiServiceLIZFingerprint, SettingsStatusLoadFingerprint)
+    setOf(FeedApiServiceLIZFingerprint, SettingsStatusLoadFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         FeedApiServiceLIZFingerprint.result?.mutableMethod?.apply {
@@ -36,13 +36,13 @@ object FeedFilterPatch : BytecodePatch(
             addInstruction(
                 returnFeedItemInstruction.location.index,
                 "invoke-static { v$feedItemsRegister }, " +
-                        "Lapp/revanced/integrations/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
+                    "Lapp/revanced/integrations/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V",
             )
         } ?: throw FeedApiServiceLIZFingerprint.exception
 
         SettingsStatusLoadFingerprint.result?.mutableMethod?.addInstruction(
             0,
-            "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableFeedFilter()V"
+            "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableFeedFilter()V",
         ) ?: throw SettingsStatusLoadFingerprint.exception
     }
 }

src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/RememberClearDisplayPatch.kt

@@ -9,38 +9,38 @@ 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.tiktok.interaction.cleardisplay.fingerprints.OnClearDisplayEventFingerprint
-import app.revanced.patches.tiktok.interaction.cleardisplay.fingerprints.OnRenderFirstFrameFingerprint
+import app.revanced.patches.tiktok.shared.fingerprints.OnRenderFirstFrameFingerprint
 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",
     description = "Remembers the clear display configurations in between videos.",
     compatiblePackages = [
-        CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
+        CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
+        CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
-    ]
+    ],
 )
 @Suppress("unused")
 object RememberClearDisplayPatch : BytecodePatch(
     setOf(
         OnClearDisplayEventFingerprint,
-        OnRenderFirstFrameFingerprint
+        OnRenderFirstFrameFingerprint,
-    )
+    ),
 ) {
     override fun execute(context: BytecodeContext) {
         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 isEnabledIndex = it.indexOfFirstInstructionOrThrow(Opcode.IGET_BOOLEAN) + 1
-            val isEnabledRegister = it.getInstruction<Instruction22c>(isEnabledIndex - 1).registerA
+            val isEnabledRegister = it.getInstruction<TwoRegisterInstruction>(isEnabledIndex - 1).registerA
 
             it.addInstructions(
                 isEnabledIndex,
                 "invoke-static { v$isEnabledRegister }, " +
-                        "Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->rememberClearDisplayState(Z)V"
+                    "Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->rememberClearDisplayState(Z)V",
             )
 
             // endregion
@@ -54,22 +54,25 @@ object RememberClearDisplayPatch : BytecodePatch(
                     """
                         # Create a new clearDisplayEvent and post it to the EventBus (https://github.com/greenrobot/EventBus)
 
-                        # The state of clear display.
-                        invoke-static { }, Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->getClearDisplayState()Z
-                        move-result v3
-                        if-eqz v3, :clear_display_disabled
-
                         # Clear display type such as 0 = LONG_PRESS, 1 = SCREEN_RECORD etc.
                         const/4 v1, 0x0
 
+                        # Enter method (Such as "pinch", "swipe_exit", or an empty string (unknown, what it means)).
+                        const-string v2, ""
+
                         # Name of the clear display type which is equivalent to the clear display type.
-                        const-string v2, "long_press"
+                        const-string v3, "long_press"
+                        
+                         # The state of clear display.
+                        invoke-static { }, Lapp/revanced/integrations/tiktok/cleardisplay/RememberClearDisplayPatch;->getClearDisplayState()Z
+                        move-result v4
+                        if-eqz v4, :clear_display_disabled
 
                         new-instance v0, $clearDisplayEventClass
-                        invoke-direct { v0, v1, v2, v3 }, $clearDisplayEventClass-><init>(ILjava/lang/String;Z)V
+                        invoke-direct { v0, v1, v2, v3, v4 }, $clearDisplayEventClass-><init>(ILjava/lang/String;Ljava/lang/String;Z)V
                         invoke-virtual { v0 }, $clearDisplayEventClass->post()Lcom/ss/android/ugc/governance/eventbus/IEvent;
                     """,
-                    ExternalLabel("clear_display_disabled", getInstruction(0))
+                    ExternalLabel("clear_display_disabled", getInstruction(0)),
                 )
             } ?: throw OnRenderFirstFrameFingerprint.exception
 

src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/fingerprints/OnRenderFirstFrameFingerprint.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.tiktok.interaction.cleardisplay.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object OnRenderFirstFrameFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/BaseListFragmentPanel;") && methodDef.name == "onRenderFirstFrame"
-    }
-)

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/DownloadsPatch.kt

@@ -13,14 +13,13 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
-import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadUriFingerprint
 import app.revanced.patches.tiktok.misc.integrations.IntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.SettingsPatch
 import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
 import app.revanced.util.exception
+import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
@@ -28,9 +27,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
     description = "Removes download restrictions and changes the default path to download to.",
     dependencies = [IntegrationsPatch::class, SettingsPatch::class],
     compatiblePackages = [
-        CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
+        CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"])
+        CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
-    ]
+    ],
 )
 @Suppress("unused")
 object DownloadsPatch : BytecodePatch(
@@ -38,9 +37,9 @@ object DownloadsPatch : BytecodePatch(
         ACLCommonShareFingerprint,
         ACLCommonShareFingerprint2,
         ACLCommonShareFingerprint3,
-        DownloadPathParentFingerprint,
+        DownloadUriFingerprint,
-        SettingsStatusLoadFingerprint
+        SettingsStatusLoadFingerprint,
-    )
+    ),
 ) {
     override fun execute(context: BytecodeContext) {
         fun MethodFingerprint.getMethod() = result?.mutableMethod ?: throw exception
@@ -52,7 +51,7 @@ object DownloadsPatch : BytecodePatch(
                     """
                         const/4 v0, 0x0
                         return v0
-                    """
+                    """,
                 )
             },
             ACLCommonShareFingerprint2 to {
@@ -61,7 +60,7 @@ object DownloadsPatch : BytecodePatch(
                     """
                         const/4 v0, 0x2
                         return v0
-                    """
+                    """,
                 )
             },
             // Download videos without watermark.
@@ -76,48 +75,40 @@ object DownloadsPatch : BytecodePatch(
                     return v0
                     :noremovewatermark
                     nop
-                """
+                """,
                 )
             },
             // Change the download path patch.
-            DownloadPathParentFingerprint to {
+            DownloadUriFingerprint to {
-                val targetIndex = indexOfFirstInstructionOrThrow { opcode == Opcode.INVOKE_STATIC }
+                val firstIndex = indexOfFirstInstructionOrThrow {
-                val downloadUriMethod = context
+                    getReference<MethodReference>()?.name == "<init>"
-                    .toMethodWalker(this)
-                    .nextMethod(targetIndex, true)
-                    .getMethod() as MutableMethod
-
-                val firstIndex = downloadUriMethod.indexOfFirstInstructionOrThrow {
-                    opcode == Opcode.INVOKE_DIRECT && ((this as Instruction35c).reference as MethodReference).name == "<init>"
                 }
-                val secondIndex = downloadUriMethod.indexOfFirstInstructionOrThrow {
+                val secondIndex = indexOfFirstInstructionOrThrow {
-                    opcode == Opcode.INVOKE_STATIC && ((this as Instruction35c).reference as MethodReference).returnType.contains(
+                    getReference<MethodReference>()?.returnType?.contains("Uri") == true
-                        "Uri"
-                    )
                 }
 
-                downloadUriMethod.addInstructions(
+                addInstructions(
                     secondIndex,
                     """
                         invoke-static {}, Lapp/revanced/integrations/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
                         move-result-object v0
-                """
+                    """,
                 )
 
-                downloadUriMethod.addInstructions(
+                addInstructions(
                     firstIndex,
                     """
                         invoke-static {}, Lapp/revanced/integrations/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
                         move-result-object v0
-                """
+                    """,
                 )
             },
             SettingsStatusLoadFingerprint to {
                 addInstruction(
                     0,
-                    "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableDownload()V"
+                    "invoke-static {}, Lapp/revanced/integrations/tiktok/settings/SettingsStatus;->enableDownload()V",
                 )
-            }
+            },
         ).forEach { (fingerprint, patch) ->
             fingerprint.getMethod().patch()
         }

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadUriFingerprint.kt

@@ -3,22 +3,18 @@ package app.revanced.patches.tiktok.interaction.downloads.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 DownloadPathParentFingerprint : MethodFingerprint(
+internal object DownloadUriFingerprint : MethodFingerprint(
-    "L",
+    "Landroid/net/Uri;",
     AccessFlags.PUBLIC or AccessFlags.STATIC,
     strings = listOf(
-        "video/mp4"
+        "/",
+        "/Camera",
+        "/Camera/",
+        "video/mp4",
     ),
     parameters = listOf(
-        "L",
+        "Landroid/content/Context;",
-        "L"
+        "Ljava/lang/String;",
     ),
-    opcodes = listOf(
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.RETURN_OBJECT
-    )
 )

src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/PlaybackSpeedPatch.kt

@@ -9,11 +9,13 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.tiktok.interaction.speed.fingerprints.GetSpeedFingerprint
-import app.revanced.patches.tiktok.interaction.speed.fingerprints.OnRenderFirstFrameFingerprint
 import app.revanced.patches.tiktok.interaction.speed.fingerprints.SetSpeedFingerprint
+import app.revanced.patches.tiktok.shared.fingerprints.GetEnterFromFingerprint
+import app.revanced.patches.tiktok.shared.fingerprints.OnRenderFirstFrameFingerprint
 import app.revanced.util.exception
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction11x
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
@@ -22,8 +24,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
     description = "Enables the playback speed option for all videos and " +
         "retains the speed configurations in between videos.",
     compatiblePackages = [
-        CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
+        CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"]),
+        CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
     ],
 )
 @Suppress("unused")
@@ -32,6 +34,7 @@ object PlaybackSpeedPatch : BytecodePatch(
         GetSpeedFingerprint,
         OnRenderFirstFrameFingerprint,
         SetSpeedFingerprint,
+        GetEnterFromFingerprint,
     ),
 ) {
     override fun execute(context: BytecodeContext) {
@@ -55,7 +58,7 @@ object PlaybackSpeedPatch : BytecodePatch(
                 """
                     # Video playback location (e.g. home page, following page or search result page) retrieved using getEnterFrom method.
                     const/4 v0, 0x1
-                invoke-virtual {p0, v0}, Lcom/ss/android/ugc/aweme/feed/panel/BaseListFragmentPanel;->getEnterFrom(Z)Ljava/lang/String;
+                    invoke-virtual {p0, v0}, ${GetEnterFromFingerprint.resultOrThrow().method}
                     move-result-object v0
     
                     # Model of current video retrieved using getCurrentAweme method.

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/SettingsPatch.kt

@@ -24,8 +24,8 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
     description = "Adds ReVanced settings to TikTok.",
     dependencies = [IntegrationsPatch::class],
     compatiblePackages = [
-        CompatiblePackage("com.ss.android.ugc.trill", ["32.5.3"]),
+        CompatiblePackage("com.ss.android.ugc.trill", ["36.5.4"]),
-        CompatiblePackage("com.zhiliaoapp.musically", ["32.5.3"]),
+        CompatiblePackage("com.zhiliaoapp.musically", ["36.5.4"]),
     ],
 )
 object SettingsPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/tiktok/shared/fingerprints/GetEnterFromFingerprint.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.tiktok.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 GetEnterFromFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/String;",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Z"),
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.RETURN_OBJECT,
+    ),
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass.endsWith("/BaseListFragmentPanel;")
+    },
+)

src/main/kotlin/app/revanced/patches/tiktok/shared/fingerprints/OnRenderFirstFrameFingerprint.kt

@@ -1,9 +1,10 @@
-package app.revanced.patches.tiktok.interaction.speed.fingerprints
+package app.revanced.patches.tiktok.shared.fingerprints
 
 import app.revanced.patcher.fingerprint.MethodFingerprint
 
 internal object OnRenderFirstFrameFingerprint : MethodFingerprint(
+    strings = listOf("method_enable_viewpager_preload_duration"),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("/BaseListFragmentPanel;") && methodDef.name == "onRenderFirstFrame"
+        methodDef.definingClass.endsWith("/BaseListFragmentPanel;")
-    }
+    },
 )

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"),
 )

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)
 )

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
+    }
+}

src/main/kotlin/app/revanced/patches/twitter/misc/links/OpenLinksWithAppChooserPatch.kt

@@ -12,7 +12,7 @@ import app.revanced.util.exception
     name = "Open links with app chooser",
     description = "Instead of opening links directly, open them with an app chooser. " +
         "As a result you can select a browser to open the link with.",
-    compatiblePackages = [CompatiblePackage("com.twitter.android", ["10.48.0-release"])],
+    compatiblePackages = [CompatiblePackage("com.twitter.android", ["10.48.0-release.0"])],
     use = false,
 )
 @Suppress("unused")

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"),
+)

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())"),
+)

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"),
+)

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()
+        }
+    }
+}

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 "
+    )
+)

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;"
+    }
+)

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",
             ],
         ),
     ],

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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",
             ],
         ),
     ],
@@ -51,8 +38,8 @@ object CopyVideoUrlBytecodePatch : BytecodePatch(emptySet()) {
 
     override fun execute(context: BytecodeContext) {
         BUTTONS_DESCRIPTORS.forEach { descriptor ->
-            PlayerControlsBytecodePatch.initializeControl("$descriptor->initializeButton(Landroid/view/View;)V")
+            PlayerControlsBytecodePatch.initializeBottomControl(descriptor)
-            PlayerControlsBytecodePatch.injectVisibilityCheckCall("$descriptor->changeVisibility(Z)V")
+            PlayerControlsBytecodePatch.injectVisibilityCheckCall(descriptor)
         }
     }
 }

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlResourcePatch.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.ResourcePatch
 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.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
@@ -13,7 +13,7 @@ import app.revanced.util.copyResources
 @Patch(
     dependencies = [
         SettingsPatch::class,
-        BottomControlsResourcePatch::class,
+        PlayerControlsResourcePatch::class,
         AddResourcesPatch::class
     ]
 )
@@ -34,6 +34,6 @@ internal object CopyVideoUrlResourcePatch : ResourcePatch() {
             )
         )
 
-        BottomControlsResourcePatch.addControls("copyvideourl")
+        PlayerControlsResourcePatch.addBottomControls("copyvideourl")
     }
 }

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",
             ]
         )
     ]

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",
             ],
         ),
     ],
@@ -58,8 +45,8 @@ object DownloadsPatch : BytecodePatch(
     private const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/youtube/videoplayer/ExternalDownloadButton;"
 
     override fun execute(context: BytecodeContext) {
-        PlayerControlsBytecodePatch.initializeControl("$BUTTON_DESCRIPTOR->initializeButton(Landroid/view/View;)V")
+        PlayerControlsBytecodePatch.initializeBottomControl(BUTTON_DESCRIPTOR)
-        PlayerControlsBytecodePatch.injectVisibilityCheckCall("$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(BUTTON_DESCRIPTOR)
 
         // Main activity is used to launch downloader intent.
         MainActivityFingerprint.resultOrThrow().mutableMethod.apply {

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

@@ -9,14 +9,14 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
-import app.revanced.patches.youtube.misc.playercontrols.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 
 @Patch(
     dependencies = [
-        BottomControlsResourcePatch::class,
+        PlayerControlsResourcePatch::class,
         SettingsPatch::class,
         AddResourcesPatch::class,
     ],
@@ -42,6 +42,6 @@ internal object DownloadsResourcePatch : ResourcePatch() {
             ResourceGroup("drawable", "revanced_yt_download_button.xml"),
         )
 
-        BottomControlsResourcePatch.addControls("downloads")
+        PlayerControlsResourcePatch.addBottomControls("downloads")
     }
 }

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 app.revanced.util.alsoResolve
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @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 =
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-        "Lapp/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch;->" +
+        "Lapp/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch;"
-                "disableGesture(Landroid/view/VelocityTracker;Landroid/view/MotionEvent;)V"
 
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
@@ -65,19 +47,37 @@ object DisablePreciseSeekingGesturePatch : BytecodePatch(
             SwitchPreference("revanced_disable_precise_seeking_gesture")
         )
 
-        IsSwipingUpFingerprint.result?.let {
+        AllowSwipingUpGestureFingerprint.alsoResolve(
-            val addMovementIndex = it.scanResult.patternScanResult!!.startIndex - 1
+            context,
-
+            SwipingUpGestureParentFingerprint
-            it.mutableMethod.apply {
+        ).mutableMethod.apply {
-                val addMovementInstruction = getInstruction<FiveRegisterInstruction>(addMovementIndex)
+            addInstructionsWithLabels(
-                val trackerRegister = addMovementInstruction.registerC
+                0,
-                val eventRegister = addMovementInstruction.registerD
+                """
-
+                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isGestureDisabled()Z
-                replaceInstruction(
+                    move-result v0
-                    addMovementIndex,
+                    if-eqz v0, :disabled
-                    "invoke-static {v$trackerRegister, v$eventRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR"
+                    return-void
+                """,
+                ExternalLabel("disabled", getInstruction(0))
+            )
+        }
+
+        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))
             )
         }
-        } ?: throw IsSwipingUpFingerprint.exception
     }
 }

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.38.44 patches but crashes on startup.
-                "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",
             ]
         )
     ]

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.38.44",
-                "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",
             ]
         )
     ],
@@ -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(
+        var modifiedMethods = false
-            // 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
 
+        // Restore the behaviour to slide to seek.
+        SlideToSeekFingerprint.resultOrThrow().let {
+            val checkIndex = it.scanResult.patternScanResult!!.startIndex
+            val checkReference = it.mutableMethod
+                .getInstruction(checkIndex).getReference<MethodReference>()!!
+
+            // 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 isEnabledRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+                    val insertIndex = it.scanResult.patternScanResult!!.endIndex + 1
+                    val targetRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
 
                     addInstructions(
                         insertIndex,
                         """
-                        invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isSlideToSeekDisabled()Z
+                            invoke-static { v$targetRegister }, $INTEGRATIONS_METHOD_DESCRIPTOR
-                        move-result v$isEnabledRegister
+                            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
+                        """
+                    )
+                }
+            }}
+        }
     }
 }

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"),
+)

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;")
+    }
+)

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),

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")
+)

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
-    )
-)

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 ->
+        methodDef.containsWideLiteralInstructionValue(Integer.MAX_VALUE.toLong())
-            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
-        }
     }
 )

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 }
+)

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",
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    parameters = emptyList(),
+    returnType = "V",
-    opcodes = listOf(Opcode.MOVE_RESULT),
+    parameters = listOf("Landroid/view/View;", "F"),
-    literalSupplier = { 45411329 }
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.GOTO_16
+    ),
+    literalSupplier = { 67108864 }
 )

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 }
+)

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",
             ],
         ),
     ],

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",
             ]
         )
     ],

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",
             ]
         )
     ]

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",
             ],
         ),
     ],

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",
             ]
         )
     ]

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",
             ],
         ),
     ],

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.fingerprints.PlayerControlsPreviousNextOverlayTouchFingerprint
-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.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.exception
+import app.revanced.util.getReference
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
+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 {
+        PlayerControlsPreviousNextOverlayTouchFingerprint.resultOrThrow().mutableMethod.apply {
-            val callIndex = scanResult.patternScanResult!!.endIndex
+            val resourceIndex = indexOfFirstWideLiteralInstructionValueOrThrow(
-            val callInstruction = mutableMethod.getInstruction<Instruction3rc>(callIndex)
+                HidePlayerButtonsResourcePatch.playerControlPreviousButtonTouchArea
-
-            // 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
-                """
             )
-        } ?: throw PlayerControlsVisibilityModelFingerprint.exception
+
+            val insertIndex = indexOfFirstInstructionOrThrow(resourceIndex) {
+                opcode == Opcode.INVOKE_STATIC
+                        && getReference<MethodReference>()?.parameterTypes?.firstOrNull() == "Landroid/view/View;"
             }
 
-    private object ParameterOffsets {
+            val viewRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerC
-        const val HAS_NEXT = 5
+
-        const val HAS_PREVIOUS = 6
+            addInstruction(
+                insertIndex,
+                "invoke-static { v$viewRegister }, Lapp/revanced/integrations/youtube/patches/HidePlayerButtonsPatch;" +
+                        "->hidePreviousNextButtons(Landroid/view/View;)V"
+            )
+        }
     }
 }

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"
+        ]
+    }
+}

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
+        )
+    }
+)

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")
-)

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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",
             ]
         )
     ]

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 {
+        ShowWatermarkFingerprint.alsoResolve(
-            it.resolve(context, PlayerOverlayFingerprint.resultOrThrow().classDef)
+            context,
-        }.resultOrThrow().mutableMethod.apply {
+            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
     }
 }

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"
+        ]
     }
 }

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 }
+)

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 {
+        InfocardsIncognitoFingerprint.alsoResolve(context, InfocardsIncognitoParentFingerprint).mutableMethod.apply {
-            it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
-        }.result!!.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")

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",
             ]
         )
     ]

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.43 is the earliest target this patch works.
-                "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",
             ]
         )
     ]

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.alsoResolve(
-            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
+            context,
-        }.result!!.mutableMethod.addInstructionsWithLabels(
+            SeekbarFingerprint
+        ).mutableMethod.addInstructionsWithLabels(
             0,
             """
                 const/4 v0, 0x0

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt

@@ -2,20 +2,27 @@ 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
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPatchOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 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
@@ -31,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",
             ],
         ),
     ],
@@ -69,18 +58,33 @@ object HideShortsComponentsPatch : BytecodePatch(
     setOf(
         CreateShortsButtonsFingerprint,
         ReelConstructorFingerprint,
-        BottomNavigationBarFingerprint,
+        ShortsBottomBarContainerFingerprint,
+        LegacyRenderBottomNavigationBarParentFingerprint,
         RenderBottomNavigationBarParentFingerprint,
         SetPivotBarVisibilityParentFingerprint,
     ),
 ) {
     private const val FILTER_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/youtube/patches/components/ShortsFilter;"
 
+    internal val hideShortsAppShortcut by booleanPatchOption(
+        key = "hideShortsAppShortcut",
+        default = false,
+        title = "Hide Shorts app shortcut",
+        description = "Permanently hides the shortcut to open Shorts when long pressing the app icon in your launcher."
+    )
+
+    internal val hideShortsWidget by booleanPatchOption(
+        key = "hideShortsWidget",
+        default = false,
+        title = "Hide Shorts widget",
+        description = "Permanently hides the launcher widget Shorts button."
+    )
+
     override fun execute(context: BytecodeContext) {
         // 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.
+        if (!VersionCheckPatch.is_19_03_or_greater) {
             ReelConstructorFingerprint.result?.let {
                 it.mutableMethod.apply {
                     val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
@@ -93,16 +97,17 @@ object HideShortsComponentsPatch : BytecodePatch(
                         "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
 
@@ -110,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 {
+        SetPivotBarVisibilityFingerprint.alsoResolve(
-            if (!SetPivotBarVisibilityFingerprint.resolve(context, it.classDef)) {
+            context,
-                throw SetPivotBarVisibilityFingerprint.exception
+            SetPivotBarVisibilityParentFingerprint
-            }
+        ).let { result->
-
-            SetPivotBarVisibilityFingerprint.result!!.let { result ->
             result.mutableMethod.apply {
                 val insertIndex = result.scanResult.patternScanResult!!.endIndex
                 val viewRegister = getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA
-                    addInstruction(
+                addInstruction(insertIndex, "invoke-static {v$viewRegister}," +
-                        insertIndex,
+                        " $FILTER_CLASS_DESCRIPTOR->setNavigationBar(Lcom/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar;)V"
-                        "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.
+        // Hook to hide the shared navigation bar when the Shorts player is opened.
-        RenderBottomNavigationBarParentFingerprint.result?.let {
+        RenderBottomNavigationBarFingerprint.alsoResolve(
-            if (!RenderBottomNavigationBarFingerprint.resolve(context, it.classDef)) {
+            context,
-                throw RenderBottomNavigationBarFingerprint.exception
+            if (VersionCheckPatch.is_19_41_or_greater)
-            }
+                RenderBottomNavigationBarParentFingerprint
+            else
+                LegacyRenderBottomNavigationBarParentFingerprint
+        ).mutableMethod.addInstruction(
+            0,
+            "invoke-static { p1 }, $FILTER_CLASS_DESCRIPTOR->hideNavigationBar(Ljava/lang/String;)V"
+        )
 
-            RenderBottomNavigationBarFingerprint.result!!.mutableMethod.apply {
+        // Hide the bottom bar container of the Shorts player.
-                addInstruction(0, "invoke-static { }, $FILTER_CLASS_DESCRIPTOR->hideNavigationBar()V")
+        ShortsBottomBarContainerFingerprint.resultOrThrow().mutableMethod.apply {
-            }
+            val resourceIndex = indexOfFirstWideLiteralInstructionValue(HideShortsComponentsResourcePatch.bottomBarContainer)
-        } ?: throw RenderBottomNavigationBarParentFingerprint.exception
 
-        // Required to prevent a black bar from appearing at the bottom of the screen.
+            val targetIndex = indexOfFirstInstructionOrThrow(resourceIndex) {
-        BottomNavigationBarFingerprint.result?.let {
+                getReference<MethodReference>()?.name == "getHeight"
-            it.mutableMethod.apply {
+            } + 1
-                val moveResultIndex = it.scanResult.patternScanResult!!.startIndex + 2
-                val viewRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-                val insertIndex = moveResultIndex + 1
 
-                addInstruction(
+            val heightRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
-                    insertIndex,
+
-                    "invoke-static { v$viewRegister }, $FILTER_CLASS_DESCRIPTOR->" +
+            addInstructions(targetIndex + 1, """
-                        "hideNavigationBar(Landroid/view/View;)Landroid/view/View;",
+                    invoke-static { v$heightRegister }, $FILTER_CLASS_DESCRIPTOR->getNavigationBarHeight(I)I
+                    move-result v$heightRegister
+                """
             )
         }
-        } ?: throw BottomNavigationBarFingerprint.exception
 
         // endregion
     }
@@ -172,14 +191,12 @@ object HideShortsComponentsPatch : BytecodePatch(
         fun injectHideCall(method: MutableMethod) {
             val referencedIndex = method.indexOfIdResourceOrThrow(resourceName)
 
-            val instruction = method.implementation!!.instructions
+            val setIdIndex = method.indexOfFirstInstructionOrThrow(referencedIndex) {
-                .subList(referencedIndex, referencedIndex + 20)
+                opcode == Opcode.INVOKE_VIRTUAL && getReference<MethodReference>()?.name == "setId"
-                .first {
-                    it.opcode == Opcode.INVOKE_VIRTUAL && it.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)
         }
     }

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt

@@ -6,12 +6,25 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 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
 
-@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)
@@ -26,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"),
@@ -38,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"),
@@ -52,19 +70,48 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
             SwitchPreference("revanced_hide_shorts_navigation_bar"),
         )
 
+        if (hideShortsAppShortcut == true) {
+            context.xmlEditor["res/xml/main_shortcuts.xml"].use { editor ->
+                val shortsItem = editor.file.childNodes.findElementByAttributeValueOrThrow(
+                    "android:shortcutId",
+                    "shorts-shortcut",
+                )
+
+                shortsItem.parentNode.removeChild(shortsItem)
+            }
+        }
+
+        if (hideShortsWidget == true) {
+            context.xmlEditor["res/layout/appwidget_two_rows.xml"].use { editor ->
+                val shortsItem = editor.file.childNodes.findElementByAttributeValueOrThrow(
+                    "android:id",
+                    "@id/button_shorts_container",
+                )
+
+                shortsItem.parentNode.removeChild(shortsItem)
+            }
+        }
+
         reelPlayerRightCellButtonHeight = ResourceMappingPatch[
             "dimen",
             "reel_player_right_cell_button_height",
         ]
 
-        // Resource not present in new versions of the app.
+        bottomBarContainer = ResourceMappingPatch[
-        try {
+                "id",
-            ResourceMappingPatch[
+                "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 }
     }
 }

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"
-    ),
-)

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")
+)

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, _ ->
+    literalSupplier = { HideShortsComponentsResourcePatch.reelMultipleItemShelfId }
-        // Cannot use LiteralValueFingerprint, because the resource id may not be present.
-        val reelMultipleItemShelfId = HideShortsComponentsResourcePatch.reelMultipleItemShelfId
-        reelMultipleItemShelfId != -1L
-                && methodDef.containsWideLiteralInstructionValue(reelMultipleItemShelfId)
-    }
 )

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,

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")
 )