chore(release): 2.148.0-dev.3 [skip ci]

# [2.148.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.148.0-dev.2...v2.148.0-dev.3) (2022-12-26)

### Bug Fixes

* **youtube/general-ads:** don't early return when not necessary ([#1353](https://github.com/revanced/revanced-patches/issues/1353)) ([3227d66](3227d66dc2))

.github/workflows/pull_request.yml

@@ -0,0 +1,24 @@
+name: PR to main
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  MESSAGE: merge branch \`${{ github.head_ref || github.ref_name }}\` to \`main\`
+
+jobs:
+  pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Open pull request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: 'main'
+          pr_title: 'chore: ${{ env.MESSAGE }}'
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_draft: true

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -22,18 +22,25 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'temurin'
+          distribution: 'zulu'
           cache: gradle
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'latest'
+          cache: 'npm'
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: amyu/setup-android@v2
+        with:
+          cache-disabled: false
+          sdk-version: '33'
+          build-tools-version: '33.0.1'
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean generateMeta
-      - name: Install Android build-tools
-        run: sdkmanager "build-tools;32.0.0"
+        run: ./gradlew generateMeta clean --no-daemon
       - name: Setup semantic-release
-        run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+        run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -118,3 +118,6 @@ gradle-app.setting
 
 # Ignore vscode config
 .vscode/
+
+# Dependency directories
+node_modules/

.releaserc

@@ -7,11 +7,7 @@
     }
   ],
   "plugins": [
-    ["@semantic-release/commit-analyzer", {
-      "releaseRules": [
-        {"type": "build", "release": "patch"}
-      ]
-    }],
+    "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -38,6 +34,13 @@
           }
         ]
       }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        branches: [{from: "main", to: "dev"}],
+        clearWorkspace: true
+      }
     ]
   ]
 }

CHANGELOG.md

@@ -1,3 +1,253 @@
+# [2.148.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.148.0-dev.2...v2.148.0-dev.3) (2022-12-26)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** don't early return when not necessary ([#1353](https://github.com/revanced/revanced-patches/issues/1353)) ([003a400](https://github.com/revanced/revanced-patches/commit/003a400ce41ff543fb5484c576f5ec2df0a87273))
+
+# [2.148.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.148.0-dev.1...v2.148.0-dev.2) (2022-12-26)
+
+
+### Features
+
+* **youtube/general-ads-patch:** hide guidelines for subscriber ([#1352](https://github.com/revanced/revanced-patches/issues/1352)) ([2d10932](https://github.com/revanced/revanced-patches/commit/2d1093251d5d50b476ca44f76acb9a8597b37aea))
+
+# [2.148.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.147.0...v2.148.0-dev.1) (2022-12-21)
+
+
+### Features
+
+* **tasker:** `unlock-license` patch ([#1339](https://github.com/revanced/revanced-patches/issues/1339)) ([78a43b8](https://github.com/revanced/revanced-patches/commit/78a43b8abd972172eab99519dfa636ce77d9e64f))
+
+# [2.147.0](https://github.com/revanced/revanced-patches/compare/v2.146.0...v2.147.0) (2022-12-21)
+
+
+### Features
+
+* **youtube/return-youtube-dislike:** debug connection statistics, toast on error, high priority background threads ([#1320](https://github.com/revanced/revanced-patches/issues/1320)) ([30273a9](https://github.com/revanced/revanced-patches/commit/30273a9bbdd40453baeb09f26ac9d218569a3e71))
+
+# [2.147.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.146.0...v2.147.0-dev.1) (2022-12-21)
+
+
+### Features
+
+* **youtube/return-youtube-dislike:** debug connection statistics, toast on error, high priority background threads ([#1320](https://github.com/revanced/revanced-patches/issues/1320)) ([30273a9](https://github.com/revanced/revanced-patches/commit/30273a9bbdd40453baeb09f26ac9d218569a3e71))
+
+# [2.146.0](https://github.com/revanced/revanced-patches/compare/v2.145.0...v2.146.0) (2022-12-18)
+
+
+### Features
+
+* **predictive-back-gesture:** exclude by default ([176d34b](https://github.com/revanced/revanced-patches/commit/176d34b2ff92d0eb627dad86ad87f559df3db815))
+* **twitter/timeline-ads:** add clarifying notice to description ([0eca2af](https://github.com/revanced/revanced-patches/commit/0eca2af1a4a688903c61ff6469ffea90c60f06a6))
+* **youtube:** bump patches compatibility to v17.49.37 ([83ebc73](https://github.com/revanced/revanced-patches/commit/83ebc731130d3d216ac4b815382d8f13548cf665))
+
+# [2.146.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.145.0...v2.146.0-dev.1) (2022-12-18)
+
+
+### Features
+
+* **predictive-back-gesture:** exclude by default ([176d34b](https://github.com/revanced/revanced-patches/commit/176d34b2ff92d0eb627dad86ad87f559df3db815))
+* **twitter/timeline-ads:** add clarifying notice to description ([0eca2af](https://github.com/revanced/revanced-patches/commit/0eca2af1a4a688903c61ff6469ffea90c60f06a6))
+* **youtube:** bump patches compatibility to v17.49.37 ([83ebc73](https://github.com/revanced/revanced-patches/commit/83ebc731130d3d216ac4b815382d8f13548cf665))
+
+# [2.145.0](https://github.com/revanced/revanced-patches/compare/v2.144.0...v2.145.0) (2022-12-18)
+
+
+### Bug Fixes
+
+* **tiktok/settings:** make compatible with newer versions ([c88740d](https://github.com/revanced/revanced-patches/commit/c88740dc2bf040747d9704d5bed52a7b533c22d6))
+
+
+### Features
+
+* **crunchyroll:** remove `enable-downloads` patch ([2ac1546](https://github.com/revanced/revanced-patches/commit/2ac15460f5734fc2c6d2d78d34083a8e6b2f7012))
+* **youtube-music:** bump compatibility to 5.36.51 ([c4a3099](https://github.com/revanced/revanced-patches/commit/c4a3099c1ca39431fba9beb94cc2b43e260561d9))
+
+# [2.145.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.144.0...v2.145.0-dev.1) (2022-12-18)
+
+
+### Bug Fixes
+
+* **tiktok/settings:** make compatible with newer versions ([c88740d](https://github.com/revanced/revanced-patches/commit/c88740dc2bf040747d9704d5bed52a7b533c22d6))
+
+
+### Features
+
+* **crunchyroll:** remove `enable-downloads` patch ([2ac1546](https://github.com/revanced/revanced-patches/commit/2ac15460f5734fc2c6d2d78d34083a8e6b2f7012))
+* **youtube-music:** bump compatibility to 5.36.51 ([c4a3099](https://github.com/revanced/revanced-patches/commit/c4a3099c1ca39431fba9beb94cc2b43e260561d9))
+
+# [2.144.0](https://github.com/revanced/revanced-patches/compare/v2.143.0...v2.144.0) (2022-12-15)
+
+
+### Features
+
+* **citra:** add compatibility for canary package ([#1256](https://github.com/revanced/revanced-patches/issues/1256)) ([42ec021](https://github.com/revanced/revanced-patches/commit/42ec0218d829ea15759f83562d24588ce97cb646))
+* link packages to Google PlayStore ([#1272](https://github.com/revanced/revanced-patches/issues/1272)) ([97892e0](https://github.com/revanced/revanced-patches/commit/97892e01044c74916375aeebcc094d3304e14f4e))
+
+# [2.144.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.144.0-dev.1...v2.144.0-dev.2) (2022-12-15)
+
+
+### Features
+
+* link packages to Google PlayStore ([#1272](https://github.com/revanced/revanced-patches/issues/1272)) ([97892e0](https://github.com/revanced/revanced-patches/commit/97892e01044c74916375aeebcc094d3304e14f4e))
+
+# [2.144.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.143.0...v2.144.0-dev.1) (2022-12-15)
+
+
+### Features
+
+* **citra:** add compatibility for canary package ([#1256](https://github.com/revanced/revanced-patches/issues/1256)) ([42ec021](https://github.com/revanced/revanced-patches/commit/42ec0218d829ea15759f83562d24588ce97cb646))
+
+# [2.143.0](https://github.com/revanced/revanced-patches/compare/v2.142.0...v2.143.0) (2022-12-14)
+
+
+### Bug Fixes
+
+* **predictive-back-gesture:** create attribute, if it does not exist ([c00e771](https://github.com/revanced/revanced-patches/commit/c00e7717053f806e3b5b3f0bf0ca9c2da07c289b))
+
+
+### Features
+
+* **sleepasandroid:** remove `unlock-premium` patch ([#1253](https://github.com/revanced/revanced-patches/issues/1253)) ([414f503](https://github.com/revanced/revanced-patches/commit/414f503e493f2dc27edf134f5db723da77636d81))
+
+# [2.143.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.143.0-dev.1...v2.143.0-dev.2) (2022-12-14)
+
+
+### Bug Fixes
+
+* **predictive-back-gesture:** create attribute, if it does not exist ([c00e771](https://github.com/revanced/revanced-patches/commit/c00e7717053f806e3b5b3f0bf0ca9c2da07c289b))
+
+# [2.143.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.142.0...v2.143.0-dev.1) (2022-12-13)
+
+
+### Features
+
+* **sleepasandroid:** remove `unlock-premium` patch ([#1253](https://github.com/revanced/revanced-patches/issues/1253)) ([414f503](https://github.com/revanced/revanced-patches/commit/414f503e493f2dc27edf134f5db723da77636d81))
+
+# [2.142.0](https://github.com/revanced/revanced-patches/compare/v2.141.0...v2.142.0) (2022-12-11)
+
+
+### Features
+
+* `predictive-back-gesture` patch ([#1236](https://github.com/revanced/revanced-patches/issues/1236)) ([11b59f7](https://github.com/revanced/revanced-patches/commit/11b59f767c94514d49a84593618ff9d2aace2636))
+* **twitch/block-embedded-ads:** `block-embedded-ads` patch ([#1166](https://github.com/revanced/revanced-patches/issues/1166)) ([018606e](https://github.com/revanced/revanced-patches/commit/018606e9832c43836b6b8f4fbd623adb8876d162))
+
+# [2.141.0](https://github.com/revanced/revanced-patches/compare/v2.140.0...v2.141.0) (2022-12-09)
+
+
+### Bug Fixes
+
+* inconsistencies in preference switches ([#1207](https://github.com/revanced/revanced-patches/issues/1207)) ([b6ea5a4](https://github.com/revanced/revanced-patches/commit/b6ea5a43b3eec6a06c7514cd79569b97a2b7d333))
+
+
+### Features
+
+* **youtube/return-youtube-dislike:** simplify preference descriptions ([#1216](https://github.com/revanced/revanced-patches/issues/1216)) ([514b5da](https://github.com/revanced/revanced-patches/commit/514b5da9a7de6f8d0b0d00ec6269f836df3e9333))
+
+# [2.140.0](https://github.com/revanced/revanced-patches/compare/v2.139.0...v2.140.0) (2022-12-05)
+
+
+### Features
+
+* **music:** bump compatibility to v5.34.51 ([fc0c92e](https://github.com/revanced/revanced-patches/commit/fc0c92e2b68a2d93a02f4577aeb864955b1b5701))
+
+# [2.139.0](https://github.com/revanced/revanced-patches/compare/v2.138.0...v2.139.0) (2022-12-05)
+
+
+### Features
+
+* **youtube/return-youtube-dislike:** improve settings labels ([#1203](https://github.com/revanced/revanced-patches/issues/1203)) ([fb4a612](https://github.com/revanced/revanced-patches/commit/fb4a612592d82857b0e892a6f5d135dbd657c44d))
+
+# [2.138.0](https://github.com/revanced/revanced-patches/compare/v2.137.0...v2.138.0) (2022-12-05)
+
+
+### Features
+
+* **youtube/debugging:** print stack traces ([9cea382](https://github.com/revanced/revanced-patches/commit/9cea382750456434d0547351ee7d4013eac9de9c))
+
+# [2.137.0](https://github.com/revanced/revanced-patches/compare/v2.136.0...v2.137.0) (2022-12-03)
+
+
+### Features
+
+* **youtube/return-youtube-dislike:** show dislike as a percentage ([#1185](https://github.com/revanced/revanced-patches/issues/1185)) ([cbbab0b](https://github.com/revanced/revanced-patches/commit/cbbab0b4069534a2032258f9a09e9690fc68c291))
+
+# [2.136.0](https://github.com/revanced/revanced-patches/compare/v2.135.0...v2.136.0) (2022-12-02)
+
+
+### Bug Fixes
+
+* syntax error in compatiblity annotation ([#1181](https://github.com/revanced/revanced-patches/issues/1181)) ([0830c7e](https://github.com/revanced/revanced-patches/commit/0830c7ed1064757cf6354b426549275ece55408e))
+
+
+### Features
+
+* **youtube:** drop support for compatibility of old versions ([7413aad](https://github.com/revanced/revanced-patches/commit/7413aad6d215f24a66ba9a33917c73dbdb0b7bc3))
+
+# [2.135.0](https://github.com/revanced/revanced-patches/compare/v2.134.1...v2.135.0) (2022-12-02)
+
+
+### Features
+
+* sort README patch table by amount of patches per package ([40cb14e](https://github.com/revanced/revanced-patches/commit/40cb14e1838aee5b49b60094cd134ed7e1726c3f))
+
+## [2.134.1](https://github.com/revanced/revanced-patches/compare/v2.134.0...v2.134.1) (2022-12-02)
+
+
+### Bug Fixes
+
+* **youtube:** swipe gesture on home screen ([9294084](https://github.com/revanced/revanced-patches/commit/929408406b53d8b0db69f092c3e191791b9fa8ee)), closes [#610](https://github.com/revanced/revanced-patches/issues/610)
+
+# [2.134.0](https://github.com/revanced/revanced-patches/compare/v2.133.0...v2.134.0) (2022-12-02)
+
+
+### Bug Fixes
+
+* **anytracker:** syntax error in fingerprint ([#1165](https://github.com/revanced/revanced-patches/issues/1165)) ([46ad786](https://github.com/revanced/revanced-patches/commit/46ad786b1488814494080ca48cff27c361c47ca1))
+
+
+### Features
+
+* **anytracker:** `unlock-premium` patch ([#1165](https://github.com/revanced/revanced-patches/issues/1165)) ([e7ed324](https://github.com/revanced/revanced-patches/commit/e7ed324bb5216037be0646a698e7e808fbf03e4e))
+
+# [2.133.0](https://github.com/revanced/revanced-patches/compare/v2.132.0...v2.133.0) (2022-12-01)
+
+
+### Features
+
+* **moneymanager:** `unlock-premium` patch ([#1173](https://github.com/revanced/revanced-patches/issues/1173)) ([438c1bc](https://github.com/revanced/revanced-patches/commit/438c1bca684c7d47bd5a401b4dccbaddef604650))
+
+# [2.132.0](https://github.com/revanced/revanced-patches/compare/v2.131.0...v2.132.0) (2022-12-01)
+
+
+### Features
+
+* **sleepasandroid:** `unlock-premium` patch ([#1172](https://github.com/revanced/revanced-patches/issues/1172)) ([580ddcd](https://github.com/revanced/revanced-patches/commit/580ddcdf1f8ef4a525f772630b3c085b706e4dc7))
+* **twitch:** remove `block-embedded-ads` patch ([#1164](https://github.com/revanced/revanced-patches/issues/1164)) ([ecc1eae](https://github.com/revanced/revanced-patches/commit/ecc1eaef4daa7dfecb7913c378188b2b4685e610))
+
+# [2.131.0](https://github.com/revanced/revanced-patches/compare/v2.130.0...v2.131.0) (2022-11-30)
+
+
+### Features
+
+* **twitch/block-embedded-ads:** `block-embedded-ads` patch support ([#1160](https://github.com/revanced/revanced-patches/issues/1160)) ([641d33f](https://github.com/revanced/revanced-patches/commit/641d33fc7e213031124491bb468fb382267769aa))
+
+# [2.130.0](https://github.com/revanced/revanced-patches/compare/v2.129.0...v2.130.0) (2022-11-29)
+
+
+### Features
+
+* **youtube/enable-wide-searchbar:** bump compatibility to v17.45.36 ([66ce54c](https://github.com/revanced/revanced-patches/commit/66ce54c9921e6fbf5bbe52d73b0182352181f2b8))
+
+# [2.129.0](https://github.com/revanced/revanced-patches/compare/v2.128.0...v2.129.0) (2022-11-28)
+
+
+### Features
+
+* **youtube/hide-create-button:** bump compatibility to v17.45.36 ([751f604](https://github.com/revanced/revanced-patches/commit/751f6047ba1589593d881ad523727d00dfb2609b))
+* **youtube/hide-shorts-button:** bump compatibility to v17.45.36 ([51bfa7a](https://github.com/revanced/revanced-patches/commit/51bfa7afd1720d958847a44ae636de722311a199))
+
 # [2.128.0](https://github.com/revanced/revanced-patches/compare/v2.127.0...v2.128.0) (2022-11-28)
 
 

README.md

@@ -4,73 +4,160 @@ The official Patch bundle provided by ReVanced and the community.
 
 > Looking for the JSON variant of this? [Click here](patches.json).
 
-### 📦 `ginlemon.iconpackstudio`
+### [📦 `com.google.android.youtube`](https://play.google.com/store/apps/details?id=com.google.android.youtube)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
+| `always-autorepeat` | Always repeats the playing video again. | 17.49.37 |
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `comments` | Hides components related to comments. | 17.49.37 |
+| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.49.37 |
+| `custom-video-speed` | Adds more video speed options. | 17.49.37 |
+| `debugging` | Adds debugging options. | all |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.49.37 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.49.37 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.49.37 |
+| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.49.37 |
+| `disable-zoom-haptics` | Disables haptics when zooming. | all |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.49.37 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.49.37 |
+| `general-ads` | Removes general ads. | 17.49.37 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.49.37 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 17.49.37 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 17.49.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.49.37 |
+| `hide-captions-button` | Hides the captions button on video player. | 17.49.37 |
+| `hide-cast-button` | Hides the cast button in the video player. | all |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.49.37 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.49.37 |
+| `hide-email-address` | Hides the email address in the account switcher. | 17.49.37 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.49.37 |
+| `hide-info-cards` | Hides info-cards in videos. | 17.49.37 |
+| `hide-my-mix` | Hides mix playlists. | 17.49.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.49.37 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.49.37 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.49.37 |
+| `hide-watch-in-vr` | Hides the Watch in VR option in the player settings flyout panel. | 17.49.37 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.49.37 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.49.37 |
+| `minimized-playback` | Enables minimized and background playback. | 17.49.37 |
+| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 17.49.37 |
+| `open-links-directly` | Bypasses URL redirects and opens links directly inside YouTube app. | 17.49.37 |
+| `premium-heading` | Shows premium branding on the home screen. | all |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.49.37 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 17.49.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.49.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.49.37 |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
+| `sponsorblock` | Integrate SponsorBlock. | 17.49.37 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.49.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.49.37 |
+| `theme` | Applies a custom theme. | all |
+| `video-ads` | Removes ads in the video player. | 17.49.37 |
 </details>
 
-### 📦 `org.citra.citra_emu`
+### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `premium-unlock` | Unlocks premium functions. | all |
+| `background-play` | Enables playing music in the background. | 5.36.51 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.36.51 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.36.51 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.36.51 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.36.51 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.36.51 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.36.51 |
+| `music-video-ads` | Removes ads in the music player. | 5.36.51 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.36.51 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.36.51 |
 </details>
 
-### 📦 `com.ss.android.ugc.trill`
+### [📦 `com.ss.android.ugc.trill`](https://play.google.com/store/apps/details?id=com.ss.android.ugc.trill)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `disable-login-requirement` | Do not force login. | all |
+| `downloads` | Removes download restrictions and changes the default path to download to. | all |
+| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
+| `fix-google-login` | Allows logging in with a Google account. | all |
 | `hide-ads` | Removes ads from TikTok. | all |
 | `playback-speed` | Enables the playback speed option for all videos. | all |
-| `downloads` | Removes download restrictions and changes the default path to download to. | all |
+| `settings` | Adds ReVanced settings to TikTok. | all |
 | `show-seekbar` | Shows progress bar for all video. | all |
-| `settings` | Adds settings for ReVanced to TikTok. | all |
-| `fix-google-login` | Allows logging in with a Google account. | all |
-| `disable-login-requirement` | Do not force login. | all |
 | `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | all |
-| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 </details>
 
-### 📦 `com.zhiliaoapp.musically`
+### [📦 `com.zhiliaoapp.musically`](https://play.google.com/store/apps/details?id=com.zhiliaoapp.musically)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `disable-login-requirement` | Do not force login. | all |
+| `downloads` | Removes download restrictions and changes the default path to download to. | all |
+| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
+| `fix-google-login` | Allows logging in with a Google account. | all |
 | `hide-ads` | Removes ads from TikTok. | all |
 | `playback-speed` | Enables the playback speed option for all videos. | all |
-| `downloads` | Removes download restrictions and changes the default path to download to. | all |
+| `settings` | Adds ReVanced settings to TikTok. | all |
 | `show-seekbar` | Shows progress bar for all video. | all |
-| `settings` | Adds settings for ReVanced to TikTok. | all |
-| `fix-google-login` | Allows logging in with a Google account. | all |
-| `disable-login-requirement` | Do not force login. | all |
 | `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | all |
-| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 </details>
 
-### 📦 `com.twitter.android`
+### [📦 `tv.twitch.android.app`](https://play.google.com/store/apps/details?id=tv.twitch.android.app)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `block-audio-ads` | Blocks audio ads in streams and VODs. | all |
+| `block-embedded-ads` | Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker. | all |
+| `block-video-ads` | Blocks video ads in streams and VODs. | all |
+| `debug-mode` | Enables Twitch's internal debugging mode. | all |
+| `settings` | Adds settings menu to Twitch. | all |
+| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
+</details>
+
+### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-capture-restriction` | Allows capturing Spotify's audio output while screen sharing or screen recording. | all |
+| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
+| `spotify-theme` | Applies a custom theme. | all |
+</details>
+
+### [📦 `com.twitter.android`](https://play.google.com/store/apps/details?id=com.twitter.android)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `timeline-ads` | Removes ads from the Twitter timeline. | all |
 | `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
 | `monochrome-icon` | Adds a monochrome icon. | all |
+| `timeline-ads` | Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads. | all |
 </details>
 
-### 📦 `de.dwd.warnapp`
+### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
+| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
 </details>
 
-### 📦 `com.myprog.hexedit`
+### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+</details>
+
+### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -78,95 +165,55 @@ The official Patch bundle provided by ReVanced and the community.
 | `disable-ads` | Disables ads in HexEditor. | all |
 </details>
 
-### 📦 `com.spotify.music`
+### [📦 `org.citra.citra_emu`](https://play.google.com/store/apps/details?id=org.citra.citra_emu)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `spotify-theme` | Applies a custom theme. | all |
-| `disable-capture-restriction` | Allows capturing Spotify's audio output while screen sharing or screen recording. | all |
-| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
+| `premium-unlock` | Unlocks premium functions. | all |
 </details>
 
-### 📦 `com.google.android.youtube`
+### [📦 `org.citra.citra_emu.canary`](https://play.google.com/store/apps/details?id=org.citra.citra_emu.canary)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.45.36 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.45.36 |
-| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.45.36 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.43.36 |
-| `hide-captions-button` | Hides the captions button on video player. | 17.45.36 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.43.36 |
-| `hide-create-button` | Hides the create button in the navigation bar. | 17.43.36 |
-| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.45.36 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 17.45.36 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.45.36 |
-| `hide-cast-button` | Hides the cast button in the video player. | all |
-| `sponsorblock` | Integrate SponsorBlock. | 17.45.36 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.45.36 |
-| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.45.36 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 17.45.36 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.45.36 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.45.36 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.45.36 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 17.45.36 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.45.36 |
-| `comments` | Hides components related to comments. | 17.45.36 |
-| `theme` | Applies a custom theme. | all |
-| `hide-email-address` | Hides the email address in the account switcher. | 17.45.36 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.45.36 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.45.36 |
-| `hide-info-cards` | Hides info-cards in videos. | 17.45.36 |
-| `hide-my-mix` | Hides mix playlists. | 17.45.36 |
-| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `premium-heading` | Shows premium branding on the home screen. | all |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.45.36 |
-| `general-ads` | Removes general ads. | 17.45.36 |
-| `video-ads` | Removes ads in the video player. | 17.45.36 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.45.36 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.45.36 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.45.36 |
-| `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `settings` | Adds settings for ReVanced to YouTube. | all |
-| `open-links-directly` | Bypasses redirect links and allows opening links directly. | 17.45.36 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.45.36 |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.45.36 |
-| `debugging` | Adds debugging options. | all |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `always-autorepeat` | Always repeats the playing video again. | 17.45.36 |
-| `minimized-playback` | Enables minimized and background playback. | 17.45.36 |
-| `custom-video-speed` | Adds more video speed options. | 17.45.36 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.45.36 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.45.36 |
+| `premium-unlock` | Unlocks premium functions. | all |
 </details>
 
