chore(release): 2.121.0 [skip ci]

# [2.121.0](https://github.com/revanced/revanced-patches/compare/v2.120.0...v2.121.0) (2022-11-23) ### Features * **anytracker:** remove `unlock-premium` patch ([#1094](https://github.com/revanced/revanced-patches/issues/1094)) ([7f9fb09](700ca5b543))
feat(anytracker): remove unlock-premium patch (#1094 )
2026-01-17 00:03:57 +00:00 · 2022-11-23 16:21:42 +00:00 · 2022-11-23 17:19:48 +01:00 · 2022-11-23 06:36:16 +00:00 · 2022-11-23 07:34:39 +01:00 · 2022-11-23 06:32:04 +00:00
240 changed files with 904 additions and 1292 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,98 @@
+# [2.121.0](https://github.com/revanced/revanced-patches/compare/v2.120.0...v2.121.0) (2022-11-23)
+
+
+### Features
+
+* **anytracker:** remove `unlock-premium` patch ([#1094](https://github.com/revanced/revanced-patches/issues/1094)) ([c3818be](https://github.com/revanced/revanced-patches/commit/c3818befc6e342ff04bc8e9fde84a667c123d7ab))
+
+# [2.120.0](https://github.com/revanced/revanced-patches/compare/v2.119.0...v2.120.0) (2022-11-23)
+
+
+### Features
+
+* **youtube:** `remove-player-button-background` patch ([#855](https://github.com/revanced/revanced-patches/issues/855)) ([9e14817](https://github.com/revanced/revanced-patches/commit/9e14817fd2ef29b9f3ec161d74ab972ba19066b0))
+
+# [2.119.0](https://github.com/revanced/revanced-patches/compare/v2.118.1...v2.119.0) (2022-11-23)
+
+
+### Features
+
+* **twitch:** ˋintegrationsˋ  dependency patch ([#1074](https://github.com/revanced/revanced-patches/issues/1074)) ([a84ca7e](https://github.com/revanced/revanced-patches/commit/a84ca7ec04389c3665358a7d239c615214fd327d))
+
+## [2.118.1](https://github.com/revanced/revanced-patches/compare/v2.118.0...v2.118.1) (2022-11-22)
+
+# [2.118.0](https://github.com/revanced/revanced-patches/compare/v2.117.1...v2.118.0) (2022-11-22)
+
+
+### Features
+
+* **youtube:** bump patches compatibility to v17.45.36 ([ab7dfd8](https://github.com/revanced/revanced-patches/commit/ab7dfd8ee1d902095811ed91b80aa0ed362ee9c5))
+
+## [2.117.1](https://github.com/revanced/revanced-patches/compare/v2.117.0...v2.117.1) (2022-11-22)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** hide reels shelf ([a436663](https://github.com/revanced/revanced-patches/commit/a436663e7755fc714c735df626d39bbd94f83dbb))
+
+# [2.117.0](https://github.com/revanced/revanced-patches/compare/v2.116.0...v2.117.0) (2022-11-21)
+
+
+### Features
+
+* **tiktok:** `tiktok-web-login` patch ([#593](https://github.com/revanced/revanced-patches/issues/593)) ([233e578](https://github.com/revanced/revanced-patches/commit/233e578b4d1cd5e783369e0c855e8246d158f8ed))
+
+# [2.116.0](https://github.com/revanced/revanced-patches/compare/v2.115.0...v2.116.0) (2022-11-21)
+
+
+### Features
+
+* **youtube/theme:** make amoled the default color for dark theme background" ([2b68ac7](https://github.com/revanced/revanced-patches/commit/2b68ac7796e54ed07c697909a84b3847f4ed7f01))
+
+# [2.115.0](https://github.com/revanced/revanced-patches/compare/v2.114.2...v2.115.0) (2022-11-21)
+
+
+### Features
+
+* **youtube/general-ads:** normalize switch names ([7636180](https://github.com/revanced/revanced-patches/commit/763618002ab6ccd9cd23889275c0e9b23642763e))
+* **youtube/theme:** exclude the patch by default ([57358ed](https://github.com/revanced/revanced-patches/commit/57358edc4cf3ae6b05cfb51359f66fc94c71cb5c))
+* **youtube/theme:** make dark the default color for dark theme background ([db44fa6](https://github.com/revanced/revanced-patches/commit/db44fa6f5adad19384970dad58784b2bf5fe1007))
+
+## [2.114.2](https://github.com/revanced/revanced-patches/compare/v2.114.1...v2.114.2) (2022-11-20)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** hide bytecode home ad view ([4976ad4](https://github.com/revanced/revanced-patches/commit/4976ad44b1867c93e976d91075b5bcead8d69c90))
+* **youtube/general-ads:** remove unused switch ([43cddcc](https://github.com/revanced/revanced-patches/commit/43cddcc85830524cd88d87ae1178f11451f158d8))
+
+## [2.114.1](https://github.com/revanced/revanced-patches/compare/v2.114.0...v2.114.1) (2022-11-20)
+
+
+### Bug Fixes
+
+* **tiktok/settings:** make compatible with newer versions ([#1057](https://github.com/revanced/revanced-patches/issues/1057)) ([e1d5d64](https://github.com/revanced/revanced-patches/commit/e1d5d6492ed660f43c87c796a59e766ea6b8ead0))
+
+# [2.114.0](https://github.com/revanced/revanced-patches/compare/v2.113.0...v2.114.0) (2022-11-20)
+
+
+### Features
+
+* **youtube:** `disable-zoom-haptics` patch ([#1079](https://github.com/revanced/revanced-patches/issues/1079)) ([a7cfba5](https://github.com/revanced/revanced-patches/commit/a7cfba54fbb3ee0ee5511a45d0b3c4620eb0c861))
+
+# [2.113.0](https://github.com/revanced/revanced-patches/compare/v2.112.0...v2.113.0) (2022-11-19)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** hide ads with buttons ([97fd3fd](https://github.com/revanced/revanced-patches/commit/97fd3fda79ff4bb2fadd0e6c4aa80b96d71f46da))
+
+
+### Features
+
+* **youtube/general-ads:** custom component filter ([b5e81d0](https://github.com/revanced/revanced-patches/commit/b5e81d0eaff3ab67a59ccd45eac6bf9414ed1380))
+* **youtube/general-ads:** hide gray separators ([59693f0](https://github.com/revanced/revanced-patches/commit/59693f007192c195258cea3a222d7fb94b6385c2))
+
 # [2.112.0](https://github.com/revanced/revanced-patches/compare/v2.111.3...v2.112.0) (2022-11-19)


--- a/README-template.md
+++ b/README-template.md
@@ -18,7 +18,6 @@ The file contains an array of objects, each object representing a patch. The obj
 | `description`                 | The description of the patch.                                                                                                                                                         |
 | `version`                     | The version of the patch.                                                                                                                                                             |
 | `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
 | `options`                     | An array of options for this patch.                                                                                                                                                   |
 | `options.key`                 | The key of the option.                                                                                                                                                                |
 | `options.title`               | The title of the option.                                                                                                                                                              |
@@ -39,7 +38,6 @@ 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",
--- a/README.md
+++ b/README.md
@@ -21,8 +21,9 @@ The official Patch bundle provided by ReVanced and the community.
 | `tiktok-speed` | Enables the playback speed option for all videos. | all |
 | `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
 | `tiktok-seekbar` | Show progress bar for all video. | all |
-| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-settings` | Adds settings for ReVanced to TikTok. | all |
 | `tiktok-force-login` | Do not force login. | all |
+| `tiktok-web-login` | Allows logging in with a Google account. | all |
 | `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 </details>

@@ -35,8 +36,9 @@ The official Patch bundle provided by ReVanced and the community.
 | `tiktok-speed` | Enables the playback speed option for all videos. | all |
 | `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
 | `tiktok-seekbar` | Show progress bar for all video. | all |
-| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-settings` | Adds settings for ReVanced to TikTok. | all |
 | `tiktok-force-login` | Do not force login. | all |
+| `tiktok-web-login` | Allows logging in with a Google account. | all |
 | `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 </details>

@@ -81,51 +83,53 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.43.36 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.43.36 |
-| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.43.36 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.45.36 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.45.36 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.45.36 |
 | `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.43.36 |
-| `hide-captions-button` | Hides the captions button on video player. | 17.43.36 |
+| `hide-captions-button` | Hides the captions button on video player. | 17.45.36 |
 | `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.43.36 |
 | `hide-create-button` | Hides the create button in the navigation bar. | 17.43.36 |
-| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.43.36 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.43.36 |
+| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.45.36 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 17.45.36 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.45.36 |
 | `hide-cast-button` | Hides the cast button in the video player. | all |
-| `sponsorblock` | Integrate SponsorBlock. | 17.43.36 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.43.36 |
-| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.43.36 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 17.43.36 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.43.36 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.43.36 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.43.36 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 17.43.36 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.43.36 |
-| `comments` | Hides components related to comments. | 17.43.36 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.45.36 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.45.36 |
+| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.45.36 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 17.45.36 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.45.36 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.45.36 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.45.36 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 17.45.36 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.45.36 |
+| `comments` | Hides components related to comments. | 17.45.36 |
 | `theme` | Applies a custom theme. | all |
-| `hide-email-address` | Hides the email address in the account switcher. | 17.43.36 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.43.36 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.43.36 |
-| `hide-info-cards` | Hides info-cards in videos. | 17.43.36 |
-| `hide-my-mix` | Hides mix playlists. | 17.43.36 |
+| `hide-email-address` | Hides the email address in the account switcher. | 17.45.36 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.45.36 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.45.36 |
+| `hide-info-cards` | Hides info-cards in videos. | 17.45.36 |
+| `hide-my-mix` | Hides mix playlists. | 17.45.36 |
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
 | `premium-heading` | Shows premium branding on the home screen. | all |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.43.36 |
-| `general-ads` | Removes general ads. | 17.43.36 |
-| `video-ads` | Removes ads in the video player. | 17.43.36 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.43.36 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.43.36 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.43.36 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.45.36 |
+| `general-ads` | Removes general ads. | 17.45.36 |
+| `video-ads` | Removes ads in the video player. | 17.45.36 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.45.36 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.45.36 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.45.36 |
+| `disable-zoom-haptics` | Disables haptics when zooming. | all |
 | `settings` | Adds settings for ReVanced to YouTube. | all |
-| `open-links-directly` | Bypasses redirect links and allows opening links directly. | 17.43.36 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.43.36 |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.43.36 |
+| `open-links-directly` | Bypasses redirect links and allows opening links directly. | 17.45.36 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.45.36 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.45.36 |
 | `debugging` | Adds debugging options. | all |
 | `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `always-autorepeat` | Always repeats the playing video again. | 17.43.36 |
-| `minimized-playback` | Enables minimized and background playback. | 17.43.36 |
-| `custom-video-speed` | Adds more video speed options. | 17.43.36 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.43.36 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.43.36 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.45.36 |
+| `minimized-playback` | Enables minimized and background playback. | 17.45.36 |
+| `custom-video-speed` | Adds more video speed options. | 17.45.36 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.45.36 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.45.36 |
 </details>

 ### 📦 `com.vanced.android.youtube`
@@ -144,14 +148,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-themes` | Unlocks all themes. | all |
 </details>

-### 📦 `com.shervinkoushan.anyTracker`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-premium` | Unlocks all premium features. | all |
-</details>
-
 ### 📦 `tv.twitch.android.app`
 <details>

@@ -219,7 +215,6 @@ The file contains an array of objects, each object representing a patch. The obj
 | `description`                 | The description of the patch.                                                                                                                                                         |
 | `version`                     | The version of the patch.                                                                                                                                                             |
 | `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
 | `options`                     | An array of options for this patch.                                                                                                                                                   |
 | `options.key`                 | The key of the option.                                                                                                                                                                |
 | `options.title`               | The title of the option.                                                                                                                                                              |
@@ -240,7 +235,6 @@ 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",
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,10 +20,10 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:6.0.2")
+    implementation("app.revanced:revanced-patcher:6.1.0")
    implementation("app.revanced:multidexlib2:2.5.2.r2")
    // Required for meta
-    implementation("com.google.code.gson:gson:2.9.1")
+    implementation("com.google.code.gson:gson:2.10")
 }

 tasks {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.112.0
+version = 2.121.0
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/meta/json/Generator.kt
+++ b/src/main/kotlin/app/revanced/meta/json/Generator.kt
@@ -3,7 +3,6 @@ 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
@@ -22,7 +21,6 @@ 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,
--- a/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt
+++ b/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt
@@ -7,7 +7,6 @@ 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>,
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.hexeditor.ad.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility

-@Name("ads-fingerprint-primary")
-@HexEditorAdsCompatibility
-@Version("0.0.1")
 object PrimaryAdsFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("PreferencesHelper;") && methodDef.name == "isAdsDisabled"
--- a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.iconpackstudio.misc.pro.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility

-@Name("check-pro-fingerprint")
-@UnlockProCompatibility
-@Version("0.0.1")
 object CheckProFingerprint : MethodFingerprint(
    "Z",
    customFingerprint = { it.definingClass.endsWith("IPSPurchaseRepository;")}
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt
@@ -1,18 +1,11 @@
 package app.revanced.patches.music.ad.video.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("show-video-ads-constructor-fingerprint")
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MusicVideoAdsCompatibility
-@Version("0.0.1")
 object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
        Opcode.INVOKE_DIRECT,
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt
@@ -1,18 +1,10 @@
 package app.revanced.patches.music.ad.video.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("show-video-ads-method-fingerprint")
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MusicVideoAdsCompatibility
-@Version("0.0.1")
 object ShowMusicVideoAdsFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
        Opcode.IPUT_BOOLEAN,
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt
@@ -1,18 +1,13 @@
 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.annotation.FuzzyPatternScanMethod
 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

-@Name("all-codecs-reference-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@CodecsUnlockCompatibility
-@Version("0.0.1")
 object AllCodecsReferenceFingerprint : MethodFingerprint(
    "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
        Opcode.INVOKE_STATIC,
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
@@ -1,18 +1,13 @@
 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.annotation.FuzzyPatternScanMethod
 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

-@Name("codec-lock-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@CodecsUnlockCompatibility
-@Version("0.0.1")
 object CodecsLockFingerprint : MethodFingerprint(
    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
        Opcode.INVOKE_DIRECT,
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
@@ -1,20 +1,10 @@
 package app.revanced.patches.music.audio.exclusiveaudio.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("audio-only-enabler-fingerprint")
-
-@ExclusiveAudioCompatibility
-@Version(
-    "0.0.1"
-)
 object  AudioOnlyEnablerFingerprint: MethodFingerprint(
    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
        Opcode.IGET_OBJECT,
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.music.audio.exclusiveaudio.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("exclusive-audio-fingerprints")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@ExclusiveAudioCompatibility
-@Version("0.0.1")
 object ExclusiveAudioFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt
@@ -1,16 +1,10 @@
 package app.revanced.patches.music.layout.compactheader.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("compact-header-constructor-fingerprint")
-@CompactHeaderCompatibility
-@Version("0.0.1")
 object CompactHeaderConstructorFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
        Opcode.INVOKE_DIRECT,
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
@@ -1,16 +1,10 @@
 package app.revanced.patches.music.layout.minimizedplayback.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("minimized-playback-manager-fingerprint")
-@MinimizedPlaybackCompatibility
-@Version("0.0.1")
 object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
@@ -1,16 +1,10 @@
 package app.revanced.patches.music.layout.premium.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("hide-get-premium-fingerprint")
-@HideGetPremiumCompatibility
-@Version("0.0.1")
 object HideGetPremiumFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
        Opcode.IF_NEZ,
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt
@@ -1,16 +1,10 @@
 package app.revanced.patches.music.layout.premium.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("hide-get-premium-parent-fingerprint")
-@HideGetPremiumCompatibility
-@Version("0.0.1")
 object HideGetPremiumParentFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
        Opcode.IGET_BOOLEAN,
--- a/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.music.layout.tastebuilder.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("taste-builder-constructor-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@RemoveTasteBuilderCompatibility
-@Version("0.0.1")
 object TasteBuilderConstructorFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
        Opcode.INVOKE_DIRECT,
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.music.layout.upgradebutton.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("pivot-bar-constructor-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@RemoveUpgradeButtonCompatibility
-@Version("0.0.1")
 object PivotBarConstructorFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
@@ -1,15 +1,8 @@
 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.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

-@Name("cast-context-fetch-fingerprint")
-
-@MicroGPatchCompatibility
-@Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(
    strings = listOf("Error fetching CastContext.")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
@@ -1,15 +1,8 @@
 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.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

-@Name("cast-module-fingerprint")
-
-@MicroGPatchCompatibility
-@Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(
    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
@@ -1,15 +1,8 @@
 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.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

-@Name("cast-context-fetch-fingerprint")
-
-@MicroGPatchCompatibility
-@Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
    strings = listOf("Failed to load module via V2: ")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
@@ -1,17 +1,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.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("google-play-utility-fingerprint")
-
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(
    "I",
    AccessFlags.PUBLIC or AccessFlags.STATIC,
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
@@ -1,15 +1,8 @@
 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.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility

-@Name("google-play-prime-fingerprint")
-
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(
    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
@@ -1,17 +1,12 @@
 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.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("google-play-service-checker-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.STATIC,
--- a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.music.premium.backgroundplay.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("background-playback-disabler-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@BackgroundPlayCompatibility
-@Version("0.0.1")
 object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
        Opcode.CONST_4,
--- a/src/main/kotlin/app/revanced/patches/nyx/misc/pro/fingerprints/CheckProFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/nyx/misc/pro/fingerprints/CheckProFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.nyx.misc.pro.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.nyx.misc.pro.annotations.UnlockProCompatibility

-@Name("check-pro-fingerprint")
-@UnlockProCompatibility
-@Version("0.0.1")
 object CheckProFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("BillingManager;") && methodDef.name == "isProVersion"
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
@@ -1,13 +1,7 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility

-@Name("premium-icon-fingerprint")
-@PremiumIconCompatibility
-@Version("0.0.1")
 object PremiumIconFingerprint : MethodFingerprint(
    "Z",
    customFingerprint = { methodDef ->
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceMappingResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceMappingResourcePatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.mapping.patch
+package app.revanced.patches.shared.mapping.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit
@Name("resource-mapping")
@Description("Creates a map of public resources.")
@Version("0.0.1")
-class ResourceMappingResourcePatch : ResourcePatch {
+class ResourceMappingPatch : ResourcePatch {
    companion object {
        internal lateinit var resourceMappings: List<ResourceElement>
            private set
--- a/src/main/kotlin/app/revanced/patches/spotify/audio/fingerprints/DisableCaptureRestrictionAudioDriverFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/audio/fingerprints/DisableCaptureRestrictionAudioDriverFingerprint.kt
@@ -1,15 +1,8 @@
 package app.revanced.patches.spotify.audio.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.spotify.audio.annotation.DisableCaptureRestrictionCompatibility

-@Name("disable-capture-restriction-audio-driver-fingerprint")
-
-@DisableCaptureRestrictionCompatibility
-@Version("0.0.2")
 object DisableCaptureRestrictionAudioDriverFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass == "Lcom/spotify/playback/playbacknative/AudioDriver;" && methodDef.name == "constructAudioAttributes"
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.spotify.premium_navbar_tab.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility

-@Name("premium-navbar-fingerprint")
-@Version("0.0.1")
-@PremiumNavbarTabCompatibility
 object AddPremiumNavbarTabFingerprint : MethodFingerprint(
    parameters = listOf("L", "L", "L", "L", "L", "L")
 )
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.spotify.premium_navbar_tab.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility

-@Name("add-premium-navbar-tab-parent-fingerprint")
-@Version("0.0.1")
-@PremiumNavbarTabCompatibility
 object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
 )
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
@@ -14,7 +14,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
 import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabFingerprint
 import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabParentFingerprint
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.shared.mapping.patch.ResourceMappingPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction

@@ -23,7 +23,7 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
@Description("Removes the premium tab from the navbar.")
@PremiumNavbarTabCompatibility
@Version("0.0.1")
-@DependsOn([ResourceMappingResourcePatch::class])
+@DependsOn([ResourceMappingPatch::class])
 class PremiumNavbarTabPatch : BytecodePatch(
    listOf(
        AddPremiumNavbarTabParentFingerprint
@@ -40,7 +40,7 @@ class PremiumNavbarTabPatch : BytecodePatch(
        val lastInstructionIdx = methodInstructions.size - 1

        val premiumTabId =
-            ResourceMappingResourcePatch.resourceMappings.single { it.type == "id" && it.name == "premium_tab" }.id
+            ResourceMappingPatch.resourceMappings.single { it.type == "id" && it.name == "premium_tab" }.id

        var removeAmount = 2
        // 2nd const remove method
--- a/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/CheckLockedThemesFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/CheckLockedThemesFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.ticktick.misc.themeunlock.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.ticktick.misc.themeunlock.annotations.UnlockThemesCompatibility

-@Name("check-locked-theme-fingerprint")
-@UnlockThemesCompatibility
-@Version("0.0.1")
 object CheckLockedThemesFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("Theme;") && methodDef.name == "isLockedTheme"
--- a/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/SetThemeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/fingerprints/SetThemeFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.ticktick.misc.themeunlock.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.ticktick.misc.themeunlock.annotations.UnlockThemesCompatibility

-@Name("set-theme-fingerprint")
-@UnlockThemesCompatibility
-@Version("0.0.1")
 object SetThemeFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("ThemePreviewActivity;") && methodDef.name == "lambda\$updateUserBtn\$1"
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
@@ -1,13 +1,7 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility

-@Name("convert-help-v2-feeditemlist-fingerprint")
-@TiktokAdsCompatibility
-@Version("0.0.1")
 object ConvertHelpFeedItemListFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("/ConvertHelp;") &&
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
@@ -1,13 +1,7 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility

-@Name("feed-item-clone-fingerprint")
-@TiktokAdsCompatibility
-@Version("0.0.1")
 object FeedItemListCloneFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone"
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
@@ -1,15 +1,9 @@
 package app.revanced.patches.tiktok.feedfilter.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("feed-api-service-fingerprint")
-@FeedFilterCompatibility
-@Version("0.0.1")
 object FeedApiServiceLIZFingerprint : MethodFingerprint(
    access = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
    customFingerprint = { methodDef ->
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
@@ -1,15 +1,9 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("acl-common-share-get-code")
-@DownloadsCompatibility
-@Version("0.0.1")
 object ACLCommonShareFingerprint : MethodFingerprint(
    "I",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/DownloadPathParentFingerprint.kt
@@ -1,15 +1,9 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("download-path-parent-fingerprint")
-@DownloadsCompatibility
-@Version("0.0.1")
 object DownloadPathParentFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt
@@ -1,14 +1,8 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("aweme-get-video-control")
-@SeekbarCompatibility
-@Version("0.0.1")
 object AwemeGetVideoControlFingerprint : MethodFingerprint(
    "L",
    AccessFlags.PUBLIC.value,
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt
@@ -1,15 +1,9 @@
 package app.revanced.patches.tiktok.interaction.speed.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.interaction.speed.annotations.SpeedCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("speed-control-parent-fingerprint")
-@SpeedCompatibility
-@Version("0.0.1")
 object SpeedControlParentFingerprint : MethodFingerprint(
    returnType = "L",
    access = AccessFlags.PRIVATE or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.tiktok.misc.forcelogin.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility

-@Name("mandatory-login-service-fingerprint")
-@DisableForceLoginCompatibility
-@Version("0.0.1")
 object MandatoryLoginServiceFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.tiktok.misc.integrations.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint

-@Name("init-fingerprint")
-@TikTokIntegrationsCompatibility
-@Version("0.0.1")
-object InitFingerprint : MethodFingerprint(
+object InitFingerprint : IntegrationsFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("/AwemeHostApplication;") &&
                methodDef.name == "onCreate"
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt
@@ -1,38 +1,13 @@
 package app.revanced.patches.tiktok.misc.integrations.patch

-import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
 import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
+import app.revanced.shared.patches.AbstractIntegrationsPatch

@Name("tiktok-integrations")
-@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
@TikTokIntegrationsCompatibility
-@Version("0.0.1")
-class TikTokIntegrationsPatch : BytecodePatch(
-    listOf(
-        InitFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass("Lapp/revanced/tiktok/utils/ReVancedUtils") == null)
-            return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
-        val result = InitFingerprint.result!!
-
-        val method = result.mutableMethod
-        val implementation = method.implementation!!
-        val count = implementation.registerCount - 1
-
-        method.addInstruction(
-            0, "sput-object v$count, Lapp/revanced/tiktok/utils/ReVancedUtils;->context:Landroid/content/Context;"
-        )
-        return PatchResultSuccess()
-    }
-}
+class TikTokIntegrationsPatch : AbstractIntegrationsPatch(
+    "Lapp/revanced/tiktok/utils/ReVancedUtils;",
+    listOf(InitFingerprint)
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/annotations/TikTokWebLoginCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/annotations/TikTokWebLoginCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.loginfallback.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 TikTokWebLoginCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/fingerprints/GoogleAuthAvailableFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/fingerprints/GoogleAuthAvailableFingerprint.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.loginfallback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object GoogleAuthAvailableFingerprint : MethodFingerprint(
+    returnType = "Z",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass == "Lcom/bytedance/lobby/google/GoogleAuth;"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/fingerprints/GoogleOneTapAuthAvailableFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/fingerprints/GoogleOneTapAuthAvailableFingerprint.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.loginfallback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object GoogleOneTapAuthAvailableFingerprint : MethodFingerprint(
+    returnType = "Z",
+    access = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass == "Lcom/bytedance/lobby/google/GoogleOneTapAuth;"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/patch/TikTokLoginFallbackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/loginfallback/patch/TikTokLoginFallbackPatch.kt
@@ -0,0 +1,44 @@
+package app.revanced.patches.tiktok.misc.loginfallback.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.tiktok.misc.loginfallback.annotations.TikTokWebLoginCompatibility
+import app.revanced.patches.tiktok.misc.loginfallback.fingerprints.GoogleAuthAvailableFingerprint
+import app.revanced.patches.tiktok.misc.loginfallback.fingerprints.GoogleOneTapAuthAvailableFingerprint
+
+@Patch
+@Name("tiktok-web-login")
+@Description("Allows logging in with a Google account.")
+@TikTokWebLoginCompatibility
+@Version("0.0.1")
+class TikTokLoginFallbackPatch : BytecodePatch(
+    listOf(
+        GoogleOneTapAuthAvailableFingerprint,
+        GoogleAuthAvailableFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        listOf(
+            GoogleOneTapAuthAvailableFingerprint,
+            GoogleAuthAvailableFingerprint
+        ).forEach {
+            with(it.result!!.mutableMethod) {
+                addInstructions(
+                    0,
+                    """
+                        const/4 v0, 0x0
+                        return v0
+                    """
+                )
+            }
+        }
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AboutOnClickMethodFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AboutOnClickMethodFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object AboutOnClickMethodFingerprint : MethodFingerprint(
+    strings = listOf(
+        "//setting/about",
+        "enter_from",
+        "settings_page",
+        "enter_settings_about"
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt
@@ -1,16 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
-
-@Name("ad-personalization-activity-fingerprint")
-@TikTokSettingsCompatibility
-@Version("0.0.1")
-object AdPersonalizationActivityFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("/AdPersonalizationActivity;") &&
-                methodDef.name == "onCreate"
-    }
-)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityOnCreateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityOnCreateFingerprint.kt
@@ -0,0 +1,10 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object AdPersonalizationActivityOnCreateFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AdPersonalizationActivity;") &&
+                methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt
@@ -1,16 +0,0 @@
-package app.revanced.patches.tiktok.misc.settings.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
-
-@Name("copyright-settings-string-fingerprint")
-@TikTokSettingsCompatibility
-@Version("0.0.1")
-object CopyRightSettingsStringFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("/SettingNewVersionFragment;") &&
-                methodDef.name == "onViewCreated"
-    }
-)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsOnViewCreatedFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsOnViewCreatedFingerprint.kt
@@ -0,0 +1,10 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object SettingsOnViewCreatedFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/SettingNewVersionFragment;") &&
+                methodDef.name == "onViewCreated"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.tiktok.misc.settings.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility

-@Name("settings-status-load-fingerprint")
-@TikTokSettingsCompatibility
-@Version("0.0.1")
 object SettingsStatusLoadFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("Lapp/revanced/tiktok/settingsmenu/SettingsStatus;") &&
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -14,85 +15,111 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
-import app.revanced.patches.tiktok.misc.settings.fingerprints.AdPersonalizationActivityFingerprint
-import app.revanced.patches.tiktok.misc.settings.fingerprints.CopyRightSettingsStringFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.AboutOnClickMethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.AdPersonalizationActivityOnCreateFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsOnViewCreatedFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.iface.reference.TypeReference

@Patch
@DependsOn([TikTokIntegrationsPatch::class])
@Name("tiktok-settings")
-@Description("Add settings menu to TikTok.")
+@Description("Adds settings for ReVanced to TikTok.")
@TikTokSettingsCompatibility
@Version("0.0.1")
 class TikTokSettingsPatch : BytecodePatch(
    listOf(
-        AdPersonalizationActivityFingerprint,
-        CopyRightSettingsStringFingerprint
+        AdPersonalizationActivityOnCreateFingerprint,
+        SettingsOnViewCreatedFingerprint,
+        AboutOnClickMethodFingerprint
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        //Replace string `Copyright Policy` to 'Revanced Settings` in TikTok settings.
-        val method1 = CopyRightSettingsStringFingerprint.result!!.mutableMethod
-        val implementation1 = method1.implementation!!
-        for ((index, instruction) in implementation1.instructions.withIndex()) {
-            if (instruction.opcode != Opcode.CONST_STRING) continue
-            val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-            if (string != "copyright_policy") continue
-            var targetIndex = index
-            while (targetIndex >= 0) {
-                targetIndex--
-                val invokeInstruction = implementation1.instructions[targetIndex]
-                if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) continue
-                val methodName = ((invokeInstruction as Instruction35c).reference as MethodReference).name
-                if (methodName != "getString") continue
-                val resultInstruction = implementation1.instructions[targetIndex + 1]
-                if (resultInstruction.opcode != Opcode.MOVE_RESULT_OBJECT) continue
-                val overrideRegister = (resultInstruction as OneRegisterInstruction).registerA
-                method1.replaceInstruction(
-                    targetIndex + 1,
+        // Patch Settings UI to add 'Revanced Settings'.
+        val targetIndexes = findOptionsOnClickIndex()
+        with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
+            for (index in targetIndexes) {
+                if (
+                    instruction(index).opcode != Opcode.NEW_INSTANCE ||
+                    instruction(index - 4).opcode != Opcode.MOVE_RESULT_OBJECT
+                )
+                    return PatchResultError("Hardcode offset changed.")
+                patchOptionNameAndOnClickEvent(index, context)
+            }
+        }
+        // Implement settings screen in `AdPersonalizationActivity`
+        with(AdPersonalizationActivityOnCreateFingerprint.result!!.mutableMethod) {
+            for ((index, instruction) in implementation!!.instructions.withIndex()) {
+                if (instruction.opcode != Opcode.INVOKE_SUPER) continue
+                val thisRegister = (instruction as Instruction35c).registerC
+                addInstructions(
+                    index + 1,
                    """
-                        const-string v$overrideRegister, "Revanced Settings"
+                        invoke-static {v$thisRegister}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->initializeSettings(Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;)V
+                        return-void
                    """
                )
                break
            }
-            //Change onClick to start settings activity.
-            val clickInstruction = implementation1.instructions[index - 1]
-            if (clickInstruction.opcode != Opcode.INVOKE_DIRECT)
-                return PatchResultError("Can not find click listener.")
-            val clickClass = ((clickInstruction as ReferenceInstruction).reference as MethodReference).definingClass
-            val mutableClickClass = context.findClass(clickClass)!!.mutableClass
-            val mutableOnClickMethod = mutableClickClass.methods.first {
-                it.name == "onClick"
-            }
-            mutableOnClickMethod.addInstructions(
-                0,
-                """
-                    invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V
-                    return-void
-                """
-            )
-            break
-        }
-        //Implement revanced settings screen in `AdPersonalizationActivity`
-        val method2 = AdPersonalizationActivityFingerprint.result!!.mutableMethod
-        for ((index, instruction) in method2.implementation!!.instructions.withIndex()) {
-            if (instruction.opcode != Opcode.INVOKE_SUPER) continue
-            val thisRegister = (instruction as Instruction35c).registerC
-            method2.addInstructions(
-                index + 1,
-                """
-                    invoke-static {v$thisRegister}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->initializeSettings(Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;)V
-                    return-void
-                """
-            )
-            break
        }
        return PatchResultSuccess()
    }
+
+    private fun findOptionsOnClickIndex(): IntArray {
+        val results = IntArray(2)
+        var found = 0
+        with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
+            for ((index, instruction) in implementation!!.instructions.withIndex()) {
+                // Old UI settings option to replace to 'Revanced Settings'
+                if (instruction.opcode == Opcode.CONST_STRING) {
+                    val string = ((instruction as ReferenceInstruction).reference as StringReference).string
+                    if (string == "copyright_policy") {
+                        results[0] = index - 2
+                        found++
+                    }
+                }
+
+                // New UI settings option to replace to 'Revanced Settings'
+                if (instruction.opcode == Opcode.NEW_INSTANCE) {
+                    val onClickClass = ((instruction as Instruction21c).reference as TypeReference).type
+                    if (onClickClass == AboutOnClickMethodFingerprint.result!!.mutableMethod.definingClass) {
+                        results[1] = index
+                        found++
+                    }
+                }
+                if (found > 1) break
+            }
+        }
+        return results
+    }
+
+    private fun patchOptionNameAndOnClickEvent(index: Int, context: BytecodeContext) {
+        with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) {
+            // Patch option name
+            val overrideRegister = (instruction(index - 4) as OneRegisterInstruction).registerA
+            replaceInstruction(
+                index - 4,
+                """
+                    const-string v$overrideRegister, "Revanced Settings"
+                """
+            )
+
+            // Patch option OnClick Event
+            with(((instruction(index) as ReferenceInstruction).reference as TypeReference).type) {
+                context.findClass(this)!!.mutableClass.methods.first { it.name == "onClick" }
+                    .addInstructions(
+                        0,
+                        """
+                                 invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V
+                                 return-void
+                             """
+                    )
+            }
+        }
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/audio/fingerprints/AudioAdsPresenterPlayFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/audio/fingerprints/AudioAdsPresenterPlayFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.ad.audio.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.ad.audio.annotations.AudioAdsCompatibility

-@Name("audio-ads-presenter-play-fingerprint")
-@AudioAdsCompatibility
-@Version("0.0.1")
 object AudioAdsPresenterPlayFingerprint : MethodFingerprint(
    customFingerprint = { method ->
        method.definingClass.endsWith("AudioAdsPlayerPresenter;") && method.name == "playAd"
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/AdsManagerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/AdsManagerFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.ad.video.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility

-@Name("ads-manager-play-fingerprint")
-@VideoAdsCompatibility
-@Version("0.0.1")
 object AdsManagerFingerprint : MethodFingerprint(
    customFingerprint = { method ->
        method.definingClass.endsWith("AdsManagerImpl;") && method.name == "playAds"
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/CheckAdEligibilityLambdaFingerprint.kt
@@ -1,16 +1,9 @@
 package app.revanced.patches.twitch.ad.video.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("check-ad-eligibility-fingerprint")
-@VideoAdsCompatibility
-@Version("0.0.1")
 object CheckAdEligibilityLambdaFingerprint : MethodFingerprint(
    "L",
    AccessFlags.PRIVATE or AccessFlags.FINAL or AccessFlags.STATIC,
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/video/fingerprints/ContentConfigShowAdsFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.ad.video.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.ad.video.annotations.VideoAdsCompatibility

-@Name("content-config-show-ads-fingerprint")
-@VideoAdsCompatibility
-@Version("0.0.1")
 object ContentConfigShowAdsFingerprint : MethodFingerprint(
    customFingerprint = { method ->
        method.definingClass.endsWith("ContentConfigData;") && method.name == "getShowAds"
--- a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/fingerprints/DeletedMessageClickableSpanCtorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/fingerprints/DeletedMessageClickableSpanCtorFingerprint.kt
@@ -1,16 +1,9 @@
 package app.revanced.patches.twitch.chat.antidelete.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.chat.antidelete.annotations.ShowDeletedMessagesCompatibility
 import org.jf.dexlib2.AccessFlags

-@Name("deleted-msg-span-ctor-fingerprint")
-@ShowDeletedMessagesCompatibility
-@Version("0.0.1")
 object DeletedMessageClickableSpanCtorFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    customFingerprint = { methodDef ->
--- a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/fingerprints/SetHasModAccessFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/fingerprints/SetHasModAccessFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.chat.antidelete.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.chat.antidelete.annotations.ShowDeletedMessagesCompatibility

-@Name("has-mod-access-fingerprint")
-@ShowDeletedMessagesCompatibility
-@Version("0.0.1")
 object SetHasModAccessFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("DeletedMessageClickableSpan;") && methodDef.name == "setHasModAccess"
--- a/src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/IsDebugConfigEnabledFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/IsDebugConfigEnabledFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.debug.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.debug.annotations.DebugModeCompatibility

-@Name("is-debug-config-enabled-fingerprint")
-@DebugModeCompatibility
-@Version("0.0.1")
 object IsDebugConfigEnabledFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("BuildConfigUtil;") && methodDef.name == "isDebugConfigEnabled"
--- a/src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/IsOmVerificationEnabledFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/IsOmVerificationEnabledFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.debug.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.debug.annotations.DebugModeCompatibility

-@Name("is-om-verification-enabled-fingerprint")
-@DebugModeCompatibility
-@Version("0.0.1")
 object IsOmVerificationEnabledFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("BuildConfigUtil;") && methodDef.name == "isOmVerificationEnabled"
--- a/src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/ShouldShowDebugOptionsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/debug/fingerprints/ShouldShowDebugOptionsFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitch.debug.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitch.debug.annotations.DebugModeCompatibility

-@Name("should-show-debug-options-fingerprint")
-@DebugModeCompatibility
-@Version("0.0.1")
 object ShouldShowDebugOptionsFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("BuildConfigUtil;") && methodDef.name == "shouldShowDebugOptions"
--- a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/annotations/IntegrationsCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.twitch.misc.integrations.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("tv.twitch.android.app")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class IntegrationsCompatibility
--- a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/fingerprints/InitFingerprint.kt
@@ -0,0 +1,16 @@
+package app.revanced.patches.twitch.misc.integrations.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch.IntegrationsFingerprint
+
+@Name("init-fingerprint")
+@IntegrationsCompatibility
+@Version("0.0.1")
+object InitFingerprint : IntegrationsFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/TwitchApplication;") &&
+                methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/misc/integrations/patch/IntegrationsPatch.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.twitch.misc.integrations.patch
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patches.twitch.misc.integrations.fingerprints.InitFingerprint
+import app.revanced.patches.twitch.misc.integrations.annotations.IntegrationsCompatibility
+import app.revanced.shared.patches.AbstractIntegrationsPatch
+
+@Name("integrations")
+@IntegrationsCompatibility
+class IntegrationsPatch : AbstractIntegrationsPatch(
+    "Lapp/revanced/twitch/utils/ReVancedUtils;",
+    listOf(InitFingerprint)
+)
--- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.twitter.ad.timeline.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.twitter.ad.timeline.annotations.TimelineAdsCompatibility
 import org.jf.dexlib2.Opcode

-@Name("timeline-tweet-json-parser-fingerprint")
-@TimelineAdsCompatibility
-@Version("0.0.1")
 object TimelineTweetJsonParserFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.IPUT_OBJECT,
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility

-@Name("messaging-app-certificate-fingerprint")
-@FirebaseGetCertPatchCompatibility
-@Version("0.0.1")
 object GetMessagingCertFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
    strings = listOf(
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility

-@Name("registration-app-certificate-fingerprint")
-@FirebaseGetCertPatchCompatibility
-@Version("0.0.1")
 object GetReqistrationCertFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
    strings = listOf(
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
@@ -1,13 +1,6 @@
 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.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility

-@Name("promo-code-unlock-fingerprint")
-@PromoCodeUnlockCompatibility
-@Version("0.0.1")
 object PromoCodeUnlockFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/fingerprints/ReelConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/fingerprints/ReelConstructorFingerprint.kt
@@ -0,0 +1,17 @@
+package app.revanced.patches.youtube.ad.general.bytecode.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+object ReelConstructorFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL
+    ),
+    customFingerprint = { method ->
+        method.implementation?.instructions?.any {
+            it.opcode == Opcode.CONST && (it as WideLiteralInstruction).wideLiteral == GeneralAdsResourcePatch.reelMultipleItemShelfId
+        } ?: false
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt
@@ -0,0 +1,107 @@
+package app.revanced.patches.youtube.ad.general.bytecode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.softCompareTo
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint
+import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction31i
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+import java.util.*
+
+
+@Patch
+@DependsOn([GeneralAdsResourcePatch::class])
+@Name("general-ads")
+@Description("Removes general ads.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralAdsPatch : BytecodePatch(
+    listOf(ReelConstructorFingerprint)
+) {
+    internal companion object {
+        private fun MutableClass.findMutableMethodOf(
+            method: Method
+        ) = this.methods.first {
+            it.softCompareTo(
+                ImmutableMethodReference(
+                    method.definingClass, method.name, method.parameters, method.returnType
+                )
+            )
+        }
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        fun String.buildHideCall(viewRegister: Int) = "invoke-static { v$viewRegister }, " +
+                "Lapp/revanced/integrations/patches/GeneralAdsPatch;" +
+                "->" +
+                "$this(Landroid/view/View;)V"
+
+        fun MutableMethod.injectHideCall(insertIndex: Int, viewRegister: Int, method: String) =
+            this.addInstruction(insertIndex, method.buildHideCall(viewRegister))
+
+        context.classes.forEach { classDef ->
+            classDef.methods.forEach { method ->
+                with(method.implementation) {
+                    this?.instructions?.forEachIndexed { index, instruction ->
+                        if (instruction.opcode != org.jf.dexlib2.Opcode.CONST)
+                            return@forEachIndexed
+                        // Instruction to store the id adAttribution into a register
+                        if ((instruction as Instruction31i).wideLiteral != GeneralAdsResourcePatch.adAttributionId)
+                            return@forEachIndexed
+
+                        val insertIndex = index + 1
+
+                        // Call to get the view with the id adAttribution
+                        with(instructions.elementAt(insertIndex)) {
+                            if (opcode != org.jf.dexlib2.Opcode.INVOKE_VIRTUAL)
+                                return@forEachIndexed
+
+                            // Hide the view
+                            val viewRegister = (this as Instruction35c).registerC
+                            context.proxy(classDef)
+                                .mutableClass
+                                .findMutableMethodOf(method)
+                                .injectHideCall(insertIndex, viewRegister, "hideAdAttributionView")
+                        }
+                    }
+                }
+            }
+        }
+
+        with(
+            ReelConstructorFingerprint.result
+                ?: return PatchResultError("Could not resolve fingerprint")
+        ) {
+            // iput-object v$viewRegister, ...
+            val insertIndex = this.scanResult.patternScanResult!!.startIndex + 2
+
+            with(this.mutableMethod) {
+                val viewRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA
+
+                injectHideCall(insertIndex, viewRegister, "hideReelView")
+            }
+
+        }
+
+        return PatchResultSuccess()
+    }
+
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralAdsResourcePatch.kt
@@ -1,89 +1,94 @@
-package app.revanced.patches.youtube.ad.general.patch
+package app.revanced.patches.youtube.ad.general.resource.patch

-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.shared.mapping.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
 import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.*

-@Patch
-@DependsOn(dependencies = [FixLocaleConfigErrorPatch::class, LithoFilterPatch::class, SettingsPatch::class])
-@Name("general-ads")
-@Description("Removes general ads.")
+@DependsOn(dependencies = [
+    FixLocaleConfigErrorPatch::class,
+    LithoFilterPatch::class,
+    SettingsPatch::class,
+    ResourceMappingPatch::class
+])
@GeneralAdsCompatibility
@Version("0.0.1")
-class GeneralAdsPatch : ResourcePatch {
+class GeneralAdsResourcePatch : ResourcePatch {
+    internal companion object {
+        var adAttributionId: Long = -1
+        var reelMultipleItemShelfId: Long = -1
+    }
+
    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.ADS.addPreferences(
-            SwitchPreference(
-                "revanced_home_ads_removal",
-                StringResource("revanced_home_ads_removal_title", "Remove home ads"),
-                true,
-                StringResource("revanced_home_ads_removal_summary_on", "Home ads are hidden"),
-                StringResource("revanced_home_ads_removal_summary_off", "Home ads are shown")
-            ),
+        PreferenceScreen.ADS.addPreferences(
            SwitchPreference(
                "revanced_adremover_ad_removal",
-                StringResource("revanced_adremover_ad_removal_enabled_title", "Remove general ads"),
+                StringResource("revanced_adremover_ad_removal_enabled_title", "Hide general ads"),
                true,
                StringResource("revanced_adremover_ad_removal_enabled_summary_on", "General ads are hidden"),
                StringResource("revanced_adremover_ad_removal_enabled_summary_off", "General ads are shown")
            ),
+            SwitchPreference(
+                "revanced_adremover_buttoned",
+                StringResource("revanced_adremover_buttoned_enabled_title", "Hide buttoned ad"),
+                true,
+                StringResource("revanced_adremover_buttoned_enabled_summary_on", "Buttoned ads are hidden"),
+                StringResource("revanced_adremover_buttoned_enabled_summary_off", "Buttoned ads are shown")
+            ),
            SwitchPreference(
                "revanced_adremover_merchandise",
-                StringResource("revanced_adremover_merchandise_enabled_title", "Remove merchandise banners"),
+                StringResource("revanced_adremover_merchandise_enabled_title", "Hide merchandise banners"),
                true,
                StringResource("revanced_adremover_merchandise_enabled_summary_on", "Merchandise banners are hidden"),
                StringResource("revanced_adremover_merchandise_enabled_summary_off", "Merchandise banners are shown")
            ),
            SwitchPreference(
                "revanced_adremover_community_posts_removal",
-                StringResource("revanced_adremover_community_posts_enabled_title", "Remove community posts"),
+                StringResource("revanced_adremover_community_posts_enabled_title", "Hide community posts"),
                false,
                StringResource("revanced_adremover_community_posts_enabled_summary_on", "Community posts are hidden"),
                StringResource("revanced_adremover_community_posts_enabled_summary_off", "Community posts are shown")
            ),
            SwitchPreference(
                "revanced_adremover_compact_banner_removal",
-                StringResource("revanced_adremover_compact_banner_enabled_title", "Remove compact banners"),
+                StringResource("revanced_adremover_compact_banner_enabled_title", "Hide compact banners"),
                true,
                StringResource("revanced_adremover_compact_banner_enabled_summary_on", "Compact banners are hidden"),
                StringResource("revanced_adremover_compact_banner_enabled_summary_off", "Compact banners are shown")
            ),
            SwitchPreference(
                "revanced_adremover_movie",
-                StringResource("revanced_adremover_movie_enabled_title", "Remove movies section"),
+                StringResource("revanced_adremover_movie_enabled_title", "Hide movies section"),
                true,
                StringResource("revanced_adremover_movie_enabled_summary_on", "Movies section is hidden"),
                StringResource("revanced_adremover_movie_enabled_summary_off", "Movies section is shown")
            ),
            SwitchPreference(
                "revanced_adremover_feed_survey",
-                StringResource("revanced_adremover_feed_survey_enabled_title", "Remove feed surveys"),
+                StringResource("revanced_adremover_feed_survey_enabled_title", "Hide feed surveys"),
                true,
                StringResource("revanced_adremover_feed_survey_enabled_summary_on", "Feed surveys are hidden"),
                StringResource("revanced_adremover_feed_survey_enabled_summary_off", "Feed surveys are shown")
            ),
            SwitchPreference(
                "revanced_adremover_shorts",
-                StringResource("revanced_adremover_shorts_enabled_title", "Remove shorts"),
+                StringResource("revanced_adremover_shorts_enabled_title", "Hide shorts"),
                true,
                StringResource("revanced_adremover_shorts_enabled_summary_on", "Shorts are hidden"),
                StringResource("revanced_adremover_shorts_enabled_summary_off", "Shorts are shown")
            ),
            SwitchPreference(
                "revanced_adremover_community_guidelines",
-                StringResource("revanced_adremover_community_guidelines_enabled_title", "Remove community guidelines"),
+                StringResource("revanced_adremover_community_guidelines_enabled_title", "Hide community guidelines"),
                true,
                StringResource(
                    "revanced_adremover_community_guidelines_enabled_summary_on",
@@ -96,28 +101,28 @@ class GeneralAdsPatch : ResourcePatch {
            ),
            SwitchPreference(
                "revanced_adremover_emergency_box_removal",
-                StringResource("revanced_adremover_emergency_box_enabled_title", "Remove emergency boxes"),
+                StringResource("revanced_adremover_emergency_box_enabled_title", "Hide emergency boxes"),
                true,
                StringResource("revanced_adremover_emergency_box_enabled_summary_on", "Emergency boxes are hidden"),
                StringResource("revanced_adremover_emergency_box_enabled_summary_off", "Emergency boxes are shown")
            ),
            SwitchPreference(
                "revanced_adremover_info_panel",
-                StringResource("revanced_adremover_info_panel_enabled_title", "Remove info panels"),
+                StringResource("revanced_adremover_info_panel_enabled_title", "Hide info panels"),
                true,
                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Info panels are hidden"),
                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Info panels are shown")
            ),
            SwitchPreference(
                "revanced_adremover_medical_panel",
-                StringResource("revanced_adremover_medical_panel_enabled_title", "Remove medical panels"),
+                StringResource("revanced_adremover_medical_panel_enabled_title", "Hide medical panels"),
                true,
                StringResource("revanced_adremover_medical_panel_enabled_summary_on", "Medical panels are hidden"),
                StringResource("revanced_adremover_medical_panel_enabled_summary_off", "Medical panels are shown")
            ),
            SwitchPreference(
                "revanced_adremover_paid_content",
-                StringResource("revanced_adremover_paid_content_enabled_title", "Remove paid content"),
+                StringResource("revanced_adremover_paid_content_enabled_title", "Hide paid content"),
                true,
                StringResource("revanced_adremover_paid_content_enabled_summary_on", "Paid content is hidden"),
                StringResource("revanced_adremover_paid_content_enabled_summary_off", "Paid content is shown")
@@ -156,6 +161,13 @@ class GeneralAdsPatch : ResourcePatch {
                StringResource("revanced_adremover_self_sponsor_enabled_summary_on", "Self sponsored cards are hidden"),
                StringResource("revanced_adremover_self_sponsor_enabled_summary_off", "Self sponsored cards are shown")
            ),
+            SwitchPreference(
+                "revanced_adremover_separator",
+                StringResource("revanced_adremover_separator_title", "Hide gray separator"),
+                true,
+                StringResource("revanced_adremover_separator_summary_on", "Gray separators are hidden"),
+                StringResource("revanced_adremover_separator_summary_off", "Gray separators are shown")
+            ),
            SwitchPreference(
                "revanced_adremover_chapter_teaser",
                StringResource(
@@ -171,9 +183,47 @@ class GeneralAdsPatch : ResourcePatch {
                    "revanced_adremover_chapter_teaser_enabled_summary_off",
                    "Chapter teasers are shown"
                )
+            ),
+            PreferenceScreen(
+                "revanced_adremover_custom",
+                StringResource("revanced_adremover_custom_title", "Custom filter"),
+                listOf(
+                    SwitchPreference(
+                        "revanced_adremover_custom_enabled",
+                        StringResource(
+                            "revanced_adremover_custom_enabled_title",
+                            "Enable custom filter"
+                        ),
+                        false,
+                        StringResource(
+                            "revanced_adremover_custom_enabled_summary_on",
+                            "Custom filter is enabled"
+                        ),
+                        StringResource(
+                            "revanced_adremover_custom_enabled_summary_off",
+                            "Custom filter is disabled"
+                        )
+                    ),
+                    // TODO: This should be a ListPreference, which does not exist yet
+                    TextPreference(
+                        "revanced_adremover_custom_strings",
+                        StringResource("revanced_adremover_custom_strings_title", "Custom filter"),
+                        InputType.STRING,
+                        "",
+                        StringResource(
+                            "revanced_adremover_custom_strings_summary",
+                            "Filter components by their name separated by a comma"
+                        )
+                    )
+                )
            )
        )

+        fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
+
+        adAttributionId = "ad_attribution".getId()
+        reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
+
        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/LoadVideoAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/LoadVideoAdsFingerprint.kt
@@ -1,14 +1,8 @@
 package app.revanced.patches.youtube.ad.video.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility

-@Name("load-ads-fingerprint")
-@VideoAdsCompatibility
-@Version("0.0.1")
 object LoadVideoAdsFingerprint : MethodFingerprint(
    strings = listOf(
        "TriggerBundle doesn't have the required metadata specified by the trigger ",
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("enable-seekbar-tapping-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@SeekbarTappingCompatibility
-@Version("0.0.1")
 object SeekbarTappingFingerprint : MethodFingerprint(
    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
        Opcode.INVOKE_VIRTUAL,
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingParentFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.youtube.interaction.seekbar.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("enable-seekbar-tapping-parent-fingerprint")
+
@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@SeekbarTappingCompatibility
-@Version("0.0.1")
 object SeekbarTappingParentFingerprint : MethodFingerprint(
    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
        Opcode.INVOKE_VIRTUAL,
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/annotation/SwipeControlsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
@@ -1,15 +1,8 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility

-@Name("swipe-controls-host-activity-fingerprint")
-
-@SwipeControlsCompatibility
-@Version("0.0.1")
 object SwipeControlsHostActivityFingerprint : MethodFingerprint(
    customFingerprint = { methodDef ->
        methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;" && methodDef.name == "<init>"
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/annotations/AutoCaptionsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt
@@ -1,18 +1,13 @@
 package app.revanced.patches.youtube.layout.autocaptions.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.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("start-video-informer-fingerprint")
+
@FuzzyPatternScanMethod(3)
-@AutoCaptionsCompatibility
-@Version("0.0.1")
 object StartVideoInformerFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L", "L", "L"), listOf(
        Opcode.INVOKE_STATIC,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt
@@ -1,16 +1,10 @@
 package app.revanced.patches.youtube.layout.autocaptions.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("subtitle-button-controller-fingerprint")
-@AutoCaptionsCompatibility
-@Version("0.0.1")
 object SubtitleButtonControllerFingerprint : MethodFingerprint(
    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
        Opcode.IGET_OBJECT,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt
@@ -1,16 +1,10 @@
 package app.revanced.patches.youtube.layout.autocaptions.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.autocaptions.annotations.AutoCaptionsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("subtitle-track-fingerprint")
-@AutoCaptionsCompatibility
-@Version("0.0.1")
 object SubtitleTrackFingerprint : MethodFingerprint(
    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
        Opcode.CONST_STRING,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/annotations/AutoplayButtonCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/annotations/AutoplayButtonCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt
@@ -1,16 +1,10 @@
 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.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

-@Name("autonav-informer-fingerprint")
-@AutoplayButtonCompatibility
-@Version("0.0.1")
 object AutoNavInformerFingerprint : MethodFingerprint(
    "Z",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.youtube.layout.autoplaybutton.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayButtonCompatibility

-@Name("layout-constructor-fingerprint")
-@AutoplayButtonCompatibility
-@Version("0.0.1")
 object LayoutConstructorFingerprint : MethodFingerprint(
    strings = listOf("1.0x"),
    customFingerprint = { methodDef ->
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButtonPatch.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayBu
 import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.AutoNavInformerFingerprint
 import app.revanced.patches.youtube.layout.autoplaybutton.fingerprints.LayoutConstructorFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.shared.mapping.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 import org.jf.dexlib2.iface.reference.MethodReference

@Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingResourcePatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, ResourceMappingPatch::class])
@Name("hide-autoplay-button")
@Description("Hides the autoplay button in the video player.")
@AutoplayButtonCompatibility
@@ -53,7 +53,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
        val layoutGenMethodInstructions = layoutGenMethod.implementation!!.instructions

        // resolve the offsets such as ...
-        val autoNavPreviewStubId = ResourceMappingResourcePatch.resourceMappings.single {
+        val autoNavPreviewStubId = ResourceMappingPatch.resourceMappings.single {
            it.name == "autonav_preview_stub"
        }.id
        // where to insert the branch instructions and ...
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/annotations/HideButtonsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/annotations/HideButtonsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/patch/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/patch/HideButtonsPatch.kt
@@ -11,14 +11,14 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 import app.revanced.patches.youtube.layout.buttons.annotations.HideButtonsCompatibility
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.shared.mapping.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference

@Patch
-@DependsOn([ResourceMappingResourcePatch::class, LithoFilterPatch::class])
+@DependsOn([ResourceMappingPatch::class, LithoFilterPatch::class])
@Name("hide-video-buttons")
@Description("Adds options to hide action buttons under a video.")
@HideButtonsCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/comments/annotations/CommentsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/comments/annotations/CommentsCompatibility.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
    )]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/comments/bytecode/fingerprints/ShortsCommentsButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/comments/bytecode/fingerprints/ShortsCommentsButtonFingerprint.kt
@@ -1,18 +1,12 @@
 package app.revanced.patches.youtube.layout.comments.bytecode.fingerprints

-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.comments.annotations.CommentsCompatibility
 import app.revanced.patches.youtube.layout.comments.resource.patch.CommentsResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction

-@Name("shorts-comments-button-fingerprint")
-@CommentsCompatibility
-@Version("0.0.1")
 object ShortsCommentsButtonFingerprint : MethodFingerprint(
    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("Z", "Z", "L"),
    customFingerprint = { methodDef ->
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/comments/resource/patch/CommentsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/comments/resource/patch/CommentsResourcePatch.kt
@@ -8,7 +8,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.layout.comments.annotations.CommentsCompatibility
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
+import app.revanced.patches.shared.mapping.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -16,7 +16,7 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Swit

@Name("comments-resource-patch")
@CommentsCompatibility
-@DependsOn([SettingsPatch::class, ResourceMappingResourcePatch::class])
+@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
@Version("0.0.1")
 class CommentsResourcePatch : ResourcePatch {
    companion object {
@@ -55,7 +55,7 @@ class CommentsResourcePatch : ResourcePatch {
            )
        )

-        shortsCommentsButtonId = ResourceMappingResourcePatch.resourceMappings.single {
+        shortsCommentsButtonId = ResourceMappingPatch.resourceMappings.single {
            it.type == "drawable" && it.name == "ic_right_comment_32c"
        }.id

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	97ea238520	chore(release): 2.121.0 [skip ci] # [2.121.0](https://github.com/revanced/revanced-patches/compare/v2.120.0...v2.121.0) (2022-11-23) ### Features * anytracker: remove `unlock-premium` patch ([#1094](https://github.com/revanced/revanced-patches/issues/1094)) ([`7f9fb09`](`700ca5b543`))	2022-11-23 16:21:42 +00:00
Shervin Koushan	700ca5b543	feat(anytracker): remove `unlock-premium` patch (#1094 )	2022-11-23 17:19:48 +01:00
semantic-release-bot	b792be5b78	chore(release): 2.120.0 [skip ci] # [2.120.0](https://github.com/revanced/revanced-patches/compare/v2.119.0...v2.120.0) (2022-11-23) ### Features * youtube: `remove-player-button-background` patch ([#855](https://github.com/revanced/revanced-patches/issues/855)) ([`5988f63`](`025b480175`))	2022-11-23 06:36:16 +00:00
johnconner122	025b480175	feat(youtube): `remove-player-button-background` patch (#855 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-11-23 07:34:39 +01:00
semantic-release-bot	e1b53b214f	chore(release): 2.119.0 [skip ci] # [2.119.0](https://github.com/revanced/revanced-patches/compare/v2.118.1...v2.119.0) (2022-11-23) ### Features * twitch: ˋintegrationsˋ dependency patch ([#1074](https://github.com/revanced/revanced-patches/issues/1074)) ([`8196f26`](`30939e5efe`))	2022-11-23 06:32:04 +00:00
Tim Schneeberger	30939e5efe	feat(twitch): ˋintegrationsˋ dependency patch (#1074 )	2022-11-23 07:30:11 +01:00
semantic-release-bot	4d9c41488d	chore(release): 2.118.1 [skip ci] ## [2.118.1](https://github.com/revanced/revanced-patches/compare/v2.118.0...v2.118.1) (2022-11-22)	2022-11-22 23:37:23 +00:00
oSumAtrIX	2fffcde357	build: bump dependencies	2022-11-23 00:35:08 +01:00
oSumAtrIX	7af08e0ba7	feat!: apply changes from ReVanced Patcher	2022-11-23 00:35:07 +01:00
semantic-release-bot	228834fda8	chore(release): 2.118.0 [skip ci] # [2.118.0](https://github.com/revanced/revanced-patches/compare/v2.117.1...v2.118.0) (2022-11-22) ### Features * youtube: bump patches compatibility to v17.45.36 ([`5ee123f`](`7466aecc5b`))	2022-11-22 22:56:01 +00:00
oSumAtrIX	7466aecc5b	feat(youtube): bump patches compatibility to v17.45.36	2022-11-22 23:54:07 +01:00
semantic-release-bot	8ee36541b4	chore(release): 2.117.1 [skip ci] ## [2.117.1](https://github.com/revanced/revanced-patches/compare/v2.117.0...v2.117.1) (2022-11-22) ### Bug Fixes * youtube/general-ads: hide reels shelf ([`2f8b911`](`a4fd6603fe`))	2022-11-22 22:43:58 +00:00
oSumAtrIX	a4fd6603fe	fix(youtube/general-ads): hide reels shelf	2022-11-22 23:41:53 +01:00
oSumAtrIX	510cb8f590	refactor: apply auto-refactor	2022-11-22 20:18:29 +01:00
Sculas	c02ebd752c	refactor(integrations): merge integrations code (#1052 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-11-21 22:26:43 +01:00
semantic-release-bot	b4d7eca5fa	chore(release): 2.117.0 [skip ci] # [2.117.0](https://github.com/revanced/revanced-patches/compare/v2.116.0...v2.117.0) (2022-11-21) ### Features * tiktok: `tiktok-web-login` patch ([#593](https://github.com/revanced/revanced-patches/issues/593)) ([`879f9c5`](`c6125c071b`))	2022-11-21 15:16:45 +00:00
d4rkk3y	c6125c071b	feat(tiktok): `tiktok-web-login` patch (#593 )	2022-11-21 16:14:58 +01:00
d4rkk3y	478de297f9	frat(tiktok/settings): make patch name unique (#1082 )	2022-11-21 16:12:44 +01:00
semantic-release-bot	ebc4a12cd7	chore(release): 2.116.0 [skip ci] # [2.116.0](https://github.com/revanced/revanced-patches/compare/v2.115.0...v2.116.0) (2022-11-21) ### Features * youtube/theme: make amoled the default color for dark theme background" ([`5a904ce`](`b3c0291e70`))	2022-11-21 02:55:24 +00:00
oSumAtrIX	b3c0291e70	feat(youtube/theme): make amoled the default color for dark theme background" This reverts commit `91ae954210`.	2022-11-21 03:53:18 +01:00
semantic-release-bot	c43588ee40	chore(release): 2.115.0 [skip ci] # [2.115.0](https://github.com/revanced/revanced-patches/compare/v2.114.2...v2.115.0) (2022-11-21) ### Features * youtube/general-ads: normalize switch names ([`e9d5a5e`](`c2122494bc`)) * youtube/theme: exclude the patch by default ([bfda80c](`c74b5d4e47`)) * youtube/theme: make dark the default color for dark theme background ([`b099d8b`](`91ae954210`))	2022-11-21 00:00:19 +00:00
oSumAtrIX	c74b5d4e47	feat(youtube/theme): exclude the patch by default	2022-11-21 00:58:56 +01:00
oSumAtrIX	91ae954210	feat(youtube/theme): make dark the default color for dark theme background	2022-11-21 00:58:56 +01:00
oSumAtrIX	65172cad4f	refactor(youtube/general-ads): apply auto-refactor	2022-11-21 00:58:55 +01:00
oSumAtrIX	c2122494bc	feat(youtube/general-ads): normalize switch names	2022-11-21 00:58:55 +01:00
semantic-release-bot	6ed94935ca	chore(release): 2.114.2 [skip ci] ## [2.114.2](https://github.com/revanced/revanced-patches/compare/v2.114.1...v2.114.2) (2022-11-20) ### Bug Fixes * youtube/general-ads: hide bytecode home ad view ([`a2717d1`](`f3785c4e47`)) * youtube/general-ads: remove unused switch ([`e05dd02`](`a934821fa7`))	2022-11-20 23:27:07 +00:00
oSumAtrIX	a934821fa7	fix(youtube/general-ads): remove unused switch	2022-11-21 00:25:31 +01:00
oSumAtrIX	f3785c4e47	fix(youtube/general-ads): hide bytecode home ad view	2022-11-21 00:25:30 +01:00
oSumAtrIX	67e0db5ac9	refactor(youtube/resource-mapping): move to appropriate package	2022-11-21 00:25:30 +01:00
oSumAtrIX	aaa820430b	style(youtube/resource-mapping): use shorter name for class	2022-11-21 00:25:29 +01:00
semantic-release-bot	cf5ed1baea	chore(release): 2.114.1 [skip ci] ## [2.114.1](https://github.com/revanced/revanced-patches/compare/v2.114.0...v2.114.1) (2022-11-20) ### Bug Fixes * tiktok/settings: make compatible with newer versions ([#1057](https://github.com/revanced/revanced-patches/issues/1057)) ([`79e6fcb`](`206341cec4`))	2022-11-20 16:12:02 +00:00
d4rkk3y	206341cec4	fix(tiktok/settings): make compatible with newer versions (#1057 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-11-20 17:09:59 +01:00
semantic-release-bot	e8f4890edd	chore(release): 2.114.0 [skip ci] # [2.114.0](https://github.com/revanced/revanced-patches/compare/v2.113.0...v2.114.0) (2022-11-20) ### Features * youtube: `disable-zoom-haptics` patch ([#1079](https://github.com/revanced/revanced-patches/issues/1079)) ([`974a042`](`9463f11dbf`))	2022-11-20 13:26:23 +00:00
aliernfrog	9463f11dbf	feat(youtube): `disable-zoom-haptics` patch (#1079 )	2022-11-20 14:24:41 +01:00
semantic-release-bot	2b3e153b60	chore(release): 2.113.0 [skip ci] # [2.113.0](https://github.com/revanced/revanced-patches/compare/v2.112.0...v2.113.0) (2022-11-19) ### Bug Fixes * youtube/general-ads: hide ads with buttons ([`8909a06`](`3175e864af`)) ### Features * youtube/general-ads: custom component filter ([`b315b6f`](`4b6bf69366`)) * youtube/general-ads: hide gray separators ([`478ef39`](`38e8e7898b`))	2022-11-19 22:34:33 +00:00
oSumAtrIX	4b6bf69366	feat(youtube/general-ads): custom component filter	2022-11-19 23:21:57 +01:00
oSumAtrIX	38e8e7898b	feat(youtube/general-ads): hide gray separators	2022-11-19 23:21:38 +01:00
oSumAtrIX	3175e864af	fix(youtube/general-ads): hide ads with buttons	2022-11-19 23:21:22 +01:00