chore(release): 2.10.2 [skip ci]

## [2.10.2](https://github.com/revanced/revanced-patches/compare/v2.10.1...v2.10.2) (2022-07-08)

### Bug Fixes

* trigger release on `build` commits ([0822383](0822383271))

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -28,12 +28,14 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
-      - name: Make gradlew executable
+      - name: Setup Android SDK
-        run: chmod +x gradlew
+        uses: android-actions/setup-android@v2
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build clean
+      - name: Install Android build-tools
+        run: sdkmanager "build-tools;32.0.0"
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.releaserc

@@ -7,7 +7,11 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    ["@semantic-release/commit-analyzer", {
+      "releaseRules": [
+        {"type": "build", "release": "patch"}
+      ]
+    }],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -15,6 +19,7 @@
       "@semantic-release/git",
       {
         "assets": [
+          "README.md",
           "CHANGELOG.md",
           "gradle.properties"
         ]
@@ -26,6 +31,9 @@
         "assets": [
           {
             "path": "build/libs/*.jar"
+          },
+          {
+            "path": "build/libs/*.dex"
           }
         ]
       }

CHANGELOG.md

@@ -1,3 +1,551 @@
+## [2.10.2](https://github.com/revanced/revanced-patches/compare/v2.10.1...v2.10.2) (2022-07-08)
+
+
+### Bug Fixes
+
+* trigger release on `build` commits ([be8bd1b](https://github.com/revanced/revanced-patches/commit/be8bd1b2a4b91f9763448661a802a5dc4a6b1d1d))
+
+## [2.10.1](https://github.com/revanced/revanced-patches/compare/v2.10.0...v2.10.1) (2022-07-08)
+
+
+### Bug Fixes
+
+* patch description consistency ([#134](https://github.com/revanced/revanced-patches/issues/134)) ([da5896d](https://github.com/revanced/revanced-patches/commit/da5896dde0a2b2b9ffe65e486402e4ef92ec1ce9))
+
+# [2.10.0](https://github.com/revanced/revanced-patches/compare/v2.9.4...v2.10.0) (2022-07-07)
+
+
+### Features
+
+* implement `wide-searchbar` Patch ([#130](https://github.com/revanced/revanced-patches/issues/130)) ([332f4d1](https://github.com/revanced/revanced-patches/commit/332f4d12d06316d65db252a280fe1f263e65c3a8))
+
+## [2.9.4](https://github.com/revanced/revanced-patches/compare/v2.9.3...v2.9.4) (2022-07-06)
+
+
+### Bug Fixes
+
+* add 17.25.34 as supported version for swipe-controls patch ([4d84c19](https://github.com/revanced/revanced-patches/commit/4d84c1914f8ecf51cee25667219bc6cf635a6c1c))
+
+## [2.9.3](https://github.com/revanced/revanced-patches/compare/v2.9.2...v2.9.3) (2022-07-06)
+
+
+### Bug Fixes
+
+* Readd `swipe-controls` patch ([#123](https://github.com/revanced/revanced-patches/issues/123)) ([7f2a2b2](https://github.com/revanced/revanced-patches/commit/7f2a2b2ee4e6045d53aba4e7705431b643981107))
+
+## [2.9.2](https://github.com/revanced/revanced-patches/compare/v2.9.1...v2.9.2) (2022-07-05)
+
+
+### Bug Fixes
+
+* revert `swipe-controls` patch  ([66e1f33](https://github.com/revanced/revanced-patches/commit/66e1f3384a58361737ba889d946be875b23f3163))
+
+## [2.9.1](https://github.com/revanced/revanced-patches/compare/v2.9.0...v2.9.1) (2022-07-05)
+
+
+### Bug Fixes
+
+* make `minimized-playback-manager-fingerprint` unique ([#120](https://github.com/revanced/revanced-patches/issues/120)) ([cd5e911](https://github.com/revanced/revanced-patches/commit/cd5e911f4ed9ad95b02c13c30cd9466d250e8904))
+
+# [2.9.0](https://github.com/revanced/revanced-patches/compare/v2.8.2...v2.9.0) (2022-07-05)
+
+
+### Features
+
+* `swipe-controls` patch ([#115](https://github.com/revanced/revanced-patches/issues/115)) ([1d0a7dc](https://github.com/revanced/revanced-patches/commit/1d0a7dcc0cc3ea2bcd8ce0221d5e2f53d6eb0ae5))
+
+## [2.8.2](https://github.com/revanced/revanced-patches/compare/v2.8.1...v2.8.2) (2022-07-05)
+
+
+### Bug Fixes
+
+* show minimized playback options in settings ([#118](https://github.com/revanced/revanced-patches/issues/118)) ([6e1a538](https://github.com/revanced/revanced-patches/commit/6e1a538d34291d75f19bf66a188bc69241de3a7a))
+
+## [2.8.1](https://github.com/revanced/revanced-patches/compare/v2.8.0...v2.8.1) (2022-07-05)
+
+
+### Bug Fixes
+
+* remove unnecessary version constraints ([#117](https://github.com/revanced/revanced-patches/issues/117)) ([1cddf8d](https://github.com/revanced/revanced-patches/commit/1cddf8d9063da3bbdba0fd7080c8c93768b83a4c))
+
+# [2.8.0](https://github.com/revanced/revanced-patches/compare/v2.7.0...v2.8.0) (2022-07-04)
+
+
+### Features
+
+* `enable-debugging` patch ([#116](https://github.com/revanced/revanced-patches/issues/116)) ([bb355e7](https://github.com/revanced/revanced-patches/commit/bb355e7b7e78e602a10b346fe7e5795463615a81))
+
+# [2.7.0](https://github.com/revanced/revanced-patches/compare/v2.6.0...v2.7.0) (2022-07-03)
+
+
+### Features
+
+* `hdr-max-brightness` patch ([#105](https://github.com/revanced/revanced-patches/issues/105)) ([1310573](https://github.com/revanced/revanced-patches/commit/131057366a777786d6016d3385584b4e17bc4a8b))
+* `hide-infocard-suggestions` patch ([#107](https://github.com/revanced/revanced-patches/issues/107)) ([31a767a](https://github.com/revanced/revanced-patches/commit/31a767adbb152906303ab0ae5250769fc38d0625))
+
+# [2.6.0](https://github.com/revanced/revanced-patches/compare/v2.5.0...v2.6.0) (2022-07-02)
+
+
+### Bug Fixes
+
+* freezing panels when watching video in fullscreen ([#89](https://github.com/revanced/revanced-patches/issues/89)) ([f5d4f6c](https://github.com/revanced/revanced-patches/commit/f5d4f6c3419916c6a9cf67babc6be8a64c854d3b))
+* invalid version in compatibility annotation ([#90](https://github.com/revanced/revanced-patches/issues/90)) ([df43547](https://github.com/revanced/revanced-patches/commit/df435475cdd0494a1e4ea9e2980c2998c9bc7048))
+* remove refreshing home screen not working ([6c24ebe](https://github.com/revanced/revanced-patches/commit/6c24ebef2fb4f0d58e369ac5bf63e4cab6ca0e80))
+
+
+### Features
+
+* migrate to breaking changes of patcher ([d9147cd](https://github.com/revanced/revanced-patches/commit/d9147cd60c0c25d0c5cc05409b8889dfacd89af9))
+
+# [2.6.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.6.0-dev.1...v2.6.0-dev.2) (2022-07-02)
+
+
+### Bug Fixes
+
+* remove refreshing home screen not working ([ec7ae90](https://github.com/revanced/revanced-patches/commit/ec7ae900181b6456c692adb3b5bb337e81bc5fea))
+
+# [2.6.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.5.1-dev.1...v2.6.0-dev.1) (2022-07-02)
+
+
+### Features
+
+* migrate to breaking changes of patcher ([a116852](https://github.com/revanced/revanced-patches/commit/a11685263fb2274c67684258e73c5247502cb010))
+
+## [2.5.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.5.0...v2.5.1-dev.1) (2022-06-30)
+
+
+### Bug Fixes
+
+* freezing panels when watching video in fullscreen ([#89](https://github.com/revanced/revanced-patches/issues/89)) ([f5d4f6c](https://github.com/revanced/revanced-patches/commit/f5d4f6c3419916c6a9cf67babc6be8a64c854d3b))
+* invalid version in compatibility annotation ([#90](https://github.com/revanced/revanced-patches/issues/90)) ([df43547](https://github.com/revanced/revanced-patches/commit/df435475cdd0494a1e4ea9e2980c2998c9bc7048))
+
+# [2.5.0](https://github.com/revanced/revanced-patches/compare/v2.4.0...v2.5.0) (2022-06-30)
+
+
+### Features
+
+* hide watermark support for 17.25.34 ([#87](https://github.com/revanced/revanced-patches/issues/87)) ([0cdb65b](https://github.com/revanced/revanced-patches/commit/0cdb65bbb3e7b9d75eb393ee87e3718bcd6af4b3))
+
+# [2.4.0](https://github.com/revanced/revanced-patches/compare/v2.3.1...v2.4.0) (2022-06-30)
+
+
+### Features
+
+* add youtube version 17.25.34 ([#85](https://github.com/revanced/revanced-patches/issues/85)) ([889c9d5](https://github.com/revanced/revanced-patches/commit/889c9d564d16c6e68a52095a4fc8e6d04346c9e9))
+
+## [2.3.1](https://github.com/revanced/revanced-patches/compare/v2.3.0...v2.3.1) (2022-06-30)
+
+
+### Bug Fixes
+
+* change fingerprint to work on latest youtube ([#80](https://github.com/revanced/revanced-patches/issues/80)) ([4dba323](https://github.com/revanced/revanced-patches/commit/4dba323ddf8980cd2b0908a0de41c4b4dea6b0d7))
+
+# [2.3.0](https://github.com/revanced/revanced-patches/compare/v2.2.0...v2.3.0) (2022-06-30)
+
+
+### Features
+
+* `disable-autoplay-button` patch ([#79](https://github.com/revanced/revanced-patches/issues/79)) ([0d6fb51](https://github.com/revanced/revanced-patches/commit/0d6fb51e025649aae37e230778ea367482fab0d7))
+
+# [2.2.0](https://github.com/revanced/revanced-patches/compare/v2.1.0...v2.2.0) (2022-06-29)
+
+
+### Features
+
+* make resource mapping patch aware of types ([#77](https://github.com/revanced/revanced-patches/issues/77)) ([188491a](https://github.com/revanced/revanced-patches/commit/188491a707abccc1164413f075d8a66c145a1455))
+
+# [2.1.0](https://github.com/revanced/revanced-patches/compare/v2.0.3...v2.1.0) (2022-06-28)
+
+
+### Features
+
+* `custom-playback-speed` patch ([#50](https://github.com/revanced/revanced-patches/issues/50)) ([224254b](https://github.com/revanced/revanced-patches/commit/224254bcce2b394bbfd2549089f0204ce4ed4a89))
+
+## [2.0.3](https://github.com/revanced/revanced-patches/compare/v2.0.2...v2.0.3) (2022-06-27)
+
+
+### Bug Fixes
+
+* check if resource files exist ([ba1f3af](https://github.com/revanced/revanced-patches/commit/ba1f3af99be58edc44ed1b8f1875508d5034efd8))
+
+## [2.0.2](https://github.com/revanced/revanced-patches/compare/v2.0.1...v2.0.2) (2022-06-27)
+
+
+### Bug Fixes
+
+* some more refactoring of integrations, add hide-watermark patch ([#63](https://github.com/revanced/revanced-patches/issues/63)) ([feb09c5](https://github.com/revanced/revanced-patches/commit/feb09c56f475e2537a67d3636b08737848158a8e))
+
+## [2.0.1](https://github.com/revanced/revanced-patches/compare/v2.0.0...v2.0.1) (2022-06-26)
+
+
+### Bug Fixes
+
+* invalid string in strings list ([f08b53b](https://github.com/revanced/revanced-patches/commit/f08b53b07d93bd8ac6e7da376ea6e6023e53076e))
+* migrate to new `proxy` api ([db32ffe](https://github.com/revanced/revanced-patches/commit/db32ffe56a8e73177bef724ee10eda9a28b367b8))
+
+# [2.0.0](https://github.com/revanced/revanced-patches/compare/v1.11.0...v2.0.0) (2022-06-26)
+
+
+### Code Refactoring
+
+* migrate from `Signature` to `Fingerprint` ([084078e](https://github.com/revanced/revanced-patches/commit/084078e7f1852ccd2045e3fa8aedc25a7fd5faa8))
+
+
+### BREAKING CHANGES
+
+* Not backwards compatible, since a lot of classes where renamed.
+
+# [1.11.0](https://github.com/revanced/revanced-patches/compare/v1.10.5...v1.11.0) (2022-06-26)
+
+
+### Features
+
+* add youtube version 17.24.35 ([ec626cc](https://github.com/revanced/revanced-patches/commit/ec626ccfa2bcf14b722d08110382de009a1c12b4))
+* add youtube version 17.24.35 ([adc60a6](https://github.com/revanced/revanced-patches/commit/adc60a6fa09f6a21800ba51b8ca888d11a17e870))
+
+## [1.10.5](https://github.com/revanced/revanced-patches/compare/v1.10.4...v1.10.5) (2022-06-25)
+
+
+### Bug Fixes
+
+* put back proper variable ([#61](https://github.com/revanced/revanced-patches/issues/61)) ([d26c423](https://github.com/revanced/revanced-patches/commit/d26c4233031fd418eb37c8f05e9bc1857e0572e6))
+
+## [1.10.4](https://github.com/revanced/revanced-patches/compare/v1.10.3...v1.10.4) (2022-06-23)
+
+
+### Bug Fixes
+
+* missing brackets at inlining ([8936c8a](https://github.com/revanced/revanced-patches/commit/8936c8aaedb56817cda5eec5f4a8c32f433862aa))
+
+## [1.10.3](https://github.com/revanced/revanced-patches/compare/v1.10.2...v1.10.3) (2022-06-23)
+
+
+### Bug Fixes
+
+* get create button view register by more reliable means ([#59](https://github.com/revanced/revanced-patches/issues/59)) ([6ab821e](https://github.com/revanced/revanced-patches/commit/6ab821e377176f4e9f1b7ec2b58a924fa40299db))
+
+## [1.10.2](https://github.com/revanced/revanced-patches/compare/v1.10.1...v1.10.2) (2022-06-23)
+
+
+### Bug Fixes
+
+* `disable-create-button` not working with prebuilt jar file ([#55](https://github.com/revanced/revanced-patches/issues/55)) ([78be64a](https://github.com/revanced/revanced-patches/commit/78be64accc2023281c0c376849cdb0213622dc5c))
+
+## [1.10.1](https://github.com/revanced/revanced-patches/compare/v1.10.0...v1.10.1) (2022-06-23)
+
+
+### Bug Fixes
+
+* patcher not propagating dexlib ([980c486](https://github.com/revanced/revanced-patches/commit/980c48673259496d793bc7f864ad355188dcf7b6))
+* update patcher version ([e3d0bb7](https://github.com/revanced/revanced-patches/commit/e3d0bb7ee1923ea996cf637267c62d233a74c7fa))
+
+# [1.10.0](https://github.com/revanced/revanced-patches/compare/v1.9.1...v1.10.0) (2022-06-23)
+
+
+### Features
+
+* add compatibility for YouTube v17.23.36 and v17.24.34 ([1812bc3](https://github.com/revanced/revanced-patches/commit/1812bc39e0e88f1ab02ae8127e9000780eedf49c))
+
+## [1.9.1](https://github.com/revanced/revanced-patches/compare/v1.9.0...v1.9.1) (2022-06-21)
+
+
+### Bug Fixes
+
+* update patcher version ([5f54bc9](https://github.com/revanced/revanced-patches/commit/5f54bc9aa8fd8b83448141a9b05746e3e977369d))
+
+# [1.9.0](https://github.com/revanced/revanced-patches/compare/v1.8.2...v1.9.0) (2022-06-21)
+
+
+### Features
+
+* use `install` mode by default ([c2b2993](https://github.com/revanced/revanced-patches/commit/c2b299336a984d66a2d066e5ebe9c4f9bee5c2aa))
+
+## [1.8.2](https://github.com/revanced/revanced-patches/compare/v1.8.1...v1.8.2) (2022-06-20)
+
+
+### Bug Fixes
+
+* migrate to breaking changes from patcher ([2c0a419](https://github.com/revanced/revanced-patches/commit/2c0a4196fed2fbdcd454ed882b720898d3050c51))
+* old usage of `toInstructions` extension method ([65ddd52](https://github.com/revanced/revanced-patches/commit/65ddd522dca19e0590d9cb6fdb2d85ad7b98481e))
+
+## [1.8.1](https://github.com/revanced/revanced-patches/compare/v1.8.0...v1.8.1) (2022-06-20)
+
+
+### Bug Fixes
+
+* add execute permission to `./gradlew` file ([ff7a560](https://github.com/revanced/revanced-patches/commit/ff7a5602f68428111fea6c60cbea694592039ef1))
+
+# [1.8.0](https://github.com/revanced/revanced-patches/compare/v1.7.0...v1.8.0) (2022-06-20)
+
+
+### Features
+
+* bump compatibility of patches for Youtube to v17.23.35 ([3748d05](https://github.com/revanced/revanced-patches/commit/3748d0533e62a8871ab2202ce9b61170a90dae62))
+
+# [1.7.0](https://github.com/revanced/revanced-patches/compare/v1.6.4...v1.7.0) (2022-06-20)
+
+
+### Features
+
+* `disable-fullscreen-panels` patch ([3bf0561](https://github.com/revanced/revanced-patches/commit/3bf056163500b006d1a20c5f3a3e0c92fec13bd8))
+
+## [1.6.4](https://github.com/revanced/revanced-patches/compare/v1.6.3...v1.6.4) (2022-06-19)
+
+
+### Bug Fixes
+
+* update patcher version ([#35](https://github.com/revanced/revanced-patches/issues/35)) ([1a379df](https://github.com/revanced/revanced-patches/commit/1a379dfd974b9f92d4bd0d5d7a4711eb6d1060b3)), closes [#34](https://github.com/revanced/revanced-patches/issues/34)
+
+## [1.6.3](https://github.com/revanced/revanced-patches/compare/v1.6.2...v1.6.3) (2022-06-16)
+
+
+### Bug Fixes
+
+* wrong dex path ([170fbbb](https://github.com/revanced/revanced-patches/commit/170fbbb99e4a2dbe3e0febe44d07a692aa9d7224))
+
+## [1.6.2](https://github.com/revanced/revanced-patches/compare/v1.6.1...v1.6.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([91483a8](https://github.com/revanced/revanced-patches/commit/91483a8fbf92559d079dc52f846f5f871f5d6b5c))
+
+## [1.6.1](https://github.com/revanced/revanced-patches/compare/v1.6.0...v1.6.1) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([4d07961](https://github.com/revanced/revanced-patches/commit/4d07961c8afd24da7f8879d11419147f2e100f05))
+
+# [1.6.0](https://github.com/revanced/revanced-patches/compare/v1.5.3...v1.6.0) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([28e3f55](https://github.com/revanced/revanced-patches/commit/28e3f554ea6a7144416523fe48ce7adbb613b263))
+
+
+### Features
+
+* generate dex files using gradle task ([c34c1be](https://github.com/revanced/revanced-patches/commit/c34c1be21f50b4f720a7cd81e0dfe5ef6330caab))
+
+## [1.5.3](https://github.com/revanced/revanced-patches/compare/v1.5.2...v1.5.3) (2022-06-16)
+
+
+### Bug Fixes
+
+* forgot about this ([7102a25](https://github.com/revanced/revanced-patches/commit/7102a25dc618f19b324b01870d23f5418f375b2a))
+
+## [1.5.2](https://github.com/revanced/revanced-patches/compare/v1.5.1...v1.5.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* dummy task for Gradle semantic-release plugin ([f6a8911](https://github.com/revanced/revanced-patches/commit/f6a8911906dfe52fcdb685daf7a02d6d0052cba9))
+* releases ([30d5c9a](https://github.com/revanced/revanced-patches/commit/30d5c9a67ccf88ca6ac00d0a9f2a2e330f8092dd))
+
+## [1.5.1](https://github.com/revanced/revanced-patches/compare/v1.5.0...v1.5.1) (2022-06-16)
+
+
+### Reverts
+
+* Revert "Changed app name to ReVanced (#21)" (#24) ([70a48c5](https://github.com/revanced/revanced-patches/commit/70a48c5f35cd236612352a1dbbf50487625e6e96)), closes [#21](https://github.com/revanced/revanced-patches/issues/21) [#24](https://github.com/revanced/revanced-patches/issues/24)
+
+# [1.5.0](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.5.0) (2022-06-15)
+
+
+### Bug Fixes
+
+* sync version ([6170e36](https://github.com/revanced/revanced-patches/commit/6170e3689d9c8998be94a8464352af620cccd11b))
+
+
+### Features
+
+* `hide-cast-button` patch ([2cd531e](https://github.com/revanced/revanced-patches/commit/2cd531eb5a334f3cf91cba4556f07e863cd9ec1b))
+
+# [1.4.0](https://github.com/revanced/revanced-patches/compare/v1.3.1...v1.4.0) (2022-06-15)
+
+
+### Bug Fixes
+
+* add size `48px` for `custom-branding` patch ([f81872b](https://github.com/revanced/revanced-patches/commit/f81872b8e41da215517fdb59364130d8ce681607))
+
+
+### Features
+
+* `premium-heading` patch ([78913bf](https://github.com/revanced/revanced-patches/commit/78913bf1e80f5b91d0dee506fdfe3f875e8e6988))
+
+## [1.3.1](https://github.com/revanced/revanced-patches/compare/v1.3.0...v1.3.1) (2022-06-15)
+
+
+### Bug Fixes
+
+* `custom-branding` patch failing to get resources ([efb6d4c](https://github.com/revanced/revanced-patches/commit/efb6d4c2be515185fc9bd29c40ce202f0d684cee))
+
+# [1.3.0](https://github.com/revanced/revanced-patches/compare/v1.2.2...v1.3.0) (2022-06-14)
+
+
+### Features
+
+* `custom-branding` patch ([0d65ea8](https://github.com/revanced/revanced-patches/commit/0d65ea8cdb0e02287f6be6855cd3d28823a61e70))
+
+## [1.2.2](https://github.com/revanced/revanced-patches/compare/v1.2.1...v1.2.2) (2022-06-13)
+
+
+### Bug Fixes
+
+* environment variable not found in gradle build script ([0da15fb](https://github.com/revanced/revanced-patches/commit/0da15fb0effac0566d080d7b85e9fbe46c3dd34d))
+
+## [1.2.1](https://github.com/revanced/revanced-patches/compare/v1.2.0...v1.2.1) (2022-06-12)
+
+
+### Performance Improvements
+
+* fix high battery consumption due to chromecast not working with `microg` ([dd8b01a](https://github.com/revanced/revanced-patches/commit/dd8b01a5c5d75b00ea4d04ce35bc43942c1b0409))
+
+# [1.2.0](https://github.com/revanced/revanced-patches/compare/v1.1.0...v1.2.0) (2022-06-11)
+
+
+### Bug Fixes
+
+* migrate to `include` annotation ([110bbf1](https://github.com/revanced/revanced-patches/commit/110bbf143a9cec8dce1f0416cff40f8d93055e96))
+
+
+### Features
+
+* `microg-patch` ([48bbd57](https://github.com/revanced/revanced-patches/commit/48bbd574a52c8bf6834b26facfe7384b830f944a))
+* updated all patches to support v17.22.36 of `com.android.google.youtube` ([e12dc11](https://github.com/revanced/revanced-patches/commit/e12dc11b670c2b0c414741616e0a646e8421e418))
+
+# [1.1.0](https://github.com/revanced/revanced-patches/compare/v1.0.0...v1.1.0) (2022-06-11)
+
+
+### Features
+
+* generate & upload dex files ([#18](https://github.com/revanced/revanced-patches/issues/18)) ([e6f5355](https://github.com/revanced/revanced-patches/commit/e6f53553a98c164c4eb926fb273358ed506e00a4))
+
+# 1.0.0 (2022-06-05)
+
+
+### Bug Fixes
+
+* `create-button-signature` ([a173f6e](https://github.com/revanced/revanced-patches/commit/a173f6e5a7e65943657e2072e8a72a4a680e5277))
+* `enable-seekbar-tapping` patch ([52fd726](https://github.com/revanced/revanced-patches/commit/52fd726d9b0d2efbd0f9742fc84ad01ccdcff168))
+* `Index` in wrong package ([2f9360f](https://github.com/revanced/revanced-patches/commit/2f9360f57cc8415564534fbbd8bd5e2a83a1b629))
+* `minimized-playback` & `old-quality-layout` wrong opcodes ([b45d175](https://github.com/revanced/revanced-patches/commit/b45d175c6f1ece6da894ab16128c2644d262c9c7))
+* `minimized-playback` patch ([55677a4](https://github.com/revanced/revanced-patches/commit/55677a44ff965c0b92c3f1d771bd68c12c142ad4))
+* `SignatureChecker` not handling nullable field `methodMetadata` ([17bcf78](https://github.com/revanced/revanced-patches/commit/17bcf786a85ccf1f7d9f5a66a044a3c26def09bb))
+* accidentally removed code in refactor ([0077e26](https://github.com/revanced/revanced-patches/commit/0077e26d23cc112b671a41614a55348fac2c88ca))
+* add missing `trimIndent()` to string literals ([76d3c71](https://github.com/revanced/revanced-patches/commit/76d3c71b67edebd79f2cdb1bb28e4d2969d72223))
+* add missing opcode for `create-button-method` ([0a398ef](https://github.com/revanced/revanced-patches/commit/0a398ef364f91a0dd9608df1a036a2515476ccf2))
+* attempt on all patches ([3395d69](https://github.com/revanced/revanced-patches/commit/3395d69747103a4bdf314297aa0bfa6ef6a0fc36))
+* breaking changes by `revanced-patcher` dependency ([e12e484](https://github.com/revanced/revanced-patches/commit/e12e484e3796c5c9c8505b677838cdf8432f2e79))
+* breaking changes by `revanced-patcher` dependency ([7e485b4](https://github.com/revanced/revanced-patches/commit/7e485b4ffe204d724809aeb9bd9f693a35ded94d))
+* breaking changes of the patcher ([1a49bbd](https://github.com/revanced/revanced-patches/commit/1a49bbdbc4ff6f427934259536218e161908b449))
+* breaking patcher changes ([50f9cc5](https://github.com/revanced/revanced-patches/commit/50f9cc52acfd5bc23330ecd23d8d85678a9d3eee))
+* breaking patcher changes ([cbb9e2c](https://github.com/revanced/revanced-patches/commit/cbb9e2cd1fa829e1d1dd92dbd40131b11ae6a05b))
+* breaking patcher changes ([581d1b0](https://github.com/revanced/revanced-patches/commit/581d1b0ca7d15adcdb1ab6116ef035acfe701757))
+* bugfixes in `microg` ([a43b33b](https://github.com/revanced/revanced-patches/commit/a43b33bdbb2b36e0a8f991fa11dfeeec34de01f9))
+* clean after building ([a2df3fb](https://github.com/revanced/revanced-patches/commit/a2df3fbc9761b07f3010542fa8684ade00e4dc91))
+* disable `hide-suggestions-patch` patch until fixed ([99099ea](https://github.com/revanced/revanced-patches/commit/99099ea0bc12f5f25896967db642442df69d0c4f))
+* incorrect endIndex (fixed in Patcher) ([424788e](https://github.com/revanced/revanced-patches/commit/424788edd777110cdaff97500556d18628f33385))
+* loop in `amoled` patch ([c4c86b6](https://github.com/revanced/revanced-patches/commit/c4c86b65fd8b2463c1d86ad2e46ec9f08e60d47c))
+* migrate patches to latest patcher api changes ([8a0ee03](https://github.com/revanced/revanced-patches/commit/8a0ee03a71cf4a000c9a7246d0e64ed8291a5127))
+* missing extension method `doRecursively` ([e9c9460](https://github.com/revanced/revanced-patches/commit/e9c946008ee912652d288e515b83b52ae2d239d8))
+* modified opcode for `show-video-ads-constructor` ([a0dcea3](https://github.com/revanced/revanced-patches/commit/a0dcea3a13f68cae449dfaf445b542e339c83ff0))
+* multiple bugs in patches ([e37201d](https://github.com/revanced/revanced-patches/commit/e37201d0ceef474696857a0d8845950c888194d0))
+* name for `IntegrationsPatch` ([e46ef02](https://github.com/revanced/revanced-patches/commit/e46ef02302825d62b57912b2747a25f858036bb7))
+* print instruction index of warning ([9e29aee](https://github.com/revanced/revanced-patches/commit/9e29aeeeff222412f6c45cf7e4879f8ec53ca6ee))
+* publish releases ([83916f9](https://github.com/revanced/revanced-patches/commit/83916f96d27989dcbb35c0ba6ef326a16b470501))
+* remove `HideSuggestionsPatch` from `Index` ([f32e474](https://github.com/revanced/revanced-patches/commit/f32e4747b512c675b807ff5eebfd0b8e66173fba))
+* remove unused patches ([d12e92a](https://github.com/revanced/revanced-patches/commit/d12e92aead677fefa9dcb48748d783225b65fab1))
+* signature checker with changes of patcher ([e82459d](https://github.com/revanced/revanced-patches/commit/e82459d37759e1a5a860d3e7fcdf69d95b06858e))
+* spelling mistake ([52f9147](https://github.com/revanced/revanced-patches/commit/52f9147ee8d591f786397d174dc02a141d9250a9))
+* tests failing ([102793f](https://github.com/revanced/revanced-patches/commit/102793f24f8bf7c7fd254968b29d65da7b2b962f))
+* update `HomeAdsPatch` ([62f1801](https://github.com/revanced/revanced-patches/commit/62f1801e9cbee53c0be3413c245161bd941e4aec))
+* update patches ([91b8ec8](https://github.com/revanced/revanced-patches/commit/91b8ec81f33417798546c32db708fe09ada3930c))
+* use the latest version of patcher dependency ([fe4a439](https://github.com/revanced/revanced-patches/commit/fe4a439cb2bc5e385ae13e8e155f25bb15e74633))
+* version in package metadata of music ([b299205](https://github.com/revanced/revanced-patches/commit/b299205aa7cde82f1f55fc598de3ff8d80b8bcb0))
+* **VideoAds:** remove `istore1` opcode ([dc4ec57](https://github.com/revanced/revanced-patches/commit/dc4ec574414c5df959efa0ca8f1cd39a812fedf8))
+* write while reading resources and remove checking for "." in resource extensions ([7bc6094](https://github.com/revanced/revanced-patches/commit/7bc60943cb2350e89dac091ec9c98c5effd0b8a9))
+* wrong access flag in signature for `Create button patch` ([9fbb89d](https://github.com/revanced/revanced-patches/commit/9fbb89d05336a256a0759eea6095e073946c45e5))
+* wrong annotation and signature in patches ([a0fdee8](https://github.com/revanced/revanced-patches/commit/a0fdee81a6d6773603520e7c3040ae8637642d58))
+* wrong opcode for `create-button-method` ([3214650](https://github.com/revanced/revanced-patches/commit/32146506f139aebc44cd5faffb7706b8b9c21c3d))
+* wrong opcode pattern for `create-button-method` ([f4d8a85](https://github.com/revanced/revanced-patches/commit/f4d8a8525bc64b90748b21979d463977a21dcd85))
+* wrong opcode pattern for `enable-seekbar-tapping-signature` ([1d83395](https://github.com/revanced/revanced-patches/commit/1d833957ed3e01188770c85e3d84e483419bd797))
+* wrong opcode pattern for signature in `Hide suggestions patch` ([535aee0](https://github.com/revanced/revanced-patches/commit/535aee08408b990c80f5966c13fa84666a8b35d0))
+* wrong patches in `upgrade-tab-remover` ([5182290](https://github.com/revanced/revanced-patches/commit/518229031ceca049ad790f7b77b19405d39f0ce1))
+* wrong signature for `hide-reels-signature` ([2d9ff2a](https://github.com/revanced/revanced-patches/commit/2d9ff2af0a991d7721f3741187716a3b08bb4029))
+* wrong signatures for patch `Old Quality Layout Patch` ([823e503](https://github.com/revanced/revanced-patches/commit/823e503d84037bdf27b09f17e63383f963c76854))
+* wrong versions of patches ([a112b22](https://github.com/revanced/revanced-patches/commit/a112b22ce6e685204caab6f95f511e26ef95806b))
+
+
+### Code Refactoring
+
+* Rename `net.revanced` to `app.revanced` ([68ea89f](https://github.com/revanced/revanced-patches/commit/68ea89f15e9ea077df0d0ac20a40b735bb5ae26c))
+
+
+### Features
+
+* `Dependencies` annotation ([85806bb](https://github.com/revanced/revanced-patches/commit/85806bb355e342ecb33d4ee1e76f9edf89b2c2ee))
+* `GeneralBytecodeAds` and `GeneralResourceAds` patch ([f99bbef](https://github.com/revanced/revanced-patches/commit/f99bbef4c911ac2492166c7a3792ea11ffceffab))
+* `hide-shorts-button` patch ([88352ee](https://github.com/revanced/revanced-patches/commit/88352ee6ecd23faa4a7fd9f7495e67fa1d3e33bd))
+* `tastebuilder-remover` for music ([a6aeca3](https://github.com/revanced/revanced-patches/commit/a6aeca31bd80b8c4a8acd071e22faca6e136bdb0))
+* Add (WIP) Signature Checker ([ae4c7b2](https://github.com/revanced/revanced-patches/commit/ae4c7b29f211c461de460f97f3a8656e795adafb))
+* add `amoled` patch ([d61bac4](https://github.com/revanced/revanced-patches/commit/d61bac4f8243d0ef72ca91c7c1d5facd858d515e))
+* add home ads patch ([36cddd1](https://github.com/revanced/revanced-patches/commit/36cddd1488683e19e2b927e34c80a4f0f3cace35))
+* add patches compatibility to the newest version ([799401d](https://github.com/revanced/revanced-patches/commit/799401ddf99da0aaa5f52c39d3d3d4061370fd75))
+* add publishing to package registry ([b475e09](https://github.com/revanced/revanced-patches/commit/b475e09577db4dda7bbb45dbf170d78772834a6d))
+* add semantic-release ([d60f1d0](https://github.com/revanced/revanced-patches/commit/d60f1d06798d312b158b71691ecc87e828dccbc1))
+* added `codecs-unlock` patch ([e5fd7ce](https://github.com/revanced/revanced-patches/commit/e5fd7cece94b1ff5342178f59b29576db806e0f6))
+* begin `MicroG Patch` ([91474ba](https://github.com/revanced/revanced-patches/commit/91474ba07376c13e7a71685dfd8b6e6913ed5ee9))
+* display metadata for each signature in `SignatureChecker` ([736a71f](https://github.com/revanced/revanced-patches/commit/736a71fac21a32dbb1eef9c3a9f0d3005e7d9ca0))
+* get required register dynamically ([0924ca2](https://github.com/revanced/revanced-patches/commit/0924ca2ad30ae865dcc0fd484cb0da517e827352))
+* Initial commit ([bee5f2f](https://github.com/revanced/revanced-patches/commit/bee5f2faed882271ed059b0435e6e1aa91f93dbd))
+* integrations patch ([19c0b0d](https://github.com/revanced/revanced-patches/commit/19c0b0d194bb97c7248ea7a9b081176961653b9d))
+* migrate to dalvik patches ([e088c67](https://github.com/revanced/revanced-patches/commit/e088c671081bcf75586ccc1c4bdbed9366e93874))
+* MinimizedPlayback, CreateButtonRemover ([cc08c6c](https://github.com/revanced/revanced-patches/commit/cc08c6c3d38879dd4672ec671631b34aa2e3cc77))
+* OldQualityLayout, HideSuggestions, HideReels, EnableSeekbarTapping ([04a7cff](https://github.com/revanced/revanced-patches/commit/04a7cfff20d2734b1c92713de4e7e08a3b93ee85))
+* Patches for YouTube Music ([b60c9d3](https://github.com/revanced/revanced-patches/commit/b60c9d33b611bb4d5b55bb419652bc14b0309792))
+* remove obsolete patch `Hide suggestions patch` ([e65c6f2](https://github.com/revanced/revanced-patches/commit/e65c6f240ed23a54271d20a90fc57ec65cafc02d))
+* update MicroG patch to latest version ([c24f806](https://github.com/revanced/revanced-patches/commit/c24f8063a04f89aea2d2f7087a435738de7dfeae))
+* update patches to latest version ([bad25de](https://github.com/revanced/revanced-patches/commit/bad25dec1d73137f8b7a1bf4daaceb2279b4d48c))
+* use supplier instead of KClass ([08af6e5](https://github.com/revanced/revanced-patches/commit/08af6e54af79ef9ef4fb3372a348ce9b6fba4d20))
+* use supplier instead of KClass ([91aa019](https://github.com/revanced/revanced-patches/commit/91aa019f8d3d87fbf7affeb7abc2b02ba87af5c3))
+
+
+### BREAKING CHANGES
+
+* signature of patches was changed
+* signature of patches was changed
+* Package name was changed from "net.revanced" to "app.revanced"
+
+# [1.0.0-dev.16](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.15...v1.0.0-dev.16) (2022-06-05)
+
+
+### Features
+
+* add patches compatibility to the newest version ([799401d](https://github.com/revanced/revanced-patches/commit/799401ddf99da0aaa5f52c39d3d3d4061370fd75))
+
+# [1.0.0-dev.15](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.14...v1.0.0-dev.15) (2022-06-05)
+
+
+### Bug Fixes
+
+* remove unused patches ([d12e92a](https://github.com/revanced/revanced-patches/commit/d12e92aead677fefa9dcb48748d783225b65fab1))
+
+# [1.0.0-dev.14](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.13...v1.0.0-dev.14) (2022-06-04)
+
+
+### Bug Fixes
+
+* spelling mistake ([52f9147](https://github.com/revanced/revanced-patches/commit/52f9147ee8d591f786397d174dc02a141d9250a9))
+
+
+### Features
+
+* `Dependencies` annotation ([85806bb](https://github.com/revanced/revanced-patches/commit/85806bb355e342ecb33d4ee1e76f9edf89b2c2ee))
+* `GeneralBytecodeAds` and `GeneralResourceAds` patch ([f99bbef](https://github.com/revanced/revanced-patches/commit/f99bbef4c911ac2492166c7a3792ea11ffceffab))
+
 # [1.0.0-dev.13](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.12...v1.0.0-dev.13) (2022-05-31)
 
 

README.md

@@ -1,2 +1,2 @@
-# revanced-patches
+# ReVanced Patches
-Repo for all ReVanced patches
+🧩 Official patches by ReVanced

build.gradle.kts

@@ -1,59 +1,69 @@
+import org.apache.tools.ant.taskdefs.ExecTask
+
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.0"
-    java
-    `maven-publish`
 }
 
 group = "app.revanced"
 
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
     mavenCentral()
     mavenLocal()
     maven {
-        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") // note the "r"!
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
-            // DO NOT set these variables in the project's gradle.properties.
+            username = githubUsername
-            // Instead, you should set them in:
+            password = githubPassword
-            // Windows: %homepath%\.gradle\gradle.properties
-            // Linux: ~/.gradle/gradle.properties
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
-            password = project.findProperty("gpr.key")  as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
         }
     }
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+    implementation(kotlin("stdlib"))
 
-    implementation("app.revanced:revanced-patcher:1.0.0-dev.17")
+    implementation("app.revanced:revanced-patcher:2.3.0")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
+    implementation("app.revanced:multidexlib2:2.5.2.r2")
 }
 
-java {
+tasks {
-    withSourcesJar()
+    register<DefaultTask>("generateDex") {
-    withJavadocJar()
+        description = "Generate dex files from build"
-}
+        dependsOn(build)
 
-val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
+        doLast {
+            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = "${androidHome}/build-tools/32.0.0/d8"
+            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val output = input.replace(".jar", ".dex")
+            val work = File("${buildDir}/libs")
 
-publishing {
+            exec {
-    repositories {
+                workingDir = work
-        if (isGitHubCI) {
+                commandLine = listOf(d8, input)
-            maven {
+            }
-                name = "GitHubPackages"
+
-                url = uri("https://maven.pkg.github.com/revanced/revanced-patches") // note the "s"!
+            exec {
-                credentials {
+                workingDir = work
-                    username = System.getenv("GITHUB_ACTOR")
+                commandLine = listOf("mv", "classes.dex", output)
-                    password = System.getenv("GITHUB_TOKEN")
-                }
             }
-        } else {
-            mavenLocal()
         }
     }
-    publications {
+    register<JavaExec>("generateReadme") {
-        register<MavenPublication>("gpr") {
+        description = "Generate README.md"
-            from(components["java"])
+        dependsOn(build)
-        }
+
+        classpath = sourceSets["main"].runtimeClasspath
+        mainClass.set("app.revanced.patches.meta.ReadmeGenerator")
+    }
+    // Dummy task to fix the Gradle semantic-release plugin.
+    // Remove this if you forked it to support building only.
+    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    register<DefaultTask>("publish") {
+        group = "publish"
+        description = "Dummy task"
+        dependsOn(named("generateDex"), named("generateReadme"))
     }
 }

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.0.0-dev.13
+version = 2.10.2

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

@@ -1,7 +1,18 @@
 package app.revanced.extensions
 
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.toInstruction
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
+import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 import org.w3c.dom.Node
 
 internal fun MutableMethodImplementation.injectHideCall(
@@ -10,26 +21,135 @@ internal fun MutableMethodImplementation.injectHideCall(
 ) {
     this.addInstruction(
         index,
-        "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->HideView(Landroid/view/View;)V".toInstruction()
+        "invoke-static { v$register }, Lapp/revanced/integrations/patches/HideHomeAdsPatch;->HideHomeAds(Landroid/view/View;)V".toInstruction()
     )
 }
 
+/**
+ * Insert an event hook at the top of the method. If the hook returns true, the event is consumed and the method will return with true
+ *
+ * the hook method MUST return a boolean and MUST take two parameters, like so:
+ *  fun hook(thisRef: Object, eventData: Object): Boolean {}
+ *
+ * The final injected code will resemble the following logic:
+ *  if( YouHook(this, event) ) { return true; }
+ *  ...
+ *
+ * @param hookRef reference to the hook method
+ */
+internal fun MutableMethod.injectConsumableEventHook(hookRef: ImmutableMethodReference) {
+    val isStaticMethod = AccessFlags.STATIC.isSet(this.accessFlags)
+    this.implementation?.let { impl ->
+        // create label to index 0 to continue to the normal program flow
+        val lblContinueNormalFlow = impl.newLabelForIndex(0)
+
+        // define registers
+        /** V0 */
+        val regV0 = 0
+
+        /** this  */
+        val regP0 = impl.registerCount - this.parameters.size - (if (isStaticMethod) 0 else 1)
+
+        /** motionEvent */
+        val regP1 = regP0 + 1
+
+        // insert instructions at the start of the method:
+        // if( Hook(this, event) ) { return true; }
+        impl.addInstructions(
+            0, listOf(
+                // invoke-static { p0, p1 } <hook>
+                BuilderInstruction35c(
+                    Opcode.INVOKE_STATIC,
+                    2,
+                    regP0,
+                    regP1,
+                    0, 0, 0,
+                    hookRef
+                ),
+
+                // move-result v0
+                BuilderInstruction11x(
+                    Opcode.MOVE_RESULT,
+                    regV0
+                ),
+
+                // if-eqz v0, :continue_normal_flow
+                BuilderInstruction21t(
+                    Opcode.IF_EQZ,
+                    regV0,
+                    lblContinueNormalFlow
+                ),
+
+                // const/4 v0, 0x1
+                BuilderInstruction11n(
+                    Opcode.CONST_4,
+                    regV0,
+                    0x1
+                ),
+
+                // return v0
+                BuilderInstruction11x(
+                    Opcode.RETURN,
+                    regV0
+                )
+
+                // :continue_normal_flow
+            )
+        )
+    }
+}
+
+/**
+ * Insert instructions into a named method
+ *
+ * @param targetClass the name of the class of which the method is a member
+ * @param targetMethod the name of the method to insert into
+ * @param index index to insert the instructions at. If the index is negative, it is used as an offset to the last method (so -1 inserts at the end of the method)
+ * @param instructions the smali instructions to insert (they'll be compiled by MutableMethod.addInstructions)
+ */
+internal fun BytecodeData.injectIntoNamedMethod(
+    targetClass: String,
+    targetMethod: String,
+    index: Int,
+    instructions: String
+) {
+    var injections = 0
+    this.classes.filter { it.type.endsWith("$targetClass;") }.forEach { classDef ->
+        this.proxy(classDef).resolve().methods.filter { it.name == targetMethod }.forEach { methodDef ->
+            // if index is negative, interpret as an offset from the back
+            var insertIndex = index
+            if (insertIndex < 0) {
+                insertIndex += methodDef.implementation!!.instructions.size
+            }
+
+            // insert instructions
+            methodDef.addInstructions(insertIndex, instructions)
+            injections++
+        }
+    }
+
+    // fail if nothing was injected
+    if (injections <= 0) {
+        throw PatchResultError("failed to inject into $targetClass.$targetMethod: no targets were found")
+    }
+}
+
 internal fun Node.doRecursively(action: (Node) -> Unit) {
     action(this)
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
-internal fun String.startsWithAny(vararg prefix: String): Boolean {
+internal fun String.startsWithAny(vararg prefixes: String): Boolean {
-    for (_prefix in prefix)
+    for (prefix in prefixes)
-        if (this.startsWith(_prefix))
+        if (this.startsWith(prefix))
             return true
 
     return false
 }
 
-internal fun String.containsAny(vararg others: String): Boolean {
+internal fun String.equalsAny(vararg other: String): Boolean {
-    for (other in others)
+    for (_other in other)
-        if (this.contains(other))
+        if (this == _other)
             return true
 
     return false

src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt

@@ -0,0 +1,55 @@
+package app.revanced.patches.meta
+
+import java.io.File
+import kotlin.io.writeText
+import kotlin.collections.first
+import app.revanced.patcher.util.patch.implementation.JarPatchBundle
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.extensions.PatchExtensions.description
+
+class ReadmeGenerator {
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            //should be moved to a file?
+            val generalReadme =
+                """    
+            # ReVanced Patches
+            🧩 Official patches by ReVanced
+
+            # Patch list
+            """.trimIndent()
+
+            val tableHeader =
+                """
+            | 💊 Patch | 📜 Description | 🎯 Target Package | 🏹 Target Version |
+            |:-----:|:-----------:|:--------------:|:----------------------:|
+            """.trimIndent()
+
+            val readmeFile = File("README.md")
+
+            val buildDir = File("build/libs/")
+            val buildJar = buildDir.listFiles().first { it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar") }
+
+            val bundle = JarPatchBundle(buildJar.absolutePath).loadPatches()
+
+            val builder = StringBuilder()
+
+            builder.appendLine(generalReadme)
+            builder.appendLine(tableHeader)
+
+            for (patch in bundle) {
+                val humanName =
+                    patch.patchName.split('-').map { it.replaceFirstChar { it.uppercase() } }.joinToString(" ")
+
+                val compatiblePackage = patch.compatiblePackages?.first()
+                val latestVersion = compatiblePackage?.versions?.maxByOrNull { it.replace(".", "").toInt() } ?: "all"
+
+                builder.appendLine("|$humanName|${patch.description}|`${compatiblePackage?.name}`|$latestVersion|")
+            }
+
+            readmeFile.writeText(builder.toString())
+        }
+    }
+}

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

@@ -1,16 +1,16 @@
-package app.revanced.patches.music.audio.codecs.signatures
+package app.revanced.patches.music.audio.codecs.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher. fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("all-codecs-reference-signature")
+@Name("all-codecs-reference-fingerprint")
 @MatchingMethod(
     "Laari;",
     "b",
@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @CodecsUnlockCompatibility
 @Version("0.0.1")
-object AllCodecsReferenceSignature : MethodSignature(
+object AllCodecsReferenceFingerprint : MethodFingerprint(
     "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT_OBJECT,

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

@@ -1,16 +1,16 @@
-package app.revanced.patches.music.audio.codecs.signatures
+package app.revanced.patches.music.audio.codecs.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("codec-lock-signature")
+@Name("codec-lock-fingerprint")
 @MatchingMethod(
     "Labwj;",
     "a",
@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @CodecsUnlockCompatibility
 @Version("0.0.1")
-object CodecsLockSignature : MethodSignature(
+object CodecsLockFingerprint : MethodFingerprint(
     "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L", "L", "L"), listOf(
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT_OBJECT,

src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt

@@ -3,16 +3,16 @@ package app.revanced.patches.music.audio.codecs.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.implementation.toMethodWalker
+import app.revanced.patcher.data.impl.toMethodWalker
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
-import app.revanced.patches.music.audio.codecs.signatures.AllCodecsReferenceSignature
+import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
-import app.revanced.patches.music.audio.codecs.signatures.CodecsLockSignature
+import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
 
 @Patch
 @Name("codecs-unlock")
@@ -21,19 +21,19 @@ import app.revanced.patches.music.audio.codecs.signatures.CodecsLockSignature
 @Version("0.0.1")
 class CodecsUnlockPatch : BytecodePatch(
     listOf(
-        CodecsLockSignature, AllCodecsReferenceSignature
+        CodecsLockFingerprint, AllCodecsReferenceFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
+        var result = CodecsLockFingerprint.result!!
 
-        val implementation = result.method.implementation!!
+        val implementation = result.mutableMethod.implementation!!
 
-        val instructionIndex = result.scanResult.startIndex
+        val instructionIndex = result.patternScanResult!!.startIndex
 
-        result = signatures.last().result!!
+        result = AllCodecsReferenceFingerprint.result!!
         val codecMethod =
-            data.toMethodWalker(result.immutableMethod).nextMethod(result.scanResult.startIndex).getMethod()
+            data.toMethodWalker(result.method).nextMethod(result.patternScanResult!!.startIndex).getMethod()
 
         implementation.replaceInstruction(
             instructionIndex,

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt

@@ -0,0 +1,43 @@
+package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("audio-only-enabler-fingerprint")
+@MatchingMethod(
+    "Lgmd;",
+    "d"
+)
+@DirectPatternScanMethod
+@ExclusiveAudioCompatibility
+@Version(
+    "0.0.1"
+)
+object  AudioOnlyEnablerFingerprint: MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IF_NEZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.GOTO,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN
+    )
+)

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.music.audio.exclusiveaudio.signatures
+package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("exclusive-audio-signature")
+@Name("exclusive-audio-fingerprints")
 @MatchingMethod(
     "Lgmd;", "c"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @ExclusiveAudioCompatibility
 @Version("0.0.1")
-object ExclusiveAudioSignature : MethodSignature(
+object ExclusiveAudioFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("L", "Z"),

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

@@ -3,67 +3,34 @@ package app.revanced.patches.music.audio.exclusiveaudio.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
-import app.revanced.patches.music.audio.exclusiveaudio.signatures.ExclusiveAudioSignature
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
-import org.jf.dexlib2.AccessFlags
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.ExclusiveAudioFingerprint
-import org.jf.dexlib2.Opcode
 
 @Patch
 @Name("exclusive-audio-playback")
-@Description("Add the option to play music without video.")
+@Description("Adds the option to play music without video.")
 @ExclusiveAudioCompatibility
 @Version("0.0.1")
 class ExclusiveAudioPatch : BytecodePatch(
     listOf(
-        ExclusiveAudioSignature
+        ExclusiveAudioFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!.findParentMethod(@Name("audio-only-enabler-method") @MatchingMethod(
+        ExclusiveAudioFingerprint.resolve(data, AudioOnlyEnablerFingerprint.result!!.classDef)
-            "Lgmd;",
-            "d"
-        ) @DirectPatternScanMethod @ExclusiveAudioCompatibility @Version(
-            "0.0.1"
-        ) object : MethodSignature(
-            "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT,
-                Opcode.GOTO,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT,
-                Opcode.RETURN
-            )
-        ) {}) ?: return PatchResultError("Required parent method could not be found.")
 
-        val implementation = result.method.implementation!!
+        val method = ExclusiveAudioFingerprint.result!!.mutableMethod
-        implementation.replaceInstruction(
+        method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
-            implementation.instructions.count() - 1, "const/4 v0, 0x1".toInstruction()
+        method.addInstruction("return v0")
-        )
-        implementation.addInstruction(
-            "return v0".toInstruction()
-        )
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.music.layout.tastebuilder.signatures
+package app.revanced.patches.music.layout.tastebuilder.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("taste-builder-constructor")
+@Name("taste-builder-constructor-fingerprint")
 @MatchingMethod(
     "Lkyu;", "<init>"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @RemoveTasteBuilderCompatibility
 @Version("0.0.1")
-object TasteBuilderConstructorSignature : MethodSignature(
+object TasteBuilderConstructorFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,
         Opcode.INVOKE_VIRTUAL,

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt

@@ -3,15 +3,14 @@ package app.revanced.patches.music.layout.tastebuilder.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
-import app.revanced.patches.music.layout.tastebuilder.signatures.TasteBuilderConstructorSignature
+import app.revanced.patches.music.layout.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
 
 @Patch
@@ -21,24 +20,20 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction22c
 @Version("0.0.1")
 class RemoveTasteBuilderPatch : BytecodePatch(
     listOf(
-        TasteBuilderConstructorSignature
+        TasteBuilderConstructorFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = TasteBuilderConstructorFingerprint.result!!
-        val implementation = result.method.implementation!!
+        val method = result.mutableMethod
 
-        val insertIndex = result.scanResult.endIndex - 8
+        val insertIndex = result.patternScanResult!!.endIndex - 8
-
+        val register = (method.implementation!!.instructions[insertIndex] as Instruction22c).registerA
-        val register = (implementation.instructions[insertIndex] as Instruction22c).registerA
+        method.addInstructions(
-
+            insertIndex, """
-        val instructionList = """
                 const/16 v1, 0x8
                 invoke-virtual {v${register}, v1}, Landroid/view/View;->setVisibility(I)V
-            """.trimIndent().toInstructions().toMutableList()
+            """
-
-        implementation.addInstructions(
-            insertIndex, instructionList
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.music.layout.upgradebutton.signatures
+package app.revanced.patches.music.layout.upgradebutton.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("pivot-bar-constructor")
+@Name("pivot-bar-constructor-fingerprint")
 @MatchingMethod(
     "Lhfu;", "<init2>"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")
-object PivotBarConstructorSignature : MethodSignature(
+object PivotBarConstructorFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     listOf("L", "Z"),

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -3,15 +3,15 @@ package app.revanced.patches.music.layout.upgradebutton.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
-import app.revanced.patches.music.layout.upgradebutton.signatures.PivotBarConstructorSignature
+import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
@@ -20,20 +20,20 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 @Patch
 @Name("upgrade-button-remover")
-@Description("Remove the upgrade tab from t he pivot bar in YouTube music.")
+@Description("Removes the upgrade tab from the pivot bar in YouTube music.")
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(
     listOf(
-        PivotBarConstructorSignature
+        PivotBarConstructorFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = PivotBarConstructorFingerprint.result!!
-        val implementation = result.method.implementation!!
+        val implementation = result.mutableMethod.implementation!!
 
         val pivotBarElementFieldRef =
-            (implementation.instructions[result.scanResult.endIndex - 1] as Instruction22c).reference
+            (implementation.instructions[result.patternScanResult!!.endIndex - 1] as Instruction22c).reference
 
         val register = (implementation.instructions.first() as Instruction35c).registerC
         // first compile all the needed instructions
@@ -43,19 +43,19 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
                 const/4 v2, 0x3
                 invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
                 iput-object v0, v$register, $pivotBarElementFieldRef
-            """.trimIndent().toInstructions().toMutableList()
+            """.toInstructions().toMutableList()
 
 
         // replace the instruction to retain the label at given index
         implementation.replaceInstruction(
-            result.scanResult.endIndex - 1, instructionList[0] // invoke-interface
+            result.patternScanResult!!.endIndex - 1, instructionList[0] // invoke-interface
         )
         // do not forget to remove this instruction since we added it already
         instructionList.removeFirst()
 
         val exitInstruction = instructionList.last() // iput-object
         implementation.addInstruction(
-            result.scanResult.endIndex, exitInstruction
+            result.patternScanResult!!.endIndex, exitInstruction
         )
         // do not forget to remove this instruction since we added it already
         instructionList.removeLast()
@@ -64,12 +64,12 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         instructionList.add(
             2, // if-le
             BuilderInstruction22t(
-                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(result.scanResult.endIndex)
+                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(result.patternScanResult!!.endIndex)
             )
         )
 
         implementation.addInstructions(
-            result.scanResult.endIndex, instructionList
+            result.patternScanResult!!.endIndex, instructionList
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.music.premium.backgroundplay.signatures
+package app.revanced.patches.music.premium.backgroundplay.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("background-playback-disabler-signature")
+@Name("background-playback-disabler-fingerprint")
 @MatchingMethod(
     "Lafgf;", "e"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @BackgroundPlayCompatibility
 @Version("0.0.1")
-object BackgroundPlaybackDisableSignature : MethodSignature(
+object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
     "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
         Opcode.CONST_4,
         Opcode.IF_EQZ,

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt

@@ -3,15 +3,14 @@ package app.revanced.patches.music.premium.backgroundplay.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
-import app.revanced.patches.music.premium.backgroundplay.signatures.BackgroundPlaybackDisableSignature
+import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
 
 @Patch
 @Name("background-play")
@@ -20,16 +19,16 @@ import app.revanced.patches.music.premium.backgroundplay.signatures.BackgroundPl
 @Version("0.0.1")
 class BackgroundPlayPatch : BytecodePatch(
     listOf(
-        BackgroundPlaybackDisableSignature
+        BackgroundPlaybackDisableFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        signatures.first().result!!.method.implementation!!.addInstructions(
+        BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
                 const/4 v0, 0x1
                 return v0
-            """.trimIndent().toInstructions()
+            """
         )
 
         return PatchResultSuccess()

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

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.ad.general.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class GeneralAdsCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/extensions/MethodExtensions.kt

@@ -0,0 +1,64 @@
+package app.revanced.patches.youtube.ad.general.bytecode.extensions
+
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.softCompareTo
+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.builder.BuilderInstruction
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.Reference
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+internal object MethodExtensions {
+    internal fun MutableMethodImplementation.insertBlocks(
+        startIndex: Int,
+        vararg blocks: List<BuilderInstruction>,
+    ) {
+        blocks.reversed().forEach {
+            this.addInstructions(
+                startIndex, it
+            )
+        }
+    }
+
+    internal fun MutableClass.addMethod(mutableMethod: MutableMethod) {
+        this.methods.add(mutableMethod)
+    }
+
+    internal fun MutableClass.findMutableMethodOf(
+        method: Method
+    ) = this.methods.first {
+        it.softCompareTo(
+            ImmutableMethodReference(
+                method.definingClass, method.name, method.parameters, method.returnType
+            )
+        )
+    }
+
+    internal inline fun <reified T : Reference> Instruction.toDescriptor(): String {
+        val reference = (this as ReferenceInstruction).reference
+        return when (T::class) {
+            MethodReference::class -> {
+                val methodReference = reference as MethodReference
+                "${methodReference.definingClass}->${methodReference.name}(${
+                    methodReference.parameterTypes.joinToString(
+                        ""
+                    ) { it }
+                })${methodReference.returnType}"
+            }
+
+            FieldReference::class -> {
+                val fieldReference = reference as FieldReference
+                "${fieldReference.definingClass}->${fieldReference.name}:${fieldReference.type}"
+            }
+
+            else -> throw PatchResultError("Unsupported reference type")
+        }
+    }
+}

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

@@ -0,0 +1,424 @@
+package app.revanced.patches.youtube.ad.general.bytecode.patch
+
+import app.revanced.extensions.injectHideCall
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.addMethod
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.findMutableMethodOf
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.insertBlocks
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
+import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.instruction.*
+import org.jf.dexlib2.iface.MethodImplementation
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction31i
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+@Patch
+@Dependencies(
+    dependencies = [ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class]
+)
+@Name("general-ads")
+@Description("Removes general ads in bytecode.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralBytecodeAdsPatch : BytecodePatch() {
+    // a constant used by litho
+    private val lithoConstant = 0xaed2868
+
+    // list of resource names to get the id of
+    private val resourceIds = arrayOf(
+        "ad_attribution",
+        "reel_multiple_items_shelf",
+        "info_cards_drawer_header",
+        "endscreen_element_layout_video",
+        "endscreen_element_layout_circle",
+        "endscreen_element_layout_icon",
+        "promoted_video_item_land",
+        "promoted_video_item_full_bleed",
+    ).map { name ->
+        ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.name == name }.id
+    }
+
+    private val stringReferences = arrayOf(
+        "Claiming to use more elements than provided",
+        "loadVideo() called on LocalDirector in wrong state",
+        "LoggingProperties are not in proto format"
+    )
+
+    override fun execute(data: BytecodeData): PatchResult {
+        // iterating through all classes is expensive
+        for (classDef in data.classes) {
+            var mutableClass: MutableClass? = null
+
+            method@ for (method in classDef.methods) {
+                var mutableMethod: MutableMethod? = null
+
+                if (method.implementation == null) continue@method
+
+                val instructions = method.implementation!!.instructions
+                instructions.forEachIndexed { index, instruction ->
+                    when (instruction.opcode) {
+                        Opcode.CONST -> {
+                            // TODO: find a way to de-duplicate code.
+                            //  The issue is we need to save mutableClass and mutableMethod to the existing fields
+                            when ((instruction as Instruction31i).wideLiteral) {
+                                resourceIds[0] -> { // general ads
+                                    //  and is followed by an instruction with the mnemonic INVOKE_VIRTUAL
+                                    val insertIndex = index + 1
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // insert hide call to hide the view corresponding to the resource
+                                    val viewRegister = (invokeInstruction as Instruction35c).registerC
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+
+                                }
+
+                                resourceIds[1] -> { // reel ads
+                                    //  and is followed by an instruction at insertIndex with the mnemonic IPUT_OBJECT
+                                    val insertIndex = index + 4
+                                    val iPutInstruction = instructions.elementAt(insertIndex)
+                                    if (iPutInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    val viewRegister = (iPutInstruction as Instruction22c).registerA
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+                                }
+
+                                resourceIds[2] -> { // info cards ads
+                                    //  and is followed by an instruction with the mnemonic INVOKE_VIRTUAL
+                                    val removeIndex = index - 1
+                                    val invokeInstruction = instructions.elementAt(removeIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    mutableMethod!!.implementation!!.removeInstruction(removeIndex)
+                                }
+
+                                resourceIds[3], resourceIds[4], resourceIds[5] -> { // end screen ads
+                                    //  and is followed by an instruction with the mnemonic IPUT_OBJECT
+                                    val insertIndex = index + 7
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // TODO: dynamically get registers
+                                    mutableMethod!!.addInstructions(
+                                        insertIndex, """
+                                                const/16 v1, 0x8
+                                                invoke-virtual {v0,v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
+                                            """
+                                    )
+                                }
+
+                                resourceIds[6] -> {
+                                    //  and is followed by an instruction with the mnemonic INVOKE_DIRECT
+                                    val insertIndex = index + 3
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_DIRECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // insert hide call to hide the view corresponding to the resource
+                                    val viewRegister = (invokeInstruction as Instruction35c).registerE
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+                                }
+
+                                resourceIds[7] -> {
+                                    // TODO, go to class, hide the inflated view
+                                }
+                            }
+                        }
+
+                        Opcode.CONST_STRING -> {
+
+                            when (((instruction as Instruction21c).reference as StringReference).string) {
+                                stringReferences[0] -> {
+                                    val stringInstruction = instructions.elementAt(3)
+                                    if (stringInstruction.opcode == Opcode.CONST_STRING) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // return the method
+                                    val insertIndex = 1 // after super constructor
+                                    mutableMethod!!.implementation!!.addInstruction(
+                                        insertIndex, BuilderInstruction10x(Opcode.RETURN_VOID)
+                                    )
+                                }
+
+                                stringReferences[1] -> {
+                                    // TODO: migrate video ads patch to here if necessary
+                                }
+
+                                stringReferences[2] -> { // Litho ads
+                                    // create proxied method.
+                                    val proxy = data.proxy(classDef)
+                                    val mutableClass = proxy.resolve()
+
+                                    // add getIsEmpty method
+                                    mutableClass.addGetIsEmptyMethod()
+
+                                    // get required method to patch and get references from
+                                    val lithoMethod = getLithoMethod(mutableClass)
+                                        ?: return PatchResultError("Could not find required litho method to patch.")
+                                    val lithoMethodImplementation = lithoMethod.implementation!!
+
+                                    // create and add getTemplateName method
+                                    val getTemplateMethod =
+                                        mutableClass.createGetTemplateNameMethod(lithoMethodImplementation)
+                                    mutableClass.addMethod(getTemplateMethod)
+
+                                    val lithoInstructions = lithoMethodImplementation.instructions
+                                    val thisType = mutableClass.type
+                                    val templateNameParameterType = getTemplateMethod.parameterTypes.first()
+
+                                    // get reference descriptors
+                                    val indexOfReference1 = lithoInstructions.indexOfFirst {
+                                        it.opcode == Opcode.INVOKE_STATIC_RANGE
+                                    }
+                                    val descriptor1 =
+                                        lithoInstructions.elementAt(indexOfReference1).toDescriptor<MethodReference>()
+                                    val descriptor2 = lithoInstructions.elementAt(indexOfReference1 + 2)
+                                        .toDescriptor<FieldReference>()
+
+                                    // create label
+                                    val lithoRemoveLabel = lithoMethodImplementation.newLabelForIndex(0)
+
+                                    // create branch instructions
+                                    val ifEqzFirstInstruction =
+                                        BuilderInstruction21t(Opcode.IF_EQZ, 0, lithoRemoveLabel)
+                                    val ifEqzSecondInstruction =
+                                        BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
+
+                                    // create blocks
+                                    val block1 = """
+                                        invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
+                                        move-result-object v0
+                                    """.toInstructions(lithoMethod)
+                                    val block2 = """
+                                        move-object/from16 v1, p3
+                                        iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
+                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
+                                        move-result v1
+                                    """.toInstructions(lithoMethod)
+                                    val block3 = """
+                                        move-object/from16 v2, p1
+                                        invoke-static {v2}, $descriptor1
+                                        move-result-object v0
+                                        iget-object v0, v0, $descriptor2
+                                        return-object v0
+                                    """.toInstructions(lithoMethod)
+
+                                    // insert blocks and branch instructions
+                                    lithoMethodImplementation.insertBlocks(
+                                        0,
+                                        block1,
+                                        listOf(ifEqzFirstInstruction),
+                                        block2,
+                                        listOf(ifEqzSecondInstruction),
+                                        block3,
+                                    )
+                                }
+                            }
+
+                        }
+
+                        else -> return@forEachIndexed
+                    }
+                }
+            }
+        }
+        return PatchResultSuccess()
+    }
+
+    private fun getLithoMethod(mutableClass: MutableClass) = mutableClass.methods.firstOrNull {
+        it.implementation?.instructions?.any { instruction ->
+            instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
+        } ?: false
+    }
+
+    private fun MutableClass.addGetIsEmptyMethod() {
+        val getIsEmptyImplementation = MutableMethodImplementation(1)
+
+        // create target instructions
+        val firstTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 1)
+        val secondTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 0)
+
+        // add instructions to the instruction list
+        getIsEmptyImplementation.addInstructions(
+            0, listOf(
+                // BuilderInstruction21t(Opcode.IF_EQZ, 0, first),
+                BuilderInstruction35c(
+                    Opcode.INVOKE_VIRTUAL,
+                    1,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    ImmutableMethodReference("Ljava/lang/String;", "isEmpty", null, "Z")
+                ),
+                BuilderInstruction11x(Opcode.MOVE_RESULT, 0),
+                // BuilderInstruction21t(Opcode.IF_EQZ, 0, second),
+                // BuilderInstruction10t(Opcode.GOTO, first),
+                secondTargetInstruction,
+                BuilderInstruction11x(Opcode.RETURN, 0),
+                firstTargetInstruction,
+                BuilderInstruction11x(Opcode.RETURN, 0),
+            )
+        )
+
+        val getIsEmptyInstructions = getIsEmptyImplementation.instructions
+
+        // create labels for the target instructions
+        val firstLabel =
+            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(firstTargetInstruction))
+        val secondLabel =
+            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(secondTargetInstruction))
+
+        // create branch instructions to the labels
+        val ifEqzFirstInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, firstLabel)
+        val ifEqzSecondInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, secondLabel)
+        val gotoInstruction = BuilderInstruction10t(Opcode.GOTO, firstLabel)
+
+        // insert remaining branch instructions, order of adding those instructions is important
+        getIsEmptyImplementation.addInstructions(
+            2, listOf(
+                ifEqzSecondInstruction, gotoInstruction
+            )
+        )
+        getIsEmptyImplementation.addInstruction(
+            0, ifEqzFirstInstruction
+        )
+
+        this.addMethod(
+            createMutableMethod(
+                this.type, "getIsEmpty", "Z", "Ljava/lang/String;", getIsEmptyImplementation
+            )
+        )
+    }
+
+    private fun MutableClass.createGetTemplateNameMethod(lithoMethodImplementation: MethodImplementation): MutableMethod {
+        var counter = 1
+        val descriptors = buildList {
+            for (instruction in lithoMethodImplementation.instructions) {
+                if (instruction !is ReferenceInstruction) continue
+                if (counter++ > 4) break
+
+                add(instruction.toDescriptor<MethodReference>())
+            }
+        }
+
+        val getTemplateNameImplementation = MutableMethodImplementation(2)
+
+        // create code blocks
+        val block1 = """
+            invoke-virtual {p0}, ${descriptors[0]}
+            move-result-object p0
+            const v0, $lithoConstant
+            invoke-static {p0, v0}, ${descriptors[1]}
+            move-result-object p0
+        """.toInstructions()
+        val block2 = """
+              invoke-static {p0}, ${descriptors[2]}
+              move-result-object p0
+              invoke-virtual {p0}, ${descriptors[3]}
+              move-result-object v0
+              invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
+              move-result v0
+        """.toInstructions()
+        val block3 = """
+              invoke-virtual {p0}, ${descriptors[3]}
+              move-result-object p0
+              return-object p0
+        """.toInstructions()
+
+        // create target instruction
+        val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)
+        // and remaining instruction
+        val returnInstruction = BuilderInstruction11x(Opcode.RETURN_OBJECT, 1)
+
+        // insert blocks and instructions
+        getTemplateNameImplementation.insertBlocks(
+            0,
+            block1,
+            block2,
+            block3,
+            listOf(
+                targetInstruction, returnInstruction
+            ),
+        )
+
+        // create label for target instruction
+        val targetInstructionLabel =
+            getTemplateNameImplementation.newLabelForIndex(getTemplateNameImplementation.instructions.size - 2)
+
+        // create branch instructions to the label
+        val ifEqzInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 1, targetInstructionLabel)
+        val ifNezInstruction = BuilderInstruction21t(Opcode.IF_NEZ, 0, targetInstructionLabel)
+
+        // insert branch instructions
+        getTemplateNameImplementation.addInstruction(
+            block1.size, ifEqzInstruction
+        )
+        getTemplateNameImplementation.addInstruction(
+            block1.size + block2.size + 1, ifNezInstruction
+        )
+
+        // create the method
+        return createMutableMethod(
+            this.type,
+            "getTemplateName",
+            "Ljava/lang/String;",
+            descriptors[0].split("->")[0], // a bit weird to get the type this way,
+            getTemplateNameImplementation
+        )
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/utils/MethodUtils.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.ad.general.bytecode.utils
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.iface.MethodImplementation
+import org.jf.dexlib2.immutable.ImmutableMethod
+import org.jf.dexlib2.immutable.ImmutableMethodParameter
+
+internal object MethodUtils {
+    internal fun createMutableMethod(
+        definingClass: String, name: String, returnType: String, parameter: String, implementation: MethodImplementation
+    ) = ImmutableMethod(
+        definingClass, name, listOf(
+            ImmutableMethodParameter(
+                parameter, null, null
+            )
+        ), returnType, AccessFlags.PRIVATE or AccessFlags.STATIC, null, null, implementation
+    ).toMutable()
+}

src/main/kotlin/app/revanced/patches/youtube/ad/home/patch/PromotionsPatch.kt

@@ -1,65 +0,0 @@
-package app.revanced.patches.youtube.ad.home.patch
-
-import app.revanced.extensions.injectHideCall
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.data.implementation.toMethodWalker
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.ad.home.annotation.PromotionsCompatibility
-import app.revanced.patches.youtube.ad.home.signatures.PromotedDiscoveryActionParentSignature
-import app.revanced.patches.youtube.ad.home.signatures.PromotedDiscoveryAppParentSignature
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction11x
-
-//@Patch(dependencies = [IntegrationsPatch::class])
-@Name("home-promo-ads")
-@Description("Patch to remove promoted ads in YouTube.")
-@PromotionsCompatibility
-@Version("0.0.1")
-class PromotionsPatch : BytecodePatch(
-    listOf(
-        PromotedDiscoveryAppParentSignature, PromotedDiscoveryActionParentSignature
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        for (signature in signatures) {
-            val result = signature.result!!
-
-            val requiredMethod =
-                result.findParentMethod(@Name("promotion-ads-signature") @MatchingMethod(name = "d") @DirectPatternScanMethod @PromotionsCompatibility @Version(
-                    "0.0.1"
-                ) object : MethodSignature(
-                    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("Z", "Z"), null
-                ) {}) ?: return PatchResultError("Required parent method could not be found.")
-
-            val toBePatchedInvokeOffset =
-                requiredMethod.immutableMethod.implementation!!.instructions.indexOfFirst { it.opcode == Opcode.INVOKE_DIRECT }
-            val toBePatchedMethod =
-                data.toMethodWalker(requiredMethod.immutableMethod).nextMethod(toBePatchedInvokeOffset, true)
-                    .getMethod() as MutableMethod
-
-            val implementation = toBePatchedMethod.implementation!!
-            val invokeVirtualOffset = implementation.instructions.indexOfFirst { it.opcode == Opcode.INVOKE_VIRTUAL }
-
-            val moveResultInstruction = implementation.instructions[invokeVirtualOffset + 1]
-            if (moveResultInstruction.opcode != Opcode.MOVE_RESULT_OBJECT) return PatchResultError("The toBePatchedInvokeOffset offset was wrong in ${this.javaClass.patchName}")
-
-            val register = (moveResultInstruction as Instruction11x).registerA
-            implementation.injectHideCall(invokeVirtualOffset + 2, register)
-        }
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/ad/home/signatures/PromotedDiscoveryActionParentSignature.kt

@@ -1,58 +0,0 @@
-package app.revanced.patches.youtube.ad.home.signatures
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.ad.home.annotation.PromotionsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("promoted-discovery-app-parent-signature")
-@MatchingMethod(
-    "Ljqb;", "lG"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@PromotionsCompatibility
-@Version("0.0.1")
-object PromotedDiscoveryActionParentSignature : MethodSignature(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-    listOf("L", "L"),
-    listOf(
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL_RANGE,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.XOR_INT_2ADDR,
-        Opcode.IGET_BOOLEAN,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/ad/home/signatures/PromotedDiscoveryAppParentSignature.kt

@@ -1,61 +0,0 @@
-package app.revanced.patches.youtube.ad.home.signatures
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.ad.home.annotation.PromotionsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("promoted-discovery-action-parent-signature")
-@MatchingMethod(
-    "Ljqj;",
-    "lG"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@PromotionsCompatibility
-@Version("0.0.1")
-
-object PromotedDiscoveryAppParentSignature : MethodSignature(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-    listOf("L", "L"),
-    listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.NEW_ARRAY,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_GE,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.APUT_OBJECT,
-        Opcode.ADD_INT_LIT8,
-        Opcode.GOTO
-    )
-)

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

@@ -1,14 +1,13 @@
-package app.revanced.patches.youtube.ad.home.annotation
+package app.revanced.patches.youtube.ad.infocardsuggestions.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class PromotionsCompatibility
+internal annotation class HideInfocardSuggestionsCompatibility
-

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

@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-infocard-suggestions-fingerprint")
+@MatchingMethod("Liff;", "i")
+@FuzzyPatternScanMethod(2)
+@HideInfocardSuggestionsCompatibility
+@Version("0.0.1")
+object HideInfocardSuggestionsFingerprint : MethodFingerprint(
+    "Ljava/lang/Boolean;",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    null,
+    null,
+    listOf("vibrator"),
+    null
+)

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

@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-infocard-suggestions-parent-fingerprint")
+@MatchingMethod("Liff;", "lE")
+@FuzzyPatternScanMethod(2)
+@HideInfocardSuggestionsCompatibility
+@Version("0.0.1")
+object HideInfocardSuggestionsParentFingerprint : MethodFingerprint(
+    "Ljava/lang/String;",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf(),
+    null,
+    listOf("player_overlay_info_card_teaser"),
+    null
+)

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

@@ -0,0 +1,63 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
+import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsFingerprint
+import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsParentFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("hide-infocard-suggestions")
+@Description("Hides infocards in videos.")
+@HideInfocardSuggestionsCompatibility
+@Version("0.0.1")
+class HideInfocardSuggestionsPatch : BytecodePatch(
+    listOf(
+        HideInfocardSuggestionsParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val parentResult = HideInfocardSuggestionsParentFingerprint.result
+            ?: return PatchResultError("Parent fingerprint not resolved!")
+
+
+        HideInfocardSuggestionsFingerprint.resolve(data, parentResult.classDef)
+        val result = HideInfocardSuggestionsFingerprint.result
+            ?: return PatchResultError("Required parent method could not be found.")
+
+        val method = result.mutableMethod
+        val implementation = method.implementation
+            ?: return PatchResultError("Implementation not found.")
+
+        val index = implementation.instructions.indexOfFirst { ((it as? BuilderInstruction35c)?.reference.toString() == "Landroid/view/View;->setVisibility(I)V") }
+        val register = "v" + (implementation.instructions.get(index) as FiveRegisterInstruction).registerD
+
+        method.removeInstruction(index)
+
+        method.addInstructions(
+            index, """
+            invoke-static {}, Lapp/revanced/integrations/patches/HideInfoCardSuggestionsPatch;->hideInfoCardSuggestions()I
+            move-result $register
+            invoke-virtual {p1, $register}, Landroid/view/View;->setVisibility(I)V
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+
+}

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsConstructorFingerprint.kt

@@ -1,16 +1,16 @@
-package app.revanced.patches.youtube.ad.video.signatures
+package app.revanced.patches.youtube.ad.video.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("show-video-ads-constructor-signature")
+@Name("show-video-ads-constructor-fingerprint")
 @MatchingMethod(
     "Laair",
     "<init>",
@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @VideoAdsCompatibility
 @Version("0.0.1")
-object ShowVideoAdsConstructorSignature : MethodSignature(
+object ShowVideoAdsConstructorFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,
         Opcode.NEW_INSTANCE,

src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("show-video-ads-method-fingerprint")
+@MatchingMethod(
+    definingClass = "zai"
+)
+@DirectPatternScanMethod
+@VideoAdsCompatibility
+@Version("0.0.1")
+object ShowVideoAdsFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
+)

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

@@ -3,47 +3,39 @@ package app.revanced.patches.youtube.ad.video.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.youtube.ad.video.signatures.ShowVideoAdsConstructorSignature
+import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsConstructorFingerprint
+import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.AccessFlags
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("video-ads")
-@Description("Patch to remove ads in the YouTube video player.")
+@Description("Removes ads in the YouTube video player.")
 @VideoAdsCompatibility
 @Version("0.0.1")
 class VideoAdsPatch : BytecodePatch(
     listOf(
-        ShowVideoAdsConstructorSignature
+        ShowVideoAdsConstructorFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result =
+        ShowVideoAdsFingerprint.resolve(data, ShowVideoAdsConstructorFingerprint.result!!.classDef)
-            signatures.first().result!!.findParentMethod(@Name("show-video-ads-method-signature") @MatchingMethod(
-                definingClass = "zai"
-            ) @DirectPatternScanMethod @VideoAdsCompatibility @Version("0.0.1") object : MethodSignature(
-                "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
-            ) {}) ?: return PatchResultError("Required parent method could not be found.")
 
         // Override the parameter by calling shouldShowAds and setting the parameter to the result
-        result.method.implementation!!.addInstructions(
+        ShowVideoAdsFingerprint.result!!.mutableMethod.addInstructions(
             0, """
-                invoke-static { }, Lfi/vanced/libraries/youtube/whitelisting/Whitelist;->shouldShowAds()Z
+                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
                 move-result v1
-            """.trimIndent().toInstructions()
+            """
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/interaction/fenster/annotation/FensterCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/interaction/fenster/fingerprints/UpdatePlayerTypeFingerprint.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.youtube.interaction.fenster.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.interaction.fenster.annotation.FensterCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("update-player-type-fingerprint")
+@MatchingMethod(
+    "LYoutubePlayerOverlaysLayout;",
+    "nM"
+)
+@FuzzyPatternScanMethod(2)
+@FensterCompatibility
+@Version("0.0.1")
+object UpdatePlayerTypeFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    null,
+    listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.RETURN_VOID,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
+        Opcode.RETURN_VOID,
+        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/interaction/fenster/patch/FensterPatch.kt

@@ -0,0 +1,121 @@
+package app.revanced.patches.youtube.interaction.fenster.patch
+
+import app.revanced.extensions.injectConsumableEventHook
+import app.revanced.extensions.injectIntoNamedMethod
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.interaction.fenster.annotation.FensterCompatibility
+import app.revanced.patches.youtube.interaction.fenster.fingerprints.UpdatePlayerTypeFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+@Patch
+@Name("fenster-swipe-controls")
+@Description("Adds volume and brightness swipe controls.")
+@FensterCompatibility
+@Version("0.0.1")
+@Dependencies(dependencies = [IntegrationsPatch::class])
+class FensterPatch : BytecodePatch(
+    listOf(
+        UpdatePlayerTypeFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        // hook WatchWhileActivity.onStart (main activity lifecycle hook)
+        data.injectIntoNamedMethod(
+            "com/google/android/apps/youtube/app/watchwhile/WatchWhileActivity",
+            "onStart",
+            0,
+            "invoke-static { p0 }, Lapp/revanced/integrations/patches/FensterSwipePatch;->WatchWhileActivity_onStartHookEX(Ljava/lang/Object;)V"
+        )
+
+        // hook YoutubePlayerOverlaysLayout.onFinishInflate (player overlays init hook)
+        data.injectIntoNamedMethod(
+            "com/google/android/apps/youtube/app/common/player/overlay/YouTubePlayerOverlaysLayout",
+            "onFinishInflate",
+            -2,
+            "invoke-static { p0 }, Lapp/revanced/integrations/patches/FensterSwipePatch;->YouTubePlayerOverlaysLayout_onFinishInflateHookEX(Ljava/lang/Object;)V"
+        )
+
+        // hook YoutubePlayerOverlaysLayout.UpdatePlayerType
+        injectUpdatePlayerTypeHook(
+            UpdatePlayerTypeFingerprint.result!!,
+            "com/google/android/apps/youtube/app/common/player/overlay/YouTubePlayerOverlaysLayout"
+        )
+
+        // hook NextGenWatchLayout.onTouchEvent and NextGenWatchLayout.onInterceptTouchEvent (player touch event hook)
+        injectWatchLayoutTouchHooks(
+            data,
+            "com/google/android/apps/youtube/app/watch/nextgenwatch/ui/NextGenWatchLayout"
+        )
+
+        return PatchResultSuccess()
+    }
+
+    @Suppress("SameParameterValue")
+    private fun injectUpdatePlayerTypeHook(fingerPrintResult: MethodFingerprintResult, targetClass: String) {
+        // validate fingerprint found the right class
+        if (!fingerPrintResult.classDef.type.endsWith("$targetClass;")) {
+            throw PatchResultError("$targetClass.UpdatePlayerType fingerprint could not be validated")
+        }
+
+        // insert the hook
+        fingerPrintResult.mutableMethod.addInstruction(
+            0,
+            "invoke-static { p1 }, Lapp/revanced/integrations/patches/FensterSwipePatch;->YouTubePlayerOverlaysLayout_updatePlayerTypeHookEX(Ljava/lang/Object;)V"
+        )
+    }
+
+    /**
+     * Inject onTouch event hooks into the watch layout class
+     *
+     * @param data bytecode data
+     * @param targetClass watch layout class name
+     */
+    @Suppress("SameParameterValue")
+    private fun injectWatchLayoutTouchHooks(data: BytecodeData, targetClass: String) {
+        var touchHooksCount = 0
+        data.classes.filter { it.type.endsWith("$targetClass;") }.forEach { classDef ->
+            // hook onTouchEvent
+            data.proxy(classDef).resolve().methods.filter { it.name == "onTouchEvent" }.forEach { methodDef ->
+                touchHooksCount++
+                methodDef.injectConsumableEventHook(
+                    ImmutableMethodReference(
+                        "Lapp/revanced/integrations/patches/FensterSwipePatch;",
+                        "NextGenWatchLayout_onTouchEventHookEX",
+                        listOf("Ljava/lang/Object;", "Ljava/lang/Object;"),
+                        "Z"
+                    )
+                )
+            }
+
+            // hook onInterceptTouchEvent
+            data.proxy(classDef).resolve().methods.filter { it.name == "onInterceptTouchEvent" }.forEach { methodDef ->
+                touchHooksCount++
+                methodDef.injectConsumableEventHook(
+                    ImmutableMethodReference(
+                        "Lapp/revanced/integrations/patches/FensterSwipePatch;",
+                        "NextGenWatchLayout_onInterceptTouchEventHookEX",
+                        listOf("Ljava/lang/Object;", "Ljava/lang/Object;"),
+                        "Z"
+                    )
+                )
+            }
+        }
+
+        // fail if no touch hooks were inserted
+        if (touchHooksCount <= 0) {
+            throw PatchResultError("failed to inject onTouchEvent hook into NextGenWatchLayout: none found")
+        }
+    }
+}

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt

@@ -1,21 +1,21 @@
-package app.revanced.patches.youtube.interaction.seekbar.signatures
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("enable-seekbar-tapping-signature")
+@Name("enable-seekbar-tapping-fingerprint")
 @MatchingMethod("Lfbl;", "onTouchEvent")
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @SeekbarTappingCompatibility
 @Version("0.0.1")
-object SeekbarTappingSignature : MethodSignature(
+object SeekbarTappingFingerprint : MethodFingerprint(
     "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_WIDE,

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingParentFingerprint.kt

@@ -1,21 +1,21 @@
-package app.revanced.patches.youtube.interaction.seekbar.signatures
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("enable-seekbar-tapping-parent")
+@Name("enable-seekbar-tapping-parent-fingerprint")
 @MatchingMethod("Lzmx;", "I")
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @SeekbarTappingCompatibility
 @Version("0.0.1")
-object SeekbarTappingParentSignature : MethodSignature(
+object SeekbarTappingParentFingerprint : MethodFingerprint(
     "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt

@@ -3,17 +3,17 @@ package app.revanced.patches.youtube.interaction.seekbar.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
-import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingParentSignature
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingFingerprint
-import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingSignature
+import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
@@ -21,24 +21,24 @@ import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.formats.Instruction11n
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
-
+@Patch
-@Patch(dependencies = [IntegrationsPatch::class])
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("seekbar-tapping")
-@Description("Enable tapping on the seekbar of the YouTube player.")
+@Description("Enables tapping on the seekbar of the YouTube player.")
 @SeekbarTappingCompatibility
 @Version("0.0.1")
 class EnableSeekbarTappingPatch : BytecodePatch(
     listOf(
-        SeekbarTappingParentSignature, SeekbarTappingSignature
+        SeekbarTappingParentFingerprint, SeekbarTappingFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
+        var result = SeekbarTappingParentFingerprint.result!!
 
         val tapSeekMethods = mutableMapOf<String, Method>()
 
         // find the methods which tap the seekbar
-        for (it in result.definingClassProxy.immutableClass.methods) {
+        for (it in result.classDef.methods) {
             if (it.implementation == null) continue
 
             val instructions = it.implementation!!.instructions
@@ -57,38 +57,38 @@ class EnableSeekbarTappingPatch : BytecodePatch(
             if (literal == 2) tapSeekMethods["O"] = it
         }
 
-        // replace map because we dont need the upper one anymore
+        // replace map because we don't need the upper one anymore
-        result = signatures.last().result!!
+        result = SeekbarTappingFingerprint.result!!
 
-        val implementation = result.method.implementation!!
+        val implementation = result.mutableMethod.implementation!!
 
         // if tap-seeking is enabled, do not invoke the two methods below
         val pMethod = tapSeekMethods["P"]!!
         val oMethod = tapSeekMethods["O"]!!
 
         // get the required register
-        val instruction = implementation.instructions[result.scanResult.endIndex]
+        val instruction = implementation.instructions[result.patternScanResult!!.endIndex]
         if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct register")
         val register = (instruction as Instruction35c).registerC
 
         // the instructions are written in reverse order.
-        implementation.addInstructions(
+        result.mutableMethod.addInstructions(
-            result.scanResult.endIndex + 1, """
+            result.patternScanResult!!.endIndex + 1, """
                invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
                invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
-            """.trimIndent().toInstructions()
+            """
         )
 
         // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
-        val elseLabel = implementation.newLabelForIndex(result.scanResult.endIndex + 1)
+        val elseLabel = implementation.newLabelForIndex(result.patternScanResult!!.endIndex + 1)
         implementation.addInstruction(
-            result.scanResult.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
+            result.patternScanResult!!.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
         )
-        implementation.addInstructions(
+        result.mutableMethod.addInstructions(
-            result.scanResult.endIndex + 1, """
+            result.patternScanResult!!.endIndex + 1, """
-                invoke-static { }, Lfi/razerman/youtube/preferences/BooleanPreferences;->isTapSeekingEnabled()Z
+                invoke-static { }, Lapp/revanced/integrations/patches/SeekbarTappingPatch;->isTapSeekingEnabled()Z
                 move-result v0
-            """.trimIndent().toInstructions()
+            """
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt

@@ -3,17 +3,19 @@ package app.revanced.patches.youtube.layout.amoled.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.impl.ResourcePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patches.youtube.layout.amoled.annotations.AmoledCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import org.w3c.dom.Element
 import java.io.File
 
-@Patch(
+@Patch
+@Dependencies(
     dependencies = [
         FixLocaleConfigErrorPatch::class
     ]
@@ -24,7 +26,7 @@ import java.io.File
 @Version("0.0.1")
 class AmoledPatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
-        data.getXmlEditor("res${File.separator}values${File.separator}colors.xml").use { editor ->
+        data.xmlEditor["res${File.separator}values${File.separator}colors.xml"].use { editor ->
             val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
 
             for (i in 0 until resourcesNode.childNodes.length) {

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutonavInformerFingerprint.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.youtube.layout.autoplaybutton.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("autonav-informer-fingerprint")
+@MatchingMethod(
+    "LWillAutonavInformer;", "k"
+)
+@FuzzyPatternScanMethod(2)
+@AutoplayButtonCompatibility
+@Version("0.0.1")
+object AutonavInformerFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    null,
+    listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+    ),
+    null,
+    { it.definingClass.endsWith("WillAutonavInformer;") }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.youtube.layout.autoplaybutton.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("layout-constructor-fingerprint")
+@MatchingMethod(
+    "LYouTubeControlsOverlay;", "F"
+)
+@FuzzyPatternScanMethod(2)
+@AutoplayButtonCompatibility
+@Version("0.0.1")
+object LayoutConstructorFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    null,
+    listOf(
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_VIRTUAL,
+    ),
+    listOf("1.0x")
+)

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

@@ -0,0 +1,61 @@
+package app.revanced.patches.youtube.layout.autoplaybutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.removeInstructions
+import app.revanced.patcher.extensions.replaceInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
+import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutonavInformerFingerprint
+import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Patch
+@Dependencies(dependencies = [ResourceIdMappingProviderResourcePatch::class])
+@Name("hide-autoplay-button")
+@Description("Disables the autoplay button.")
+@AutoplayButtonCompatibility
+@Version("0.0.1")
+class HideAutoplayButton : BytecodePatch(
+    listOf(
+        LayoutConstructorFingerprint, AutonavInformerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val layoutGenMethod = LayoutConstructorFingerprint.result!!.mutableMethod
+
+        val autonavToggle =
+            ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "id" && it.name == "autonav_toggle" }
+        val autonavPreviewStub =
+            ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "id" && it.name == "autonav_preview_stub" }
+
+        val autonavToggleConstIndex =
+            layoutGenMethod.implementation!!.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavToggle.id }
+        val autonavPreviewStubConstIndex =
+            layoutGenMethod.implementation!!.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavPreviewStub.id }
+
+        //remove adding autoplay button to the layout
+        layoutGenMethod.removeInstructions(autonavToggleConstIndex, 5)
+        layoutGenMethod.removeInstructions(autonavPreviewStubConstIndex, 5)
+
+        val autonavInformerMethod = AutonavInformerFingerprint.result!!.mutableMethod
+
+        //force disable autoplay since it's hard to do without the button
+        autonavInformerMethod.replaceInstructions(
+        0,
+        """
+            const/4 v0, 0x0
+            return v0
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt

@@ -0,0 +1,53 @@
+package app.revanced.patches.youtube.layout.branding.header.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.layout.branding.header.annotations.PremiumHeadingCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import kotlin.io.path.exists
+
+@Patch
+@Dependencies(
+    dependencies = [FixLocaleConfigErrorPatch::class]
+)
+@Name("premium-heading")
+@Description("Show the premium branding on the the YouTube home screen.")
+@PremiumHeadingCompatibility
+@Version("0.0.1")
+class PremiumHeadingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data["res"]
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"
+        val modes = arrayOf("light", "dark")
+
+        arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi").forEach { size ->
+            val headingDirectory = resDirectory.resolve("drawable-$size")
+            modes.forEach {mode ->
+                val fromPath = headingDirectory.resolve("${original}_$mode.png").toPath()
+                val toPath = headingDirectory.resolve("${replacement}_$mode.png").toPath()
+
+                if (!fromPath.exists())
+                    return PatchResultError("The file $fromPath does not exist in the resources. Therefore, this patch can not succeed.")
+                Files.copy(
+                    fromPath,
+                    toPath,
+                    StandardCopyOption.REPLACE_EXISTING
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt

@@ -0,0 +1,56 @@
+package app.revanced.patches.youtube.layout.branding.icon.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.layout.branding.icon.annotations.CustomBrandingCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import java.nio.file.Files
+
+@Patch
+@Dependencies(
+    dependencies = [FixLocaleConfigErrorPatch::class]
+)
+@Name("custom-branding")
+@Description("Change the branding of YouTube.")
+@CustomBrandingCompatibility
+@Version("0.0.1")
+class CustomBrandingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data["res"]
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val iconNames = arrayOf(
+            "adaptiveproduct_youtube_background_color_108",
+            "adaptiveproduct_youtube_foreground_color_108",
+            "ic_launcher",
+            "ic_launcher_round"
+        )
+
+        mapOf(
+            "xxxhdpi" to 192,
+            "xxhdpi" to 144,
+            "xhdpi" to 96,
+            "hdpi" to 72,
+            "mdpi" to 48
+        ).forEach { (iconDirectory, size) ->
+            iconNames.forEach iconLoop@{ iconName ->
+                val iconFile = this.javaClass.classLoader.getResourceAsStream("branding/$size/$iconName.png")
+                    ?: return PatchResultError("The icon $iconName can not be found.")
+
+                Files.write(
+                    resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(), iconFile.readAllBytes()
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt

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

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

@@ -0,0 +1,42 @@
+package app.revanced.patches.youtube.layout.castbutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.youtube.layout.castbutton.annotations.CastButtonCompatibility
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("hide-cast-button")
+@Description("Hides the cast button.")
+@CastButtonCompatibility
+@Version("0.0.1")
+class HideCastButtonPatch : BytecodePatch() {
+    override fun execute(data: BytecodeData): PatchResult {
+        data.classes.forEach { classDef ->
+            classDef.methods.forEach { method ->
+                if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {
+                    val setVisibilityMethod =
+                        data.proxy(classDef).resolve().methods.first { it.name == "setVisibility" }
+
+                    setVisibilityMethod.addInstructions(
+                        0, """
+                            invoke-static {p1}, Lapp/revanced/integrations/patches/HideCastButtonPatch;->getCastButtonOverrideV2(I)I
+                            move-result p1
+                        """
+                    )
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/fingerprints/CreateButtonFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.youtube.layout.createbutton.signatures
+package app.revanced.patches.youtube.layout.createbutton.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("create-button-signature")
+@Name("create-button-fingerprint")
 @MatchingMethod(
     "Lknw", "z"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @CreateButtonCompatibility
 @Version("0.0.1")
-object CreateButtonSignature : MethodSignature(
+object CreateButtonFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("Z"),

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

@@ -3,43 +3,62 @@ package app.revanced.patches.youtube.layout.createbutton.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
-import app.revanced.patches.youtube.layout.createbutton.signatures.CreateButtonSignature
+import app.revanced.patches.youtube.layout.createbutton.fingerprints.CreateButtonFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class])
 @Name("disable-create-button")
-@Description("Disable the create button.")
+@Description("Disables the create button.")
 @CreateButtonCompatibility
 @Version("0.0.1")
 class CreateButtonRemoverPatch : BytecodePatch(
     listOf(
-        CreateButtonSignature
+        CreateButtonFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = CreateButtonFingerprint.result!!
 
         // Get the required register which holds the view object we need to pass to the method hideCreateButton
-        val implementation = result.method.implementation!!
+        val implementation = result.mutableMethod.implementation!!
-        val instruction = implementation.instructions[result.scanResult.endIndex + 1]
+
-        if (instruction.opcode != Opcode.INVOKE_STATIC)
+        val imageOnlyLayout =
-            return PatchResultError("Could not find the correct register")
+            ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "layout" && it.name == "image_only_tab" }
-        val register = (instruction as Instruction35c).registerC
+
+        val imageOnlyLayoutConstIndex =
+            implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout.id }
+
+        val (instructionIndex, instruction) = implementation.instructions.drop(imageOnlyLayoutConstIndex).withIndex()
+            .first {
+                (((it.value as? ReferenceInstruction)?.reference) as? MethodReference)?.definingClass?.contains("PivotBar")
+                    ?: false
+            }
+
+        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct instruction")
+
+        val moveResultIndex = imageOnlyLayoutConstIndex + instructionIndex + 1
+        val moveResultInstruction = implementation.instructions[moveResultIndex] as OneRegisterInstruction
 
         // Hide the button view via proxy by passing it to the hideCreateButton method
-        implementation.addInstruction(
+        result.mutableMethod.addInstruction(
-            result.scanResult.endIndex + 1,
+            moveResultIndex + 1,
-            "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->hideCreateButton(Landroid/view/View;)V".toInstruction()
+            "invoke-static { v${moveResultInstruction.registerA} }, Lapp/revanced/integrations/patches/HideCreateButtonPatch;->hideCreateButton(Landroid/view/View;)V"
         )
 
         return PatchResultSuccess()

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

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.fullscreenpanels.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class FullscreenPanelsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("fullscreen-view-adder-fingerprint")
+@MatchingMethod(
+    "LFullscreenEngagementPanelOverlay;", "e"
+)
+@FuzzyPatternScanMethod(2)
+@ShortsButtonCompatibility
+@Version("0.0.1")
+object FullscreenViewAdderFingerprint : MethodFingerprint(
+    null,
+    null,
+    listOf("L", "L"),
+    listOf(
+        Opcode.GOTO,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+    ),
+    null,
+    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
+)

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

@@ -0,0 +1,51 @@
+package app.revanced.patches.youtube.layout.fullscreenpanels.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.fullscreenpanels.annotations.FullscreenPanelsCompatibility
+import app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints.FullscreenViewAdderFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@Name("disable-fullscreen-panels")
+@Description("Disables comments panel in fullscreen view.")
+@FullscreenPanelsCompatibility
+@Version("0.0.1")
+class FullscreenPanelsRemovalPatch : BytecodePatch(
+    listOf(
+        FullscreenViewAdderFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = FullscreenViewAdderFingerprint.result?.mutableMethod!!
+        val implementation = method.implementation!!
+
+        val (visibilityCallIndex, visibilityCall) =
+            implementation.instructions.withIndex()
+                .first { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.name == ("setVisibility") }
+
+        val gotoIndex =
+            implementation.instructions.subList(0, visibilityCallIndex).indexOfLast { it.opcode == Opcode.GOTO }
+
+        //force the if
+        method.removeInstruction(gotoIndex)
+
+        val visibilityIntRegister = (visibilityCall as FiveRegisterInstruction).registerD
+
+        //set the visibility to GONE
+        method.addInstruction(visibilityCallIndex - 1, "const/16 v$visibilityIntRegister, 0x8")
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.youtube.layout.minimizedplayback.signatures
+package app.revanced.patches.youtube.layout.minimizedplayback.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("minimized-playback-manager-signature")
+@Name("minimized-playback-manager-fingerprint")
 @MatchingMethod(
     "Lyuf", "n"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")
-object MinimizedPlaybackManagerSignature : MethodSignature(
+object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
     "Z",
     AccessFlags.PUBLIC or AccessFlags.STATIC,
     listOf("L"),

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.youtube.layout.minimizedplayback.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Name("minimized-playback-manager-fingerprint")
+@MatchingMethod(
+    "Ladj", "w"
+)
+@FuzzyPatternScanMethod(2)
+@MinimizedPlaybackCompatibility
+@Version("0.0.1")
+object MinimizedPlaybackSettingsFingerprint : MethodFingerprint(
+    "L",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    null,
+    listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.IF_NEZ,
+        Opcode.GOTO,
+        Opcode.IGET_OBJECT,
+        Opcode.CHECK_CAST
+    ),
+)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -3,36 +3,57 @@ package app.revanced.patches.youtube.layout.minimizedplayback.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
-import app.revanced.patches.youtube.layout.minimizedplayback.signatures.MinimizedPlaybackManagerSignature
+import app.revanced.patches.youtube.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import app.revanced.patches.youtube.layout.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
 
 
 @Patch
 @Name("minimized-playback")
-@Description("Enable minimized and background playback.")
+@Description("Enables minimized and background playback.")
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
     listOf(
-        MinimizedPlaybackManagerSignature
+        MinimizedPlaybackManagerFingerprint, MinimizedPlaybackSettingsFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
         // Instead of removing all instructions like Vanced,
         // we return the method at the beginning instead
-        signatures.first().result!!.method.implementation!!.addInstructions(
+        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
             0, """
                 const/4 v0, 0x1
                 return v0
-                """.trimIndent().toInstructions()
+                """
         )
+
+        val method = MinimizedPlaybackSettingsFingerprint.result!!.mutableMethod
+        val booleanCalls = method.implementation!!.instructions.withIndex()
+            .filter { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.returnType == "Z" }
+
+        val settingsBooleanIndex = booleanCalls.elementAt(1).index
+        val settingsBooleanMethod =
+            data.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod
+
+        settingsBooleanMethod.addInstructions(
+            0, """
+                const/4 v0, 0x1
+                return v0
+                """
+        )
+
         return PatchResultSuccess()
     }
 }

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/fingerprints/OldQualityFingerprint.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("old-quality-fingerprint")
+@MatchingMethod(definingClass = "Libh")
+@FuzzyPatternScanMethod(2)
+@OldQualityLayoutCompatibility
+@Version("0.0.1")
+object OldQualityFingerprint : MethodFingerprint(
+    "L", AccessFlags.FINAL or AccessFlags.PRIVATE, listOf("Z"), listOf(
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.GOTO,
+        Opcode.IGET_OBJECT,
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/fingerprints/OldQualityParentFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.youtube.layout.oldqualitylayout.signatures
+package app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("old-quality-parent-method-signature")
+@Name("old-quality-parent-method-fingerprint")
 @MatchingMethod(
     "Libh", "<init>"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @OldQualityLayoutCompatibility
 @Version("0.0.1")
-object OldQualityParentSignature : MethodSignature(
+object OldQualityParentFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     listOf("L", "L", "L", "L", "L", "L", "L"),

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

@@ -3,63 +3,50 @@ package app.revanced.patches.youtube.layout.oldqualitylayout.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
-import app.revanced.patches.youtube.layout.oldqualitylayout.signatures.OldQualityParentSignature
+import app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints.OldQualityFingerprint
+import app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints.OldQualityParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("old-quality-layout")
-@Description("Enable the original quality flyout menu.")
+@Description("Enables the original quality flyout menu.")
 @OldQualityLayoutCompatibility
 @Version("0.0.1")
 class OldQualityLayoutPatch : BytecodePatch(
     listOf(
-        OldQualityParentSignature
+        OldQualityParentFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!.findParentMethod(@Name("old-quality-signature") @MatchingMethod(
+        OldQualityFingerprint.resolve(data, OldQualityParentFingerprint.result!!.classDef)
-            definingClass = "Libh"
+        val result = OldQualityFingerprint.result
-        ) @FuzzyPatternScanMethod(2) @OldQualityLayoutCompatibility @Version("0.0.1") object : MethodSignature(
+            ?: return PatchResultError("Required parent method could not be found.")
-            "L", AccessFlags.FINAL or AccessFlags.PRIVATE, listOf("Z"), listOf(
-                Opcode.CONST_4,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.GOTO,
-                Opcode.IGET_OBJECT,
-            )
-        ) {}) ?: return PatchResultError("Required parent method could not be found.")
 
-        val implementation = result.method.implementation!!
+        val implementation = result.mutableMethod.implementation!!
 
         // if useOldStyleQualitySettings == true, jump over all instructions
         val jmpInstruction = BuilderInstruction21t(
-            Opcode.IF_NEZ, 0, implementation.instructions[result.scanResult.endIndex].location.labels.first()
+            Opcode.IF_NEZ, 0, implementation.instructions[result.patternScanResult!!.endIndex].location.labels.first()
         )
         implementation.addInstruction(5, jmpInstruction)
-        implementation.addInstructions(
+        result.mutableMethod.addInstructions(
             0, """
-                invoke-static { }, Lfi/razerman/youtube/XGlobals;->useOldStyleQualitySettings()Z
+                invoke-static { }, Lapp/revanced/integrations/patches/OldStyleQualityPatch;->useOldStyleQualitySettings()Z
                 move-result v0
-            """.trimIndent().toInstructions()
+            """
         )
 
         return PatchResultSuccess()

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

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt

@@ -1,22 +1,22 @@
-package app.revanced.patches.youtube.layout.reels.signatures
+package app.revanced.patches.youtube.layout.reels.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import org.jf.dexlib2.AccessFlags
 
-@Name("hide-reels-signature")
+@Name("hide-reels-fingerprint")
 @MatchingMethod(
     "Ljvy", "<init>"
 )
 @FuzzyPatternScanMethod(3) // FIXME: Test this threshold and find the best value.
 @HideReelsCompatibility
 @Version("0.0.1")
-object HideReelsSignature : MethodSignature(
+object HideReelsFingerprint : MethodFingerprint(
     null, AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L", "L"), null,
     listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
 )

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

@@ -2,34 +2,33 @@ package app.revanced.patches.youtube.layout.reels.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
-import app.revanced.patches.youtube.layout.reels.signatures.HideReelsSignature
+import app.revanced.patches.youtube.layout.reels.fingerprints.HideReelsFingerprint
 
-//@Patch TODO: converted to litho
+//@Patch TODO: this is currently in the general-bytecode-ads patch due to the integrations having a preference for including reels or not. Move it here.
 @Name("hide-reels")
-@Description("Hide reels on the page.")
+@Description("Hides reels on the page.")
 @HideReelsCompatibility
 @Version("0.0.1")
 class HideReelsPatch : BytecodePatch(
     listOf(
-        HideReelsSignature
+        HideReelsFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = HideReelsFingerprint.result!!
-        val implementation = result.method.implementation!!
 
         // HideReel will hide the reel view before it is being used,
         // so we pass the view to the HideReel method
-        implementation.addInstruction(
+        result.mutableMethod.addInstruction(
-            result.scanResult.endIndex,
+            result.patternScanResult!!.endIndex,
-            "invoke-static { v2 }, Lfi/razerman/youtube/XAdRemover;->HideReel(Landroid/view/View;)V".toInstruction()
+            "invoke-static { v2 }, Lapp/revanced/integrations/patches/HideReelsPatch;->HideReel(Landroid/view/View;)V"
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/fingerprints/PivotBarButtonTabEnumFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.youtube.layout.shorts.button.signatures
+package app.revanced.patches.youtube.layout.shorts.button.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("pivotbar-buttons-tabenum-signature")
+@Name("pivotbar-buttons-tabenum-fingerprint")
 @MatchingMethod(
-    "Lknw", "z"
+    "Lknw;", "z"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @ShortsButtonCompatibility
 @Version("0.0.1")
-object PivotBarButtonTabenumSignature : MethodSignature(
+object PivotBarButtonTabEnumFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("Z"),

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/fingerprints/PivotBarButtonsViewFingerprint.kt

@@ -1,23 +1,23 @@
-package app.revanced.patches.youtube.layout.shorts.button.signatures
+package app.revanced.patches.youtube.layout.shorts.button.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("pivotbar-buttons-view-signature")
+@Name("pivotbar-buttons-view-fingerprint")
 @MatchingMethod(
-    "Lknw", "z"
+    "Lknw;", "z"
 )
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @ShortsButtonCompatibility
 @Version("0.0.1")
-object PivotBarButtonsViewSignature : MethodSignature(
+object PivotBarButtonsViewFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
     listOf("Z"),

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt

@@ -3,50 +3,53 @@ package app.revanced.patches.youtube.layout.shorts.button.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
-import app.revanced.patches.youtube.layout.shorts.button.signatures.PivotBarButtonTabenumSignature
+import app.revanced.patches.youtube.layout.shorts.button.fingerprints.PivotBarButtonTabEnumFingerprint
-import app.revanced.patches.youtube.layout.shorts.button.signatures.PivotBarButtonsViewSignature
+import app.revanced.patches.youtube.layout.shorts.button.fingerprints.PivotBarButtonsViewFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.formats.Instruction11x
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
-@Name("shorts-button")
+@Dependencies(dependencies = [IntegrationsPatch::class])
-@Description("Hide the shorts button.")
+@Name("hide-shorts-button")
+@Description("Hides the shorts button.")
 @ShortsButtonCompatibility
 @Version("0.0.1")
 class ShortsButtonRemoverPatch : BytecodePatch(
     listOf(
-        PivotBarButtonTabenumSignature, PivotBarButtonsViewSignature
+        PivotBarButtonTabEnumFingerprint, PivotBarButtonsViewFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result1 = signatures.first().result!!
+        val tabEnumResult = PivotBarButtonTabEnumFingerprint.result!!
-        val implementation1 = result1.method.implementation!!
+        val tabEnumImplementation = tabEnumResult.mutableMethod.implementation!!
-        val moveEnumInstruction = implementation1.instructions[result1.scanResult.endIndex]
+        val moveEnumInstruction = tabEnumImplementation.instructions[tabEnumResult.patternScanResult!!.endIndex]
-        val enumRegister = (moveEnumInstruction as Instruction11x).registerA
+        val enumRegister = (moveEnumInstruction as OneRegisterInstruction).registerA
+
+        val buttonsViewResult = PivotBarButtonsViewFingerprint.result!!
+        val buttonsViewImplementation = buttonsViewResult.mutableMethod.implementation!!
+        val moveViewInstruction = buttonsViewImplementation.instructions[buttonsViewResult.patternScanResult!!.endIndex]
+        val viewRegister = (moveViewInstruction as OneRegisterInstruction).registerA
 
-        val result2 = signatures.last().result!!
-        val implementation2 = result2.method.implementation!!
-        val moveViewInstruction = implementation2.instructions[result2.scanResult.endIndex]
-        val viewRegister = (moveViewInstruction as Instruction11x).registerA
 
         // Save the tab enum in XGlobals to avoid smali/register workarounds
-        implementation1.addInstruction(
+        tabEnumResult.mutableMethod.addInstruction(
-            result1.scanResult.endIndex + 1,
+            tabEnumResult.patternScanResult!!.endIndex + 1,
-            "sput-object v$enumRegister, Lfi/razerman/youtube/XGlobals;->lastPivotTab:Ljava/lang/Enum;".toInstruction()
+            "sput-object v$enumRegister, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->lastPivotTab:Ljava/lang/Enum;"
         )
 
         // Hide the button view via proxy by passing it to the hideShortsButton method
         // It only hides it if the last tab name is "TAB_SHORTS"
-        implementation2.addInstruction(
+        buttonsViewResult.mutableMethod.addInstruction(
-            result2.scanResult.endIndex + 2,
+            buttonsViewResult.patternScanResult!!.endIndex + 2,
-            "invoke-static { v$viewRegister }, Lfi/razerman/youtube/XAdRemover;->hideShortsButton(Landroid/view/View;)V".toInstruction()
+            "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->hideShortsButton(Landroid/view/View;)V"
         )
 
         return PatchResultSuccess()

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.layout.watermark.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-watermark-signature")
+@MatchingMethod(
+    "Ljvy;", "<init>"
+)
+@FuzzyPatternScanMethod(3)
+@HideWatermarkCompatibility
+@Version("0.0.1")
+object HideWatermarkFingerprint : MethodFingerprint (
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), null ,null, null
+)

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.layout.watermark.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-watermark-parent-signature")
+@MatchingMethod(
+    "Ljvy;", "<init>"
+)
+@FuzzyPatternScanMethod(3)
+@HideWatermarkCompatibility
+@Version("0.0.1")
+object HideWatermarkParentFingerprint : MethodFingerprint (
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, null, null, listOf("player_overlay_in_video_programming"), null
+)

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt

@@ -0,0 +1,50 @@
+package app.revanced.patches.youtube.layout.watermark.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCompatibility
+import app.revanced.patches.youtube.layout.watermark.fingerprints.HideWatermarkParentFingerprint
+import app.revanced.patches.youtube.layout.watermark.fingerprints.HideWatermarkFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("hide-watermark")
+@Description("Hides the creator's watermark on videos.")
+@HideWatermarkCompatibility
+@Version("0.0.1")
+class HideWatermarkPatch : BytecodePatch(
+    listOf(
+        HideWatermarkParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        HideWatermarkFingerprint.resolve(data, HideWatermarkParentFingerprint.result!!.classDef)
+        val result = HideWatermarkFingerprint.result
+            ?: return PatchResultError("Required parent method could not be found.")
+
+        val method = result.mutableMethod
+        val line = method.implementation!!.instructions.size - 5
+
+        method.removeInstruction(line)
+        method.addInstructions(
+            line, """
+            invoke-static {}, Lapp/revanced/integrations/patches/BrandingWaterMarkPatch;->isBrandingWatermarkShown()Z
+            move-result p2
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt

@@ -0,0 +1,48 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("wide-searchbar-methodone-fingerprint")
+@MatchingMethod(
+    "Ljkg;", "i"
+)
+@DirectPatternScanMethod
+@WideSearchbarCompatibility
+@Version("0.0.1")
+
+/*
+This finds the following method:
+public final View i(akrl akrlVar, adpd adpdVar) {
+}
+
+Method we search for is located in smali now.
+See:
+.method public final i(Lakrl;Ladpd;)Landroid/view/View;
+    iget-object v0, p0, Ljkg;->a:Landroid/app/Activity;
+    invoke-static {v0}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater;
+    move-result-object v0
+    iget-object v1, p0, Ljkg;->g:Ljis;
+    const/4 v2, 0x0
+    invoke-interface {v1, v2}, Ljis;->h(Z)V
+    iget-object p1, p1, Lakrl;->f:Lahnq;
+    if-nez p1, :cond_12
+    sget-object p1, Lahnq;->a:Lahnq;
+    :cond_12
+    iget-object v1, p0, Ljkg;->x:Ltxm;
+    invoke-static {v1}, Lfbn;->aF(Ltxm;)Z //THIS IS WHAT WE SEARCH FOR (Method fbn.aF)
+    move-result v1
+ */
+
+object WideSearchbarOneFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC),
+    null, null
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("wide-searchbar-methodone-parent-fingerprint")
+@MatchingMethod(
+    "Ljkg;", "l"
+)
+@FuzzyPatternScanMethod(3)
+@WideSearchbarCompatibility
+@Version("0.0.1")
+
+/*
+ * This finds the following method:
+  private final void l(PaneDescriptor paneDescriptor) {
+        Class cls = null;
+        ahat f = paneDescriptor != null ? paneDescriptor.f() : null;
+        if (paneDescriptor != null) {
+            cls = paneDescriptor.a;
+        }
+        ftu k = k();
+        if ((k == null || !k.bk()) && ((!frx.k(f) && !((Boolean) aqer.S(this.n).X(new fac(this, f, 19)).K(irx.i).aH(false)).booleanValue()) || (f != null && f.qA(ReelWatchEndpointOuterClass$ReelWatchEndpoint.reelWatchEndpoint)))) {
+            String j = frx.j(f);
+            if ((j != null && ("FEhistory".equals(j) || "FEmy_videos".equals(j) || "FEpurchases".equals(j) || j.startsWith("VL"))) || cls == this.I.E() || cls == this.G.a) {
+                this.F = 3;
+                return;
+            } else {
+                this.F = 2;
+                return;
+            }
+        }
+        this.F = 1;
+    }
+ */
+
+object WideSearchbarOneParentFingerprint : MethodFingerprint(
+    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"), null,
+    listOf("FEhistory", "FEmy_videos", "FEpurchases")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt

@@ -0,0 +1,49 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("wide-searchbar-methodtwo-fingerprint")
+@MatchingMethod(
+    "Lkrf;", "h"
+)
+@DirectPatternScanMethod
+@WideSearchbarCompatibility
+@Version("0.0.1")
+
+/*
+public static jis h(Context context, txm txmVar, uag uagVar, txp txpVar) {
+        return fbn.aB(txmVar) ? new jhx(context, txmVar, uagVar, txpVar) : jis.d;
+    }
+
+Method we search for is located in smali now.
+See:
+.method public static h(Landroid/content/Context;Ltxm;Luag;Ltxp;)Ljis;
+    invoke-static {p1}, Lfbn;->aB(Ltxm;)Z //this is the method we want to change. fbn.aB
+    move-result v0
+    if-eqz v0, :cond_c
+    new-instance v0, Ljhx;
+    invoke-direct {v0, p0, p1, p2, p3}, Ljhx;-><init>(Landroid/content/Context;Ltxm;Luag;Ltxp;)V
+    goto :goto_e
+    :cond_c
+    sget-object v0, Ljis;->d:Ljis;
+    :goto_e
+    return-object v0
+.end method
+
+ */
+
+object WideSearchbarTwoFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_EQZ, Opcode.NEW_INSTANCE
+    ),
+    null, null
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt

@@ -0,0 +1,35 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("wide-searchbar-methodtwo-parent-fingerprint")
+@MatchingMethod(
+    "Lkrf;", "i"
+)
+@FuzzyPatternScanMethod(3)
+@WideSearchbarCompatibility
+@Version("0.0.1")
+
+/*
+This finds following method:
+public static ies i(br brVar) {
+        bp f = brVar.getSupportFragmentManager().f("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT");
+        if (f != null) {
+            return (kga) f;
+        }
+        return new kga();
+    }
+ */
+
+object WideSearchbarTwoParentFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null,
+    listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/patch/WideSearchbarPatch.kt

@@ -0,0 +1,105 @@
+package app.revanced.patches.youtube.layout.widesearchbar.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarOneFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarOneParentFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarTwoFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarTwoParentFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+
+@Patch(include = false)
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("enable-wide-searchbar")
+@Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
+@WideSearchbarCompatibility
+@Version("0.0.1")
+class WideSearchbarPatch : BytecodePatch(
+    listOf(
+        WideSearchbarOneParentFingerprint, WideSearchbarTwoParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        WideSearchbarOneFingerprint.resolve(data, WideSearchbarOneParentFingerprint.result!!.classDef)
+        WideSearchbarTwoFingerprint.resolve(data, WideSearchbarTwoParentFingerprint.result!!.classDef)
+
+        val resultOne = WideSearchbarOneFingerprint.result
+
+        //This should be the method aF in class fbn
+        val targetMethodOne =
+            data.toMethodWalker(resultOne!!.method).nextMethod(resultOne.patternScanResult!!.endIndex, true).getMethod() as MutableMethod
+
+        //Since both methods have the same smali code, inject instructions using a method.
+        addInstructions(targetMethodOne)
+
+        val resultTwo = WideSearchbarTwoFingerprint.result
+
+        //This should be the method aB in class fbn
+        val targetMethodTwo =
+            data.toMethodWalker(resultTwo!!.method).nextMethod(resultTwo.patternScanResult!!.startIndex, true).getMethod() as MutableMethod
+
+        //Since both methods have the same smali code, inject instructions using a method.
+        addInstructions(targetMethodTwo)
+
+        return PatchResultSuccess()
+    }
+
+    private fun addInstructions(method: MutableMethod) {
+        val index = method.implementation!!.instructions.size - 1
+        method.addInstructions(
+            index, """
+            invoke-static {}, Lapp/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
+            move-result p0
+        """
+        )
+    }
+
+    //targetMethodOne: in class fbn
+    /*
+    .method public static aF(Ltxm;)Z
+        invoke-virtual {p0}, Ltxm;->b()Lahah;
+        move-result-object p0
+        iget-object p0, p0, Lahah;->e:Lakfd;
+        if-nez p0, :cond_a
+        sget-object p0, Lakfd;->a:Lakfd;
+        :cond_a
+        iget-boolean p0, p0, Lakfd;->V:Z
+        //added code here:
+            invoke-static {}, app/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
+            move-result p0
+        //original code here:
+        return p0
+    .end method
+   */
+
+    //targetMethodTwo: in class fbn
+    /*
+    .method public static aB(Ltxm;)Z
+        invoke-virtual {p0}, Ltxm;->b()Lahah;
+        move-result-object p0
+        iget-object p0, p0, Lahah;->e:Lakfd;
+        if-nez p0, :cond_a
+        sget-object p0, Lakfd;->a:Lakfd;
+        :cond_a
+        iget-boolean p0, p0, Lakfd;->y:Z
+        //added code here:
+            invoke-static {}, app/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
+            move-result p0
+        //original code here:
+        return p0
+    .end method
+
+    */
+}

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/annotations/CustomPlaybackSpeedCompatibility.kt

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

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt

@@ -0,0 +1,33 @@
+package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("speed-array-generator-fingerprint")
+@MatchingMethod(
+    "Lzdj;", "d"
+)
+@FuzzyPatternScanMethod(2)
+@CustomPlaybackSpeedCompatibility
+@Version("0.0.1")
+object SpeedArrayGeneratorFingerprint : MethodFingerprint(
+    "[L",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    null,
+    listOf(
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.GOTO,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
+    ),
+    listOf("0.0#")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedLimiterFingerprint.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("speed-limiter-fingerprint")
+@MatchingMethod(
+    "Lxgy;", "y"
+)
+@FuzzyPatternScanMethod(2) 
+@CustomPlaybackSpeedCompatibility
+@Version("0.0.1")
+object SpeedLimiterFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("F"),
+    listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.CONST_HIGH16,
+        Opcode.GOTO,
+        Opcode.CONST_HIGH16,
+        Opcode.CONST_HIGH16,
+        Opcode.INVOKE_STATIC,
+    ),
+)

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

@@ -0,0 +1,110 @@
+package app.revanced.patches.youtube.misc.customplaybackspeed.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedArrayGeneratorFingerprint
+import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedLimiterFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@Name("custom-playback-speed")
+@Description("Allows to change the default playback speed options.")
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@CustomPlaybackSpeedCompatibility
+@Version("0.0.1")
+class CustomPlaybackSpeedPatch : BytecodePatch(
+    listOf(
+        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint
+    )
+) {
+
+    override fun execute(data: BytecodeData): PatchResult {
+        val arrayGenMethod = SpeedArrayGeneratorFingerprint.result?.mutableMethod!!
+        val arrayGenMethodImpl = arrayGenMethod.implementation!!
+
+        val sizeCallIndex = arrayGenMethodImpl.instructions
+            .indexOfFirst { ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "size" }
+
+        if (sizeCallIndex == -1) return PatchResultError("Couldn't find call to size()")
+
+        val sizeCallResultRegister =
+            (arrayGenMethodImpl.instructions.elementAt(sizeCallIndex + 1) as OneRegisterInstruction).registerA
+
+        arrayGenMethod.replaceInstruction(
+            sizeCallIndex + 1,
+            "const/4 v$sizeCallResultRegister, 0x0"
+        )
+
+        val (arrayLengthConstIndex, arrayLengthConst) = arrayGenMethodImpl.instructions.withIndex()
+            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 7 }
+
+        val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA
+
+        val videoSpeedsArrayType = "Lapp/revanced/integrations/videoplayer/videosettings/VideoSpeed;->videoSpeeds:[F"
+
+        arrayGenMethod.addInstructions(
+            arrayLengthConstIndex + 1,
+            """
+            sget-object v$arrayLengthConstDestination, $videoSpeedsArrayType
+            array-length v$arrayLengthConstDestination, v$arrayLengthConstDestination
+            """
+        )
+
+        val (originalArrayFetchIndex, originalArrayFetch) = arrayGenMethodImpl.instructions.withIndex()
+            .first {
+                val reference = ((it.value as? ReferenceInstruction)?.reference as? FieldReference)
+                reference?.definingClass?.contains("PlayerConfigModel") ?: false &&
+                        reference?.type == "[F"
+            }
+
+        val originalArrayFetchDestination = (originalArrayFetch as OneRegisterInstruction).registerA
+
+        arrayGenMethod.replaceInstruction(
+            originalArrayFetchIndex,
+            "sget-object v$originalArrayFetchDestination, $videoSpeedsArrayType"
+        )
+
+        val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!;
+        val limiterMethodImpl = limiterMethod.implementation!!
+
+        val speedLimitMin = 0.25f
+        val speedLimitMax = 100f
+
+        val (limiterMinConstIndex, limiterMinConst) = limiterMethodImpl.instructions.withIndex()
+            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 0.25f.toRawBits() }
+        val (limiterMaxConstIndex, limiterMaxConst) = limiterMethodImpl.instructions.withIndex()
+            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 2.0f.toRawBits() }
+
+        val limiterMinConstDestination = (limiterMinConst as OneRegisterInstruction).registerA
+        val limiterMaxConstDestination = (limiterMaxConst as OneRegisterInstruction).registerA
+
+        fun hexFloat(float: Float): String = "0x%08x".format(float.toRawBits())
+
+        limiterMethod.replaceInstruction(
+            limiterMinConstIndex,
+            "const/high16 v$limiterMinConstDestination, ${hexFloat(speedLimitMin)}"
+        )
+        limiterMethod.replaceInstruction(
+            limiterMaxConstIndex,
+            "const/high16 v$limiterMaxConstDestination, ${hexFloat(speedLimitMax)}"
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt

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

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

@@ -0,0 +1,35 @@
+package app.revanced.patches.youtube.misc.enabledebugging.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.misc.enabledebugging.annotations.EnableDebuggingCompatibility
+import org.w3c.dom.Element
+
+@Patch(false)
+@Name("enable-debugging")
+@Description("Enables app debugging by patching the manifest file.")
+@EnableDebuggingCompatibility
+@Version("0.0.1")
+class EnableDebuggingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        // create an xml editor instance
+        data.xmlEditor["AndroidManifest.xml"].use { dom ->
+            // get the application node
+            val applicationNode = dom
+                .file
+                .getElementsByTagName("application")
+                .item(0) as Element
+
+            // set application as debuggable
+            applicationNode.setAttribute("android:debuggable", "true")
+        }
+
+        return PatchResultSuccess()
+    }
+}

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

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

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt

@@ -0,0 +1,35 @@
+package app.revanced.patches.youtube.misc.hdrbrightness.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
+
+@Name("hdrbrightness-fingerprint")
+@MatchingMethod(
+    "Lghz;", "mZ"
+)
+@FuzzyPatternScanMethod(3)
+@HDRBrightnessCompatibility
+@Version("0.0.1")
+object HDRBrightnessFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, null,
+    listOf(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_HIGH16,
+        Opcode.IPUT,
+        Opcode.INVOKE_VIRTUAL
+    ),
+    null,
+    customFingerprint = { methodDef ->
+        methodDef.implementation!!.instructions.count() == 16 && methodDef.implementation!!.instructions.any {((it as? NarrowLiteralInstruction)?.narrowLiteral == (-1.0f).toRawBits())}
+    }
+)

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt

@@ -0,0 +1,48 @@
+package app.revanced.patches.youtube.misc.hdrbrightness.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
+import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprint
+import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@Name("hdr-max-brightness")
+@Description("Sets brightness to max for HDR videos in fullscreen mode.")
+@HDRBrightnessCompatibility
+@Version("0.0.1")
+class HDRBrightnessPatch : BytecodePatch(
+    listOf(
+        HDRBrightnessFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val result = HDRBrightnessFingerprint.result
+            ?: return PatchResultError("HDRBrightnessFingerprint could not resolve the method!")
+
+
+        val method = result.mutableMethod
+
+        //Get the index here, so we know where to inject our code to override -1.0f
+        val index = method.implementation!!.instructions.indexOfFirst { ((it as? NarrowLiteralInstruction)?.narrowLiteral == (-1.0f).toRawBits()) }
+        val register = (method.implementation!!.instructions.get(index) as OneRegisterInstruction).registerA
+
+        method.addInstructions(
+            index + 1, """
+           invoke-static {v$register}, Lapp/revanced/integrations/patches/HDRMaxBrightnessPatch;->getHDRBrightness(F)F
+           move-result v$register
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt

@@ -1,18 +1,18 @@
-package app.revanced.patches.youtube.misc.integrations.signatures
+package app.revanced.patches.youtube.misc.integrations.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
 
-@Name("init-signature")
+@Name("init-fingerprint")
 @MatchingMethod(
     "Lacuu", "onCreate"
 )
 @IntegrationsCompatibility
 @Version("0.0.1")
-object InitSignature : MethodSignature(
+object InitFingerprint : MethodFingerprint(
     null, null, null, null,
     listOf("Application creation")
 )

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt

@@ -3,17 +3,17 @@ package app.revanced.patches.youtube.misc.integrations.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
-import app.revanced.patches.youtube.misc.integrations.signatures.InitSignature
+import app.revanced.patches.youtube.misc.integrations.fingerprints.InitFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.immutable.ImmutableMethod
 import org.jf.dexlib2.immutable.ImmutableMethodImplementation
@@ -24,26 +24,27 @@ import org.jf.dexlib2.immutable.ImmutableMethodImplementation
 @Version("0.0.1")
 class IntegrationsPatch : BytecodePatch(
     listOf(
-        InitSignature
+        InitFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        if (data.findClass("Lapp/revanced/integrations/Globals") == null)
+        if (data.findClass("Lapp/revanced/integrations/utils/ReVancedUtils") == null)
             return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
 
-        val result = signatures.first().result!!
+        val result = InitFingerprint.result!!
 
-        val implementation = result.method.implementation!!
+        val method = result.mutableMethod
+        val implementation = method.implementation!!
         val count = implementation.registerCount - 1
 
-        implementation.addInstructions(
+        method.addInstructions(
-            result.scanResult.endIndex + 1, """
+            0, """
-                  invoke-static {v$count}, Lpl/jakubweg/StringRef;->setContext(Landroid/content/Context;)V
+                  invoke-static {v$count}, Lapp/revanced/integrations/sponsorblock/StringRef;->setContext(Landroid/content/Context;)V
-                  sput-object v$count, Lapp/revanced/integrations/Globals;->context:Landroid/content/Context;
+                  sput-object v$count, Lapp/revanced/integrations/utils/ReVancedUtils;->context:Landroid/content/Context;
-            """.trimIndent().toInstructions()
+            """
         )
 
-        val classDef = result.definingClassProxy.resolve()
+        val classDef = result.mutableClass
         classDef.methods.add(
             ImmutableMethod(
                 classDef.type,
@@ -55,10 +56,10 @@ class IntegrationsPatch : BytecodePatch(
                 null,
                 ImmutableMethodImplementation(
                     1, """
-                        invoke-static { }, Lapp/revanced/integrations/Globals;->getAppContext()Landroid/content/Context;
+                        invoke-static { }, Lapp/revanced/integrations/utils/ReVancedUtils;->getAppContext()Landroid/content/Context;
                         move-result-object v0
                         return-object v0
-                    """.trimIndent().toInstructions(), null, null
+                    """.toInstructions(), null, null
                 )
             ).toMutable()
         )

src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35","17.25.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)