-### 📦 `com.vanced.android.youtube`
+### [📦 `com.backdrops.wallpapers`](https://play.google.com/store/apps/details?id=com.backdrops.wallpapers)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `pro-unlock` | Unlocks pro-only functions. | all |
 </details>
 
-### 📦 `com.ticktick.task`
+### [📦 `de.dwd.warnapp`](https://play.google.com/store/apps/details?id=de.dwd.warnapp)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-themes` | Unlocks all themes. | all |
+| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>
 
-### 📦 `com.crunchyroll.crunchyroid`
+### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `enable-downloads` | Enables downloads for Crunchyroll. | all |
+| `unlock-license` | Unlocks the trial version. | all |
 </details>
 
-### 📦 `org.totschnig.myexpenses`
+### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -174,19 +221,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all professional features. | all |
 </details>
 
-### 📦 `tv.twitch.android.app`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `debug-mode` | Enables Twitch's internal debugging mode. | all |
-| `block-audio-ads` | Blocks audio ads in streams and VODs. | all |
-| `block-video-ads` | Blocks video ads in streams and VODs. | all |
-| `settings` | Adds settings menu to Twitch. | all |
-| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
-</details>
-
-### 📦 `co.windyapp.android`
+### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -194,41 +229,15 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
-### 📦 `com.garzotto.pflotsh.ecmwf_a`
+### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
+| `unlock-pro` | Unlocks pro features. | all |
 </details>
 
