chore(release): 2.52.3 [skip ci]

## [2.52.3](https://github.com/revanced/revanced-patches/compare/v2.52.2...v2.52.3) (2022-09-11)

### Bug Fixes

* path for download icon ([#465](https://github.com/revanced/revanced-patches/issues/465)) ([bff22c3](6d6a0375c8))

.gitignore

@@ -114,4 +114,7 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 # Potentially copyrighted test APK
-*.apk
+*.apk
+
+# Ignore vscode config
+.vscode/

.idea/.gitignore

@@ -6,3 +6,4 @@
 /dataSources.local.xml
 # Editor-based HTTP Client requests
 /httpRequests/
+/kotlinc.xml

.releaserc

@@ -32,6 +32,9 @@
         "assets": [
           {
             "path": "build/libs/*.jar"
+          },
+          {
+            "path": "patches.json"
           }
         ]
       }

CHANGELOG.md

@@ -1,3 +1,152 @@
+## [2.52.3](https://github.com/revanced/revanced-patches/compare/v2.52.2...v2.52.3) (2022-09-11)
+
+
+### Bug Fixes
+
+* path for download icon ([#465](https://github.com/revanced/revanced-patches/issues/465)) ([bff22c3](https://github.com/revanced/revanced-patches/commit/bff22c3a154fd8059f4f8995a303354633a50517))
+
+## [2.52.2](https://github.com/revanced/revanced-patches/compare/v2.52.1...v2.52.2) (2022-09-11)
+
+
+### Bug Fixes
+
+* design language for download icon ([#464](https://github.com/revanced/revanced-patches/issues/464)) ([c24dc17](https://github.com/revanced/revanced-patches/commit/c24dc175f705fd5364b8bcf01f27f3ac8ecc0e64))
+
+## [2.52.1](https://github.com/revanced/revanced-patches/compare/v2.52.0...v2.52.1) (2022-09-08)
+
+
+### Bug Fixes
+
+* multiple compatible pkgs on readme ([3f82a13](https://github.com/revanced/revanced-patches/commit/3f82a1349fb11b1152ac10d76deb930f7325b7c9))
+
+# [2.52.0](https://github.com/revanced/revanced-patches/compare/v2.51.3...v2.52.0) (2022-09-08)
+
+
+### Features
+
+* add deprecated & options to patches.json ([759315b](https://github.com/revanced/revanced-patches/commit/759315be1b23a6b3655fc87b56a8974ebac648cc))
+
+## [2.51.3](https://github.com/revanced/revanced-patches/compare/v2.51.2...v2.51.3) (2022-09-08)
+
+
+### Bug Fixes
+
+* cleanup & trigger release for ThemePatch ([8d25b21](https://github.com/revanced/revanced-patches/commit/8d25b214e297797092432b5fe1a4ede1f42115c8)), closes [#447](https://github.com/revanced/revanced-patches/issues/447) [revanced/revanced-patcher#99](https://github.com/revanced/revanced-patcher/issues/99)
+
+## [2.51.2](https://github.com/revanced/revanced-patches/compare/v2.51.1...v2.51.2) (2022-09-08)
+
+## [2.51.1](https://github.com/revanced/revanced-patches/compare/v2.51.0...v2.51.1) (2022-09-08)
+
+
+### Bug Fixes
+
+* wrap theme option ([150c173](https://github.com/revanced/revanced-patches/commit/150c173adce31d9984d6feca694b472649233056))
+
+# [2.51.0](https://github.com/revanced/revanced-patches/compare/v2.50.8...v2.51.0) (2022-09-08)
+
+
+### Features
+
+* Theme Patch ([#440](https://github.com/revanced/revanced-patches/issues/440)) ([f3b92ca](https://github.com/revanced/revanced-patches/commit/f3b92cab5a057ce605b6d9e75e3b99161bf1422c))
+
+## [2.50.8](https://github.com/revanced/revanced-patches/compare/v2.50.7...v2.50.8) (2022-09-08)
+
+## [2.50.7](https://github.com/revanced/revanced-patches/compare/v2.50.6...v2.50.7) (2022-09-08)
+
+## [2.50.6](https://github.com/revanced/revanced-patches/compare/v2.50.5...v2.50.6) (2022-09-07)
+
+## [2.50.5](https://github.com/revanced/revanced-patches/compare/v2.50.4...v2.50.5) (2022-09-07)
+
+## [2.50.4](https://github.com/revanced/revanced-patches/compare/v2.50.3...v2.50.4) (2022-09-03)
+
+
+### Bug Fixes
+
+* don't respect primary color for the download button icon ([#424](https://github.com/revanced/revanced-patches/issues/424)) ([3fa70f4](https://github.com/revanced/revanced-patches/commit/3fa70f48a206c56f6ca8aed88baed722e76281e2))
+
+## [2.50.3](https://github.com/revanced/revanced-patches/compare/v2.50.2...v2.50.3) (2022-09-01)
+
+
+### Bug Fixes
+
+* partial ad blockage in `tiktok-ads` patch ([#420](https://github.com/revanced/revanced-patches/issues/420)) ([bc6d192](https://github.com/revanced/revanced-patches/commit/bc6d19205940e3b4b228a9b5de627a2260abd00e))
+
+## [2.50.2](https://github.com/revanced/revanced-patches/compare/v2.50.1...v2.50.2) (2022-08-31)
+
+
+### Bug Fixes
+
+* wrong dependency version ([1e63a57](https://github.com/revanced/revanced-patches/commit/1e63a57b86475670442e6a24a7f24c02dabee239))
+
+## [2.50.1](https://github.com/revanced/revanced-patches/compare/v2.50.0...v2.50.1) (2022-08-31)
+
+
+### Bug Fixes
+
+* resolve fingerprint in `premium-icon-reddit` patch ([#413](https://github.com/revanced/revanced-patches/issues/413)) ([60ec2c6](https://github.com/revanced/revanced-patches/commit/60ec2c6f8a29cfc36313617a92e976f01213ce00))
+
+# [2.50.0](https://github.com/revanced/revanced-patches/compare/v2.49.0...v2.50.0) (2022-08-31)
+
+
+### Features
+
+* `tiktok-download` and `tiktok-seekbar` patch ([#405](https://github.com/revanced/revanced-patches/issues/405)) ([f36e000](https://github.com/revanced/revanced-patches/commit/f36e0007c52f4e925a3a2370cdb51bd45ee00a1b))
+
+# [2.49.0](https://github.com/revanced/revanced-patches/compare/v2.48.2...v2.49.0) (2022-08-31)
+
+
+### Features
+
+* bump YouTube Music patches to v5.22.54 ([#409](https://github.com/revanced/revanced-patches/issues/409)) ([859176e](https://github.com/revanced/revanced-patches/commit/859176e3ece415243ba887424513a961fe4a5ad8))
+
+## [2.48.2](https://github.com/revanced/revanced-patches/compare/v2.48.1...v2.48.2) (2022-08-30)
+
+
+### Bug Fixes
+
+* do not constrain `amoled` patch to versions ([#408](https://github.com/revanced/revanced-patches/issues/408)) ([4af1714](https://github.com/revanced/revanced-patches/commit/4af1714dae4da40fe7488e8b734da91c978f1bdf))
+
+## [2.48.1](https://github.com/revanced/revanced-patches/compare/v2.48.0...v2.48.1) (2022-08-30)
+
+
+### Bug Fixes
+
+* don't overwrite register in `compact-header` patch ([#406](https://github.com/revanced/revanced-patches/issues/406)) ([3da8ab5](https://github.com/revanced/revanced-patches/commit/3da8ab5702f5c2a0384ce85fcb3df3b837cdc90e))
+
+# [2.48.0](https://github.com/revanced/revanced-patches/compare/v2.47.0...v2.48.0) (2022-08-30)
+
+
+### Features
+
+* bump YouTube Music patches to v5.21.52 ([#404](https://github.com/revanced/revanced-patches/issues/404)) ([0abb196](https://github.com/revanced/revanced-patches/commit/0abb1960c10f03149e45e9e5074cafcc1801fc32))
+
+# [2.47.0](https://github.com/revanced/revanced-patches/compare/v2.46.0...v2.47.0) (2022-08-29)
+
+
+### Features
+
+* bump youtube version to v17.33.42 ([#398](https://github.com/revanced/revanced-patches/issues/398)) ([769aa25](https://github.com/revanced/revanced-patches/commit/769aa25a6fffbff4c895ae8a291d97836ba03ed9))
+
+# [2.46.0](https://github.com/revanced/revanced-patches/compare/v2.45.3...v2.46.0) (2022-08-29)
+
+
+### Bug Fixes
+
+* `seekbar-tapping` toggling ([#401](https://github.com/revanced/revanced-patches/issues/401)) ([5550244](https://github.com/revanced/revanced-patches/commit/55502446ce5967922f2e9711a5fea2758fe31e83))
+
+
+### Features
+
+* `premium-icon-reddit` patch ([#333](https://github.com/revanced/revanced-patches/issues/333)) ([6739e7b](https://github.com/revanced/revanced-patches/commit/6739e7b94c18200bb3afbc9a8465d97bd18d1945))
+* blacklist `.vsc` folder in `.gitignore` ([#331](https://github.com/revanced/revanced-patches/issues/331)) ([1922253](https://github.com/revanced/revanced-patches/commit/1922253118e670aa66b33186f5cee2ffb3c55718))
+
+## [2.45.3](https://github.com/revanced/revanced-patches/compare/v2.45.2...v2.45.3) (2022-08-29)
+
+
+### Bug Fixes
+
+* release `patches.json` file ([#402](https://github.com/revanced/revanced-patches/issues/402)) ([17e351c](https://github.com/revanced/revanced-patches/commit/17e351c99a69652f20d89e579f43c1ce110cd81d))
+
 ## [2.45.2](https://github.com/revanced/revanced-patches/compare/v2.45.1...v2.45.2) (2022-08-28)
 
 

README-template.md

@@ -12,16 +12,23 @@ This section explains the JSON format for the [patches.json](patches.json) file.
 
 The file contains an array of objects, each object representing a patch. The object contains the following properties:
 
-| key                           | description                                                                                                      |
+| key                           | description                                                                                                                                                                           |
-|-------------------------------|------------------------------------------------------------------------------------------------------------------|
+|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `name`                        | The name of the patch.                                                                                           |
+| `name`                        | The name of the patch.                                                                                                                                                                |
-| `description`                 | The description of the patch.                                                                                    |
+| `description`                 | The description of the patch.                                                                                                                                                         |
-| `version`                     | The version of the patch.                                                                                        |
+| `version`                     | The version of the patch.                                                                                                                                                             |
-| `excluded`                    | Whether a patch is excluded by default. If `true`, the patch must never be included by default.                  |
+| `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `dependencies`                | An array of dependencies, which are patch names.                                                                 |
+| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
-| `compatiblePackages`          | An array of packages compatible with this patch.                                                                 |
+| `options`                     | An array of options for this patch.                                                                                                                                                   |
-| `compatiblePackages.name`     | The name of the package.                                                                                         |
+| `options.key`                 | The key of the option.                                                                                                                                                                |
-| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible. |
+| `options.title`               | The title of the option.                                                                                                                                                              |
+| `options.description`         | The description of the option.                                                                                                                                                        |
+| `options.required`            | Whether the option is required.                                                                                                                                                       |
+| `options.choices?`            | An array of choices of the option. This may be `null` if this option has no choices. The element type of this array may be any type. It can be a `String`, `Int` or something else.   |
+| `dependencies`                | An array of dependencies, which are patch names.                                                                                                                                      |
+| `compatiblePackages`          | An array of packages compatible with this patch.                                                                                                                                      |
+| `compatiblePackages.name`     | The name of the package.                                                                                                                                                              |
+| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible.                                                                      |
 
 Example:
 
@@ -32,6 +39,8 @@ Example:
     "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
     "version": "0.0.1",
     "excluded": false,
+    "deprecated": false,
+    "options": [],
     "dependencies": [
       "integrations",
       "video-id-hook"
@@ -46,24 +55,67 @@ Example:
           "17.27.39",
           "17.28.34",
           "17.29.34",
-          "17.32.35"
+          "17.32.35",
+          "17.33.42"
         ]
       }
     ]
   },
   {
-    "name": "client-spoof",
+    "name": "theme",
-    "description": "Spoofs the YouTube or Vanced client to prevent playback issues.",
+    "description": "Enables a custom theme.",
     "version": "0.0.1",
     "excluded": false,
-    "dependencies": [],
+    "deprecated": false,
+    "options": [
+      {
+        "key": "theme",
+        "title": "Theme",
+        "description": "Select a theme.",
+        "required": true,
+        "choices": [
+          "Amoled"
+        ]
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
     "compatiblePackages": [
       {
         "name": "com.google.android.youtube",
         "versions": []
+      }
+    ]
+  },
+  {
+    "name": "custom-branding",
+    "description": "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [
+      {
+        "key": "appName",
+        "title": "Application Name",
+        "description": "The name of the application it will show on your home screen.",
+        "required": true,
+        "choices": null
       },
       {
-        "name": "com.vanced.android.youtube",
+        "key": "appIconPath",
+        "title": "Application Icon Path",
+        "description": "A path to the icon of the application.",
+        "required": false,
+        "choices": null
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
         "versions": []
       }
     ]

README.md

@@ -17,6 +17,7 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `premium-icon-reddit` | Unlocking Premium Icons in reddit app. | all |
 | `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
 </details>
 
@@ -33,16 +34,16 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.17.51 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.22.54 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.16.51 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.22.54 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.17.51 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.22.54 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.16.51 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.22.54 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.17.51 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.22.54 |
-| `background-play` | Enables playing music in the background. | 5.17.51 |
+| `background-play` | Enables playing music in the background. | 5.22.54 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.17.51 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.22.54 |
-| `music-video-ads` | Removes ads in the music player. | 5.17.51 |
+| `music-video-ads` | Removes ads in the music player. | 5.22.54 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.17.51 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.22.54 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.17.51 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.22.54 |
 </details>
 
 ### 📦 `de.dwd.warnapp`
@@ -58,6 +59,18 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `tiktok-download` | Remove restrictions on downloads video. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-ads` | Removes ads from TikTok. | all |
+</details>
+
+### 📦 `com.zhiliaoapp.musically`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `tiktok-download` | Remove restrictions on downloads video. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
 </details>
 
@@ -66,36 +79,45 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.32.35 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.33.42 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.32.35 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.33.42 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.32.35 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.33.42 |
-| `amoled` | Enables pure black theme. | 17.32.35 |
+| `amoled` | Enables pure black theme. | all |
-| `disable-create-button` | Hides the create button in the navigation bar. | 17.32.35 |
+| `disable-create-button` | Hides the create button in the navigation bar. | 17.33.42 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.32.35 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.33.42 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.32.35 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.33.42 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.32.35 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.33.42 |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.32.35 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.33.42 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.32.35 |
+| `theme` | Enables a custom theme. | all |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.32.35 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.33.42 |
-| `sponsorblock` | Integrate SponsorBlock. | 17.32.35 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.33.42 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.32.35 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.33.42 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.32.35 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.33.42 |
-| `minimized-playback` | Enables minimized and background playback. | 17.32.35 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.33.42 |
+| `minimized-playback` | Enables minimized and background playback. | 17.33.42 |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.32.35 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.33.42 |
-| `always-autorepeat` | Always repeats the playing video again. | 17.32.35 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.33.42 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.32.35 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.33.42 |
 | `settings` | Adds settings for ReVanced to YouTube. | all |
 | `enable-debugging` | Enables app debugging by patching the manifest file. | all |
-| `custom-playback-speed` | Adds more video playback speed options. | 17.32.35 |
+| `custom-playback-speed` | Adds more video playback speed options. | 17.33.42 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.32.35 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.33.42 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.32.35 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.33.42 |
-| `video-ads` | Removes ads in the video player. | 17.32.35 |
+| `video-ads` | Removes ads in the video player. | 17.33.42 |
-| `general-ads` | Removes general ads. | 17.32.35 |
+| `general-ads` | Removes general ads. | 17.33.42 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.32.35 |
+| `hide-infocard-suggestions` | Hides infocards in videos. | 17.33.42 |
+</details>
+
+### 📦 `com.vanced.android.youtube`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
 </details>
 
 
@@ -106,16 +128,23 @@ This section explains the JSON format for the [patches.json](patches.json) file.
 
 The file contains an array of objects, each object representing a patch. The object contains the following properties:
 
-| key                           | description                                                                                                      |
+| key                           | description                                                                                                                                                                           |
-|-------------------------------|------------------------------------------------------------------------------------------------------------------|
+|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `name`                        | The name of the patch.                                                                                           |
+| `name`                        | The name of the patch.                                                                                                                                                                |
-| `description`                 | The description of the patch.                                                                                    |
+| `description`                 | The description of the patch.                                                                                                                                                         |
-| `version`                     | The version of the patch.                                                                                        |
+| `version`                     | The version of the patch.                                                                                                                                                             |
-| `excluded`                    | Whether a patch is excluded by default. If `true`, the patch must never be included by default.                  |
+| `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `dependencies`                | An array of dependencies, which are patch names.                                                                 |
+| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
-| `compatiblePackages`          | An array of packages compatible with this patch.                                                                 |
+| `options`                     | An array of options for this patch.                                                                                                                                                   |
-| `compatiblePackages.name`     | The name of the package.                                                                                         |
+| `options.key`                 | The key of the option.                                                                                                                                                                |
-| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible. |
+| `options.title`               | The title of the option.                                                                                                                                                              |
+| `options.description`         | The description of the option.                                                                                                                                                        |
+| `options.required`            | Whether the option is required.                                                                                                                                                       |
+| `options.choices?`            | An array of choices of the option. This may be `null` if this option has no choices. The element type of this array may be any type. It can be a `String`, `Int` or something else.   |
+| `dependencies`                | An array of dependencies, which are patch names.                                                                                                                                      |
+| `compatiblePackages`          | An array of packages compatible with this patch.                                                                                                                                      |
+| `compatiblePackages.name`     | The name of the package.                                                                                                                                                              |
+| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible.                                                                      |
 
 Example:
 
@@ -126,6 +155,8 @@ Example:
     "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
     "version": "0.0.1",
     "excluded": false,
+    "deprecated": false,
+    "options": [],
     "dependencies": [
       "integrations",
       "video-id-hook"
@@ -140,24 +171,67 @@ Example:
           "17.27.39",
           "17.28.34",
           "17.29.34",
-          "17.32.35"
+          "17.32.35",
+          "17.33.42"
         ]
       }
     ]
   },
   {
-    "name": "client-spoof",
+    "name": "theme",
-    "description": "Spoofs the YouTube or Vanced client to prevent playback issues.",
+    "description": "Enables a custom theme.",
     "version": "0.0.1",
     "excluded": false,
-    "dependencies": [],
+    "deprecated": false,
+    "options": [
+      {
+        "key": "theme",
+        "title": "Theme",
+        "description": "Select a theme.",
+        "required": true,
+        "choices": [
+          "Amoled"
+        ]
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
     "compatiblePackages": [
       {
         "name": "com.google.android.youtube",
         "versions": []
+      }
+    ]
+  },
+  {
+    "name": "custom-branding",
+    "description": "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
+    "version": "0.0.1",
+    "excluded": false,
+    "deprecated": false,
+    "options": [
+      {
+        "key": "appName",
+        "title": "Application Name",
+        "description": "The name of the application it will show on your home screen.",
+        "required": true,
+        "choices": null
       },
       {
-        "name": "com.vanced.android.youtube",
+        "key": "appIconPath",
+        "title": "Application Icon Path",
+        "description": "A path to the icon of the application.",
+        "required": false,
+        "choices": null
+      }
+    ],
+    "dependencies": [
+      "locale-config-fix"
+    ],
+    "compatiblePackages": [
+      {
+        "name": "com.google.android.youtube",
         "versions": []
       }
     ]

build.gradle.kts

@@ -20,9 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
+    implementation("app.revanced:revanced-patcher:4.2.3")
-
-    implementation("app.revanced:revanced-patcher:3.3.3")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
 
     // Required for meta

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.45.2
+version = 2.52.3

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

@@ -3,14 +3,17 @@ package app.revanced.meta.json
 import app.revanced.meta.Bundle
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.extensions.PatchExtensions.dependencies
+import app.revanced.patcher.extensions.PatchExtensions.deprecated
 import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.include
+import app.revanced.patcher.extensions.PatchExtensions.options
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.extensions.PatchExtensions.version
-import com.google.gson.Gson
+import app.revanced.patcher.patch.PatchOption
+import com.google.gson.GsonBuilder
 import java.io.File
 
-private val gson = Gson()
+private val gson = GsonBuilder().serializeNulls().create()
 
 fun generateJson(bundle: Bundle) {
     val patches = bundle.map {
@@ -19,6 +22,20 @@ fun generateJson(bundle: Bundle) {
             it.description ?: "This patch has no description.",
             it.version ?: "0.0.0",
             !it.include,
+            it.deprecated != null,
+            it.options?.map { option ->
+                Option(
+                    option.key,
+                    option.title,
+                    option.description,
+                    option.required,
+                    option.let { lo ->
+                        if (lo is PatchOption.ListOption<*>) {
+                            lo.options.toMutableList().toTypedArray()
+                        } else null
+                    }
+                )
+            }?.toTypedArray() ?: emptyArray(),
             it.dependencies?.map { dep ->
                 dep.java.patchName
             }?.toTypedArray() ?: emptyArray(),

src/main/kotlin/app/revanced/meta/json/JsonPatch.kt

@@ -7,6 +7,8 @@ data class JsonPatch(
     val description: String,
     val version: String,
     val excluded: Boolean,
+    val deprecated: Boolean,
+    val options: Array<Option>,
     val dependencies: Array<String>,
     val compatiblePackages: Array<CompatiblePackage>,
 )
@@ -14,4 +16,12 @@ data class JsonPatch(
 data class CompatiblePackage(
     val name: String,
     val versions: Array<String>,
+)
+
+data class Option(
+    val key: String,
+    val title: String,
+    val description: String,
+    val required: Boolean,
+    val choices: Array<*>?,
 )

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

@@ -17,13 +17,11 @@ fun generateText(bundle: Bundle) {
     val output = StringBuilder()
     val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()
 
-    bundle.map {
+    for (patch in bundle) {
-        val packageName = it.compatiblePackages?.first()?.name!!
+        patch.compatiblePackages?.forEach { pkg ->
-        if (!packages.contains(packageName)) {
+            if (!packages.contains(pkg.name)) packages[pkg.name] = mutableListOf()
-            packages[packageName] = mutableListOf()
+            packages[pkg.name]!!.add(patch)
         }
-
-        packages[packageName]?.add(it)
     }
 
     for (pkg in packages) {

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

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

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

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

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

@@ -3,9 +3,9 @@ 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.fingerprint.method.impl.MethodFingerprint
 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.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -19,7 +19,7 @@ import org.jf.dexlib2.Opcode
 @CodecsUnlockCompatibility
 @Version("0.0.1")
 object CodecsLockFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
         Opcode.INVOKE_DIRECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
@@ -35,5 +35,5 @@ object CodecsLockFingerprint : MethodFingerprint(
         Opcode.INVOKE_DIRECT,
         Opcode.RETURN_OBJECT
     ),
-    listOf("eac3_supported")
+    strings = listOf("eac3_supported")
 )

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

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

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

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

src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt

@@ -31,8 +31,8 @@ class CompactHeaderPatch : BytecodePatch(
         val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
         method.addInstructions(
             insertIndex, """
-                const/16 v0, 0x8
+                const/16 v2, 0x8
-                invoke-virtual {v${register}, v0}, Landroid/view/View;->setVisibility(I)V
+                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
             """
         )
 

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

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

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

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

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

@@ -10,7 +10,7 @@ import app.revanced.patcher.annotation.Package
  */
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
 @RemoveTasteBuilderCompatibility
 @Version("0.0.1")
 object TasteBuilderConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L"), listOf(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.NEW_INSTANCE,
@@ -35,9 +35,9 @@ object TasteBuilderConstructorFingerprint : MethodFingerprint(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT,
         Opcode.NEW_INSTANCE,
         Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST
     )
 )

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

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

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

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

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt

@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MicroGPatchCompatibility
 
 @Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(
-    null, null, null, null,
+    strings = listOf("Error fetching CastContext.")
-    listOf("Error fetching CastContext.")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MicroGPatchCompatibility
 
 @Name("cast-module-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(
-    null, null, null, null,
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )

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

@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MicroGPatchCompatibility
 
 @Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    null, null, null, null,
+    strings = listOf("Failed to load module via V2: ")
-    listOf("Failed to load module via V2: ")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt

@@ -3,9 +3,9 @@ package app.revanced.patches.music.misc.microg.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.DirectPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags
 
@@ -17,5 +17,14 @@ import org.jf.dexlib2.AccessFlags
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(
-    "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("This should never happen.", "MetadataValueReader", "GooglePlayServicesUtil", "com.android.vending", "android.hardware.type.embedded")
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf(
+        "This should never happen.",
+        "MetadataValueReader",
+        "GooglePlayServicesUtil",
+        "com.android.vending",
+        "android.hardware.type.embedded"
+    )
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt

@@ -2,9 +2,9 @@ package app.revanced.patches.music.misc.microg.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 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.misc.microg.annotations.MusicMicroGPatchCompatibility
 
 @Name("google-play-prime-fingerprint")
@@ -15,5 +15,5 @@ import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompat
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending")
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt

@@ -3,9 +3,9 @@ package app.revanced.patches.music.misc.microg.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags
 
@@ -17,5 +17,8 @@ import org.jf.dexlib2.AccessFlags
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("Google Play Services not available")
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf("Google Play Services not available")
 )

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

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

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt

@@ -3,11 +3,7 @@ package app.revanced.patches.reddit.ad.general.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.reddit.frontpage")])
-    [Package(
-        "com.reddit.frontpage", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.reddit.layout.premiumicon.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.reddit.frontpage")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PremiumIconCompatibility

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.reddit.layout.premiumicon.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
+
+@Name("premium-icon-fingerprint")
+@MatchingMethod(
+    "Lcom/reddit/domain/model/MyAccount;", "isPremiumSubscriber"
+)
+@PremiumIconCompatibility
+@Version("0.0.1")
+object PremiumIconFingerprint : MethodFingerprint(
+    "Z",
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber"
+    }
+)

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt

@@ -0,0 +1,36 @@
+package app.revanced.patches.reddit.layout.premiumicon.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.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
+import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
+
+@Patch
+@Name("premium-icon-reddit")
+@Description("Unlocking Premium Icons in reddit app.")
+@PremiumIconCompatibility
+@Version("0.0.1")
+class PremiumIconPatch : BytecodePatch(
+    listOf(
+        PremiumIconFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = PremiumIconFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt

@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [
-        Package("com.ss.android.ugc.trill", arrayOf()),
+        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically", arrayOf())
+        Package("com.zhiliaoapp.musically")
     ]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.ad.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
+
+@Name("convert-help-v2-feeditemlist-fingerprint")
+@MatchingMethod(
+    "Lbeancopy/ConvertHelp;",
+    "com${'$'}ss${'$'}ugc${'$'}aweme${'$'}proto${'$'}aweme_v2_feed_response${'$'}${'$'}com${'$'}ss${'$'}android${'$'}ugc${'$'}aweme${'$'}feed${'$'}model${'$'}FeedItemList",
+)
+@TiktokAdsCompatibility
+@Version("0.0.1")
+object ConvertHelpFeedItemListFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ConvertHelp;") &&
+                methodDef.name.endsWith("${'$'}FeedItemList")
+    }
+)

src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt

@@ -14,7 +14,7 @@ import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
 @TiktokAdsCompatibility
 @Version("0.0.1")
 object FeedItemListCloneFingerprint : MethodFingerprint(
-    null, null, null, null,null, { methodDef ->
+    customFingerprint = { methodDef ->
         methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone"
     }
 )

src/main/kotlin/app/revanced/patches/tiktok/ad/patch/TiktokAdsPatch.kt

@@ -11,6 +11,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
+import app.revanced.patches.tiktok.ad.fingerprints.ConvertHelpFeedItemListFingerprint
 import app.revanced.patches.tiktok.ad.fingerprints.FeedItemListCloneFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -23,26 +24,34 @@ import org.jf.dexlib2.iface.reference.FieldReference
 @TiktokAdsCompatibility
 @Version("0.0.1")
 class TiktokAdsPatch : BytecodePatch(
-    listOf(FeedItemListCloneFingerprint)
+    listOf(
+        FeedItemListCloneFingerprint,
+        ConvertHelpFeedItemListFingerprint
+    )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val method = FeedItemListCloneFingerprint.result!!.mutableMethod
+        listOf(
-        // iterate all instructions in the clone method
+            FeedItemListCloneFingerprint,
-        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+            ConvertHelpFeedItemListFingerprint
-            // conditions for the instruction we need
+        ).forEach { fingerprint ->
-            if (instruction.opcode.ordinal != Opcode.IPUT_OBJECT.ordinal) continue
+            val method = fingerprint.result!!.mutableMethod
-            val clonePreloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
+            // iterate all instructions in the clone method
-            if ((clonePreloadAdsFieldInstruction?.reference as? FieldReference)?.name != "preloadAds") continue
+            for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+                // conditions for the instruction we need
+                if (instruction.opcode.ordinal != Opcode.IPUT_OBJECT.ordinal) continue
+                val preloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
+                if ((preloadAdsFieldInstruction?.reference as? FieldReference)?.name != "preloadAds") continue
 
-            // set null instead of the field "preloadAds"
+                // set null instead of the field "preloadAds"
-            val overrideRegister = (clonePreloadAdsFieldInstruction as TwoRegisterInstruction).registerA
+                val overrideRegister = (preloadAdsFieldInstruction as TwoRegisterInstruction).registerA
-            method.addInstruction(
+                method.addInstruction(
-                index,
+                    index,
-                "const/4 v$overrideRegister, 0x0"
+                    "const/4 v$overrideRegister, 0x0"
-            )
+                )
-            return PatchResultSuccess()
+                return@forEach
+            }
+            return PatchResultError("Can not find required instruction.")
         }
-
+        return PatchResultSuccess()
-        return PatchResultError("Could not find required instruction.")
     }
 }

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

@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.downloads.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DownloadsCompatibility

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

@@ -0,0 +1,22 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("acl-common-share-get-code")
+@MatchingMethod("ACLCommonShare", "getCode")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getCode"
+    }
+)

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

@@ -0,0 +1,22 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("acl-common-share-get-show-type")
+@MatchingMethod("ACLCommonShare", "getShowType")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint2 : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getShowType"
+    }
+)

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

@@ -0,0 +1,22 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("acl-common-share-get-transcode")
+@MatchingMethod("ACLCommonShare", "getTranscode")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint3 : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getTranscode"
+    }
+)

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

@@ -0,0 +1,56 @@
+package app.revanced.patches.tiktok.interaction.downloads.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.replaceInstructions
+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.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.*
+
+@Patch
+@Name("tiktok-download")
+@Description("Remove restrictions on downloads video.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsPatch : BytecodePatch(
+    listOf(
+        ACLCommonShareFingerprint,
+        ACLCommonShareFingerprint2,
+        ACLCommonShareFingerprint3
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method1 = ACLCommonShareFingerprint.result!!.mutableMethod
+        method1.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x0
+                return v0
+            """
+        )
+        val method2 = ACLCommonShareFingerprint2.result!!.mutableMethod
+        method2.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x2
+                return v0
+            """
+        )
+        //Download videos without watermark.
+        val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
+        method3.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+
+}

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.seekbar.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SeekbarCompatibility

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.tiktok.interaction.seekbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("aweme-get-video-control")
+@MatchingMethod("Aweme", "getVideoControl")
+@SeekbarCompatibility
+@Version("0.0.1")
+object AwemeGetVideoControlFingerprint : MethodFingerprint(
+    "L",
+    AccessFlags.PUBLIC.value,
+   customFingerprint = { methodDef ->
+       methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl"
+   }
+)

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/TiktokSeekbarPatch.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.tiktok.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.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.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
+import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.*
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
+
+@Patch
+@Name("tiktok-seekbar")
+@Description("Show progress bar for all video.")
+@SeekbarCompatibility
+@Version("0.0.1")
+class TiktokSeekbarPatch : BytecodePatch(
+    listOf(
+        AwemeGetVideoControlFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        //Get VideoControl FieldReference
+        val videoControl = data.findClass { it.type.endsWith("/VideoControl;") }
+            ?: return PatchResultError("Can not find target class")
+        val fieldList = videoControl.immutableClass.fields.associateBy { field -> field.name }
+
+        val method = AwemeGetVideoControlFingerprint.result!!.mutableMethod
+        val implementation = method.implementation!!
+        implementation.addInstructions(
+            1, listOf(
+                BuilderInstruction11n(Opcode.CONST_4, 1, 1),
+                BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["showProgressBar"]!!),
+                BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["draftProgressBar"]!!)
+            )
+        )
+        return PatchResultSuccess()
+    }
+
+}

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt

@@ -3,11 +3,7 @@ package app.revanced.patches.twitter.ad.timeline.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.twitter.android")])
-    [Package(
-        "com.twitter.android", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class TimelineAdsCompatibility

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt

@@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode
 @TimelineAdsCompatibility
 @Version("0.0.1")
 object TimelineTweetJsonParserFingerprint : MethodFingerprint(
-    null, null, null, listOf(
+    opcodes = listOf(
         Opcode.IPUT_OBJECT,
         Opcode.GOTO,
         Opcode.SGET_OBJECT,
@@ -21,6 +21,6 @@ object TimelineTweetJsonParserFingerprint : MethodFingerprint(
         Opcode.CHECK_CAST,
         Opcode.IPUT_OBJECT,
         Opcode.RETURN_VOID,
-    ), listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
+    ), strings = listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
-    { methodDef -> methodDef.name == "parseField" }
+    customFingerprint = { methodDef -> methodDef.name == "parseField" }
 )

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt

@@ -3,11 +3,7 @@ package app.revanced.patches.warnwetter.misc.firebasegetcert.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("de.dwd.warnapp")])
-    [Package(
-        "de.dwd.warnapp", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class FirebaseGetCertPatchCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt

@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
 @Version("0.0.1")
 object GetMessagingCertFingerprint : MethodFingerprint(
     "Ljava/lang/String;",
-    null,
+    strings = listOf(
-    null,
-    null,
-    listOf(
         "ContentValues",
         "Could not get fingerprint hash for package: ",
         "No such package: "

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt

@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
 @Version("0.0.1")
 object GetReqistrationCertFingerprint : MethodFingerprint(
     "Ljava/lang/String;",
-    null,
+    strings = listOf(
-    null,
-    null,
-    listOf(
         "FirebaseRemoteConfig",
         "Could not get fingerprint hash for package: ",
         "No such package: "

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt

@@ -3,11 +3,7 @@ package app.revanced.patches.warnwetter.misc.promocode.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("de.dwd.warnapp")])
-    [Package(
-        "de.dwd.warnapp", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class PromoCodeUnlockCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt

@@ -2,8 +2,8 @@ package app.revanced.patches.warnwetter.misc.promocode.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
 
 @Name("promo-code-unlock-fingerprint")
@@ -13,12 +13,7 @@ import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnloc
 @PromoCodeUnlockCompatibility
 @Version("0.0.1")
 object PromoCodeUnlockFingerprint : MethodFingerprint(
-    null,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
     }
 )

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

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

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

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

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

@@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags
 object HideInfocardSuggestionsFingerprint : MethodFingerprint(
     "Ljava/lang/Boolean;",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
+    strings = listOf("vibrator")
-    null,
-    listOf("vibrator"),
-    null
 )

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

@@ -3,9 +3,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
 import org.jf.dexlib2.AccessFlags
 
@@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags
 object HideInfocardSuggestionsParentFingerprint : MethodFingerprint(
     "Ljava/lang/String;",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf(),
+    strings = listOf("player_overlay_info_card_teaser"),
-    null,
-    listOf("player_overlay_info_card_teaser"),
-    null
 )

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

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

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

@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
 @VideoAdsCompatibility
 @Version("0.0.1")
 object ShowVideoAdsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z")
 )

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

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

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

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

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

@@ -84,6 +84,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct register")
         val register = (instruction as Instruction35c).registerC
 
+        val elseLabel = implementation.newLabelForIndex(result.patternScanResult!!.endIndex + 1)
         // the instructions are written in reverse order.
         result.mutableMethod.addInstructions(
             result.patternScanResult!!.endIndex + 1, """
@@ -93,7 +94,6 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         )
 
         // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
-        val elseLabel = implementation.newLabelForIndex(result.patternScanResult!!.endIndex + 1)
         implementation.addInstruction(
             result.patternScanResult!!.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
         )

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

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

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt

@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
 @SwipeControlsCompatibility
 @Version("0.0.1")
 object SwipeControlsHostActivityFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
         methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;" && methodDef.name == "<init>"
     }
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt

@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
 @SwipeControlsCompatibility
 @Version("0.0.1")
 object WatchWhileActivityFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
         methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "<init>"
     }
 )

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt

@@ -92,8 +92,6 @@ class SwipeControlsResourcePatch : ResourcePatch() {
             )
         )
 
-        val resourcesDir = "swipecontrols"
-
         data.copyResources(
             "swipecontrols",
             ResourceUtils.ResourceGroup(

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

@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.amoled.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class AmoledCompatibility

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

@@ -2,17 +2,16 @@ 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.PatchDeprecated
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.layout.amoled.annotations.AmoledCompatibility
+import app.revanced.patches.youtube.layout.theme.patch.ThemePatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
-import org.w3c.dom.Element
-import java.io.File
 
 @Patch
 @DependsOn([FixLocaleConfigErrorPatch::class])
@@ -20,24 +19,10 @@ import java.io.File
 @Description("Enables pure black theme.")
 @AmoledCompatibility
 @Version("0.0.1")
+@PatchDeprecated("Theme patch already includes the Amoled theme.", ThemePatch::class)
 class AmoledPatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
-        data.xmlEditor["res${File.separator}values${File.separator}colors.xml"].use { editor ->
+        ThemePatch.theme = ThemePatch.Themes.Amoled.name
-            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+        return ThemePatch().execute(data)
-
-            for (i in 0 until resourcesNode.childNodes.length) {
-                val node = resourcesNode.childNodes.item(i)
-                if (node !is Element) continue
-
-                val element = resourcesNode.childNodes.item(i) as Element
-                element.textContent = when (element.getAttribute("name")) {
-                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4", "yt_status_bar_background_dark" -> "@android:color/black"
-                    "yt_selected_nav_label_dark" -> "#ffdf0000"
-                    else -> continue
-                }
-            }
-        }
-
-        return PatchResultSuccess()
     }
 }

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

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

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

@@ -3,7 +3,6 @@ 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
@@ -19,8 +18,7 @@ import org.jf.dexlib2.Opcode
 object AutoNavInformerFingerprint : MethodFingerprint(
     "Z",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
+    opcodes = listOf(
-    listOf(
         Opcode.IGET_OBJECT,
         Opcode.INVOKE_INTERFACE,
         Opcode.MOVE_RESULT_OBJECT,
@@ -28,6 +26,5 @@ object AutoNavInformerFingerprint : MethodFingerprint(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
     ),
-    null,
+    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
-    { it.definingClass.endsWith("WillAutonavInformer;") }
 )

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

@@ -13,8 +13,8 @@ import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayBu
 @AutoplayButtonCompatibility
 @Version("0.0.1")
 object LayoutConstructorFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("1.0x"),
+    strings = listOf("1.0x"),
-    { methodDef ->
+    customFingerprint = { methodDef ->
         methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
     }
 )

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

@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.header.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.google.android.youtube")])
-    [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/icon/annotations/CustomBrandingCompatibility.kt

@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.icon.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility(
+@Compatibility([Package("com.google.android.youtube")])
-    [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

@@ -10,7 +10,6 @@ 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.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -42,27 +41,18 @@ class CustomBrandingPatch : ResourcePatch() {
             "hdpi" to 72,
             "mdpi" to 48
         ).forEach { (iconDirectory, size) ->
-            iconNames.forEach iconLoop@{ iconName ->
+            iconNames.forEach { iconName ->
                 val iconFile = getIconStream("branding/$size/$iconName.png")
                     ?: return PatchResultError("The icon $iconName can not be found.")
 
-                val outputStream = ByteArrayOutputStream()
-                iconFile.use { input ->
-                    outputStream.use { output ->
-                        input.copyTo(output)
-                    }
-                }
-
                 Files.write(
                     resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(),
-                    outputStream.toByteArray()
+                    iconFile.readBytes()
                 )
             }
         }
 
         // Name branding
-        val appName: String by options[keyAppName]
-
         val manifest = data["AndroidManifest.xml"]
         manifest.writeText(
             manifest.readText()
@@ -75,24 +65,7 @@ class CustomBrandingPatch : ResourcePatch() {
         return PatchResultSuccess()
     }
 
-    override val options = PatchOptions(
-        PatchOption.StringOption(
-            key = keyAppName,
-            default = "YouTube ReVanced",
-            title = "Application Name",
-            description = "The name of the application it will show on your home screen.",
-            required = true
-        ),
-        PatchOption.StringOption(
-            key = keyAppIconPath,
-            default = null,
-            title = "Application Icon Path",
-            description = "A path to the icon of the application."
-        )
-    )
-
     private fun getIconStream(iconPath: String): InputStream? {
-        val appIconPath: String? by options[keyAppIconPath]
         if (appIconPath == null) {
             return this.javaClass.classLoader.getResourceAsStream(iconPath)
         }
@@ -101,8 +74,24 @@ class CustomBrandingPatch : ResourcePatch() {
         return FileInputStream(file)
     }
 
-    private companion object {
+    companion object : OptionsContainer() {
-        private const val keyAppName = "appName"
+        private var appName: String? by option(
-        private const val keyAppIconPath = "appIconPath"
+            PatchOption.StringOption(
+                key = "appName",
+                default = "YouTube ReVanced",
+                title = "Application Name",
+                description = "The name of the application it will show on your home screen.",
+                required = true
+            )
+        )
+
+        private var appIconPath: String? by option(
+            PatchOption.StringOption(
+                key = "appIconPath",
+                default = null,
+                title = "Application Icon Path",
+                description = "A path to the icon of the application."
+            )
+        )
     }
 }

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

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

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", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

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

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

@@ -16,10 +16,7 @@ import org.jf.dexlib2.Opcode
 @ShortsButtonCompatibility
 @Version("0.0.1")
 object FullscreenViewAdderFingerprint : MethodFingerprint(
-    null,
+    opcodes = listOf(
-    null,
-    null,
-    listOf(
         Opcode.IGET_BOOLEAN
     )
 )

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

@@ -16,10 +16,8 @@ import org.jf.dexlib2.Opcode
 @ShortsButtonCompatibility
 @Version("0.0.1")
 object FullscreenViewAdderParentFingerprint : MethodFingerprint(
-    null,
+    parameters = listOf("L", "L"),
-    null,
+    opcodes = listOf(
-    listOf("L", "L"),
-    listOf(
         Opcode.GOTO,
         Opcode.IGET_BOOLEAN,
         Opcode.IF_EQ,
@@ -27,6 +25,5 @@ object FullscreenViewAdderParentFingerprint : MethodFingerprint(
         Opcode.CONST_4,
         Opcode.INVOKE_VIRTUAL,
     ),
-    null,
+    customFingerprint = { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
-    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
 )

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

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

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

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

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

@@ -3,9 +3,9 @@ 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.fingerprint.method.impl.MethodFingerprint
 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.reels.annotations.HideReelsCompatibility
 import org.jf.dexlib2.AccessFlags
 
@@ -17,6 +17,6 @@ import org.jf.dexlib2.AccessFlags
 @HideReelsCompatibility
 @Version("0.0.1")
 object HideReelsFingerprint : MethodFingerprint(
-    null, AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L", "L"), null,
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL, parameters = listOf("L", "L"),
-    listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
+    strings = listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
 )

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

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

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt

@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object DislikeFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
+    strings = listOf("like/dislike")
-    null,
-    listOf("like/dislike")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt

@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object LikeFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
+     strings = listOf("like/like")
-    null,
-    listOf("like/like")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt

@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object RemoveLikeFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
+    strings = listOf("like/removelike")
-    null,
-    listOf("like/removelike")
 )

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt

@@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.Retu
 @ReturnYouTubeDislikeCompatibility
 @Version("0.0.1")
 object TextComponentSpecParentFingerprint : MethodFingerprint(
-    null,
+    strings = listOf("TextComponentSpec: No converter for extension: ")
-    null,
-    null,
-    null,
-    listOf("TextComponentSpec: No converter for extension: ")
 )

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", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35", "17.33.42")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -60,12 +60,12 @@ class ShortsButtonRemoverPatch : BytecodePatch(
         val buttonsViewImplementation = buttonsViewResult.mutableMethod.implementation!!
         val scanResultStartIndex = buttonsViewResult.patternScanResult!!.startIndex
         val buttonsViewIndex = scanResultStartIndex +
-                if (buttonsViewImplementation.instructions[scanResultStartIndex - 1].opcode == Opcode.IF_NEZ) {
+                if (buttonsViewImplementation.instructions[scanResultStartIndex - 1].opcode == Opcode.GOTO) {
+                    // since 17.32.xx
+                    -7
+                } else {
                     // for 17.31.xx and lower
                     -3
-                } else {
-                    // since 17.32.xx
-                    -6
                 }
         val moveViewInstruction = buttonsViewImplementation.instructions[buttonsViewIndex - 1]
         val viewRegister = (moveViewInstruction as OneRegisterInstruction).registerA
@@ -86,4 +86,4 @@ class ShortsButtonRemoverPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
-}
+}

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

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

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

@@ -15,7 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint(
-    "V", null, null,
+    "V",
-    null,
+    strings = listOf("timed_markers_width")
-    listOf("timed_markers_width")
 )

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

@@ -17,8 +17,5 @@ import org.jf.dexlib2.util.MethodUtil
 @Version("0.0.1")
 object NextGenWatchLayoutFingerprint : MethodFingerprint(
     "V", // constructors return void, in favour of speed of matching, this fingerprint has been added
-    null,
-    null,
-    null,
     customFingerprint =  { methodDef -> MethodUtil.isConstructor(methodDef) && methodDef.parameterTypes.size == 3 && methodDef.definingClass.endsWith("NextGenWatchLayout;") }
 )

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

@@ -16,7 +16,6 @@ import org.jf.dexlib2.Opcode
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(
-    null, null, null,
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
-    listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
+    strings = listOf("Media progress reported outside media playback: ")
-    listOf("Media progress reported outside media playback: ")
 )

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

@@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object PlayerInitFingerprint : MethodFingerprint(
-    null, null, null,
-    null,
     strings = listOf(
         "playVideo called on player response with no videoStreamingData."
     ),

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

@@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object PlayerOverlaysLayoutInitFingerprint : MethodFingerprint(
-    null, null, null,
+
-    null,
+    customFingerprint = { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
-    null,
-    { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
 )

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

@@ -18,11 +18,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
 @Version("0.0.1")
 object RectangleFieldInvalidatorFingerprint : MethodFingerprint(
     "V",
-    null,
+    customFingerprint = custom@{ methodDef ->
-    null,
-    null,
-    null,
-    custom@{ methodDef ->
         val instructions = methodDef.implementation?.instructions!!
         val instructionCount = instructions.count()
 

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

@@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object SeekFingerprint : MethodFingerprint(
-    null,
+    strings = listOf("Attempting to seek during an ad")
-    null,
-    null,
-    null,
-    listOf("Attempting to seek during an ad")
 )

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

@@ -16,8 +16,7 @@ import org.jf.dexlib2.Opcode
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object VideoLengthFingerprint : MethodFingerprint(
-    null, null, null,
+    opcodes = listOf(
-    listOf(
         Opcode.MOVE_RESULT_WIDE,
         Opcode.CMP_LONG,
         Opcode.IF_LEZ,

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

@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
 @SponsorBlockCompatibility
 @Version("0.0.1")
 object VideoTimeFingerprint : MethodFingerprint(
-    null, null, null, null,
+    strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
-    listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
 )