chore(release): 2.203.0-dev.1 [skip ci]

# [2.203.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.202.0...v2.203.0-dev.1) (2023-12-02) ### Features * **Infinity for Reddit - Spoof client:** Support latest version ([0ceb163](0ceb163ffa)) * **Infinity for Reddit:** Add `Unlock subscription` patch ([080b357](080b357a79))
refactor: Simplify AbstractSpoofClientPatch class
2025-12-07 18:03:55 +01:00 · 2023-12-02 16:48:08 +00:00 · 2023-12-02 17:42:14 +01:00 · 2023-12-02 17:42:14 +01:00 · 2023-12-02 17:42:14 +01:00 · 2023-12-02 17:42:13 +01:00
101 changed files with 7283 additions and 2572 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -6,12 +6,73 @@ body:
  - type: markdown
    attributes:
      value: |
+        <p align="center">
+          <picture>
+            <source
+              width="256px"
+              media="(prefers-color-scheme: dark)"
+              srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
+            >
+            <img 
+              width="256px"
+              src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
+            >
+          </picture>
+          <br>
+          <a href="https://revanced.app/">
+             <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
+                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
+             </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://github.com/ReVanced">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="http://revanced.app/discord">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://reddit.com/r/revancedapp">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://t.me/app_revanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://x.com/revancedapp">
+              <picture>
+                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://www.youtube.com/@ReVanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+             </picture>
+           </a>
+           <br>
+           <br>
+           Continuing the legacy of Vanced
+        </p>
+
        # ReVanced Patches bug report

-        Please check for existing bug reports
-        [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report)
-        before creating a new one.
+        Before creating a new bug report, please keep the following in mind:

+        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report).
+        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
  - type: textarea
    attributes:
      label: Bug description
@@ -39,9 +100,9 @@ body:
    id: acknowledgements
    attributes:
      label: Acknowledgements
-      description: Your issue will be closed if you don't follow the checklist below.
+      description: Your bug report will be closed if you don't follow the checklist below.
      options:
-        - label: This request is not a duplicate of an existing issue.
+        - label: This issue is not a duplicate of an existing bug report.
          required: true
        - label: I have chosen an appropriate title.
          required: true
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -6,11 +6,73 @@ body:
  - type: markdown
    attributes:
      value: |
+        <p align="center">
+          <picture>
+            <source
+              width="256px"
+              media="(prefers-color-scheme: dark)"
+              srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
+            >
+            <img 
+              width="256px"
+              src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-headline/revanced-headline-vertical-light.svg"
+            >
+          </picture>
+          <br>
+          <a href="https://revanced.app/">
+             <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
+                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patches/main/assets/revanced-logo/revanced-logo.svg" />
+             </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://github.com/ReVanced">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+                   <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="http://revanced.app/discord">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://reddit.com/r/revancedapp">
+               <picture>
+                   <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+                   <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+               </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://t.me/app_revanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://x.com/revancedapp">
+              <picture>
+                 <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+                 <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+              </picture>
+           </a>&nbsp;&nbsp;&nbsp;
+           <a href="https://www.youtube.com/@ReVanced">
+              <picture>
+                 <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+                 <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+             </picture>
+           </a>
+           <br>
+           <br>
+           Continuing the legacy of Vanced
+        </p>
+
        # ReVanced Patches feature request
-        
-        Please check for existing feature requests
-        [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request)
-        before creating a new one.
+
+        Before creating a new feature request, please keep the following in mind:
+
+        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request).
+        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
  - type: textarea
    attributes:
      label: Feature description
@@ -34,9 +96,9 @@ body:
    id: acknowledgements
    attributes:
      label: Acknowledgements
-      description: Your issue will be closed if you don't follow the checklist below.
+      description: Your feature request will be closed if you don't follow the checklist below.
      options:
-        - label: This request is not a duplicate of an existing issue.
+        - label: This issue is not a duplicate of an existing feature request.
          required: true
        - label: I have chosen an appropriate title.
          required: true
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -16,6 +16,7 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
+
      - name: Open pull request
        uses: repo-sync/pull-request@v2
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,21 +23,25 @@ jobs:
          # https://github.com/cycjimmy/semantic-release-action#private-packages
          persist-credentials: false
          fetch-depth: 0
-      - name: Cache
+
+      - name: Cache Node modules
        uses: actions/cache@v3
        with:
          path: |
-            ${{ runner.home }}/.gradle/caches
-            ${{ runner.home }}/.gradle/wrapper
-            .gradle
            node_modules
-          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
+          key: npm-${{ hashFiles('package-lock.json') }}
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
      - name: Build with Gradle
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: ./gradlew generateMeta clean
+
      - name: Setup semantic-release
        run: npm install