-### 📦 `com.google.android.apps.youtube.music`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.31.50 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.31.50 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.31.50 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.31.50 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.31.50 |
-| `music-video-ads` | Removes ads in the music player. | 5.31.50 |
-| `background-play` | Enables playing music in the background. | 5.31.50 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.31.50 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.31.50 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.31.50 |
-</details>
-
-### 📦 `com.reddit.frontpage`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
-</details>
-
-### 📦 `com.awedea.nyx`
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -236,12 +245,12 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-pro` | Unlocks all pro features. | all |
 </details>
 
-### 📦 `com.backdrops.wallpapers`
+### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `pro-unlock` | Unlocks pro-only functions. | all |
+| `unlock-themes` | Unlocks all themes. | all |
 </details>
 
 

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:6.1.0")
+    implementation("app.revanced:revanced-patcher:6.3.2")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10")
@@ -33,7 +33,7 @@ tasks {
 
         doLast {
             val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
-            val d8 = "${androidHome}/build-tools/32.0.0/d8"
+            val d8 = "${androidHome}/build-tools/33.0.1/d8"
             val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
             val work = File("${buildDir}/libs")
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.128.0
+version = 2.148.0-dev.3

package.json

@@ -0,0 +1,8 @@
+{
+  "devDependencies": {
+    "@semantic-release/changelog": "^6.0.2",
+    "@semantic-release/git": "^10.0.1",
+    "gradle-semantic-release-plugin": "^1.7.4",
+    "semantic-release": "^19.0.5"
+  }
+}

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -1,12 +1,22 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
 
+// TODO: populate this to all patches
+/**
+ * Convert a [MethodFingerprint] to a [PatchResultError].
+ *
+ * @return A [PatchResultError] for the [MethodFingerprint].
+ */
+fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
  *
@@ -17,19 +27,6 @@ fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
     MethodUtil.methodSignaturesMatch(it, method)
 }
 
-/**
- * traverse the class hierarchy starting from the given root class
- *
- * @param targetClass the class to start traversing the class hierarchy from
- * @param callback function that is called for every class in the hierarchy
- */
-fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
-    callback(targetClass)
-    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
-        traverseClassHierarchy(it, callback)
-    }
-}
-
 /**
  * apply a transform to all methods of the class
  *

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

@@ -24,8 +24,8 @@ fun generateText(bundle: Bundle) {
         }
     }
 
-    for (pkg in packages) {
-        output.appendLine("### \uD83D\uDCE6 `${pkg.key}`")
+    for (pkg in packages.entries.sortedByDescending { it.value.size }) {
+        output.appendLine("### [\uD83D\uDCE6 `${pkg.key}`](https://play.google.com/store/apps/details?id=${pkg.key})")
         output.appendLine("<details>\n")
 
         output.appendLine(TABLE_HEADER)

src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.all.interaction.gestures.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(false)
+@Name("predictive-back-gesture")
+@Description("Enables the predictive back gesture introduced on Android 13.")
+@Version("0.0.1")
+class PredictiveBackGesturePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+
+            with(document.getElementsByTagName("application").item(0)) {
+                if (attributes.getNamedItem(FLAG) != null) return@with
+
+                document.createAttribute(FLAG)
+                    .apply { value = "true" }
+                    .let(attributes::setNamedItem)
+
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val FLAG = "android:enableOnBackInvokedCallback"
+    }
+}

src/main/kotlin/app/revanced/patches/citra/misc/premium/annotations/PremiumUnlockCompatbility.kt

@@ -3,5 +3,5 @@ package app.revanced.patches.citra.misc.premium.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("org.citra.citra_emu")])
-internal annotation class PremiumUnlockCompatbility
+@Compatibility([Package("org.citra.citra_emu"), Package("org.citra.citra_emu.canary")])
+internal annotation class PremiumUnlockCompatbility

src/main/kotlin/app/revanced/patches/crunchyroll/downloads/fingerprints/DownloadsFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.crunchyroll.downloads.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.crunchyroll.downloads.annotations.DownloadsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("downloads-fingerprint")
-@DownloadsCompatibility
-@Version("0.0.1")
-object DownloadsFingerprint : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, null,
-    opcodes = listOf(
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN
-    ),
-    strings = listOf("offline_viewing"),
-)

src/main/kotlin/app/revanced/patches/crunchyroll/downloads/patch/DownloadsPatch.kt

@@ -1,37 +0,0 @@
-package app.revanced.patches.crunchyroll.downloads.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.crunchyroll.downloads.annotations.DownloadsCompatibility
-import app.revanced.patches.crunchyroll.downloads.fingerprints.DownloadsFingerprint
-
-@Patch
-@Name("enable-downloads")
-@Description("Enables downloads for Crunchyroll.")
-@DownloadsCompatibility
-@Version("0.0.1")
-class DownloadsPatch : BytecodePatch(
-    listOf(
-        DownloadsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        with(DownloadsFingerprint.result!!.mutableMethod) {
-            val index = implementation!!.instructions.lastIndex
-            replaceInstruction(
-                index - 1,
-                """
-                   const/4 v0, 0x1 
-                """
-            )
-        }
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/moneymanager/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.moneymanager.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.ithebk.expensemanager")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.moneymanager.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object UnlockProFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.STATIC or AccessFlags.SYNTHETIC,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_BOOLEAN,
+        Opcode.RETURN
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("MainActivity;")
+    }
+)

src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.moneymanager.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
+import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
+
+@Patch
+@Name("unlock-pro")
+@Description("Unlocks pro features.")
+@UnlockProCompatibility
+@Version("0.0.1")
+class UnlockProPatch : BytecodePatch(
+    listOf(UnlockProFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+       UnlockProFingerprint.result!!.mutableMethod.addInstructions(
+            0,
+            """
+                   const/4 v0, 0x1
+                   
+                   return v0 
+                """
+        )
+        return PatchResultSuccess()
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/kotlin/app/revanced/patches/shared/fingerprints/SeekbarFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.shared.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SeekbarFingerprint : MethodFingerprint(
+    "V",
+    strings = listOf("timed_markers_width")
+)

src/main/kotlin/app/revanced/patches/shared/fingerprints/SeekbarOnDrawFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.shared.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SeekbarOnDrawFingerprint : MethodFingerprint(
+    customFingerprint = { it.name == "onDraw" }
+)

src/main/kotlin/app/revanced/patches/shared/settings/preference/impl/ArrayResource.kt

@@ -25,7 +25,7 @@ internal data class ArrayResource(
                 resourceCallback?.invoke(item)
 
                 this.appendChild(ownerDocument.createElement("item").also { itemNode ->
-                    itemNode.textContent = item.value
+                    itemNode.textContent = "@string/${item.name}"
                 })
             }
         }

src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt

@@ -92,7 +92,7 @@ abstract class AbstractSettingsResourcePatch(
          * @param arrayResource The array resource to add.
          */
         fun addArray(arrayResource: ArrayResource) =
-            arraysNode!!.addResource(arrayResource)
+            arraysNode!!.addResource(arrayResource) { it.include() }
 
         /**
          * Add a preference to the settings.

src/main/kotlin/app/revanced/patches/tasker/license/unlock/annotations/UnlockLicenseCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.tasker.license.unlock.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("net.dinglisch.android.taskerm")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockLicenseCompatibility

src/main/kotlin/app/revanced/patches/tasker/license/unlock/fingerprints/CheckLicenseFingerprint.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.tasker.license.unlock.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object CheckLicenseFingerprint : MethodFingerprint(
+    strings = listOf("just(IsLicensedResult(true))"),
+    opcodes = listOf(
+        Opcode.GOTO,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL
+    )
+)

src/main/kotlin/app/revanced/patches/tasker/license/unlock/patch/UnlockLicensePatch.kt

@@ -0,0 +1,46 @@
+package app.revanced.patches.tasker.license.unlock.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.tasker.license.unlock.annotations.UnlockLicenseCompatibility
+import app.revanced.patches.tasker.license.unlock.fingerprints.CheckLicenseFingerprint
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.immutable.instruction.ImmutableInstruction35c
+
+@Patch
+@Name("unlock-license")
+@Description("Unlocks the trial version.")
+@UnlockLicenseCompatibility
+@Version("0.0.1")
+class UnlockLicensePatch : BytecodePatch(
+    listOf(
+        CheckLicenseFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext) = CheckLicenseFingerprint.result?.let { result ->
+        val patchIndex = result.scanResult.patternScanResult!!.endIndex
+
+        with(result.mutableMethod.instruction(patchIndex) as FiveRegisterInstruction) {
+            ImmutableInstruction35c(
+                opcode,
+                registerCount,
+                registerC,
+                0, // registerE is 1, registerD is now 0 instead of 1 bypassing the license verification
+                registerE,
+                registerF,
+                registerG,
+                (this as ReferenceInstruction).reference as MethodReference
+            )
+        }
+        PatchResultSuccess()
+    } ?: CheckLicenseFingerprint.toErrorResult()
+}

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

@@ -1,12 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object AboutOnClickMethodFingerprint : MethodFingerprint(
-    strings = listOf(
-        "//setting/about",
-        "enter_from",
-        "settings_page",
-        "enter_settings_about"
-    )
-)

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

@@ -0,0 +1,39 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+@FuzzyPatternScanMethod(4)
+object AboutViewFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.MOVE,
+        Opcode.INVOKE_DIRECT_RANGE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.NEW_INSTANCE,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.CONST_4,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_DIRECT_RANGE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.CONST
+    )
+)

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.tiktok.misc.settings.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -7,6 +8,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
@@ -15,13 +17,12 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.annotations.SettingsCompatibility
-import app.revanced.patches.tiktok.misc.settings.fingerprints.AboutOnClickMethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.AboutViewFingerprint
 import app.revanced.patches.tiktok.misc.settings.fingerprints.AdPersonalizationActivityOnCreateFingerprint
 import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsOnViewCreatedFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.iface.reference.TypeReference
@@ -29,17 +30,19 @@ import org.jf.dexlib2.iface.reference.TypeReference
 @Patch
 @DependsOn([IntegrationsPatch::class])
 @Name("settings")
-@Description("Adds settings for ReVanced to TikTok.")
+@Description("Adds ReVanced settings to TikTok.")
 @SettingsCompatibility
 @Version("0.0.1")
 class SettingsPatch : BytecodePatch(
     listOf(
         AdPersonalizationActivityOnCreateFingerprint,
         SettingsOnViewCreatedFingerprint,
-        AboutOnClickMethodFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
+        SettingsOnViewCreatedFingerprint.result?.let {
+            AboutViewFingerprint.resolve(context, it.method, it.classDef)
+        }
         // Patch Settings UI to add 'Revanced Settings'.
         val targetIndexes = findOptionsOnClickIndex()
         with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
@@ -72,29 +75,21 @@ class SettingsPatch : BytecodePatch(
 
     private fun findOptionsOnClickIndex(): IntArray {
         val results = IntArray(2)
-        var found = 0
-        with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
-            for ((index, instruction) in implementation!!.instructions.withIndex()) {
+        SettingsOnViewCreatedFingerprint.result?.apply {
+            for ((index, instruction) in mutableMethod.implementation!!.instructions.withIndex()) {
                 // Old UI settings option to replace to 'Revanced Settings'
                 if (instruction.opcode == Opcode.CONST_STRING) {
                     val string = ((instruction as ReferenceInstruction).reference as StringReference).string
                     if (string == "copyright_policy") {
                         results[0] = index - 2
-                        found++
+                        break
                     }
                 }
-
-                // New UI settings option to replace to 'Revanced Settings'
-                if (instruction.opcode == Opcode.NEW_INSTANCE) {
-                    val onClickClass = ((instruction as Instruction21c).reference as TypeReference).type
-                    if (onClickClass == AboutOnClickMethodFingerprint.result!!.mutableMethod.definingClass) {
-                        results[1] = index
-                        found++
-                    }
-                }
-                if (found > 1) break
             }
-        }
+
+            // New UI settings option to replace to 'Revanced Settings'
+            results[1] = AboutViewFingerprint.result!!.scanResult.patternScanResult!!.startIndex
+        } ?: throw SettingsOnViewCreatedFingerprint.toErrorResult()
         return results
     }
 

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/annotations/EmbeddedAdsCompatibility.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.twitch.ad.embedded.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("tv.twitch.android.app")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class EmbeddedAdsCompatibility
+

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/fingerprints/CreateUsherClientFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.twitch.ad.embedded.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CreateUsherClientFingerprint : MethodFingerprint(
+    customFingerprint = { method ->
+        method.definingClass.endsWith("Ltv/twitch/android/network/OkHttpClientFactory;") && method.name == "buildOkHttpClient"
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt

@@ -0,0 +1,78 @@
+package app.revanced.patches.twitch.ad.embedded.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.settings.preference.impl.ArrayResource
+import app.revanced.patches.shared.settings.preference.impl.ListPreference
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.twitch.ad.embedded.annotations.EmbeddedAdsCompatibility
+import app.revanced.patches.twitch.ad.embedded.fingerprints.CreateUsherClientFingerprint
+import app.revanced.patches.twitch.ad.video.patch.VideoAdsPatch
+import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
+
+@Patch
+@DependsOn([VideoAdsPatch::class, IntegrationsPatch::class, SettingsPatch::class])
+@Name("block-embedded-ads")
+@Description("Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker.")
+@EmbeddedAdsCompatibility
+@Version("0.0.1")
+class EmbeddedAdsPatch : BytecodePatch(
+    listOf(CreateUsherClientFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val result = CreateUsherClientFingerprint.result ?: return PatchResultError("${CreateUsherClientFingerprint.name} not found")
+
+        // Inject OkHttp3 application interceptor
+        result.mutableMethod.addInstructions(
+            3,
+            """
+                invoke-static  {}, Lapp/revanced/twitch/patches/EmbeddedAdsPatch;->createRequestInterceptor()Lapp/revanced/twitch/api/RequestInterceptor;
+                move-result-object v2
+                invoke-virtual {v0, v2}, Lokhttp3/OkHttpClient${"$"}Builder;->addInterceptor(Lokhttp3/Interceptor;)Lokhttp3/OkHttpClient${"$"}Builder;
+            """
+        )
+
+        SettingsPatch.PreferenceScreen.ADS.SURESTREAM.addPreferences(
+            ListPreference(
+                "revanced_block_embedded_ads",
+                StringResource(
+                    "revanced_block_embedded_ads",
+                    "Block embedded video ads"
+                ),
+                ArrayResource(
+                    "revanced_hls_proxies",
+                    listOf(
+                        StringResource("revanced_proxy_disabled", "Disabled"),
+                        StringResource("revanced_proxy_ttv_lol", "TTV LOL proxy"),
+                        StringResource("revanced_proxy_purpleadblock", "PurpleAdBlock proxy"),
+                    )
+                ),
+                ArrayResource(
+                    "revanced_hls_proxies_values",
+                    listOf(
+                        StringResource("key_revanced_proxy_disabled", "disabled"),
+                        StringResource("key_revanced_proxy_ttv_lol", "ttv-lol"),
+                        StringResource("key_revanced_proxy_purpleadblock", "purpleadblock")
+                    )
+                ),
+                "ttv-lol"
+            )
+        )
+
+        SettingsPatch.addString("revanced_embedded_ads_service_unavailable", "%s is unavailable. Ads may show. Try switching to another ad block service in settings.")
+        SettingsPatch.addString("revanced_embedded_ads_service_failed", "%s server returned an error. Ads may show. Try switching to another ad block service in settings.")
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/twitch/ad/shared/util/AbstractAdPatch.kt

@@ -0,0 +1,51 @@
+package app.revanced.patches.twitch.ad.shared.util
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
+
+abstract class AbstractAdPatch(
+    val conditionCall: String,
+    val skipLabelName: String,
+    internal val fingerprints: Iterable<MethodFingerprint>? = null,
+) : BytecodePatch(fingerprints) {
+
+    protected fun createConditionInstructions(register: String = "v0") = """
+        invoke-static { }, $conditionCall
+        move-result $register
+        if-eqz $register, :$skipLabelName
+    """
+
+    protected data class ReturnMethod(val returnType: Char = 'V', val value: String = "")
+
+    protected fun BytecodeContext.blockMethods(clazz: String, vararg methodNames: String, returnMethod: ReturnMethod = ReturnMethod()): Boolean {
+
+        return with(findClass(clazz)?.mutableClass) {
+            this ?: return false
+
+            this.methods.filter { methodNames.contains(it.name) }.forEach {
+                val retIntructions = when(returnMethod.returnType) {
+                    'V' -> "return-void"
+                    'Z' -> """
+                        const/4 v0, ${returnMethod.value}
+                        return v0
+                    """
+                    else -> throw NotImplementedError()
+                }
+                it.addInstructions(
+                    0,
+                    """
+                        ${createConditionInstructions("v0")}
+                        $retIntructions
+                    """,
+                    listOf(ExternalLabel(skipLabelName, it.instruction(0)))
+                )
+            }
+            true
+        }
+    }
+
+}

src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/GetReadyToShowAdFingerprint.kt

@@ -1,10 +1,9 @@
 package app.revanced.patches.twitch.ad.video.fingerprints
 
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-object AdsManagerFingerprint : MethodFingerprint(
+object GetReadyToShowAdFingerprint : MethodFingerprint(
     customFingerprint = { method ->
-        method.definingClass.endsWith("AdsManagerImpl;") && method.name == "playAds"
+        method.definingClass.endsWith("/StreamDisplayAdsPresenter;") && method.name == "getReadyToShowAdOrAbort"
     }
 )

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

@@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
@@ -14,10 +13,11 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.twitch.ad.shared.util.AbstractAdPatch
 import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.twitch.ad.video.fingerprints.AdsManagerFingerprint
 import app.revanced.patches.twitch.ad.video.fingerprints.CheckAdEligibilityLambdaFingerprint
 import app.revanced.patches.twitch.ad.video.fingerprints.ContentConfigShowAdsFingerprint
+import app.revanced.patches.twitch.ad.video.fingerprints.GetReadyToShowAdFingerprint
 import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
 
@@ -27,20 +27,63 @@ import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
 @Description("Blocks video ads in streams and VODs.")
 @VideoAdsCompatibility
 @Version("0.0.1")
-class VideoAdsPatch : BytecodePatch(
+class VideoAdsPatch : AbstractAdPatch(
+    "Lapp/revanced/twitch/patches/VideoAdsPatch;->shouldBlockVideoAds()Z",
+    "show_video_ads",
     listOf(
         ContentConfigShowAdsFingerprint,
-        AdsManagerFingerprint,
-        CheckAdEligibilityLambdaFingerprint
+        CheckAdEligibilityLambdaFingerprint,
+        GetReadyToShowAdFingerprint
     )
 ) {
-    private fun createConditionInstructions(register: String = "v0") = """
-        invoke-static { }, Lapp/revanced/twitch/patches/VideoAdsPatch;->shouldBlockVideoAds()Z
-        move-result $register
-        if-eqz $register, :show_video_ads
-    """
-
     override fun execute(context: BytecodeContext): PatchResult {
+        /* Amazon ads SDK */
+        context.blockMethods(
+            "Lcom/amazon/ads/video/player/AdsManagerImpl;",
+            "playAds"
+        )
+
+        /* Twitch ads manager */
+        context.blockMethods(
+            "Ltv/twitch/android/shared/ads/VideoAdManager;",
+            "checkAdEligibilityAndRequestAd", "requestAd", "requestAds"
+        )
+
+        /* Various ad presenters */
+        context.blockMethods(
+            "Ltv/twitch/android/shared/ads/AdsPlayerPresenter;",
+            "requestAd", "requestFirstAd", "requestFirstAdIfEligible", "requestMidroll", "requestAdFromMultiAdFormatEvent"
+        )
+
+        context.blockMethods(
+            "Ltv/twitch/android/shared/ads/AdsVodPlayerPresenter;",
+            "requestAd", "requestFirstAd",
+        )
+
+        context.blockMethods(
+            "Ltv/twitch/android/feature/theatre/ads/AdEdgeAllocationPresenter;",
+            "parseAdAndCheckEligibility", "requestAdsAfterEligibilityCheck", "showAd", "bindMultiAdFormatAllocation"
+        )
+
+        /* A/B ad testing experiments */
+        context.blockMethods(
+            "Ltv/twitch/android/provider/experiments/helpers/DisplayAdsExperimentHelper;",
+            "areDisplayAdsEnabled",
+            returnMethod = ReturnMethod('Z', "0")
+        )
+
+        context.blockMethods(
+            "Ltv/twitch/android/shared/ads/tracking/MultiFormatAdsTrackingExperiment;",
+            "shouldUseMultiAdFormatTracker", "shouldUseVideoAdTracker",
+            returnMethod = ReturnMethod('Z', "0")
+        )
+
+        context.blockMethods(
+            "Ltv/twitch/android/shared/ads/MultiformatAdsExperiment;",
+            "shouldDisableClientSideLivePreroll", "shouldDisableClientSideVodPreroll",
+            returnMethod = ReturnMethod('Z', "1")
+        )
+
         // Pretend our player is ineligible for all ads
         with(CheckAdEligibilityLambdaFingerprint.result!!) {
             mutableMethod.addInstructions(
@@ -52,7 +95,22 @@ class VideoAdsPatch : BytecodePatch(
                     move-result-object p0
                     return-object p0
                 """,
-                listOf(ExternalLabel("show_video_ads", mutableMethod.instruction(0)))
+                listOf(ExternalLabel(skipLabelName, mutableMethod.instruction(0)))
+            )
+        }
+
+        with(GetReadyToShowAdFingerprint.result!!) {
+            val adFormatDeclined = "Ltv/twitch/android/shared/display/ads/theatre/StreamDisplayAdsPresenter\$Action\$AdFormatDeclined;"
+            mutableMethod.addInstructions(
+                0,
+                """
+                    ${createConditionInstructions()}
+                    sget-object p2, $adFormatDeclined->INSTANCE:$adFormatDeclined
+                    invoke-static {p1, p2}, Ltv/twitch/android/core/mvp/presenter/StateMachineKt;->plus(Ltv/twitch/android/core/mvp/presenter/PresenterState;Ltv/twitch/android/core/mvp/presenter/PresenterAction;)Ltv/twitch/android/core/mvp/presenter/StateAndAction;
+                    move-result-object p1
+                    return-object p1
+                """,
+                listOf(ExternalLabel(skipLabelName, mutableMethod.instruction(0)))
             )
         }
 
@@ -61,24 +119,12 @@ class VideoAdsPatch : BytecodePatch(
             mutableMethod.addInstructions(0, """
                     ${createConditionInstructions()}
                     const/4 v0, 0
-                    :show_video_ads
+                    :$skipLabelName
                     return v0
                 """
             )
         }
 
-        // Block playAds call
-        with(AdsManagerFingerprint.result!!) {
-            mutableMethod.addInstructions(
-                0,
-                """
-                    ${createConditionInstructions()}
-                    return-void
-                """,
-                listOf(ExternalLabel("show_video_ads", mutableMethod.instruction(0)))
-            )
-        }
-
         SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences(
             SwitchPreference(
                 "revanced_block_video_ads",

src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt

@@ -173,6 +173,7 @@ class SettingsPatch : BytecodePatch(
             val GENERAL = CustomCategory("general", "General settings")
             val OTHER = CustomCategory("other", "Other settings")
             val CLIENT_SIDE = CustomCategory("client_ads", "Client-side ads")
+            val SURESTREAM = CustomCategory("surestream_ads", "Server-side surestream ads")
 
             internal inner class CustomCategory(key: String, title: String) : Screen.Category(key, title) {
                 /* For Twitch, we need to load our CustomPreferenceCategory class instead of the default one. */

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/patch/TimelineAdsPatch.kt

@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.reference.StringReference
 
 @Patch
 @Name("timeline-ads")
-@Description("Removes ads from the Twitter timeline.")
+@Description("Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads.")
 @TimelineAdsCompatibility
 @Version("0.0.1")
 class TimelineAdsPatch : BytecodePatch(

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

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

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

@@ -17,14 +17,14 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
 import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
 import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
+import app.revanced.patches.youtube.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import java.util.*
 
 
 @Patch
-@DependsOn([GeneralAdsResourcePatch::class])
+@DependsOn([GeneralAdsResourcePatch::class, VerticalScrollPatch::class])
 @Name("general-ads")
 @Description("Removes general ads.")
 @GeneralAdsCompatibility

src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt

@@ -102,6 +102,13 @@ class GeneralAdsResourcePatch : ResourcePatch {
                     "Community guidelines are shown"
                 )
             ),
+            SwitchPreference(
+                "revanced_adremover_subscribers_community_guidelines_removal",
+                StringResource("revanced_adremover_subscribers_community_guidelines_enabled_title", "Hide subscribers community guidelines"),
+                true,
+                StringResource("revanced_adremover_subscribers_community_guidelines_enabled_summary_on", "Subscribers community guidelines are hidden"),
+                StringResource("revanced_adremover_subscribers_community_guidelines_enabled_summary_off", "Subscribers community guidelines are shown")
+            ),
             SwitchPreference(
                 "revanced_adremover_emergency_box_removal",
                 StringResource("revanced_adremover_emergency_box_enabled_title", "Hide emergency boxes"),

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

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

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

@@ -12,13 +12,13 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.youtube.ad.video.fingerprints.LoadVideoAdsFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playback.fix.patch.FixPlaybackPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
+import app.revanced.patches.youtube.ad.video.fingerprints.LoadVideoAdsFingerprint
+import app.revanced.patches.youtube.misc.fix.playback.patch.FixPlaybackPatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class, FixPlaybackPatch::class])

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

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

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

@@ -8,18 +8,14 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.shared.settings.preference.impl.TextPreference
-import app.revanced.patches.shared.settings.preference.impl.InputType
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
+import app.revanced.patches.shared.settings.preference.impl.*
 import app.revanced.patches.youtube.interaction.downloads.annotation.DownloadsCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.util.resources.ResourceUtils
-import app.revanced.util.resources.ResourceUtils.Settings.mergeStrings
 import app.revanced.util.resources.ResourceUtils.copyResources
+import app.revanced.util.resources.ResourceUtils.mergeStrings
 
 @Name("downloads-resource-patch")
 @DependsOn([BottomControlsResourcePatch::class, FixLocaleConfigErrorPatch::class, SettingsPatch::class])
@@ -37,8 +33,8 @@ class DownloadsResourcePatch : ResourcePatch {
                         "revanced_downloads",
                         StringResource("revanced_downloads_enabled_title", "Show download button"),
                         true,
-                        StringResource("revanced_downloads_enabled_summary_on", "Download button is visible"),
-                        StringResource("revanced_downloads_enabled_summary_off", "Download button is hidden")
+                        StringResource("revanced_downloads_enabled_summary_on", "Download button is shown"),
+                        StringResource("revanced_downloads_enabled_summary_off", "Download button is not shown")
                     ),
                     TextPreference(
                         "revanced_downloads_package_name",

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

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

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

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

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

@@ -1,7 +1,6 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.patch.bytecode
 
 import app.revanced.extensions.transformMethods
-import app.revanced.extensions.traverseClassHierarchy
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -11,10 +10,11 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.TypeUtil.traverseClassHierarchy
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
 import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 import app.revanced.patches.youtube.interaction.swipecontrols.fingerprints.SwipeControlsHostActivityFingerprint
-import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
 import app.revanced.patches.youtube.interaction.swipecontrols.patch.resource.SwipeControlsResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch

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

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

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt

@@ -38,11 +38,11 @@ class HideAutoplayButtonPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_autoplay_button_enabled",
-                StringResource("revanced_autoplay_button_enabled_title", "Show autoplay button"),
-                false,
-                StringResource("revanced_autoplay_button_summary_on", "Autoplay button is shown"),
-                StringResource("revanced_autoplay_button_summary_off", "Autoplay button is hidden")
+                "revanced_hide_autoplay_button",
+                StringResource("revanced_hide_autoplay_button_title", "Hide autoplay button"),
+                true,
+                StringResource("revanced_hide_autoplay_button_summary_on", "Autoplay button is hidden"),
+                StringResource("revanced_hide_autoplay_button_summary_off", "Autoplay button is shown")
             )
         )
 

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/patch/HideButtonsPatch.kt

@@ -31,46 +31,46 @@ class HideButtonsPatch : ResourcePatch {
                 StringResource("revanced_hide_buttons_title", "Hide action buttons"),
                 listOf(
                     SwitchPreference(
-                        "revanced_like_button",
-                        StringResource("revanced_like_button_title", "Hide like button"),
+                        "revanced_hide_like_button",
+                        StringResource("revanced_hide_like_button_title", "Hide like button"),
                         false,
-                        StringResource("revanced_like_button_on", "Like button is hidden"),
-                        StringResource("revanced_like_button_off", "Like button is shown")
+                        StringResource("revanced_hide_like_button_summary_on", "Like button is hidden"),
+                        StringResource("revanced_hide_like_button_summary_off", "Like button is shown")
                     ),
                     SwitchPreference(
-                        "revanced_dislike_button",
-                        StringResource("revanced_dislike_button_title", "Hide dislike button"),
+                        "revanced_hide_dislike_button",
+                        StringResource("revanced_hide_dislike_button_title", "Hide dislike button"),
                         false,
-                        StringResource("revanced_dislike_button_on", "Dislike button is hidden"),
-                        StringResource("revanced_dislike_button_off", "Dislike button is shown")
+                        StringResource("revanced_hide_dislike_button_summary_on", "Dislike button is hidden"),
+                        StringResource("revanced_hide_dislike_button_summary_off", "Dislike button is shown")
                     ),
                     SwitchPreference(
-                        "revanced_download_button",
-                        StringResource("revanced_download_button_title", "Hide download button"),
+                        "revanced_hide_download_button",
+                        StringResource("revanced_hide_download_button_title", "Hide download button"),
                         false,
-                        StringResource("revanced_download_button_on", "Download button is hidden"),
-                        StringResource("revanced_download_button_off", "Download button is shown")
+                        StringResource("revanced_hide_download_button_summary_on", "Download button is hidden"),
+                        StringResource("revanced_hide_download_button_summary_off", "Download button is shown")
                     ),
                     SwitchPreference(
-                        "revanced_playlist_button",
-                        StringResource("revanced_playlist_button_title", "Hide playlist button"),
+                        "revanced_hide_playlist_button",
+                        StringResource("revanced_hide_playlist_button_title", "Hide playlist button"),
                         false,
-                        StringResource("revanced_playlist_button_on", "Playlist button is hidden"),
-                        StringResource("revanced_playlist_button_off", "Playlist button is shown")
+                        StringResource("revanced_hide_playlist_button_summary_on", "Playlist button is hidden"),
+                        StringResource("revanced_hide_playlist_button_summary_off", "Playlist button is shown")
                     ),
                     SwitchPreference(
-                        "revanced_action_button",
-                        StringResource("revanced_action_button_title", "Hide create, clip and thanks buttons"),
+                        "revanced_hide_action_button",
+                        StringResource("revanced_hide_action_button_title", "Hide create, clip and thanks buttons"),
                         true,
-                        StringResource("revanced_action_button_on", "Buttons are hidden"),
-                        StringResource("revanced_action_button_off", "Buttons are shown")
+                        StringResource("revanced_hide_action_button_summary_on", "Buttons are hidden"),
+                        StringResource("revanced_hide_action_button_summary_off", "Buttons are shown")
                     ),
                     SwitchPreference(
-                        "revanced_share_button",
-                        StringResource("revanced_share_button_title", "Hide share button"),
+                        "revanced_hide_share_button",
+                        StringResource("revanced_hide_share_button_title", "Hide share button"),
                         false,
-                        StringResource("revanced_share_button_on", "Share button is hidden"),
-                        StringResource("revanced_share_button_off", "Share button is shown")
+                        StringResource("revanced_hide_share_button_summary_on", "Share button is hidden"),
+                        StringResource("revanced_hide_share_button_summaryoff", "Share button is shown")
                     ),
                 ),
                 StringResource("revanced_hide_buttons_summary", "Hide or show buttons under videos")

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt

@@ -27,11 +27,11 @@ class HideCastButtonPatch : BytecodePatch() {
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_cast_button_enabled",
-                StringResource("revanced_cast_button_enabled_title", "Show cast button"),
-                false,
-                StringResource("revanced_cast_button_summary_on", "Cast button is shown"),
-                StringResource("revanced_cast_button_summary_off", "Cast button is hidden")
+                "revanced_hide_cast_button",
+                StringResource("revanced_hide_cast_button_title", "Hide cast button"),
+                true,
+                StringResource("revanced_hide_cast_button_summary_on", "Cast button is hidden"),
+                StringResource("revanced_hide_cast_button_summary_off", "Cast button is shown")
             )
         )
 

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/comments/resource/patch/CommentsResourcePatch.kt

@@ -31,7 +31,7 @@ class CommentsResourcePatch : ResourcePatch {
                 listOf(
                     SwitchPreference(
                         "revanced_hide_comments_section",
-                        StringResource("revanced_hide_comments_section_title", "Remove comments section"),
+                        StringResource("revanced_hide_comments_section_title", "Hide comments section"),
                         false,
                         StringResource("revanced_hide_comments_section_summary_on", "Comment section is hidden"),
                         StringResource("revanced_hide_comments_section_summary_off", "Comment section is shown")

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt

@@ -35,11 +35,11 @@ class FullscreenPanelsRemoverPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_fullscreen_panels_enabled",
-                StringResource("revanced_fullscreen_panels_enabled_title", "Show fullscreen panels"),
-                false,
-                StringResource("revanced_fullscreen_panels_summary_on", "Fullscreen panels are shown"),
-                StringResource("revanced_fullscreen_panels_summary_off", "Fullscreen panels are hidden")
+                "revanced_hide_fullscreen_panels",
+                StringResource("revanced_hide_fullscreen_panels_title", "Hide fullscreen panels"),
+                true,
+                StringResource("revanced_hide_fullscreen_panels_summary_on", "Fullscreen panels are hidden"),
+                StringResource("revanced_hide_fullscreen_panels_summary_off", "Fullscreen panels are shown")
             )
         )
 

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

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

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

@@ -26,10 +26,10 @@ class AlbumCardsResourcePatch : ResourcePatch {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_album_cards",
-                StringResource("revanced_hide_album_cards_title", "Hide the album cards"),
+                StringResource("revanced_hide_album_cards_title", "Hide album cards"),
                 false,
-                StringResource("revanced_hide_album_cards_summary_on", "Album cards is hidden"),
-                StringResource("revanced_hide_album_cards_summary_off", "Album cards is visible")
+                StringResource("revanced_hide_album_cards_summary_on", "Music album cards are hidden"),
+                StringResource("revanced_hide_album_cards_summary_off", "Music album cards are shown")
             )
         )
 

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

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

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

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

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

@@ -26,10 +26,10 @@ class CrowdfundingBoxResourcePatch : ResourcePatch {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_crowdfunding_box",
-                StringResource("revanced_hide_crowdfunding_box_title", "Hide the crowdfunding box"),
+                StringResource("revanced_hide_crowdfunding_box_title", "Hide crowdfunding box"),
                 false,
                 StringResource("revanced_hide_crowdfunding_box_summary_on", "Crowdfunding box is hidden"),
-                StringResource("revanced_hide_crowdfunding_box_summary_off", "Crowdfunding box is visible")
+                StringResource("revanced_hide_crowdfunding_box_summary_off", "Crowdfunding box is shown")
             )
         )
 

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

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

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

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

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/hidemixplaylists/patch/MixPlaylistsPatch.kt

@@ -35,11 +35,11 @@ class MixPlaylistsPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_mix_playlists_hidden",
-                StringResource("revanced_mix_playlists_title", "Hide mix playlists"),
+                "revanced_hide_mix_playlists",
+                StringResource("revanced_hide_mix_playlists_title", "Hide mix playlists"),
                 false,
-                StringResource("revanced_mix_playlists_summary_on", "Mix playlists are hidden"),
-                StringResource("revanced_mix_playlists_summary_off", "Mix playlists are shown")
+                StringResource("revanced_hide_mix_playlists_summary_on", "Mix playlists are hidden"),
+                StringResource("revanced_hide_mix_playlists_summary_off", "Mix playlists are shown")
             )
         )
 

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/hidetimeandseekbar/patch/HideTimeAndSeekbarPatch.kt

@@ -5,18 +5,20 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
-import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.CreateVideoPlayerSeekbarFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
+import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.annotations.HideTimeAndSeekbarCompatibility
+import app.revanced.patches.youtube.layout.hidetimeandseekbar.fingerprints.TimeCounterFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@@ -26,7 +28,7 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 @Version("0.0.1")
 class HideTimeAndSeekbarPatch : BytecodePatch(
     listOf(
-        CreateVideoPlayerSeekbarFingerprint, TimeCounterFingerprint
+        SeekbarFingerprint, TimeCounterFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
@@ -36,11 +38,13 @@ class HideTimeAndSeekbarPatch : BytecodePatch(
                 StringResource("revanced_hide_time_and_seekbar_title", "Hide time and seekbar"),
                 false,
                 StringResource("revanced_hide_time_and_seekbar_summary_on", "Time and seekbar are hidden"),
-                StringResource("revanced_hide_time_and_seekbar_summary_off", "Time and seekbar are visible")
+                StringResource("revanced_hide_time_and_seekbar_summary_off", "Time and seekbar are shown")
             )
         )
 
-        val createVideoPlayerSeekbarMethod = CreateVideoPlayerSeekbarFingerprint.result!!.mutableMethod
+        val createVideoPlayerSeekbarMethod = SeekbarFingerprint.result!!.let {
+            SeekbarOnDrawFingerprint.apply { resolve(context, it.mutableClass) }
+        }.result!!.mutableMethod
 
         createVideoPlayerSeekbarMethod.addInstructions(
             0, """

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

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

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

@@ -21,9 +21,11 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("old-quality-layout")
-@Description("Enables the original quality flyout menu.")
+@Description("Enables the original video quality flyout in the video player settings")
 @OldQualityLayoutCompatibility
 @Version("0.0.1")
+// new ReVanced users have no idea what it means to use the "old quality layout menu"
+// maybe rename this patch to better describe what it provides (ie: user-selectable-video-resolution )
 class OldQualityLayoutPatch : BytecodePatch(
     listOf(QualityMenuViewInflateFingerprint)
 ) {
@@ -31,10 +33,10 @@ class OldQualityLayoutPatch : BytecodePatch(
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_use_old_style_quality_settings",
-                StringResource("revanced_old_style_quality_settings_enabled_title", "Use old quality layout"),
+                StringResource("revanced_old_style_quality_settings_enabled_title", "Use old video quality player menu"),
                 true,
-                StringResource("revanced_old_style_quality_settings_summary_on", "Old quality settings are shown"),
-                StringResource("revanced_old_style_quality_settings_summary_off", "New quality settings are shown")
+                StringResource("revanced_old_style_quality_settings_summary_on", "Old video quality menu is used"),
+                StringResource("revanced_old_style_quality_settings_summary_off", "Old video quality menu is not used")
             )
         )
 

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

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

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

@@ -26,10 +26,10 @@ class HideEmailAddressResourcePatch : ResourcePatch {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_email_address",
-                StringResource("revanced_hide_email_address_title", "Hide the email address"),
+                StringResource("revanced_hide_email_address_title", "Hide email in account switcher"),
                 false,
                 StringResource("revanced_hide_email_address_summary_on", "Email address is hidden"),
-                StringResource("revanced_hide_email_address_summary_off", "Email address is visible")
+                StringResource("revanced_hide_email_address_summary_off", "Email address is shown")
             )
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/annotations/PivotBarCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/annotations/CreateButtonCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt

@@ -1,47 +1,47 @@
 package app.revanced.patches.youtube.layout.pivotbar.createbutton.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.CreateButtonCompatibility
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.pivotbar.annotations.PivotBarCompatibility
 import app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints.PivotBarCreateButtonViewFingerprint
-import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.resource.patch.ResolvePivotBarFingerprintsPatch
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
 @Name("hide-create-button")
 @Description("Hides the create button in the navigation bar.")
-@CreateButtonCompatibility
+@PivotBarCompatibility
 @Version("0.0.1")
-class CreateButtonRemoverPatch : BytecodePatch(
-    listOf(
-        PivotBarFingerprint
-    )
-) {
+class CreateButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
+    }
+
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_create_button_enabled",
-                StringResource("revanced_create_button_enabled_title", "Show create button"),
-                false,
-                StringResource("revanced_create_button_summary_on", "Create button is shown"),
-                StringResource("revanced_create_button_summary_off", "Create button is hidden")
+                "revanced_hide_create_button",
+                StringResource("revanced_hide_create_button_title", "Hide create button"),
+                true,
+                StringResource("revanced_hide_create_button_summary_on", "Create button is hidden"),
+                StringResource("revanced_hide_create_button_summary_off", "Create button is shown")
             )
         )
 
@@ -49,10 +49,10 @@ class CreateButtonRemoverPatch : BytecodePatch(
          * Resolve fingerprints
          */
 
-        val pivotBarResult = PivotBarFingerprint.result ?: return PatchResultError("PivotBarFingerprint failed")
-
-        if (!PivotBarCreateButtonViewFingerprint.resolve(context, pivotBarResult.mutableMethod, pivotBarResult.mutableClass))
-            return PatchResultError("${PivotBarCreateButtonViewFingerprint.name} failed")
+        InitializeButtonsFingerprint.result!!.let {
+            if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
+                return PivotBarCreateButtonViewFingerprint.toErrorResult()
+        }
 
         val createButtonResult = PivotBarCreateButtonViewFingerprint.result!!
         val insertIndex = createButtonResult.scanResult.patternScanResult!!.endIndex
@@ -61,9 +61,8 @@ class CreateButtonRemoverPatch : BytecodePatch(
          * Inject hooks
          */
 
-        val integrationsClass = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
-        val hook =
-            "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $integrationsClass->hideCreateButton(Landroid/view/View;)V"
+        val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
 
         createButtonResult.mutableMethod.injectHook(hook, insertIndex)
 

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/fingerprints/InitializeButtonsFingerprint.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.layout.pivotbar.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.resource.patch.ResolvePivotBarFingerprintsPatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object InitializeButtonsFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any {
+            it.opcode == Opcode.CONST && (it as WideLiteralInstruction).wideLiteral ==
+                    ResolvePivotBarFingerprintsPatch.imageOnlyTabResourceId
+        } == true
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/fingerprints/PivotBarConstructorFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.youtube.layout.pivotbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object PivotBarConstructorFingerprint : MethodFingerprint(
+    access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    strings = listOf("com.google.android.apps.youtube.app.endpoint.flags")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/fingerprints/PivotBarFingerprint.kt

@@ -1,44 +0,0 @@
-package app.revanced.patches.youtube.layout.pivotbar.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2)
-object PivotBarFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("Z"),
-    listOf(
-        Opcode.IGET,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.CONST,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_DIRECT_RANGE,
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/resource/patch/ResolvePivotBarFingerprintsPatch.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.youtube.layout.pivotbar.resource.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.youtube.layout.pivotbar.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarConstructorFingerprint
+
+@DependsOn([ResourceMappingPatch::class])
+@PivotBarCompatibility
+@Description("Resolves necessary fingerprints.")
+@Version("0.0.1")
+class ResolvePivotBarFingerprintsPatch : BytecodePatch(
+    listOf(PivotBarConstructorFingerprint)
+) {
+    internal companion object {
+        var imageOnlyTabResourceId: Long = -1
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        // imageOnlyTabResourceId is used in InitializeButtonsFingerprint fingerprint
+        ResourceMappingPatch.resourceMappings.find { it.type == "layout" && it.name == "image_only_tab" }
+            ?.let { imageOnlyTabResourceId = it.id } ?: return PatchResultError("Failed to find resource")
+
+        PivotBarConstructorFingerprint.result?.let {
+            // Resolve InitializeButtonsFingerprint on the class of the method
+            // which PivotBarConstructorFingerprint resolved to
+            if (!InitializeButtonsFingerprint.resolve(
+                    context,
+                    it.classDef
+                )
+            ) return InitializeButtonsFingerprint.toErrorResult()
+        } ?: return PivotBarConstructorFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/annotations/ShortsButtonCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt

@@ -1,45 +1,47 @@
 package app.revanced.patches.youtube.layout.pivotbar.shortsbutton.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
-import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.pivotbar.annotations.PivotBarCompatibility
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.resource.patch.ResolvePivotBarFingerprintsPatch
 import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints.PivotBarEnumFingerprint
 import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints.PivotBarShortsButtonViewFingerprint
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
 @Name("hide-shorts-button")
 @Description("Hides the shorts button on the navigation bar.")
-@ShortsButtonCompatibility
+@PivotBarCompatibility
 @Version("0.0.1")
-class ShortsButtonRemoverPatch : BytecodePatch(
-    listOf(PivotBarFingerprint)
-) {
+class ShortsButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideShortsButtonPatch;"
+    }
+
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_shorts_button_enabled",
-                StringResource("revanced_shorts_button_enabled_title", "Show shorts button"),
-                false,
-                StringResource("revanced_shorts_button_summary_on", "Shorts button is shown"),
-                StringResource("revanced_shorts_button_summary_off", "Shorts button is hidden")
+                "revanced_hide_shorts_button",
+                StringResource("revanced_hide_shorts_button_title", "Hide shorts button"),
+                true,
+                StringResource("revanced_hide_shorts_button_summary_on", "Shorts button is hidden"),
+                StringResource("revanced_hide_shorts_button_summary_off", "Shorts button is shown")
             )
         )
 
@@ -47,18 +49,21 @@ class ShortsButtonRemoverPatch : BytecodePatch(
          * Resolve fingerprints
          */
 
-        val pivotBarResult = PivotBarFingerprint.result ?: return PatchResultError("PivotBarFingerprint failed")
-        val fingerprintResults = arrayOf(PivotBarEnumFingerprint, PivotBarShortsButtonViewFingerprint)
-            .onEach {
-                val resolutionSucceeded = it.resolve(
-                    context,
-                    pivotBarResult.mutableMethod,
-                    pivotBarResult.mutableClass
-                )
+        val initializeButtonsResult = InitializeButtonsFingerprint.result!!
+
+        val fingerprintResults =
+            arrayOf(PivotBarEnumFingerprint, PivotBarShortsButtonViewFingerprint)
+                .onEach {
+                    if (!it.resolve(
+                            context,
+                            initializeButtonsResult.mutableMethod,
+                            initializeButtonsResult.mutableClass
+                        )
+                    )
+                        return it.toErrorResult()
+                }
+                .map { it.result!!.scanResult.patternScanResult!! }
 
-                if (!resolutionSucceeded) return PatchResultError("${it.name} failed")
-            }
-            .map { it.result!!.scanResult.patternScanResult!! }
 
         val enumScanResult = fingerprintResults[0]
         val buttonViewResult = fingerprintResults[1]
@@ -70,19 +75,17 @@ class ShortsButtonRemoverPatch : BytecodePatch(
          * Inject hooks
          */
 
-        val integrationsClass = "Lapp/revanced/integrations/patches/HideShortsButtonPatch;"
-
-        val enumHook =
-            "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, $integrationsClass->lastPivotTab:Ljava/lang/Enum;"
-        val buttonHook =
-            "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $integrationsClass->hideShortsButton(Landroid/view/View;)V"
+        val enumHook = "sput-object v$REGISTER_TEMPLATE_REPLACEMENT, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->lastPivotTab:Ljava/lang/Enum;"
+        val buttonHook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideShortsButton(Landroid/view/View;)V"
 
         // Inject bottom to top to not mess up the indices
         mapOf(
             buttonHook to buttonHookInsertIndex,
             enumHook to enumHookInsertIndex
         ).forEach { (hook, insertIndex) ->
-            pivotBarResult.mutableMethod.injectHook(hook, insertIndex)
+            initializeButtonsResult.mutableMethod.injectHook(hook, insertIndex)
         }
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/playerbuttonbackground/annotations/PlayerButtonBackgroundCompatibility.kt

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

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt

@@ -29,11 +29,11 @@ class HideReelsPatch : BytecodePatch(
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
-                "revanced_reel_button_enabled",
-                StringResource("revanced_reel_button_enabled_title", "Show reels button"),
-                false,
-                StringResource("revanced_reel_button_summary_on", "Reels button is shown"),
-                StringResource("revanced_reel_button_summary_off", "Reels button is hidden")
+                "revanced_hide_reel_button",
+                StringResource("revanced_hide_reel_button_title", "Hide reels button"),
+                true,
+                StringResource("revanced_hide_reel_button_summary_on", "Reels button is hidden"),
+                StringResource("revanced_hide_reel_button_summary_off", "Reels button is shown")
             )
         )
 

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

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

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -51,8 +52,8 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
         VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/ReturnYouTubeDislikePatch;->newVideoLoaded(Ljava/lang/String;)V")
 
         with(TextComponentFingerprint
-            .also { it.resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
-            .result ?: return PatchResultError("Could not find createComponent method")
+            .apply { resolve(context, TextComponentSpecParentFingerprint.result!!.classDef) }
+            .result ?: return TextComponentFingerprint.toErrorResult()
         ) {
             val createComponentMethod = mutableMethod
 

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

@@ -8,12 +8,12 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.shared.settings.preference.impl.Preference
+import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.ReturnYouTubeDislikeCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.Preference
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.util.resources.ResourceUtils.Settings.mergeStrings
+import app.revanced.util.resources.ResourceUtils.mergeStrings
 
 @DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class])
 @Name("return-youtube-dislike-resource-patch")

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

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