+
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,137 @@
+# [2.203.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.202.0...v2.203.0-dev.1) (2023-12-02)
+
+
+### Features
+
+* **Infinity for Reddit - Spoof client:** Support latest version ([ca42fd9](https://github.com/ReVanced/revanced-patches/commit/ca42fd93656eae6a5f5f0086e3cf574fb6f4f11e))
+* **Infinity for Reddit:** Add `Unlock subscription` patch ([840b29e](https://github.com/ReVanced/revanced-patches/commit/840b29e9891243a4ccabb6ade5ad6ac92984efc2))
+
+# [2.202.0](https://github.com/ReVanced/revanced-patches/compare/v2.201.1...v2.202.0) (2023-12-02)
+
+
+### Bug Fixes
+
+* **Spotify - Custom Theme:** Clarify patch option description ([#3338](https://github.com/ReVanced/revanced-patches/issues/3338)) ([1b9a90f](https://github.com/ReVanced/revanced-patches/commit/1b9a90f9753e40cb07e270e7f5144cd57c3c3ce3))
+* **YouTube - Enable tablet layout:** Respect the original device layout ([cdbbe8f](https://github.com/ReVanced/revanced-patches/commit/cdbbe8f78d26f24e58362c7ef1da83bf689d52bb))
+* **YouTube - Restore old seekbar thumbnails:** Move setting into 'Seekbar' submenu ([#3344](https://github.com/ReVanced/revanced-patches/issues/3344)) ([880091a](https://github.com/ReVanced/revanced-patches/commit/880091a96d1a628520732367c96c4c11fb93b72d))
+
+
+### Features
+
+* Modernize restart app logic ([#3343](https://github.com/ReVanced/revanced-patches/issues/3343)) ([3897647](https://github.com/ReVanced/revanced-patches/commit/3897647321b6c1860dc9804cac6c6985da8bb675))
+* **YouTube:** Support version `18.45.43` ([#3345](https://github.com/ReVanced/revanced-patches/issues/3345)) ([ff82a36](https://github.com/ReVanced/revanced-patches/commit/ff82a36e6cd661201169246497176493d7093b58))
+
+# [2.202.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.202.0-dev.3...v2.202.0-dev.4) (2023-12-01)
+
+
+### Features
+
+* **YouTube:** Support version `18.45.43` ([#3345](https://github.com/ReVanced/revanced-patches/issues/3345)) ([ff82a36](https://github.com/ReVanced/revanced-patches/commit/ff82a36e6cd661201169246497176493d7093b58))
+
+# [2.202.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.202.0-dev.2...v2.202.0-dev.3) (2023-12-01)
+
+
+### Bug Fixes
+
+* **YouTube - Enable tablet layout:** Respect the original device layout ([cdbbe8f](https://github.com/ReVanced/revanced-patches/commit/cdbbe8f78d26f24e58362c7ef1da83bf689d52bb))
+
+# [2.202.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.202.0-dev.1...v2.202.0-dev.2) (2023-12-01)
+
+
+### Bug Fixes
+
+* **Spotify - Custom Theme:** Clarify patch option description ([#3338](https://github.com/ReVanced/revanced-patches/issues/3338)) ([1b9a90f](https://github.com/ReVanced/revanced-patches/commit/1b9a90f9753e40cb07e270e7f5144cd57c3c3ce3))
+
+# [2.202.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.2-dev.1...v2.202.0-dev.1) (2023-11-29)
+
+
+### Features
+
+* Modernize restart app logic ([#3343](https://github.com/ReVanced/revanced-patches/issues/3343)) ([3897647](https://github.com/ReVanced/revanced-patches/commit/3897647321b6c1860dc9804cac6c6985da8bb675))
+
+## [2.201.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.1...v2.201.2-dev.1) (2023-11-29)
+
+
+### Bug Fixes
+
+* **YouTube - Restore old seekbar thumbnails:** Move setting into 'Seekbar' submenu ([#3344](https://github.com/ReVanced/revanced-patches/issues/3344)) ([880091a](https://github.com/ReVanced/revanced-patches/commit/880091a96d1a628520732367c96c4c11fb93b72d))
+
+## [2.201.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.0...v2.201.1) (2023-11-27)
+
+
+### Bug Fixes
+
+* **Spotify - Hide premium navbar:** Support latest version ([b87005d](https://github.com/ReVanced/revanced-patches/commit/b87005de0c40293f85d3997f43b353a87a925156))
+* **YouTube - Hide layout components:** Clarify custom filter usage ([cc16db5](https://github.com/ReVanced/revanced-patches/commit/cc16db56d1c9925852265fcebb459d9620cd1b92))
+
+## [2.201.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.201.1-dev.1...v2.201.1-dev.2) (2023-11-23)
+
+
+### Bug Fixes
+
+* **Spotify - Hide premium navbar:** Support latest version ([b87005d](https://github.com/ReVanced/revanced-patches/commit/b87005de0c40293f85d3997f43b353a87a925156))
+
+## [2.201.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.0...v2.201.1-dev.1) (2023-11-23)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Clarify custom filter usage ([cc16db5](https://github.com/ReVanced/revanced-patches/commit/cc16db56d1c9925852265fcebb459d9620cd1b92))
+
+# [2.201.0](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0) (2023-11-23)
+
+
+### Bug Fixes
+
+* **YouTube - Enable tablet layout:** Respect the original device layout ([b2c5bab](https://github.com/ReVanced/revanced-patches/commit/b2c5babf3fd9ad73daa06e03f4830a9dd7199d0c))
+
+
+### Features
+
+* **YouTube - Hide ads:** Hide shopping links in video description ([0c875a1](https://github.com/ReVanced/revanced-patches/commit/0c875a106308ae9747ae998d75b84db1c336762b))
+* **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([2bc7485](https://github.com/ReVanced/revanced-patches/commit/2bc7485cda5c5e17d65419faca983567a030f9aa))
+
+# [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0-dev.1) (2023-11-23)
+
+
+### Bug Fixes
+
+* **YouTube - Enable tablet layout:** Respect the original device layout ([b2c5bab](https://github.com/ReVanced/revanced-patches/commit/b2c5babf3fd9ad73daa06e03f4830a9dd7199d0c))
+
+
+### Features
+
+* **YouTube - Hide ads:** Hide shopping links in video description ([0c875a1](https://github.com/ReVanced/revanced-patches/commit/0c875a106308ae9747ae998d75b84db1c336762b))
+* **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([2bc7485](https://github.com/ReVanced/revanced-patches/commit/2bc7485cda5c5e17d65419faca983567a030f9aa))
+
+## [2.200.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.200.1-dev.1) (2023-11-23)
+
+
+### Bug Fixes
+
+* **YouTube - Enable tablet layout:** Respect the original device layout ([1eb12cc](https://github.com/ReVanced/revanced-patches/commit/1eb12cc40ac5c25410dac9857ff4a9585c25f5cc))
+
+# [2.200.0](https://github.com/ReVanced/revanced-patches/compare/v2.199.0...v2.200.0) (2023-11-22)
+
+
+### Bug Fixes
+
+* **Spotify - Custom theme:** Add more background surfaces coloring options ([#3285](https://github.com/ReVanced/revanced-patches/issues/3285)) ([869ec26](https://github.com/ReVanced/revanced-patches/commit/869ec26966f7750c45355ac0acc18b81a2abce87))
+* **YouTube - Remove tracking query parameter:** Sanitize shared URLs in remaining places ([2442902](https://github.com/ReVanced/revanced-patches/commit/2442902dacc25f2c932a6689e9788e5a02fdff6b))
+
+
+### Features
+
+* **Twitch:** Constrain patches to versions known to work ([65b55a5](https://github.com/ReVanced/revanced-patches/commit/65b55a5189df52dc7e99b7e9c68b908fbca92434))
+* **Twitch:** Support version `16.9.1` ([c70e4a6](https://github.com/ReVanced/revanced-patches/commit/c70e4a66bd65b42db88dcabd412ec985226bd1e7))
+
+# [2.200.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.200.0-dev.2...v2.200.0-dev.3) (2023-11-21)
+
+
+### Bug Fixes
+
+* **YouTube - Remove tracking query parameter:** Sanitize shared URLs in remaining places ([2442902](https://github.com/ReVanced/revanced-patches/commit/2442902dacc25f2c932a6689e9788e5a02fdff6b))
+
 # [2.200.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.200.0-dev.1...v2.200.0-dev.2) (2023-11-21)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,36 +6,52 @@
      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
    >
    <img 
+      width="256px"
      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
    >
  </picture>
  <br>
  <a href="https://revanced.app/">
-       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
+     </picture>
   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/revanced">
+   <a href="https://github.com/ReVanced">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="http://revanced.app/discord">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://reddit.com/r/revancedapp">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://t.me/app_revanced">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://x.com/revancedapp">
      <picture>
         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-       <picture/>
+      </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://www.youtube.com/@ReVanced">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
   </a>
   <br>
   <br>
--- a/README.md
+++ b/README.md
@@ -6,36 +6,52 @@
      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
    >
    <img 
+      width="256px"
      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
    >
  </picture>
  <br>
  <a href="https://revanced.app/">
-       <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
+     </picture>
   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/revanced">
+   <a href="https://github.com/ReVanced">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="http://revanced.app/discord">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://reddit.com/r/revancedapp">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://t.me/app_revanced">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://x.com/revancedapp">
      <picture>
         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-       <picture/>
+      </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://www.youtube.com/@ReVanced">
-       <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
   </a>
   <br>
   <br>
--- a/assets/revanced-logo/revanced-logo-round.svg
+++ b/assets/revanced-logo/revanced-logo-round.svg
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,13 +12,6 @@ repositories {
    mavenLocal()
    google()
    maven { url = uri("https://jitpack.io") }
-    // Required for FlexVer-Java
-    maven {
-        url = uri("https://repo.sleeping.town")
-        content {
-            includeGroup("com.unascribed")
-        }
-    }
 }

 dependencies {
@@ -37,6 +30,22 @@ kotlin {
    jvmToolchain(11)
 }

+tasks.withType(Jar::class) {
+    exclude("app/revanced/meta")
+
+    manifest {
+        attributes["Name"] = "ReVanced Patches"
+        attributes["Description"] = "Patches for ReVanced."
+        attributes["Version"] = version
+        attributes["Timestamp"] = System.currentTimeMillis().toString()
+        attributes["Source"] = "git@github.com:revanced/revanced-patches.git"
+        attributes["Author"] = "ReVanced"
+        attributes["Contact"] = "contact@revanced.app"
+        attributes["Origin"] = "https://revanced.app"
+        attributes["License"] = "GNU General Public License v3.0"
+    }
+}
+
 tasks {
    register<DefaultTask>("generateBundle") {
        description = "Generate dex files from build and bundle them in the jar file"
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.200.0-dev.2
+version = 2.203.0-dev.1
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-revanced-patcher = "19.0.0"
+revanced-patcher = "19.1.0"
 smali = "3.0.3"
 guava = "32.1.2-jre"
 gson = "2.10.1"
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dist
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^3.1.0",
-    "@semantic-release/changelog": "^6.0.2",
+    "@saithodev/semantic-release-backmerge": "^3.2.1",
+    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.7.6",
-    "semantic-release": "^20.1.0"
+    "gradle-semantic-release-plugin": "^1.8.0",
+    "semantic-release": "^22.0.8"
  }
 }
--- a/patches.json
+++ b/patches.json
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,9 @@
 include("dummy")

 rootProject.name = "revanced-patches"
+
+buildCache {
+    local {
+        isEnabled = !System.getenv().containsKey("CI")
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
@@ -1,6 +1,7 @@
 package app.revanced.patches.reddit.customclients

 import app.revanced.extensions.exception
+import app.revanced.patcher.PatchClass
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
@@ -9,14 +10,22 @@ import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatc

 abstract class AbstractSpoofClientPatch(
    redirectUri: String,
-    private val clientIdFingerprints: List<MethodFingerprint>,
-    private val userAgentFingerprints: List<MethodFingerprint>? = null,
-    private val miscellaneousFingerprints: List<MethodFingerprint>? = null
-) : BytecodePatch(buildSet {
-    addAll(clientIdFingerprints)
-    userAgentFingerprints?.let(::addAll)
-    miscellaneousFingerprints?.let(::addAll)
-}) {
+    private val miscellaneousFingerprints: Set<MethodFingerprint> = emptySet(),
+    private val clientIdFingerprints: Set<MethodFingerprint> = emptySet(),
+    private val userAgentFingerprints: Set<MethodFingerprint> = emptySet(),
+    compatiblePackages: Set<CompatiblePackage>,
+    dependencies: Set<PatchClass> = emptySet(),
+) : BytecodePatch(
+    name = "Spoof client",
+    description = "Restores functionality of the app by using custom client ID.",
+    fingerprints = buildSet {
+        addAll(clientIdFingerprints)
+        userAgentFingerprints.let(::addAll)
+        miscellaneousFingerprints.let(::addAll)
+    },
+    compatiblePackages = compatiblePackages,
+    dependencies = dependencies
+) {
    var clientId by stringPatchOption(
        "client-id",
        null,
@@ -30,9 +39,9 @@ abstract class AbstractSpoofClientPatch(
    )

    override fun execute(context: BytecodeContext) {
-        fun List<MethodFingerprint>?.executePatch(
-            patch: List<MethodFingerprintResult>.(BytecodeContext) -> Unit
-        ) = this?.map { it.result ?: throw it.exception }?.patch(context)
+        fun Set<MethodFingerprint>.executePatch(
+            patch: Set<MethodFingerprintResult>.(BytecodeContext) -> Unit
+        ) = this.map { it.result ?: throw it.exception }.toSet().patch(context)

        clientIdFingerprints.executePatch { patchClientId(context) }
        userAgentFingerprints.executePatch { patchUserAgent(context) }
@@ -46,7 +55,7 @@ abstract class AbstractSpoofClientPatch(
     * @param context The current [BytecodeContext].
     *
     */
-    abstract fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext)
+    open fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {}

    /**
     * Patch the user agent.
@@ -54,8 +63,7 @@ abstract class AbstractSpoofClientPatch(
     *
     * @param context The current [BytecodeContext].
     */
-    // Not every client needs to patch the user agent.
-    open fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {}
+    open fun Set<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {}

    /**
     * Patch miscellaneous things such as protection measures.
@@ -63,6 +71,5 @@ abstract class AbstractSpoofClientPatch(
     *
     * @param context The current [BytecodeContext].
     */
-    // Not every client needs to patch miscellaneous things.
-    open fun List<MethodFingerprintResult>.patchMiscellaneous(context: BytecodeContext) {}
+    open fun Set<MethodFingerprintResult>.patchMiscellaneous(context: BytecodeContext) {}
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/SpoofClientPatch.kt
@@ -4,27 +4,22 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.GetAuthorizationUrlFingerprint
 import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.RequestTokenFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction


-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    compatiblePackages = [
-        CompatiblePackage("com.onelouder.baconreader"),
-        CompatiblePackage("com.onelouder.baconreader.premium")
-    ]
-)
@Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://baconreader.com/auth", listOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint)
+    redirectUri = "http://baconreader.com/auth",
+    clientIdFingerprints = setOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint),
+    compatiblePackages = setOf(
+        CompatiblePackage("com.onelouder.baconreader"),
+        CompatiblePackage("com.onelouder.baconreader.premium")
+    )
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        fun MethodFingerprintResult.patch(replacementString: String) {
            val clientIdIndex = scanResult.stringsScanResult!!.matches.first().index

--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch.kt
@@ -3,25 +3,20 @@ package app.revanced.patches.reddit.customclients.boostforreddit.api
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.LoginActivityOnCreateFingerprint

-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    compatiblePackages = [CompatiblePackage("com.rubenmayayo.reddit")]
-)
+
@Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://rubenmayayo.com",
-    clientIdFingerprints = listOf(GetClientIdFingerprint),
-    userAgentFingerprints = listOf(LoginActivityOnCreateFingerprint)
+    redirectUri = "http://rubenmayayo.com",
+    clientIdFingerprints = setOf(GetClientIdFingerprint),
+    userAgentFingerprints = setOf(LoginActivityOnCreateFingerprint),
+    compatiblePackages = setOf(CompatiblePackage("com.rubenmayayo.reddit"))
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        first().mutableMethod.addInstructions(
            0,
            """
@@ -31,7 +26,7 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
        )
    }

-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
        first().let { result ->
            result.mutableMethod.apply {
                val insertIndex = result.scanResult.patternScanResult!!.endIndex
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch.kt
@@ -1,69 +1,46 @@
 package app.revanced.patches.reddit.customclients.infinityforreddit.api

 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
-import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
-import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHttpBasicAuthHeaderFingerprint
-import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
-import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.SetWebViewSettingsFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.APIUtilsFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodImplementation

-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    compatiblePackages = [
-        CompatiblePackage(
-            "ml.docilealligator.infinityforreddit", [
-                "5.4.0",
-                "5.4.1",
-                "5.4.2",
-                "6.0.1",
-                "6.0.2",
-                "6.0.4",
-                "6.0.6",
-                "6.1.1"
-            ]
-        )
-    ]
-)
@Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "infinity://localhost",
-    clientIdFingerprints = listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint),
-    userAgentFingerprints = listOf(SetWebViewSettingsFingerprint)
+    redirectUri = "infinity://localhost",
+    clientIdFingerprints = setOf(APIUtilsFingerprint),
+    compatiblePackages = setOf(CompatiblePackage("ml.docilealligator.infinityforreddit"))
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
-        forEach {
-            // First is index of the clientId string.
-            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
-            it.mutableMethod.apply {
-                val oAuthClientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+        first().mutableClass.methods.apply {
+            val getClientIdMethod = single { it.name == "getId" }.also(::remove)

-                replaceInstruction(
-                    clientIdIndex,
-                    "const-string v$oAuthClientIdRegister, \"$clientId\""
-                )
-            }
-        }
-    }
+            val newGetClientIdMethod = ImmutableMethod(
+                getClientIdMethod.definingClass,
+                getClientIdMethod.name,
+                null,
+                getClientIdMethod.returnType,
+                AccessFlags.PUBLIC or AccessFlags.STATIC,
+                null,
+                null,
+                ImmutableMethodImplementation(
+                    1,
+                    """
+                        const-string v0, "$clientId"
+                        return-object v0
+                    """.toInstructions(getClientIdMethod),
+                    null,
+                    null,
+                ),
+            ).toMutable()

-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
-        first().let { result ->
-            val insertIndex = result.scanResult.stringsScanResult!!.matches.first().index
-
-            result.mutableMethod.addInstructions(
-                insertIndex,
-                """
-                    const-string v0, "$OAUTH_USER_AGENT"
-                    invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
-                """
-            )
+            add(newGetClientIdMethod)
        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/SetWebViewSettingsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/SetWebViewSettingsFingerprint.kt
@@ -2,6 +2,6 @@ package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerpr

 import app.revanced.patcher.fingerprint.MethodFingerprint

-object SetWebViewSettingsFingerprint : MethodFingerprint(
-    strings= listOf("https://www.reddit.com/api/v1/authorize.compact")
+object APIUtilsFingerprint : MethodFingerprint(
+    strings = listOf("native-lib")
 )
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
@@ -1,17 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-
-/**
- * Fingerprint for a method that has the client id hardcoded in it.
- * The first string in the fingerprint is the client id.
- *
- * @param customFingerprint A custom fingerprint.
- * @param additionalStrings Additional strings to add to the fingerprint.
- */
-abstract class AbstractClientIdFingerprint(
-    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
-    vararg additionalStrings: String
-) : MethodFingerprint(strings = listOf("NOe2iKrPPzwscA", *additionalStrings), customFingerprint = customFingerprint)
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/GetHttpBasicAuthHeaderFingerprint.kt
@@ -1,3 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
-
-object GetHttpBasicAuthHeaderFingerprint : AbstractClientIdFingerprint(additionalStrings = arrayOf("Authorization"))
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/fingerprints/LoginActivityOnCreateFingerprint.kt
@@ -1,5 +0,0 @@
-package app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints
-
-object LoginActivityOnCreateFingerprint : AbstractClientIdFingerprint(custom@{ methodDef, classDef ->
-    methodDef.name == "onCreate" && classDef.type.endsWith("LoginActivity;")
-})
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/UnlockSubscriptionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/UnlockSubscriptionPatch.kt
@@ -0,0 +1,24 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.subscription
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.reddit.customclients.infinityforreddit.api.SpoofClientPatch
+import app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints.StartSubscriptionActivityFingerprint
+import app.revanced.util.Utils.returnEarly
+
+@Patch(
+    name = "Unlock subscription",
+    description = "Unlocks the subscription feature but requires a custom client ID.",
+    compatiblePackages = [
+        CompatiblePackage("ml.docilealligator.infinityforreddit")
+    ],
+    dependencies = [SpoofClientPatch::class]
+)
+@Suppress("unused")
+object UnlockSubscriptionPatch : BytecodePatch(
+    setOf(StartSubscriptionActivityFingerprint)
+) {
+    override fun execute(context: BytecodeContext) = listOf(StartSubscriptionActivityFingerprint).returnEarly()
+}
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/fingerprints/StartSubscriptionActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/fingerprints/StartSubscriptionActivityFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints
+
+import app.revanced.util.patch.LiteralValueFingerprint
+
+internal object StartSubscriptionActivityFingerprint : LiteralValueFingerprint(
+    literalSupplier = { 0x10008000 } // Intent start flag only used in the subscription activity
+)
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/SpoofClientPatch.kt
@@ -3,28 +3,23 @@ package app.revanced.patches.reddit.customclients.joeyforreddit.api
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.joeyforreddit.api.fingerprints.GetClientIdFingerprint
 import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.DisablePiracyDetectionPatch


-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    dependencies = [DisablePiracyDetectionPatch::class],
-    compatiblePackages = [
+@Suppress("unused")
+object SpoofClientPatch : AbstractSpoofClientPatch(
+    redirectUri = "https://127.0.0.1:65023/authorize_callback",
+    clientIdFingerprints = setOf(GetClientIdFingerprint),
+    compatiblePackages = setOf(
        CompatiblePackage("o.o.joey"),
        CompatiblePackage("o.o.joey.pro"),
        CompatiblePackage("o.o.joey.dev")
-    ]
-)
-@Suppress("unused")
-object SpoofClientPatch : AbstractSpoofClientPatch(
-    "https://127.0.0.1:65023/authorize_callback", listOf(GetClientIdFingerprint)
+    ),
+    dependencies = setOf(DisablePiracyDetectionPatch::class)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        first().mutableMethod.addInstructions(
            0,
            """
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatch.kt
@@ -6,29 +6,24 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
 import app.revanced.patcher.fingerprint.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BasicAuthorizationFingerprint
 import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BuildAuthorizationStringFingerprint
 import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.GetUserAgentFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    compatiblePackages = [
-        CompatiblePackage("com.andrewshu.android.reddit"),
-        CompatiblePackage("com.andrewshu.android.redditdonation")
-    ]
-)
+
@Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "redditisfun://auth",
-    listOf(BuildAuthorizationStringFingerprint, BasicAuthorizationFingerprint),
-    listOf(GetUserAgentFingerprint)
+    redirectUri = "redditisfun://auth",
+    clientIdFingerprints = setOf(BuildAuthorizationStringFingerprint, BasicAuthorizationFingerprint),
+    userAgentFingerprints = setOf(GetUserAgentFingerprint),
+    compatiblePackages = setOf(
+        CompatiblePackage("com.andrewshu.android.reddit"),
+        CompatiblePackage("com.andrewshu.android.redditdonation")
+    )
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        /**
         * Replaces a one register instruction with a const-string instruction
         * at the index returned by [getReplacementIndex].
@@ -54,7 +49,7 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
        last().replaceWith("$clientId:") { last().index + 7 }
    }

-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
        // Use a random user agent.
        val randomName = (0..100000).random()
        val userAgent = "android:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/SpoofClientPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.*
 import com.android.tools.smali.dexlib2.Opcode
@@ -14,29 +12,26 @@ import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction10t
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21t
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    compatiblePackages = [
-        CompatiblePackage("free.reddit.news"),
-        CompatiblePackage("reddit.news")
-    ]
-)
+
@Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "dbrady://relay",
-    listOf(
+    redirectUri = "dbrady://relay",
+    miscellaneousFingerprints = setOf(
+        SetRemoteConfigFingerprint,
+        RedditCheckDisableAPIFingerprint
+    ),
+    clientIdFingerprints = setOf(
        LoginActivityClientIdFingerprint,
        GetLoggedInBearerTokenFingerprint,
        GetLoggedOutBearerTokenFingerprint,
        GetRefreshTokenFingerprint
    ),
-    miscellaneousFingerprints = listOf(
-        SetRemoteConfigFingerprint,
-        RedditCheckDisableAPIFingerprint
+    compatiblePackages = setOf(
+        CompatiblePackage("free.reddit.news"),
+        CompatiblePackage("reddit.news")
    )
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        forEach {
            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
            it.mutableMethod.apply {
@@ -50,7 +45,7 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
        }
    }

-    override fun List<MethodFingerprintResult>.patchMiscellaneous(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchMiscellaneous(context: BytecodeContext) {
        // Do not load remote config which disables OAuth login remotely.
        first().mutableMethod.addInstructions(0, "return-void")

--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/SpoofClientPatch.kt
@@ -3,21 +3,17 @@ package app.revanced.patches.reddit.customclients.slide.api
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint

-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    compatiblePackages = [CompatiblePackage("me.ccrama.redditslide")]
-)
+
@Suppress("unused")
 object SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://www.ccrama.me", listOf(GetClientIdFingerprint)
+    redirectUri = "http://www.ccrama.me",
+    clientIdFingerprints = setOf(GetClientIdFingerprint),
+    compatiblePackages = setOf(CompatiblePackage("me.ccrama.redditslide"))
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        first().mutableMethod.addInstructions(
            0,
    """
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprintResult
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
 import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
@@ -20,24 +18,21 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.StringReference
 import java.util.*

-@Patch(
-    name = "Spoof client",
-    description = "Restores functionality of the app by using custom client ID's.",
-    dependencies = [DisablePiracyDetectionPatch::class],
-    compatiblePackages =  [
+
+@Suppress("unused")
+object SpoofClientPatch : AbstractSpoofClientPatch(
+    redirectUri = "http://redditsync/auth",
+    miscellaneousFingerprints = setOf(ImgurImageAPIFingerprint),
+    clientIdFingerprints = setOf(GetAuthorizationStringFingerprint),
+    userAgentFingerprints = setOf(LoadBrowserURLFingerprint),
+    compatiblePackages = setOf(
        CompatiblePackage("com.laurencedawson.reddit_sync"),
        CompatiblePackage("com.laurencedawson.reddit_sync.pro"),
        CompatiblePackage("com.laurencedawson.reddit_sync.dev")
-    ]
-)
-@Suppress("unused")
-object SpoofClientPatch : AbstractSpoofClientPatch(
-    "http://redditsync/auth",
-    clientIdFingerprints = listOf(GetAuthorizationStringFingerprint),
-    userAgentFingerprints = listOf(LoadBrowserURLFingerprint),
-    miscellaneousFingerprints = listOf(ImgurImageAPIFingerprint)
+    ),
+    dependencies = setOf(DisablePiracyDetectionPatch::class)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
        forEach { fingerprintResult ->
            fingerprintResult.also { result ->
                GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
@@ -73,7 +68,7 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
    }

    // Use the non-commercial Imgur API endpoint.
-    override fun List<MethodFingerprintResult>.patchMiscellaneous(context: BytecodeContext) = first().let {
+    override fun Set<MethodFingerprintResult>.patchMiscellaneous(context: BytecodeContext) = first().let {
        val apiUrlIndex = it.scanResult.stringsScanResult!!.matches.first().index

        it.mutableMethod.replaceInstruction(
@@ -82,7 +77,7 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
        )
    }

-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
+    override fun Set<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
        first().let { result ->
            val insertIndex = result.scanResult.patternScanResult!!.startIndex

--- a/src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/settings/AbstractSettingsResourcePatch.kt
@@ -25,18 +25,6 @@ abstract class AbstractSettingsResourcePatch(
    private val sourceDirectory: String,
 ) : ResourcePatch(), Closeable {
    override fun execute(context: ResourceContext) {
-        /*
-         * used for self-restart
-         * TODO: do this only, when necessary
-         */
-        context.xmlEditor["AndroidManifest.xml"].use { editor ->
-            editor.file.getElementsByTagName("manifest").item(0).also {
-                it.appendChild(it.ownerDocument.createElement("uses-permission").also { element ->
-                    element.setAttribute("android:name", "android.permission.SCHEDULE_EXACT_ALARM")
-                })
-            }
-        }
-
        /* copy preference template from source dir */
        context.copyResources(
            sourceDirectory,
--- a/src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt
@@ -26,7 +26,7 @@ object CustomThemePatch : ResourcePatch() {
        key = "backgroundColorSecondary",
        default = "#ff282828",
        title = "Secondary background color",
-        description = "The secondary background color. Can be a hex color or a resource reference.",
+        description = "The secondary background color. (e.g. search box, artist & podcast). Can be a hex color or a resource reference.",
        required = true
    )

--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt
@@ -1,51 +1,32 @@
 package app.revanced.patches.spotify.navbar

+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
-import app.revanced.patches.spotify.navbar.fingerprints.AddPremiumNavbarTabFingerprint
-import app.revanced.patches.spotify.navbar.fingerprints.AddPremiumNavbarTabParentFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
+import app.revanced.patches.spotify.navbar.fingerprints.AddNavBarItemFingerprint

@Patch(
    name = "Hide premium navbar",
    description = "Removes the premium tab from the navbar.",
-    dependencies = [ResourceMappingPatch::class],
+    dependencies = [PremiumNavbarTabResourcePatch::class],
    compatiblePackages = [CompatiblePackage("com.spotify.music")]
 )
@Suppress("unused")
-object PremiumNavbarTabPatch : BytecodePatch(setOf(AddPremiumNavbarTabParentFingerprint)) {
-    override fun execute(context: BytecodeContext) {
-        val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
-        AddPremiumNavbarTabFingerprint.resolve(context, parentResult.classDef)
-
-        val result = AddPremiumNavbarTabFingerprint.result!!
-
-        val method = result.mutableMethod
-        val methodInstructions = method.implementation!!.instructions
-        val lastInstructionIdx = methodInstructions.size - 1
-
-        val premiumTabId =
-            ResourceMappingPatch.resourceMappings.single { it.type == "id" && it.name == "premium_tab" }.id
-
-        var removeAmount = 2
-        // 2nd const remove method
-        for ((i, instruction) in methodInstructions.asReversed().withIndex()) {
-            if (instruction.opcode.ordinal != Opcode.CONST.ordinal) continue
-            if ((instruction as WideLiteralInstruction).wideLiteral != premiumTabId) continue
-
-            val findThreshold = 10
-            val constIndex = lastInstructionIdx - i
-            val invokeInstruction = methodInstructions.subList(constIndex, constIndex + findThreshold).first {
-                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL_RANGE.ordinal
-            }
-            method.removeInstruction(methodInstructions.indexOf(invokeInstruction))
-
-            if (--removeAmount == 0) break
-        }
-    }
-}
+object PremiumNavbarTabPatch : BytecodePatch(
+    setOf(AddNavBarItemFingerprint)
+) {
+    // If the navigation bar item is the premium tab, do not add it.
+    override fun execute(context: BytecodeContext) = AddNavBarItemFingerprint.result?.mutableMethod?.addInstructions(
+        0,
+        """
+            const v1, ${PremiumNavbarTabResourcePatch.premiumTabId}
+            if-ne p5, v1, :continue
+            return-void
+            :continue
+            nop
+        """
+    ) ?: throw AddNavBarItemFingerprint.exception
+}
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabResourcePatch.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.spotify.navbar
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.shared.mapping.misc.ResourceMappingPatch
+
+@Patch(dependencies = [ResourceMappingPatch::class])
+object PremiumNavbarTabResourcePatch : ResourcePatch() {
+    internal var showBottomNavigationItemsTextId = -1L
+    internal var premiumTabId = -1L
+
+    override fun execute(context: ResourceContext) {
+        premiumTabId = ResourceMappingPatch.resourceMappings.single {
+            it.type == "id" && it.name == "premium_tab"
+        }.id
+
+        showBottomNavigationItemsTextId = ResourceMappingPatch.resourceMappings.single {
+            it.type == "bool" && it.name == "show_bottom_navigation_items_text"
+        }.id
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddNavBarItemFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddNavBarItemFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.spotify.navbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.spotify.navbar.PremiumNavbarTabResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object AddNavBarItemFingerprint : LiteralValueFingerprint(
+     returnType = "V",
+     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+     literalSupplier = { PremiumNavbarTabResourcePatch.showBottomNavigationItemsTextId },
+)
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabFingerprint.kt
@@ -1,7 +0,0 @@
-package app.revanced.patches.spotify.navbar.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-object AddPremiumNavbarTabFingerprint : MethodFingerprint(
-    parameters = listOf("L", "L", "L", "L", "L", "L")
-)
--- a/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/navbar/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
@@ -1,7 +0,0 @@
-package app.revanced.patches.spotify.navbar.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
-     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
-)
--- a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/SettingsPatch.kt
@@ -111,7 +111,6 @@ object SettingsPatch : BytecodePatch(
        addString("revanced_settings", "ReVanced Settings", false)
        addString("revanced_reboot_message", "Twitch needs to restart to apply your changes. Restart now?", false)
        addString("revanced_reboot", "Restart", false)
-        addString("revanced_cancel", "Cancel", false)
    }

    fun addString(identifier: String, value: String, formatted: Boolean = true) =
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -26,17 +26,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt
@@ -55,6 +55,12 @@ object HideAdsResourcePatch : ResourcePatch() {
                StringResource("revanced_hide_products_banner_summary_on", "Banner is hidden"),
                StringResource("revanced_hide_products_banner_summary_off", "Banner is shown")
            ),
+            SwitchPreference(
+                "revanced_hide_shopping_links",
+                StringResource("revanced_hide_shopping_links_title", "Hide shopping links in video description"),
+                StringResource("revanced_hide_shopping_links_summary_on", "Shopping links are hidden"),
+                StringResource("revanced_hide_shopping_links_summary_off", "Shopping links are shown")
+            ),
            SwitchPreference(
                "revanced_hide_web_search_results",
                StringResource("revanced_hide_web_search_results_title", "Hide web search results"),
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
@@ -20,17 +20,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -24,17 +24,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
@@ -19,17 +19,13 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt
@@ -19,17 +19,13 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        ),
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
            [
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
@@ -25,7 +25,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
            [
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
@@ -26,17 +26,13 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -24,17 +24,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -22,17 +22,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
@@ -32,17 +32,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
@@ -23,17 +23,13 @@ import com.android.tools.smali.dexlib2.Opcode
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -29,17 +29,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
@@ -27,17 +27,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
@@ -22,17 +22,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
@@ -22,17 +22,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
@@ -21,17 +21,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
@@ -22,17 +22,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -25,17 +25,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
@@ -22,17 +22,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
@@ -18,17 +18,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
@@ -23,7 +23,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -37,7 +37,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
@@ -74,6 +75,12 @@ object HideLayoutComponentsPatch : BytecodePatch(
                StringResource("revanced_hide_channel_watermark_title_summary_on", "Watermark is hidden"),
                StringResource("revanced_hide_channel_watermark_title_summary_off", "Watermark is shown")
            ),
+            SwitchPreference(
+                "revanced_hide_for_you_shelf",
+                StringResource("revanced_hide_for_you_shelf_title", "Hide \\\'For you\\\' shelf in channel page"),
+                StringResource("revanced_hide_for_you_shelf_summary_on", "Shelf is hidden"),
+                StringResource("revanced_hide_for_you_shelf_summary_off", "Shelf is shown")
+            ),
            SwitchPreference(
                "revanced_hide_notify_me_button",
                StringResource("revanced_hide_notify_me_button_title", "Hide \\\'Notify me\\\' button"),
@@ -400,7 +407,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
                        StringResource("revanced_custom_filter_strings_title", "Custom filter"),
                        StringResource(
                            "revanced_custom_filter_strings_summary",
-                            "List of components to filter separated by new line"
+                            "List of component path builder strings to filter separated by new line"
                        ),
                        inputType = InputType.TEXT_MULTI_LINE
                    )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -29,17 +29,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
@@ -18,17 +18,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt
@@ -18,17 +18,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
@@ -21,17 +21,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
    ],
    compatiblePackages = [
        CompatiblePackage("com.google.android.youtube", [
-            "18.16.37",
-            "18.19.35",
-            "18.20.39",
-            "18.23.35",
-            "18.29.38",
            "18.32.39",
            "18.37.36",
            "18.38.44",
            "18.43.45",
            "18.44.41",
            "18.45.41",
+            "18.45.43"
        ])
    ]
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -25,7 +25,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
            "com.google.android.youtube", [
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
@@ -26,17 +26,13 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -30,17 +30,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
@@ -22,7 +22,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
@@ -19,17 +19,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
@@ -19,17 +19,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
@@ -13,17 +13,13 @@ import org.w3c.dom.Element
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -40,7 +40,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
            "com.google.android.youtube", [
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
@@ -22,16 +22,12 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt
@@ -16,7 +16,7 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
@Patch(
    name = "Restore old seekbar thumbnails",
    description = "Restores the old seekbar thumbnails that appear above the seekbar instead of fullscreen thumbnails.",
-    dependencies = [IntegrationsPatch::class, SettingsPatch::class],
+    dependencies = [IntegrationsPatch::class, SeekbarPreferencesPatch::class],
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
@@ -37,7 +38,7 @@ object RestoreOldSeekbarThumbnailsPatch : BytecodePatch(
        "Lapp/revanced/integrations/patches/RestoreOldSeekbarThumbnailsPatch;"

    override fun execute(context: BytecodeContext) {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+        SeekbarPreferencesPatch.addPreferences(
            SwitchPreference(
                "revanced_restore_old_seekbar_thumbnails",
                StringResource(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
@@ -38,17 +38,13 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
@@ -23,17 +23,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
@@ -19,17 +19,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
@@ -4,6 +4,7 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
@@ -37,18 +38,19 @@ object EnableTabletLayoutPatch : BytecodePatch(

        GetFormFactorFingerprint.result?.let {
            it.mutableMethod.apply {
-                val returnLargeFormFactorIndex = it.scanResult.patternScanResult!!.endIndex - 4
+                val returnIsLargeFormFactorIndex = getInstructions().lastIndex - 4
+                val returnIsLargeFormFactorLabel = getInstruction(returnIsLargeFormFactorIndex)

                addInstructionsWithLabels(
                    0,
                    """
-                          invoke-static {}, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z
-                          move-result v0
+                          invoke-static { }, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z
+                          move-result v0 # Free register
                          if-nez v0, :is_large_form_factor
                    """,
                    ExternalLabel(
                        "is_large_form_factor",
-                        getInstruction(returnLargeFormFactorIndex)
+                        returnIsLargeFormFactorLabel
                    )
                )
            }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt
@@ -27,17 +27,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", arrayOf(
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            )
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt
@@ -35,7 +35,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
@@ -21,15 +21,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
@@ -23,17 +23,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
@@ -24,7 +24,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch.kt
@@ -19,17 +19,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
@@ -25,7 +25,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
            [
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
@@ -23,17 +23,13 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/MicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/MicroGBytecodePatch.kt
@@ -25,17 +25,13 @@ import app.revanced.util.microg.MicroGBytecodeHelper
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
@@ -28,17 +28,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
        CompatiblePackage(
            "com.google.android.youtube",
            [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/PlayerOverlaysHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/PlayerOverlaysHookPatch.kt
@@ -13,17 +13,12 @@ import app.revanced.patches.youtube.misc.playeroverlay.fingerprint.PlayerOverlay
    dependencies = [IntegrationsPatch::class],
    compatiblePackages = [
        CompatiblePackage("com.google.android.youtube", [
-            "18.16.37",
-            "18.19.35",
-            "18.20.39",
-            "18.23.35",
-            "18.29.38",
            "18.32.39"
        ])
    ]
 )
@Suppress("unused")
-object PlayerOverlaysHookPatch : BytecodePatch(
+object PlayerOverlaysHookPatch : BytecodePatch( // TODO: delete this unused outdated patch and its integration code.
    setOf(PlayerOverlaysOnFinishInflateFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
@@ -1,16 +1,23 @@
 package app.revanced.patches.youtube.misc.privacy

+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.privacy.fingerprints.CopyTextFingerprint
+import app.revanced.patches.youtube.misc.privacy.fingerprints.SystemShareSheetFingerprint
+import app.revanced.patches.youtube.misc.privacy.fingerprints.YouTubeShareSheetFingerprint
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction

@Patch(
@@ -23,14 +30,15 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
            [
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
 )
@Suppress("unused")
 object RemoveTrackingQueryParameterPatch : BytecodePatch(
-    setOf(CopyTextFingerprint)
+    setOf(CopyTextFingerprint, SystemShareSheetFingerprint, YouTubeShareSheetFingerprint)
 ) {
    const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/RemoveTrackingQueryParameterPatch;"

@@ -53,21 +61,31 @@ object RemoveTrackingQueryParameterPatch : BytecodePatch(
            )
        )

-        CopyTextFingerprint.result?.let {
-            val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
+        fun MethodFingerprint.hook(
+            getInsertIndex: PatternScanResult.() -> Int,
+            getUrlRegister: MutableMethod.(insertIndex: Int) -> Int
+        ) = result?.let {
+            val insertIndex = it.scanResult.patternScanResult!!.getInsertIndex()
+            val urlRegister = it.mutableMethod.getUrlRegister(insertIndex)

-            it.mutableMethod.apply {
-                val urlRegister = getInstruction<TwoRegisterInstruction>(insertIndex - 2).registerA
+            it.mutableMethod.addInstructions(
+                insertIndex,
+                """
+                    invoke-static {v$urlRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->sanitize(Ljava/lang/String;)Ljava/lang/String;
+                    move-result-object v$urlRegister
+                """
+            )
+        } ?: throw exception

-                addInstructions(
-                    insertIndex,
-                    """
-                        invoke-static {v$urlRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->sanitize(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$urlRegister
-                    """
-                )
-            }
+        // Native YouTube share sheet.
+        YouTubeShareSheetFingerprint.hook(getInsertIndex = { startIndex + 1 })
+        { insertIndex -> getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA }

-        }
+        // Native system share sheet.
+        SystemShareSheetFingerprint.hook(getInsertIndex = { endIndex })
+        { insertIndex -> getInstruction<OneRegisterInstruction>(insertIndex - 1).registerA }
+
+        CopyTextFingerprint.hook(getInsertIndex = { startIndex + 2 })
+        { insertIndex -> getInstruction<TwoRegisterInstruction>(insertIndex - 2).registerA }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/fingerprints/SystemShareSheetFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/fingerprints/SystemShareSheetFingerprint.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.misc.privacy.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+object SystemShareSheetFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("L", "Ljava/util/Map;"),
+    opcodes = listOf(
+        Opcode.CHECK_CAST,
+        Opcode.GOTO
+    ),
+    strings = listOf("YTShare_Logging_Share_Intent_Endpoint_Byte_Array")
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/fingerprints/YouTubeShareSheetFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/fingerprints/YouTubeShareSheetFingerprint.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.youtube.misc.privacy.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+object YouTubeShareSheetFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L", "Ljava/util/Map;"),
+    opcodes = listOf(
+        Opcode.CHECK_CAST,
+        Opcode.GOTO,
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt
@@ -21,17 +21,13 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.16.37",
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt
@@ -31,16 +31,13 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.19.35",
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
@@ -15,15 +15,13 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
    compatiblePackages = [
        CompatiblePackage(
            "com.google.android.youtube", [
-                "18.20.39",
-                "18.23.35",
-                "18.29.38",
                "18.32.39",
                "18.37.36",
                "18.38.44",
                "18.43.45",
                "18.44.41",
-                "18.45.41"
+                "18.45.41",
+                "18.45.43"
            ]
        )
    ]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	f909df8047	chore(release): 2.203.0-dev.1 [skip ci] # [2.203.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.202.0...v2.203.0-dev.1) (2023-12-02) ### Features * Infinity for Reddit - Spoof client: Support latest version ([`0ceb163`](`0ceb163ffa`)) * Infinity for Reddit: Add `Unlock subscription` patch ([`080b357`](`080b357a79`))	2023-12-02 16:48:08 +00:00
oSumAtrIX	6e24952d10	refactor: Simplify `AbstractSpoofClientPatch` class	2023-12-02 17:42:14 +01:00
oSumAtrIX	080b357a79	feat(Infinity for Reddit): Add `Unlock subscription` patch	2023-12-02 17:42:14 +01:00
oSumAtrIX	0ceb163ffa	feat(Infinity for Reddit - Spoof client): Support latest version	2023-12-02 17:42:14 +01:00
oSumAtrIX	60340ccc7b	build: Bump dependencies	2023-12-02 17:42:13 +01:00
semantic-release-bot	fad9d2b54f	chore(release): 2.202.0 [skip ci] # [2.202.0](https://github.com/ReVanced/revanced-patches/compare/v2.201.1...v2.202.0) (2023-12-02) ### Bug Fixes * Spotify - Custom Theme: Clarify patch option description ([#3338](https://github.com/ReVanced/revanced-patches/issues/3338)) ([`b1307cf`](`b1307cf09b`)) * YouTube - Enable tablet layout: Respect the original device layout ([`c63cc2c`](`c63cc2c3bf`)) * YouTube - Restore old seekbar thumbnails: Move setting into 'Seekbar' submenu ([#3344](https://github.com/ReVanced/revanced-patches/issues/3344)) ([`a6267fd`](`a6267fd00f`)) ### Features * Modernize restart app logic ([#3343](https://github.com/ReVanced/revanced-patches/issues/3343)) ([`8c5487c`](`8c5487c467`)) * YouTube: Support version `18.45.43` ([#3345](https://github.com/ReVanced/revanced-patches/issues/3345)) ([`04c91ae`](`04c91ae28c`))	2023-12-02 14:26:34 +00:00
oSumAtrIX	4349d630a9	chore: Merge branch `dev` to `main` (#3336 )	2023-12-02 15:24:30 +01:00
semantic-release-bot	d43ea315d5	chore(release): 2.202.0-dev.4 [skip ci] # [2.202.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v2.202.0-dev.3...v2.202.0-dev.4) (2023-12-01) ### Features * YouTube: Support version `18.45.43` ([#3345](https://github.com/ReVanced/revanced-patches/issues/3345)) ([`04c91ae`](`04c91ae28c`))	2023-12-01 23:09:22 +00:00
LisoUseInAIKyrios	04c91ae28c	feat(YouTube): Support version `18.45.43` (#3345 )	2023-12-02 00:07:29 +01:00
semantic-release-bot	51aeb0b24d	chore(release): 2.202.0-dev.3 [skip ci] # [2.202.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.202.0-dev.2...v2.202.0-dev.3) (2023-12-01) ### Bug Fixes * YouTube - Enable tablet layout: Respect the original device layout ([`c63cc2c`](`c63cc2c3bf`))	2023-12-01 22:54:33 +00:00
oSumAtrIX	c63cc2c3bf	fix(YouTube - Enable tablet layout): Respect the original device layout	2023-12-01 23:52:31 +01:00
semantic-release-bot	81d12c21b2	chore(release): 2.202.0-dev.2 [skip ci] # [2.202.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.202.0-dev.1...v2.202.0-dev.2) (2023-12-01) ### Bug Fixes * Spotify - Custom Theme: Clarify patch option description ([#3338](https://github.com/ReVanced/revanced-patches/issues/3338)) ([`b1307cf`](`b1307cf09b`))	2023-12-01 00:10:35 +00:00
Advyte	b1307cf09b	fix(Spotify - Custom Theme): Clarify patch option description (#3338 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-12-01 01:08:37 +01:00
semantic-release-bot	18481c66c4	chore(release): 2.202.0-dev.1 [skip ci] # [2.202.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.2-dev.1...v2.202.0-dev.1) (2023-11-29) ### Features * Modernize restart app logic ([#3343](https://github.com/ReVanced/revanced-patches/issues/3343)) ([`8c5487c`](`8c5487c467`))	2023-11-29 20:50:42 +00:00
LisoUseInAIKyrios	8c5487c467	feat: Modernize restart app logic (#3343 )	2023-11-29 22:48:35 +02:00
semantic-release-bot	a96572001b	chore(release): 2.201.2-dev.1 [skip ci] ## [2.201.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.1...v2.201.2-dev.1) (2023-11-29) ### Bug Fixes * YouTube - Restore old seekbar thumbnails: Move setting into 'Seekbar' submenu ([#3344](https://github.com/ReVanced/revanced-patches/issues/3344)) ([`a6267fd`](`a6267fd00f`))	2023-11-29 12:35:50 +00:00
LisoUseInAIKyrios	a6267fd00f	fix(YouTube - Restore old seekbar thumbnails): Move setting into 'Seekbar' submenu (#3344 )	2023-11-29 14:33:56 +02:00
oSumAtrIX	35ac0913c9	build: Add manifest headers	2023-11-28 00:04:39 +01:00
oSumAtrIX	240696d573	build: Remove unnecessary Maven repository	2023-11-27 22:42:22 +01:00
semantic-release-bot	b16d64dd58	chore(release): 2.201.1 [skip ci] ## [2.201.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.0...v2.201.1) (2023-11-27) ### Bug Fixes * Spotify - Hide premium navbar: Support latest version ([`15702c9`](`15702c92b3`)) * YouTube - Hide layout components: Clarify custom filter usage ([`45e55b4`](`45e55b48e5`))	2023-11-27 19:09:29 +00:00
oSumAtrIX	d271ee40ad	chore: Merge branch `dev` to `main` (#3325 )	2023-11-27 20:07:20 +01:00
semantic-release-bot	8f49b7ecf5	chore(release): 2.201.1-dev.2 [skip ci] ## [2.201.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.201.1-dev.1...v2.201.1-dev.2) (2023-11-23) ### Bug Fixes * Spotify - Hide premium navbar: Support latest version ([`15702c9`](`15702c92b3`))	2023-11-23 18:37:50 +00:00
oSumAtrIX	15702c92b3	fix(Spotify - Hide premium navbar): Support latest version	2023-11-23 19:35:51 +01:00
semantic-release-bot	71633b7f1d	chore(release): 2.201.1-dev.1 [skip ci] ## [2.201.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.201.0...v2.201.1-dev.1) (2023-11-23) ### Bug Fixes * YouTube - Hide layout components: Clarify custom filter usage ([`45e55b4`](`45e55b48e5`))	2023-11-23 17:46:21 +00:00
oSumAtrIX	45e55b48e5	fix(YouTube - Hide layout components): Clarify custom filter usage	2023-11-23 18:44:21 +01:00
semantic-release-bot	f2753b2999	chore(release): 2.201.0 [skip ci] # [2.201.0](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0) (2023-11-23) ### Bug Fixes * YouTube - Enable tablet layout: Respect the original device layout ([`7f15bb4`](`7f15bb4c20`)) ### Features * YouTube - Hide ads: Hide shopping links in video description ([`6cb43c3`](`6cb43c3326`)) * YouTube - Hide layout components: Hide "For You" shelf in channel page ([`89300e1`](`89300e1f42`))	2023-11-23 03:36:39 +00:00
oSumAtrIX	6268d14212	chore: Merge branch `dev` to `main` (#3323 )	2023-11-23 04:34:44 +01:00
semantic-release-bot	576563a27b	chore(release): 2.201.0-dev.1 [skip ci] # [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0-dev.1) (2023-11-23) ### Bug Fixes * YouTube - Enable tablet layout: Respect the original device layout ([`7f15bb4`](`7f15bb4c20`)) ### Features * YouTube - Hide ads: Hide shopping links in video description ([`6cb43c3`](`6cb43c3326`)) * YouTube - Hide layout components: Hide "For You" shelf in channel page ([`89300e1`](`89300e1f42`))	2023-11-23 03:01:29 +00:00
oSumAtrIX	6cb43c3326	feat(YouTube - Hide ads): Hide shopping links in video description	2023-11-23 03:54:32 +01:00
oSumAtrIX	89300e1f42	feat(YouTube - Hide layout components): Hide "For You" shelf in channel page	2023-11-23 03:54:31 +01:00
semantic-release-bot	094ffd1b34	chore(release): 2.200.1-dev.1 [skip ci] ## [2.200.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.200.1-dev.1) (2023-11-23) ### Bug Fixes * YouTube - Enable tablet layout: Respect the original device layout ([`e88d6a8`](`e88d6a8bba`))	2023-11-23 03:54:31 +01:00
oSumAtrIX	7f15bb4c20	fix(YouTube - Enable tablet layout): Respect the original device layout	2023-11-23 03:54:31 +01:00
oSumAtrIX	20081ef27e	chore: Add heading to issue templates	2023-11-23 00:56:51 +01:00
oSumAtrIX	7df2cd0373	chore: Update README heading	2023-11-23 00:51:24 +01:00
semantic-release-bot	bab4d54019	chore(release): 2.200.0 [skip ci] # [2.200.0](https://github.com/ReVanced/revanced-patches/compare/v2.199.0...v2.200.0) (2023-11-22) ### Bug Fixes * Spotify - Custom theme: Add more background surfaces coloring options ([#3285](https://github.com/ReVanced/revanced-patches/issues/3285)) ([`521d3a0`](`521d3a08c8`)) * YouTube - Remove tracking query parameter: Sanitize shared URLs in remaining places ([`51ab7a6`](`51ab7a65a0`)) ### Features * Twitch: Constrain patches to versions known to work ([`54b23da`](`54b23da0b4`)) * Twitch: Support version `16.9.1` ([`e74f7d9`](`e74f7d96d7`))	2023-11-22 08:05:08 +00:00
oSumAtrIX	96bb0909c6	chore: Merge branch `dev` to `main` (#3319 )	2023-11-22 09:03:03 +01:00
oSumAtrIX	9457ecc2a9	build: Bump Gradle wrapper	2023-11-22 00:54:15 +01:00
oSumAtrIX	469b6f3ad5	build: Use dedicated Gradle cache action	2023-11-22 00:45:42 +01:00
oSumAtrIX	3cd1939063	build: Use Gradle build cache	2023-11-22 00:26:38 +01:00
oSumAtrIX	2575825adf	ci: Simplify cache paths	2023-11-22 00:11:16 +01:00
oSumAtrIX	798360f7b9	chore: Reword comment for first PR merge	2023-11-22 00:07:46 +01:00
oSumAtrIX	b9101caba9	chore: Add a newline between steps	2023-11-22 00:04:24 +01:00
oSumAtrIX	b16c86db36	chore: Notice about contribution guidelines in issue templates	2023-11-22 00:01:24 +01:00
oSumAtrIX	943331de02	chore: Do not use a line break in issue template sentence	2023-11-21 23:48:29 +01:00
oSumAtrIX	acaf657397	ci: Update cache key	2023-11-21 23:41:41 +01:00
oSumAtrIX	3e455ae7c2	chore: Update packages	2023-11-21 23:40:58 +01:00
semantic-release-bot	0715e4c723	chore(release): 2.200.0-dev.3 [skip ci] # [2.200.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v2.200.0-dev.2...v2.200.0-dev.3) (2023-11-21) ### Bug Fixes * YouTube - Remove tracking query parameter: Sanitize shared URLs in remaining places ([`51ab7a6`](`51ab7a65a0`))	2023-11-21 22:22:03 +00:00
oSumAtrIX	51ab7a65a0	fix(YouTube - Remove tracking query parameter): Sanitize shared URLs in remaining places	2023-11-21 23:09:57 +01:00