fix: Everything works now

# Conflicts:
#	extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/LayoutComponentsFilter.java

.github/workflows/build_pull_request.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -29,7 +29,7 @@ jobs:
         run: ./gradlew :patches:buildAndroid --no-daemon
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: revanced-patches
           path: patches/build/libs

.github/workflows/open_pull_request.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Open pull request
         uses: repo-sync/pull-request@v2

.github/workflows/pull_strings.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: dev
           clean: true

.github/workflows/push_strings.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Preprocess strings
         env:

.github/workflows/release.yml

@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -35,7 +35,7 @@ jobs:
         run: ./gradlew :patches:buildAndroid clean
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 'lts/*'
           cache: 'npm'
@@ -51,14 +51,14 @@ jobs:
           fingerprint: ${{ vars.GPG_FINGERPRINT }}
 
       - name: Release
-        uses: cycjimmy/semantic-release-action@v4
+        uses: cycjimmy/semantic-release-action@v5
         id: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Attest
         if: steps.release.outputs.new_release_published == 'true'
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v3
         with:
           subject-name: 'ReVanced Patches ${{ steps.release.outputs.new_release_git_tag }}'
           subject-path: patches/build/libs/patches-*.rvp

.github/workflows/update-gradle-wrapper.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1

CHANGELOG.md

@@ -1,3 +1,681 @@
+# [5.47.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.47.0-dev.4...v5.47.0-dev.5) (2025-11-13)
+
+
+### Bug Fixes
+
+* **YouTube - Hide player flyout menu items:** Allow hiding audio menu with 'Android No SDK' client type ([9495cf4](https://github.com/ReVanced/revanced-patches/commit/9495cf49ef8a872be64de6c971c1919b4b9a8720))
+
+# [5.47.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.47.0-dev.3...v5.47.0-dev.4) (2025-11-12)
+
+
+### Bug Fixes
+
+* **YouTube - Sanitize sharing links:** Handle non hierarchical urls ([654d091](https://github.com/ReVanced/revanced-patches/commit/654d091e650cda37650b57cbf3ba6f1cdd6d47d3))
+
+# [5.47.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.47.0-dev.2...v5.47.0-dev.3) (2025-11-12)
+
+
+### Features
+
+* **Instagram:** Add `Disable auto story flipping` patch ([#6262](https://github.com/ReVanced/revanced-patches/issues/6262)) ([2f0de15](https://github.com/ReVanced/revanced-patches/commit/2f0de15e67e4f99ed6ecdc136d04cceb23b0d069))
+
+# [5.47.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.47.0-dev.1...v5.47.0-dev.2) (2025-11-12)
+
+
+### Bug Fixes
+
+* **Instagram - Disable signature check:** Change patch to default excluded ([#6283](https://github.com/ReVanced/revanced-patches/issues/6283)) ([bb745b5](https://github.com/ReVanced/revanced-patches/commit/bb745b555b3808b7679c5995319aa365630fbd76))
+
+# [5.47.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.46.0...v5.47.0-dev.1) (2025-11-12)
+
+
+### Features
+
+* **Instagram:** Add `Anonymous story viewing` patch ([#6263](https://github.com/ReVanced/revanced-patches/issues/6263)) ([94ae84a](https://github.com/ReVanced/revanced-patches/commit/94ae84ad0fc3a9197c82d5356301d464730c3b17))
+
+# [5.46.0](https://github.com/ReVanced/revanced-patches/compare/v5.45.0...v5.46.0) (2025-11-10)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Constrain patch to last working app target ([f238ae9](https://github.com/ReVanced/revanced-patches/commit/f238ae9895000f01d1dccb800cc8efde0d5362bd))
+* **Instagram - Hide navigation buttons:** Constrain patch to last working app target ([e030e9c](https://github.com/ReVanced/revanced-patches/commit/e030e9c07a7748e117ac44f6776a9f6317b20623))
+* **Spotify - Hide Create button:** Remove obsolete patch that is no longer needed ([#6252](https://github.com/ReVanced/revanced-patches/issues/6252)) ([59d85b2](https://github.com/ReVanced/revanced-patches/commit/59d85b28a7fcb285ff5f2bb6ae654020d76b2019))
+* **YouTube - Check watch history domain name resolution:** Fix false positive warning message if the internet connection fails halfway into the DNS check ([5726353](https://github.com/ReVanced/revanced-patches/commit/57263538c79f5a561c449229ac8e068c641285d3))
+* **YouTube - Hide layout components:** Fix "Hide Hype points" ([#6247](https://github.com/ReVanced/revanced-patches/issues/6247)) ([5821440](https://github.com/ReVanced/revanced-patches/commit/582144026d28e57bb7adcbba39244f3c7cdbc0f3))
+* **YouTube - Settings:** Add additional languages to ReVanced language preference ([d390b54](https://github.com/ReVanced/revanced-patches/commit/d390b54dab92d75b4e0d3e38344eae489dd69d98))
+* **YouTube - Settings:** Resolve settings search crash when searching for specific words ([#6231](https://github.com/ReVanced/revanced-patches/issues/6231)) ([76dcfae](https://github.com/ReVanced/revanced-patches/commit/76dcfaefd8679e45a70f265b0239436e60c055cf))
+
+
+### Features
+
+* **YouTube - Debugging:** Add setting to block experimental client flags ([#6196](https://github.com/ReVanced/revanced-patches/issues/6196)) ([2e9d695](https://github.com/ReVanced/revanced-patches/commit/2e9d6959c94df7588b9e34b18770e9f437e91926))
+* **YouTube - Hide layout components:** Add "Hide Hype points" ([#6230](https://github.com/ReVanced/revanced-patches/issues/6230)) ([a52c015](https://github.com/ReVanced/revanced-patches/commit/a52c0153b12c3f6f0ad260e03d2e9850c0466392))
+* **YouTube - Hide layout components:** Add video description "Hide Featured content" and "Hide Subscribe button" ([#6253](https://github.com/ReVanced/revanced-patches/issues/6253)) ([da4cf94](https://github.com/ReVanced/revanced-patches/commit/da4cf940911a4406e2c9dd558b60305385a80c61))
+* **YouTube - Hide player flyout menu items:** Add "Hide Listen with YouTube Music" ([#6232](https://github.com/ReVanced/revanced-patches/issues/6232)) ([858edbf](https://github.com/ReVanced/revanced-patches/commit/858edbf3e7f394fcc766d767c8dc54cf5ba24370))
+* **YouTube Music:** Add `Change miniplayer color` patch ([#6259](https://github.com/ReVanced/revanced-patches/issues/6259)) ([ab808ae](https://github.com/ReVanced/revanced-patches/commit/ab808aeb773592cb26c848d8456478a346ec3bad))
+* **YouTube Music:** Add `Hide buttons` patch ([#6255](https://github.com/ReVanced/revanced-patches/issues/6255)) ([7a18ebc](https://github.com/ReVanced/revanced-patches/commit/7a18ebc7ab74ba30c5d5284a4856c55cdfc31097))
+
+# [5.46.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.9...v5.46.0-dev.10) (2025-11-09)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add video description "Hide Featured content" and "Hide Subscribe button" ([#6253](https://github.com/ReVanced/revanced-patches/issues/6253)) ([da4cf94](https://github.com/ReVanced/revanced-patches/commit/da4cf940911a4406e2c9dd558b60305385a80c61))
+
+# [5.46.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.8...v5.46.0-dev.9) (2025-11-09)
+
+
+### Features
+
+* **YouTube Music:** Add `Change miniplayer color` patch ([#6259](https://github.com/ReVanced/revanced-patches/issues/6259)) ([ab808ae](https://github.com/ReVanced/revanced-patches/commit/ab808aeb773592cb26c848d8456478a346ec3bad))
+
+# [5.46.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.7...v5.46.0-dev.8) (2025-11-09)
+
+
+### Features
+
+* **YouTube Music:** Add `Hide buttons` patch ([#6255](https://github.com/ReVanced/revanced-patches/issues/6255)) ([7a18ebc](https://github.com/ReVanced/revanced-patches/commit/7a18ebc7ab74ba30c5d5284a4856c55cdfc31097))
+
+# [5.46.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.6...v5.46.0-dev.7) (2025-11-08)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** Add additional languages to ReVanced language preference ([d390b54](https://github.com/ReVanced/revanced-patches/commit/d390b54dab92d75b4e0d3e38344eae489dd69d98))
+
+# [5.46.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.5...v5.46.0-dev.6) (2025-11-08)
+
+
+### Features
+
+* **YouTube - Debugging:** Add setting to block experimental client flags ([#6196](https://github.com/ReVanced/revanced-patches/issues/6196)) ([2e9d695](https://github.com/ReVanced/revanced-patches/commit/2e9d6959c94df7588b9e34b18770e9f437e91926))
+
+# [5.46.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.4...v5.46.0-dev.5) (2025-11-07)
+
+
+### Bug Fixes
+
+* **Duolingo - Disable ads:** Constrain patch to last working app target ([f238ae9](https://github.com/ReVanced/revanced-patches/commit/f238ae9895000f01d1dccb800cc8efde0d5362bd))
+* **Instagram - Hide navigation buttons:** Constrain patch to last working app target ([e030e9c](https://github.com/ReVanced/revanced-patches/commit/e030e9c07a7748e117ac44f6776a9f6317b20623))
+* **Spotify - Hide Create button:** Remove obsolete patch that is no longer needed ([#6252](https://github.com/ReVanced/revanced-patches/issues/6252)) ([59d85b2](https://github.com/ReVanced/revanced-patches/commit/59d85b28a7fcb285ff5f2bb6ae654020d76b2019))
+
+# [5.46.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.3...v5.46.0-dev.4) (2025-11-07)
+
+
+### Bug Fixes
+
+* **YouTube - Check watch history domain name resolution:** Fix false positive warning message if the internet connection fails halfway into the DNS check ([5726353](https://github.com/ReVanced/revanced-patches/commit/57263538c79f5a561c449229ac8e068c641285d3))
+
+# [5.46.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.2...v5.46.0-dev.3) (2025-11-06)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Fix "Hide Hype points" ([#6247](https://github.com/ReVanced/revanced-patches/issues/6247)) ([5821440](https://github.com/ReVanced/revanced-patches/commit/582144026d28e57bb7adcbba39244f3c7cdbc0f3))
+
+# [5.46.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.46.0-dev.1...v5.46.0-dev.2) (2025-11-04)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** Resolve settings search crash when searching for specific words ([#6231](https://github.com/ReVanced/revanced-patches/issues/6231)) ([76dcfae](https://github.com/ReVanced/revanced-patches/commit/76dcfaefd8679e45a70f265b0239436e60c055cf))
+
+# [5.46.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.45.0...v5.46.0-dev.1) (2025-11-04)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add "Hide Hype points" ([#6230](https://github.com/ReVanced/revanced-patches/issues/6230)) ([a52c015](https://github.com/ReVanced/revanced-patches/commit/a52c0153b12c3f6f0ad260e03d2e9850c0466392))
+* **YouTube - Hide player flyout menu items:** Add "Hide Listen with YouTube Music" ([#6232](https://github.com/ReVanced/revanced-patches/issues/6232)) ([858edbf](https://github.com/ReVanced/revanced-patches/commit/858edbf3e7f394fcc766d767c8dc54cf5ba24370))
+
+# [5.45.0](https://github.com/ReVanced/revanced-patches/compare/v5.44.0...v5.45.0) (2025-11-01)
+
+
+### Bug Fixes
+
+* **Instagram:** Update failing fingerprints on newer versions ([#6181](https://github.com/ReVanced/revanced-patches/issues/6181)) ([c73a03c](https://github.com/ReVanced/revanced-patches/commit/c73a03c9e18a12262939c974cdf16221221d1487))
+* **TikTok - Downloads:** Fix download path setting  ([#6191](https://github.com/ReVanced/revanced-patches/issues/6191)) ([3e4990a](https://github.com/ReVanced/revanced-patches/commit/3e4990afff4c86b93970b153db713ad0f813124d))
+* **YouTube - Change header:** Do not mirror header graphic with RTL languages ([a0c5604](https://github.com/ReVanced/revanced-patches/commit/a0c56049510ce040e1ccd49257864672c343344d))
+* **YouTube - Force original audio:** Fall back to visionOS and not Android Studio if Android VR is not available ([6d01863](https://github.com/ReVanced/revanced-patches/commit/6d01863ec70617d9abc864ce6686ed9764dd151d))
+* **YouTube - Spoof video streams:** Remove spoof stream audio selector that no longer works ([292fae4](https://github.com/ReVanced/revanced-patches/commit/292fae440c6d5694c5e84407becec2d91f1fd156))
+* **YouTube Music - Hide category bar:** Correctly hide the category bar in newer app targets ([#6175](https://github.com/ReVanced/revanced-patches/issues/6175)) ([13cf172](https://github.com/ReVanced/revanced-patches/commit/13cf1724bf2f946c7129cab0db96721c90f9fe89))
+
+
+### Features
+
+* **Spoof video streams:** Add experimental "Android No SDK" client type ([5f23bfe](https://github.com/ReVanced/revanced-patches/commit/5f23bfe833c6e01617a7dbc5325b4a3fb931e53e))
+* **TikTok:** Add `Sanitize sharing links` patch ([#6176](https://github.com/ReVanced/revanced-patches/issues/6176)) ([ef44eaa](https://github.com/ReVanced/revanced-patches/commit/ef44eaa119b9d6c5faec051e22d20f883d0da4f1))
+* **YouTube - Change Header:** Use SVG for header logo ([#6178](https://github.com/ReVanced/revanced-patches/issues/6178)) ([e9f45ce](https://github.com/ReVanced/revanced-patches/commit/e9f45ce92695d5857473ff71c14b190bded28a73))
+
+# [5.45.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.5...v5.45.0-dev.6) (2025-11-01)
+
+
+### Features
+
+* **Spoof video streams:** Add experimental "Android No SDK" client type ([5f23bfe](https://github.com/ReVanced/revanced-patches/commit/5f23bfe833c6e01617a7dbc5325b4a3fb931e53e))
+
+# [5.45.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.4...v5.45.0-dev.5) (2025-11-01)
+
+
+### Bug Fixes
+
+* **TikTok - Downloads:** Fix download path setting  ([#6191](https://github.com/ReVanced/revanced-patches/issues/6191)) ([3e4990a](https://github.com/ReVanced/revanced-patches/commit/3e4990afff4c86b93970b153db713ad0f813124d))
+* **YouTube - Spoof video streams:** Remove spoof stream audio selector that no longer works ([292fae4](https://github.com/ReVanced/revanced-patches/commit/292fae440c6d5694c5e84407becec2d91f1fd156))
+
+# [5.45.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.3...v5.45.0-dev.4) (2025-10-30)
+
+
+### Bug Fixes
+
+* **YouTube - Change header:** Do not mirror header graphic with RTL languages ([a0c5604](https://github.com/ReVanced/revanced-patches/commit/a0c56049510ce040e1ccd49257864672c343344d))
+
+# [5.45.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.2...v5.45.0-dev.3) (2025-10-27)
+
+
+### Features
+
+* **YouTube - Change Header:** Use SVG for header logo ([#6178](https://github.com/ReVanced/revanced-patches/issues/6178)) ([e9f45ce](https://github.com/ReVanced/revanced-patches/commit/e9f45ce92695d5857473ff71c14b190bded28a73))
+
+# [5.45.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.45.0-dev.1...v5.45.0-dev.2) (2025-10-26)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** Fall back to visionOS and not Android Studio if Android VR is not available ([6d01863](https://github.com/ReVanced/revanced-patches/commit/6d01863ec70617d9abc864ce6686ed9764dd151d))
+* **YouTube Music - Hide category bar:** Correctly hide the category bar in newer app targets ([#6175](https://github.com/ReVanced/revanced-patches/issues/6175)) ([13cf172](https://github.com/ReVanced/revanced-patches/commit/13cf1724bf2f946c7129cab0db96721c90f9fe89))
+
+# [5.45.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.44.0...v5.45.0-dev.1) (2025-10-26)
+
+
+### Bug Fixes
+
+* **Instagram:** Update failing fingerprints on newer versions ([#6181](https://github.com/ReVanced/revanced-patches/issues/6181)) ([c73a03c](https://github.com/ReVanced/revanced-patches/commit/c73a03c9e18a12262939c974cdf16221221d1487))
+
+
+### Features
+
+* **TikTok:** Add `Sanitize sharing links` patch ([#6176](https://github.com/ReVanced/revanced-patches/issues/6176)) ([ef44eaa](https://github.com/ReVanced/revanced-patches/commit/ef44eaa119b9d6c5faec051e22d20f883d0da4f1))
+
+# [5.44.0](https://github.com/ReVanced/revanced-patches/compare/v5.43.1...v5.44.0) (2025-10-24)
+
+
+### Bug Fixes
+
+* **Google Photos - Spoof features:** Add support for Pixel 10 devices ([#6161](https://github.com/ReVanced/revanced-patches/issues/6161)) ([754b719](https://github.com/ReVanced/revanced-patches/commit/754b71959a0155413eb33cf1bdc2c8976eaca634))
+* **X / Twitter - Change link sharing domain:** Use bytecode patching to resolve patching with Manager ([#6125](https://github.com/ReVanced/revanced-patches/issues/6125)) ([0af8c8a](https://github.com/ReVanced/revanced-patches/commit/0af8c8a766ae4ba6926404d59da2f14d649f91f7))
+* **YouTube - Hide layout components:** Hide new kind of community post ([#6146](https://github.com/ReVanced/revanced-patches/issues/6146)) ([cfd244b](https://github.com/ReVanced/revanced-patches/commit/cfd244b4088daacd2788ec38357ac521e4b296d5))
+* **YouTube Music:** Resolve patching 7.29 target ([2e4c6fd](https://github.com/ReVanced/revanced-patches/commit/2e4c6fdcadeef45a80733e374421d52e5e8af910))
+
+
+### Features
+
+* Add `Custom network security` patch ([#6151](https://github.com/ReVanced/revanced-patches/issues/6151)) ([e7336d2](https://github.com/ReVanced/revanced-patches/commit/e7336d2ef361cc5d6fe6e8442b36d9cf1f542931))
+* **Duolingo - Enable debug menu:** Support latest app target ([#6163](https://github.com/ReVanced/revanced-patches/issues/6163)) ([08baa19](https://github.com/ReVanced/revanced-patches/commit/08baa19b4a62e62bd103d177c3f4454de199cf16))
+* **Duolingo:** Add `Skip energy recharge ads` patch ([#6167](https://github.com/ReVanced/revanced-patches/issues/6167)) ([591e106](https://github.com/ReVanced/revanced-patches/commit/591e106098c6eff431b8b7ac7d985ce7373d701e))
+* **Samsung Radio:** Add `Disable device checks` patch ([#6145](https://github.com/ReVanced/revanced-patches/issues/6145)) ([de97562](https://github.com/ReVanced/revanced-patches/commit/de97562c5ddc8ec707761c1e04e74c4e18f9c158))
+
+# [5.44.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.44.0-dev.3...v5.44.0-dev.4) (2025-10-24)
+
+
+### Features
+
+* Add `Custom network security` patch ([#6151](https://github.com/ReVanced/revanced-patches/issues/6151)) ([e7336d2](https://github.com/ReVanced/revanced-patches/commit/e7336d2ef361cc5d6fe6e8442b36d9cf1f542931))
+* **Duolingo:** Add `Skip energy recharge ads` patch ([#6167](https://github.com/ReVanced/revanced-patches/issues/6167)) ([591e106](https://github.com/ReVanced/revanced-patches/commit/591e106098c6eff431b8b7ac7d985ce7373d701e))
+
+# [5.44.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.44.0-dev.2...v5.44.0-dev.3) (2025-10-22)
+
+
+### Features
+
+* **Duolingo - Enable debug menu:** Support latest app target ([#6163](https://github.com/ReVanced/revanced-patches/issues/6163)) ([08baa19](https://github.com/ReVanced/revanced-patches/commit/08baa19b4a62e62bd103d177c3f4454de199cf16))
+
+# [5.44.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.44.0-dev.1...v5.44.0-dev.2) (2025-10-22)
+
+
+### Bug Fixes
+
+* **Google Photos - Spoof features:** Add support for Pixel 10 devices ([#6161](https://github.com/ReVanced/revanced-patches/issues/6161)) ([754b719](https://github.com/ReVanced/revanced-patches/commit/754b71959a0155413eb33cf1bdc2c8976eaca634))
+
+# [5.44.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.43.2-dev.3...v5.44.0-dev.1) (2025-10-22)
+
+
+### Features
+
+* **Samsung Radio:** Add `Disable device checks` patch ([#6145](https://github.com/ReVanced/revanced-patches/issues/6145)) ([de97562](https://github.com/ReVanced/revanced-patches/commit/de97562c5ddc8ec707761c1e04e74c4e18f9c158))
+
+## [5.43.2-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.43.2-dev.2...v5.43.2-dev.3) (2025-10-19)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Hide new kind of community post ([#6146](https://github.com/ReVanced/revanced-patches/issues/6146)) ([cfd244b](https://github.com/ReVanced/revanced-patches/commit/cfd244b4088daacd2788ec38357ac521e4b296d5))
+
+## [5.43.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.43.2-dev.1...v5.43.2-dev.2) (2025-10-17)
+
+
+### Bug Fixes
+
+* **YouTube Music:** Resolve patching 7.29 target ([2e4c6fd](https://github.com/ReVanced/revanced-patches/commit/2e4c6fdcadeef45a80733e374421d52e5e8af910))
+
+## [5.43.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.43.1...v5.43.2-dev.1) (2025-10-16)
+
+
+### Bug Fixes
+
+* **X / Twitter - Change link sharing domain:** Use bytecode patching to resolve patching with Manager ([#6125](https://github.com/ReVanced/revanced-patches/issues/6125)) ([0af8c8a](https://github.com/ReVanced/revanced-patches/commit/0af8c8a766ae4ba6926404d59da2f14d649f91f7))
+
+## [5.43.1](https://github.com/ReVanced/revanced-patches/compare/v5.43.0...v5.43.1) (2025-10-15)
+
+
+### Bug Fixes
+
+* **X / Twitter - Change link sharing domain:** Resolve duplicate patch option ([#6119](https://github.com/ReVanced/revanced-patches/issues/6119)) ([7563990](https://github.com/ReVanced/revanced-patches/commit/75639907502382f63fa127a886362d4a4573e6e3))
+* **X / Twitter:** Do not crash Manager when clicking on domain patch option ([2a1e318](https://github.com/ReVanced/revanced-patches/commit/2a1e31860f22f537d51b40a5b71d9ad9d538789e))
+
+## [5.43.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.43.1-dev.1...v5.43.1-dev.2) (2025-10-14)
+
+
+### Bug Fixes
+
+* **X / Twitter:** Do not crash Manager when clicking on domain patch option ([2a1e318](https://github.com/ReVanced/revanced-patches/commit/2a1e31860f22f537d51b40a5b71d9ad9d538789e))
+
+## [5.43.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.43.0...v5.43.1-dev.1) (2025-10-14)
+
+
+### Bug Fixes
+
+* **X / Twitter - Change link sharing domain:** Resolve duplicate patch option ([#6119](https://github.com/ReVanced/revanced-patches/issues/6119)) ([7563990](https://github.com/ReVanced/revanced-patches/commit/75639907502382f63fa127a886362d4a4573e6e3))
+
+# [5.43.0](https://github.com/ReVanced/revanced-patches/compare/v5.42.1...v5.43.0) (2025-10-14)
+
+
+### Bug Fixes
+
+* **Custom branding:** Use white notification icon for expanded status bar panel ([95eee59](https://github.com/ReVanced/revanced-patches/commit/95eee59a87a680e212a3ba06e1afefee8d91ee9d))
+* **Instagram - Change sharing domain:** Display patch option ([#6089](https://github.com/ReVanced/revanced-patches/issues/6089)) ([be2b144](https://github.com/ReVanced/revanced-patches/commit/be2b144cc9c4108ec37e16f3dd20573d88ffaa2b))
+* **X / Twitter - Change Link Sharing Domain:** Change link domain of share copy action ([#6091](https://github.com/ReVanced/revanced-patches/issues/6091)) ([5484625](https://github.com/ReVanced/revanced-patches/commit/54846253d748f4e7e30b2bba427c7d2fb9c341e2))
+* **YouTube - Custom branding:** Do not add a broken custom icon if the user provides an invalid custom icon path ([6555f6e](https://github.com/ReVanced/revanced-patches/commit/6555f6e6f8b52c2f1ddab1f52c6704cd2d8cfc12))
+* **YouTube - Custom branding:** Use ReVanced icon for status bar notification icon ([#6108](https://github.com/ReVanced/revanced-patches/issues/6108)) ([10ea250](https://github.com/ReVanced/revanced-patches/commit/10ea250d4a91f8ab3b7f865612a403fc93a857b5))
+* **YouTube - Force original audio:** Do not use translated audio if stream spoofing is off and force audio is on ([0c19dba](https://github.com/ReVanced/revanced-patches/commit/0c19dbaf30bcb95a29448d98b028ebeea54cc7d3))
+
+
+### Features
+
+* **Instagram:** Add `Hide suggested content` patch ([#6075](https://github.com/ReVanced/revanced-patches/issues/6075)) ([50f0b9c](https://github.com/ReVanced/revanced-patches/commit/50f0b9c5eee95ff5f9974e344802e1d2a4aab47b))
+
+# [5.43.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.43.0-dev.3...v5.43.0-dev.4) (2025-10-14)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** Do not use translated audio if stream spoofing is off and force audio is on ([0c19dba](https://github.com/ReVanced/revanced-patches/commit/0c19dbaf30bcb95a29448d98b028ebeea54cc7d3))
+
+# [5.43.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.43.0-dev.2...v5.43.0-dev.3) (2025-10-14)
+
+
+### Bug Fixes
+
+* **Custom branding:** Use white notification icon for expanded status bar panel ([95eee59](https://github.com/ReVanced/revanced-patches/commit/95eee59a87a680e212a3ba06e1afefee8d91ee9d))
+
+# [5.43.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.43.0-dev.1...v5.43.0-dev.2) (2025-10-14)
+
+
+### Bug Fixes
+
+* **YouTube - Custom branding:** Use ReVanced icon for status bar notification icon ([#6108](https://github.com/ReVanced/revanced-patches/issues/6108)) ([10ea250](https://github.com/ReVanced/revanced-patches/commit/10ea250d4a91f8ab3b7f865612a403fc93a857b5))
+
+# [5.43.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.42.2-dev.3...v5.43.0-dev.1) (2025-10-11)
+
+
+### Features
+
+* **Instagram:** Add `Hide suggested content` patch ([#6075](https://github.com/ReVanced/revanced-patches/issues/6075)) ([50f0b9c](https://github.com/ReVanced/revanced-patches/commit/50f0b9c5eee95ff5f9974e344802e1d2a4aab47b))
+
+## [5.42.2-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.42.2-dev.2...v5.42.2-dev.3) (2025-10-11)
+
+
+### Bug Fixes
+
+* **YouTube - Custom branding:** Do not add a broken custom icon if the user provides an invalid custom icon path ([6555f6e](https://github.com/ReVanced/revanced-patches/commit/6555f6e6f8b52c2f1ddab1f52c6704cd2d8cfc12))
+
+## [5.42.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.42.2-dev.1...v5.42.2-dev.2) (2025-10-10)
+
+
+### Bug Fixes
+
+* **X / Twitter - Change Link Sharing Domain:** Change link domain of share copy action ([#6091](https://github.com/ReVanced/revanced-patches/issues/6091)) ([5484625](https://github.com/ReVanced/revanced-patches/commit/54846253d748f4e7e30b2bba427c7d2fb9c341e2))
+
+## [5.42.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.42.1...v5.42.2-dev.1) (2025-10-09)
+
+
+### Bug Fixes
+
+* **Instagram - Change sharing domain:** Display patch option ([#6089](https://github.com/ReVanced/revanced-patches/issues/6089)) ([be2b144](https://github.com/ReVanced/revanced-patches/commit/be2b144cc9c4108ec37e16f3dd20573d88ffaa2b))
+
+## [5.42.1](https://github.com/ReVanced/revanced-patches/compare/v5.42.0...v5.42.1) (2025-10-08)
+
+
+### Bug Fixes
+
+* **YouTube - Custom Branding:** Resolve startup crash with root installation ([fd4b2e1](https://github.com/ReVanced/revanced-patches/commit/fd4b2e1bb98c6e507178e5b46b896ef7d320bc3d))
+
+## [5.42.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.42.0...v5.42.1-dev.1) (2025-10-08)
+
+
+### Bug Fixes
+
+* **YouTube - Custom Branding:** Resolve startup crash with root installation ([fd4b2e1](https://github.com/ReVanced/revanced-patches/commit/fd4b2e1bb98c6e507178e5b46b896ef7d320bc3d))
+
+# [5.42.0](https://github.com/ReVanced/revanced-patches/compare/v5.41.0...v5.42.0) (2025-10-08)
+
+
+### Bug Fixes
+
+* **Custom branding:** Update ReVanced logo ([#6049](https://github.com/ReVanced/revanced-patches/issues/6049)) ([9441e7a](https://github.com/ReVanced/revanced-patches/commit/9441e7acb4817e12d1443d438ef6c448518bd614))
+* **Custom branding:** Update ReVanced logo sizing ([#6029](https://github.com/ReVanced/revanced-patches/issues/6029)) ([ae4b947](https://github.com/ReVanced/revanced-patches/commit/ae4b9474d3fb62528fc21397c19954d31605e9da))
+* **Instagram - Hide navigation buttons:** Resolve app startup crash ([080a226](https://github.com/ReVanced/revanced-patches/commit/080a2266146798be71789c939deef2f289697523))
+* **Spotify:** Change `Hide Create button` patch to default off ([#6067](https://github.com/ReVanced/revanced-patches/issues/6067)) ([19949e1](https://github.com/ReVanced/revanced-patches/commit/19949e1695cc252ff0f94a33b6e3fb62e967d7fd))
+* **X / Twitter:** Remove non functional and obsolete patch `Open links with app chooser` ([#6033](https://github.com/ReVanced/revanced-patches/issues/6033)) ([673609c](https://github.com/ReVanced/revanced-patches/commit/673609c2aa87988cdc138eab101b9750fe6a7b62))
+* **YouTube - Force original audio:** Change patch to default on ([#6070](https://github.com/ReVanced/revanced-patches/issues/6070)) ([bd4ba2d](https://github.com/ReVanced/revanced-patches/commit/bd4ba2dae85ee6fd8d7e6078c3de775ca336e0b6))
+* **YouTube - Force original language:** Resolve some videos using Swedish audio track ([9d67316](https://github.com/ReVanced/revanced-patches/commit/9d6731660ba0e19b863d05d54aa04f74a879f69b))
+* **YouTube - Hide end screen cards:** Hide new type of end screen card ([#6027](https://github.com/ReVanced/revanced-patches/issues/6027)) ([76b0364](https://github.com/ReVanced/revanced-patches/commit/76b0364c5b5562c6a0d178d2bbe5b220f48aaca9))
+* **YouTube - Spoof video streams:** Add "Allow Android VR AV1" setting ([#6071](https://github.com/ReVanced/revanced-patches/issues/6071)) ([f03256c](https://github.com/ReVanced/revanced-patches/commit/f03256c471e1ee6a12267c1b56b531ca8f89278c))
+* **YouTube - Spoof video streams:** Do not allow VR AV1 if "Force AVC" is enabled ([7afeaeb](https://github.com/ReVanced/revanced-patches/commit/7afeaebb5cc22eb4f4512d8aa0cf4e835e7a2daf))
+* **YouTube - Spoof video streams:** Resolve playback dropping frames ([#6051](https://github.com/ReVanced/revanced-patches/issues/6051)) ([a62ee43](https://github.com/ReVanced/revanced-patches/commit/a62ee43441b197f5c8352ae373bb8919ad66f0bd))
+* **YouTube Music - GmsCore support:** Handle sharing links to certain apps such as Instagram ([#6026](https://github.com/ReVanced/revanced-patches/issues/6026)) ([328234f](https://github.com/ReVanced/revanced-patches/commit/328234f39ada81542e596f04e8ce410c787c15c8))
+* **YouTube Music - Hide cast button:** Fix patching error ([28799a5](https://github.com/ReVanced/revanced-patches/commit/28799a548a73651134ef304cb6cb542cf8e55abe))
+* **YouTube Music - Hide cast button:** Resolve button not hiding ([7817885](https://github.com/ReVanced/revanced-patches/commit/7817885cffed66608039ab45881537cbd3069c9d))
+* **YouTube:** Resolve UI components not hiding for some users ([#6054](https://github.com/ReVanced/revanced-patches/issues/6054)) ([6b26346](https://github.com/ReVanced/revanced-patches/commit/6b2634691423f5ce25a28b3f2fbc420977b81748))
+
+
+### Features
+
+* **Custom branding:** Add in-app settings to change icon and name ([#6059](https://github.com/ReVanced/revanced-patches/issues/6059)) ([a50f3b5](https://github.com/ReVanced/revanced-patches/commit/a50f3b5177808f07d84041c946caccb5a08ad387))
+* **Instagram:** Add `Custom share domain` patch ([#5998](https://github.com/ReVanced/revanced-patches/issues/5998)) ([20c4131](https://github.com/ReVanced/revanced-patches/commit/20c413120bad97af6121718e76b22a1b5540aa44))
+* **Instagram:** Add `Enable developer menu` patch ([#6043](https://github.com/ReVanced/revanced-patches/issues/6043)) ([2154d89](https://github.com/ReVanced/revanced-patches/commit/2154d89242fd8d7f7460145d5d35a4f1986944a3))
+* **Instagram:** Add `Open links externally` patch ([#6012](https://github.com/ReVanced/revanced-patches/issues/6012)) ([08e8ead](https://github.com/ReVanced/revanced-patches/commit/08e8ead04ffff47a4608a3db7aadc8d5feccd4ad))
+* **Instagram:** Add `Sanitize sharing links` patch ([#5986](https://github.com/ReVanced/revanced-patches/issues/5986)) ([963a4ef](https://github.com/ReVanced/revanced-patches/commit/963a4ef43fd513de7a2d7d019992f06b62fdcc10))
+* **Viber:** Add `Hide navigation buttons` patch ([#5991](https://github.com/ReVanced/revanced-patches/issues/5991)) ([5cb46c4](https://github.com/ReVanced/revanced-patches/commit/5cb46c4e9180ebc16eddb983dad73d137d8ec047))
+* **YouTube Music:** Add `Custom branding` patch ([#6007](https://github.com/ReVanced/revanced-patches/issues/6007)) ([4c8b56f](https://github.com/ReVanced/revanced-patches/commit/4c8b56f5466b244737f501654eb7c5d34b6b2f88))
+* **YouTube Music:** Add `Force original audio` patch ([#6036](https://github.com/ReVanced/revanced-patches/issues/6036)) ([d0d53d1](https://github.com/ReVanced/revanced-patches/commit/d0d53d109e451759a029326873adfa36fba12b23))
+
+# [5.42.0](https://github.com/ReVanced/revanced-patches/compare/v5.41.0...v5.42.0) (2025-10-08)
+
+
+### Bug Fixes
+
+* **Custom branding:** Update ReVanced logo ([#6049](https://github.com/ReVanced/revanced-patches/issues/6049)) ([9441e7a](https://github.com/ReVanced/revanced-patches/commit/9441e7acb4817e12d1443d438ef6c448518bd614))
+* **Custom branding:** Update ReVanced logo sizing ([#6029](https://github.com/ReVanced/revanced-patches/issues/6029)) ([ae4b947](https://github.com/ReVanced/revanced-patches/commit/ae4b9474d3fb62528fc21397c19954d31605e9da))
+* **Instagram - Hide navigation buttons:** Resolve app startup crash ([080a226](https://github.com/ReVanced/revanced-patches/commit/080a2266146798be71789c939deef2f289697523))
+* **Spotify:** Change `Hide Create button` patch to default off ([#6067](https://github.com/ReVanced/revanced-patches/issues/6067)) ([19949e1](https://github.com/ReVanced/revanced-patches/commit/19949e1695cc252ff0f94a33b6e3fb62e967d7fd))
+* **X / Twitter:** Remove non functional and obsolete patch `Open links with app chooser` ([#6033](https://github.com/ReVanced/revanced-patches/issues/6033)) ([673609c](https://github.com/ReVanced/revanced-patches/commit/673609c2aa87988cdc138eab101b9750fe6a7b62))
+* **YouTube - Force original audio:** Change patch to default on ([#6070](https://github.com/ReVanced/revanced-patches/issues/6070)) ([bd4ba2d](https://github.com/ReVanced/revanced-patches/commit/bd4ba2dae85ee6fd8d7e6078c3de775ca336e0b6))
+* **YouTube - Force original language:** Resolve some videos using Swedish audio track ([9d67316](https://github.com/ReVanced/revanced-patches/commit/9d6731660ba0e19b863d05d54aa04f74a879f69b))
+* **YouTube - Hide end screen cards:** Hide new type of end screen card ([#6027](https://github.com/ReVanced/revanced-patches/issues/6027)) ([76b0364](https://github.com/ReVanced/revanced-patches/commit/76b0364c5b5562c6a0d178d2bbe5b220f48aaca9))
+* **YouTube - Spoof video streams:** Add "Allow Android VR AV1" setting ([#6071](https://github.com/ReVanced/revanced-patches/issues/6071)) ([f03256c](https://github.com/ReVanced/revanced-patches/commit/f03256c471e1ee6a12267c1b56b531ca8f89278c))
+* **YouTube - Spoof video streams:** Do not allow VR AV1 if "Force AVC" is enabled ([7afeaeb](https://github.com/ReVanced/revanced-patches/commit/7afeaebb5cc22eb4f4512d8aa0cf4e835e7a2daf))
+* **YouTube - Spoof video streams:** Resolve playback dropping frames ([#6051](https://github.com/ReVanced/revanced-patches/issues/6051)) ([a62ee43](https://github.com/ReVanced/revanced-patches/commit/a62ee43441b197f5c8352ae373bb8919ad66f0bd))
+* **YouTube Music - GmsCore support:** Handle sharing links to certain apps such as Instagram ([#6026](https://github.com/ReVanced/revanced-patches/issues/6026)) ([328234f](https://github.com/ReVanced/revanced-patches/commit/328234f39ada81542e596f04e8ce410c787c15c8))
+* **YouTube Music - Hide cast button:** Fix patching error ([28799a5](https://github.com/ReVanced/revanced-patches/commit/28799a548a73651134ef304cb6cb542cf8e55abe))
+* **YouTube Music - Hide cast button:** Resolve button not hiding ([7817885](https://github.com/ReVanced/revanced-patches/commit/7817885cffed66608039ab45881537cbd3069c9d))
+* **YouTube:** Resolve UI components not hiding for some users ([#6054](https://github.com/ReVanced/revanced-patches/issues/6054)) ([6b26346](https://github.com/ReVanced/revanced-patches/commit/6b2634691423f5ce25a28b3f2fbc420977b81748))
+
+
+### Features
+
+* **Custom branding:** Add in-app settings to change icon and name ([#6059](https://github.com/ReVanced/revanced-patches/issues/6059)) ([a50f3b5](https://github.com/ReVanced/revanced-patches/commit/a50f3b5177808f07d84041c946caccb5a08ad387))
+* **Instagram:** Add `Custom share domain` patch ([#5998](https://github.com/ReVanced/revanced-patches/issues/5998)) ([20c4131](https://github.com/ReVanced/revanced-patches/commit/20c413120bad97af6121718e76b22a1b5540aa44))
+* **Instagram:** Add `Enable developer menu` patch ([#6043](https://github.com/ReVanced/revanced-patches/issues/6043)) ([2154d89](https://github.com/ReVanced/revanced-patches/commit/2154d89242fd8d7f7460145d5d35a4f1986944a3))
+* **Instagram:** Add `Open links externally` patch ([#6012](https://github.com/ReVanced/revanced-patches/issues/6012)) ([08e8ead](https://github.com/ReVanced/revanced-patches/commit/08e8ead04ffff47a4608a3db7aadc8d5feccd4ad))
+* **Instagram:** Add `Sanitize sharing links` patch ([#5986](https://github.com/ReVanced/revanced-patches/issues/5986)) ([963a4ef](https://github.com/ReVanced/revanced-patches/commit/963a4ef43fd513de7a2d7d019992f06b62fdcc10))
+* **Viber:** Add `Hide navigation buttons` patch ([#5991](https://github.com/ReVanced/revanced-patches/issues/5991)) ([5cb46c4](https://github.com/ReVanced/revanced-patches/commit/5cb46c4e9180ebc16eddb983dad73d137d8ec047))
+* **YouTube Music:** Add `Custom branding` patch ([#6007](https://github.com/ReVanced/revanced-patches/issues/6007)) ([4c8b56f](https://github.com/ReVanced/revanced-patches/commit/4c8b56f5466b244737f501654eb7c5d34b6b2f88))
+* **YouTube Music:** Add `Force original audio` patch ([#6036](https://github.com/ReVanced/revanced-patches/issues/6036)) ([d0d53d1](https://github.com/ReVanced/revanced-patches/commit/d0d53d109e451759a029326873adfa36fba12b23))
+
+# [5.42.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.18...v5.42.0-dev.19) (2025-10-07)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Do not allow VR AV1 if "Force AVC" is enabled ([7afeaeb](https://github.com/ReVanced/revanced-patches/commit/7afeaebb5cc22eb4f4512d8aa0cf4e835e7a2daf))
+
+# [5.42.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.17...v5.42.0-dev.18) (2025-10-07)
+
+
+### Features
+
+* **Custom branding:** Add in-app settings to change icon and name ([#6059](https://github.com/ReVanced/revanced-patches/issues/6059)) ([a50f3b5](https://github.com/ReVanced/revanced-patches/commit/a50f3b5177808f07d84041c946caccb5a08ad387))
+
+# [5.42.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.16...v5.42.0-dev.17) (2025-10-07)
+
+
+### Bug Fixes
+
+* **YouTube - Force original audio:** Change patch to default on ([#6070](https://github.com/ReVanced/revanced-patches/issues/6070)) ([bd4ba2d](https://github.com/ReVanced/revanced-patches/commit/bd4ba2dae85ee6fd8d7e6078c3de775ca336e0b6))
+
+# [5.42.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.15...v5.42.0-dev.16) (2025-10-07)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Add "Allow Android VR AV1" setting ([#6071](https://github.com/ReVanced/revanced-patches/issues/6071)) ([f03256c](https://github.com/ReVanced/revanced-patches/commit/f03256c471e1ee6a12267c1b56b531ca8f89278c))
+
+# [5.42.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.14...v5.42.0-dev.15) (2025-10-07)
+
+
+### Features
+
+* **Instagram:** Add `Enable developer menu` patch ([#6043](https://github.com/ReVanced/revanced-patches/issues/6043)) ([2154d89](https://github.com/ReVanced/revanced-patches/commit/2154d89242fd8d7f7460145d5d35a4f1986944a3))
+
+# [5.42.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.13...v5.42.0-dev.14) (2025-10-07)
+
+
+### Features
+
+* **Instagram:** Add `Custom share domain` patch ([#5998](https://github.com/ReVanced/revanced-patches/issues/5998)) ([20c4131](https://github.com/ReVanced/revanced-patches/commit/20c413120bad97af6121718e76b22a1b5540aa44))
+
+# [5.42.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.12...v5.42.0-dev.13) (2025-10-07)
+
+
+### Bug Fixes
+
+* **Spotify:** Change `Hide Create button` patch to default off ([#6067](https://github.com/ReVanced/revanced-patches/issues/6067)) ([19949e1](https://github.com/ReVanced/revanced-patches/commit/19949e1695cc252ff0f94a33b6e3fb62e967d7fd))
+
+# [5.42.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.11...v5.42.0-dev.12) (2025-10-03)
+
+
+### Bug Fixes
+
+* **Custom branding:** Update ReVanced logo ([#6049](https://github.com/ReVanced/revanced-patches/issues/6049)) ([9441e7a](https://github.com/ReVanced/revanced-patches/commit/9441e7acb4817e12d1443d438ef6c448518bd614))
+
+
+### Features
+
+* **Instagram:** Add `Sanitize sharing links` patch ([#5986](https://github.com/ReVanced/revanced-patches/issues/5986)) ([963a4ef](https://github.com/ReVanced/revanced-patches/commit/963a4ef43fd513de7a2d7d019992f06b62fdcc10))
+
+# [5.42.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.10...v5.42.0-dev.11) (2025-10-03)
+
+
+### Bug Fixes
+
+* **YouTube:** Resolve UI components not hiding for some users ([#6054](https://github.com/ReVanced/revanced-patches/issues/6054)) ([6b26346](https://github.com/ReVanced/revanced-patches/commit/6b2634691423f5ce25a28b3f2fbc420977b81748))
+
+# [5.42.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.9...v5.42.0-dev.10) (2025-10-02)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof video streams:** Resolve playback dropping frames ([#6051](https://github.com/ReVanced/revanced-patches/issues/6051)) ([a62ee43](https://github.com/ReVanced/revanced-patches/commit/a62ee43441b197f5c8352ae373bb8919ad66f0bd))
+
+# [5.42.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.8...v5.42.0-dev.9) (2025-10-01)
+
+
+### Bug Fixes
+
+* **Custom branding:** Update ReVanced logo sizing ([#6029](https://github.com/ReVanced/revanced-patches/issues/6029)) ([ae4b947](https://github.com/ReVanced/revanced-patches/commit/ae4b9474d3fb62528fc21397c19954d31605e9da))
+
+# [5.42.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.7...v5.42.0-dev.8) (2025-10-01)
+
+
+### Bug Fixes
+
+* **YouTube - Force original language:** Resolve some videos using Swedish audio track ([9d67316](https://github.com/ReVanced/revanced-patches/commit/9d6731660ba0e19b863d05d54aa04f74a879f69b))
+
+
+### Features
+
+* **YouTube Music:** Add `Force original audio` patch ([#6036](https://github.com/ReVanced/revanced-patches/issues/6036)) ([d0d53d1](https://github.com/ReVanced/revanced-patches/commit/d0d53d109e451759a029326873adfa36fba12b23))
+
+# [5.42.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.6...v5.42.0-dev.7) (2025-10-01)
+
+
+### Features
+
+* **Instagram:** Add `Open links externally` patch ([#6012](https://github.com/ReVanced/revanced-patches/issues/6012)) ([08e8ead](https://github.com/ReVanced/revanced-patches/commit/08e8ead04ffff47a4608a3db7aadc8d5feccd4ad))
+
+# [5.42.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.5...v5.42.0-dev.6) (2025-09-30)
+
+
+### Bug Fixes
+
+* **X / Twitter:** Remove non functional and obsolete patch `Open links with app chooser` ([#6033](https://github.com/ReVanced/revanced-patches/issues/6033)) ([673609c](https://github.com/ReVanced/revanced-patches/commit/673609c2aa87988cdc138eab101b9750fe6a7b62))
+
+# [5.42.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.4...v5.42.0-dev.5) (2025-09-28)
+
+
+### Features
+
+* **YouTube Music:** Add `Custom branding` patch ([#6007](https://github.com/ReVanced/revanced-patches/issues/6007)) ([4c8b56f](https://github.com/ReVanced/revanced-patches/commit/4c8b56f5466b244737f501654eb7c5d34b6b2f88))
+
+# [5.42.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.3...v5.42.0-dev.4) (2025-09-28)
+
+
+### Bug Fixes
+
+* **YouTube Music - GmsCore support:** Handle sharing links to certain apps such as Instagram ([#6026](https://github.com/ReVanced/revanced-patches/issues/6026)) ([328234f](https://github.com/ReVanced/revanced-patches/commit/328234f39ada81542e596f04e8ce410c787c15c8))
+
+# [5.42.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.2...v5.42.0-dev.3) (2025-09-28)
+
+
+### Bug Fixes
+
+* **YouTube - Hide end screen cards:** Hide new type of end screen card ([#6027](https://github.com/ReVanced/revanced-patches/issues/6027)) ([76b0364](https://github.com/ReVanced/revanced-patches/commit/76b0364c5b5562c6a0d178d2bbe5b220f48aaca9))
+
+# [5.42.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.42.0-dev.1...v5.42.0-dev.2) (2025-09-27)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Resolve app startup crash ([080a226](https://github.com/ReVanced/revanced-patches/commit/080a2266146798be71789c939deef2f289697523))
+
+# [5.42.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.41.1-dev.2...v5.42.0-dev.1) (2025-09-27)
+
+
+### Features
+
+* **Viber:** Add `Hide navigation buttons` patch ([#5991](https://github.com/ReVanced/revanced-patches/issues/5991)) ([5cb46c4](https://github.com/ReVanced/revanced-patches/commit/5cb46c4e9180ebc16eddb983dad73d137d8ec047))
+
+## [5.41.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.41.1-dev.1...v5.41.1-dev.2) (2025-09-27)
+
+
+### Bug Fixes
+
+* **YouTube Music - Hide cast button:** Fix patching error ([28799a5](https://github.com/ReVanced/revanced-patches/commit/28799a548a73651134ef304cb6cb542cf8e55abe))
+
+## [5.41.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.41.0...v5.41.1-dev.1) (2025-09-27)
+
+
+### Bug Fixes
+
+* **YouTube Music - Hide cast button:** Resolve button not hiding ([7817885](https://github.com/ReVanced/revanced-patches/commit/7817885cffed66608039ab45881537cbd3069c9d))
+
+# [5.41.0](https://github.com/ReVanced/revanced-patches/compare/v5.40.0...v5.41.0) (2025-09-27)
+
+
+### Bug Fixes
+
+* **Instagram - Hide navigation buttons:** Remove button based on name ([#5971](https://github.com/ReVanced/revanced-patches/issues/5971)) ([6fa4043](https://github.com/ReVanced/revanced-patches/commit/6fa404331b5162682d83fba5f38ed570c31495fc))
+* **Instagram - Limit feed to followed profiles:** Preserve favorites feed ([#5963](https://github.com/ReVanced/revanced-patches/issues/5963)) ([ef51401](https://github.com/ReVanced/revanced-patches/commit/ef514017f46025d9aef6884424caeb0670514e7a))
+* **TikTok:** Show correct dialog restart text, use correct font color for non-dark mode ([d1a1293](https://github.com/ReVanced/revanced-patches/commit/d1a12930c35f630793a0f240d4203c2ff9060158))
+* **Twitch - Settings:** Fix missing style resources ([#5970](https://github.com/ReVanced/revanced-patches/issues/5970)) ([8c22995](https://github.com/ReVanced/revanced-patches/commit/8c229954d7f232a7a472ca49f1b5e7cdc475bbcc))
+* **YouTube - Hide Shorts components:** Fix "Hide preview comment" ([#5990](https://github.com/ReVanced/revanced-patches/issues/5990)) ([dd4e2cd](https://github.com/ReVanced/revanced-patches/commit/dd4e2cd0855ccc51b94593004fdd8150ac3b41cc))
+* **YouTube - Return YouTube Dislike:** Do not show error toast if API returns 401 status ([#5949](https://github.com/ReVanced/revanced-patches/issues/5949)) ([58d088a](https://github.com/ReVanced/revanced-patches/commit/58d088ab307440a6912a867246da799b7dd6499b))
+* **YouTube - Settings:** Handle on screen back swipe gesture ([#6002](https://github.com/ReVanced/revanced-patches/issues/6002)) ([6f92b6c](https://github.com/ReVanced/revanced-patches/commit/6f92b6c50beab091f5f7ef7386579eda38cb4c66))
+* **YouTube - Settings:** Use an overlay to show search results ([#5806](https://github.com/ReVanced/revanced-patches/issues/5806)) ([ece8076](https://github.com/ReVanced/revanced-patches/commit/ece8076f7cefd752b97515014bc50fe4fd80171e))
+* **YouTube - SponsorBlock:** Show category color dot in voting dialog menu ([4be00d0](https://github.com/ReVanced/revanced-patches/commit/4be00d09b7b87dcfac324de8709af06e9f730791))
+* **YouTube - SponsorBlock:** Show category color in create new segment menu ([#5987](https://github.com/ReVanced/revanced-patches/issues/5987)) ([ffd933c](https://github.com/ReVanced/revanced-patches/commit/ffd933c6734274cdde5aaec0159b67f173f9228c))
+* **YouTube - Spoof video streams:** Update client side effects summary text ([a0a62dd](https://github.com/ReVanced/revanced-patches/commit/a0a62ddad26cfab3e04907fae5532e1ba1fdf710))
+
+
+### Features
+
+* **Tumblr:** Add `Disable Tumblr TV` patch ([#5959](https://github.com/ReVanced/revanced-patches/issues/5959)) ([212418b](https://github.com/ReVanced/revanced-patches/commit/212418b8db9a730ae9efa89ad2bef24952afbadd))
+* **YouTube - Hide layout components:** Add "Hide Emoji and Timestamp buttons" setting ([#5992](https://github.com/ReVanced/revanced-patches/issues/5992)) ([2b555f6](https://github.com/ReVanced/revanced-patches/commit/2b555f67f07e0de5703c630888ce2fbba3145192))
+* **YouTube - Hide layout components:** Add "Hide view count" and "Hide upload time" settings ([#5983](https://github.com/ReVanced/revanced-patches/issues/5983)) ([7a37d85](https://github.com/ReVanced/revanced-patches/commit/7a37d858fb937c6bdc2219103dac765b62600e6c))
+* **YouTube - Loop video:** Add player button to change loop video state ([#5961](https://github.com/ReVanced/revanced-patches/issues/5961)) ([dfb5407](https://github.com/ReVanced/revanced-patches/commit/dfb5407e67222e80e23c8935e04b6dbf1a43d757))
+* **YouTube - Spoof app version:** Add spoof target `20.05.46` that fixes transcript functionality ([5823f0e](https://github.com/ReVanced/revanced-patches/commit/5823f0e982e87b4a35d30feeca8a7e16edfebc5f))
+* **YouTube Music:** Add `Check watch history domain name resolution` ([#5979](https://github.com/ReVanced/revanced-patches/issues/5979)) ([8af70fe](https://github.com/ReVanced/revanced-patches/commit/8af70fe2d10c0f4da2d7e53bd00f5b3979775d5d))
+* **YouTube Music:** Add `Sanitize sharing links` patch ([#5952](https://github.com/ReVanced/revanced-patches/issues/5952)) ([45c1ee8](https://github.com/ReVanced/revanced-patches/commit/45c1ee8a12dc777a371875d90741a05cf5d8e9dd))
+* **YouTube Music:** Add `Theme` patch ([#5984](https://github.com/ReVanced/revanced-patches/issues/5984)) ([3bd76d6](https://github.com/ReVanced/revanced-patches/commit/3bd76d60d664befff29c24c9de56dac1486a6e67))
+* **YouTube:** Add `Disable video codecs` patch ([#5981](https://github.com/ReVanced/revanced-patches/issues/5981)) ([bfbffbd](https://github.com/ReVanced/revanced-patches/commit/bfbffbd1f5aa867027053e25b343a51a606216a3))
+
+# [5.41.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.17...v5.41.0-dev.18) (2025-09-26)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** Handle on screen back swipe gesture ([#6002](https://github.com/ReVanced/revanced-patches/issues/6002)) ([6f92b6c](https://github.com/ReVanced/revanced-patches/commit/6f92b6c50beab091f5f7ef7386579eda38cb4c66))
+
+# [5.41.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.16...v5.41.0-dev.17) (2025-09-26)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show category color dot in voting dialog menu ([4be00d0](https://github.com/ReVanced/revanced-patches/commit/4be00d09b7b87dcfac324de8709af06e9f730791))
+
+# [5.41.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.15...v5.41.0-dev.16) (2025-09-26)
+
+
+### Features
+
+* **YouTube Music:** Add `Theme` patch ([#5984](https://github.com/ReVanced/revanced-patches/issues/5984)) ([3bd76d6](https://github.com/ReVanced/revanced-patches/commit/3bd76d60d664befff29c24c9de56dac1486a6e67))
+
+# [5.41.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.14...v5.41.0-dev.15) (2025-09-25)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add "Hide view count" and "Hide upload time" settings ([#5983](https://github.com/ReVanced/revanced-patches/issues/5983)) ([7a37d85](https://github.com/ReVanced/revanced-patches/commit/7a37d858fb937c6bdc2219103dac765b62600e6c))
+
+# [5.41.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.13...v5.41.0-dev.14) (2025-09-24)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add "Hide Emoji and Timestamp buttons" setting ([#5992](https://github.com/ReVanced/revanced-patches/issues/5992)) ([2b555f6](https://github.com/ReVanced/revanced-patches/commit/2b555f67f07e0de5703c630888ce2fbba3145192))
+
+# [5.41.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.12...v5.41.0-dev.13) (2025-09-24)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Shorts components:** Fix "Hide preview comment" ([#5990](https://github.com/ReVanced/revanced-patches/issues/5990)) ([dd4e2cd](https://github.com/ReVanced/revanced-patches/commit/dd4e2cd0855ccc51b94593004fdd8150ac3b41cc))
+
+# [5.41.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.11...v5.41.0-dev.12) (2025-09-24)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show category color in create new segment menu ([#5987](https://github.com/ReVanced/revanced-patches/issues/5987)) ([ffd933c](https://github.com/ReVanced/revanced-patches/commit/ffd933c6734274cdde5aaec0159b67f173f9228c))
+
+# [5.41.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.10...v5.41.0-dev.11) (2025-09-23)
+
+
+### Features
+
+* **YouTube:** Add `Disable video codecs` patch ([#5981](https://github.com/ReVanced/revanced-patches/issues/5981)) ([bfbffbd](https://github.com/ReVanced/revanced-patches/commit/bfbffbd1f5aa867027053e25b343a51a606216a3))
+
 # [5.41.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.41.0-dev.9...v5.41.0-dev.10) (2025-09-23)
 
 

extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/links/OpenLinksExternallyPatch.java

@@ -0,0 +1,30 @@
+package app.revanced.extension.instagram.misc.links;
+
+import android.net.Uri;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+@SuppressWarnings("unused")
+public final class OpenLinksExternallyPatch {
+
+    /**
+     * Injection point.
+     */
+    public static boolean openExternally(String url) {
+        try {
+            // The "url" parameter to this function will be of the form.
+            // https://l.instagram.com/?u=<actual url>&e=<tracking id>
+            String actualUrl = Uri.parse(url).getQueryParameter("u");
+            if (actualUrl != null) {
+                Utils.openLink(actualUrl);
+                return true;
+            }
+
+        } catch (Exception ex) {
+            Logger.printException(() -> "openExternally failure", ex);
+        }
+
+        return false;
+    }
+}

extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/privacy/SanitizeSharingLinksPatch.java

@@ -0,0 +1,15 @@
+package app.revanced.extension.instagram.misc.privacy;
+
+import app.revanced.extension.shared.privacy.LinkSanitizer;
+
+@SuppressWarnings("unused")
+public final class SanitizeSharingLinksPatch {
+    private static final LinkSanitizer sanitizer = new LinkSanitizer("igsh");
+
+    /**
+     * Injection point.
+     */
+    public static String sanitizeSharingLink(String url) {
+        return sanitizer.sanitizeUrlString(url);
+    }
+}

extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/share/domain/ChangeLinkSharingDomainPatch.java

@@ -0,0 +1,33 @@
+package app.revanced.extension.instagram.misc.share.domain;
+
+import android.net.Uri;
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public final class ChangeLinkSharingDomainPatch {
+
+    private static String getCustomShareDomain() {
+        // Method is modified during patching.
+        throw new IllegalStateException();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static String setCustomShareDomain(String url) {
+        try {
+            Uri uri = Uri.parse(url);
+            Uri.Builder builder = uri
+                    .buildUpon()
+                    .authority(getCustomShareDomain())
+                    .clearQuery();
+
+            String patchedUrl = builder.build().toString();
+            Logger.printInfo(() -> "Domain change from : " + url + " to: " + patchedUrl);
+            return patchedUrl;
+        } catch (Exception ex) {
+            Logger.printException(() -> "setCustomShareDomain failure with " + url, ex);
+            return url;
+        }
+    }
+}

extensions/instagram/src/main/java/app/revanced/extension/instagram/misc/share/privacy/SanitizeSharingLinksPatch.java

@@ -0,0 +1,15 @@
+package app.revanced.extension.instagram.misc.share.privacy;
+
+import app.revanced.extension.shared.privacy.LinkSanitizer;
+
+@SuppressWarnings("unused")
+public final class SanitizeSharingLinksPatch {
+    private static final LinkSanitizer sanitizer = new LinkSanitizer("igsh");
+
+    /**
+     * Injection point.
+     */
+    public static String sanitizeSharingLink(String url) {
+        return sanitizer.sanitizeUrlString(url);
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/ChangeMiniplayerColorPatch.java

@@ -0,0 +1,14 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ChangeMiniplayerColorPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean changeMiniplayerColor() {
+        return Settings.CHANGE_MINIPLAYER_COLOR.get();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/ForceOriginalAudioPatch.java

@@ -0,0 +1,17 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ForceOriginalAudioPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void setEnabled() {
+        app.revanced.extension.shared.patches.ForceOriginalAudioPatch.setEnabled(
+                Settings.FORCE_ORIGINAL_AUDIO.get(),
+                Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get()
+        );
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/HideButtonsPatch.java

@@ -0,0 +1,49 @@
+package app.revanced.extension.music.patches;
+
+import static app.revanced.extension.shared.Utils.hideViewBy0dpUnderCondition;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideButtonsPatch {
+
+    /**
+     * Injection point
+     */
+    public static int hideCastButton(int original) {
+        return Settings.HIDE_CAST_BUTTON.get() ? View.GONE : original;
+    }
+
+    /**
+     * Injection point
+     */
+    public static void hideCastButton(View view) {
+        hideViewBy0dpUnderCondition(Settings.HIDE_CAST_BUTTON, view);
+    }
+
+    /**
+     * Injection point
+     */
+    public static boolean hideHistoryButton(boolean original) {
+        return original && !Settings.HIDE_HISTORY_BUTTON.get();
+    }
+
+    /**
+     * Injection point
+     */
+    public static void hideNotificationButton(View view) {
+        if (view.getParent() instanceof ViewGroup viewGroup) {
+            hideViewBy0dpUnderCondition(Settings.HIDE_NOTIFICATION_BUTTON, viewGroup);
+        }
+    }
+
+    /**
+     * Injection point
+     */
+    public static void hideSearchButton(View view) {
+        hideViewBy0dpUnderCondition(Settings.HIDE_SEARCH_BUTTON, view);
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/patches/HideCastButtonPatch.java

@@ -1,24 +0,0 @@
-package app.revanced.extension.music.patches;
-
-import static app.revanced.extension.shared.Utils.hideViewBy0dpUnderCondition;
-
-import android.view.View;
-import app.revanced.extension.music.settings.Settings;
-
-@SuppressWarnings("unused")
-public class HideCastButtonPatch {
-
-    /**
-     * Injection point
-     */
-    public static int hideCastButton(int original) {
-        return Settings.HIDE_CAST_BUTTON.get() ? View.GONE : original;
-    }
-
-    /**
-     * Injection point
-     */
-    public static void hideCastButton(View view) {
-        hideViewBy0dpUnderCondition(Settings.HIDE_CAST_BUTTON.get(), view);
-    }
-}

extensions/music/src/main/java/app/revanced/extension/music/patches/HideCategoryBarPatch.java

@@ -1,5 +1,9 @@
 package app.revanced.extension.music.patches;
 
+import static app.revanced.extension.shared.Utils.hideViewBy0dpUnderCondition;
+
+import android.view.View;
+
 import app.revanced.extension.music.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -8,7 +12,7 @@ public class HideCategoryBarPatch {
     /**
      * Injection point
      */
-    public static boolean hideCategoryBar() {
-        return Settings.HIDE_CATEGORY_BAR.get();
+    public static void hideCategoryBar(View view) {
+        hideViewBy0dpUnderCondition(Settings.HIDE_CATEGORY_BAR, view);
     }
 }

extensions/music/src/main/java/app/revanced/extension/music/patches/spoof/SpoofVideoStreamsPatch.java

@@ -1,6 +1,7 @@
 package app.revanced.extension.music.patches.spoof;
 
 import static app.revanced.extension.music.settings.Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_NO_SDK;
 import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
 import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_61_48;
 import static app.revanced.extension.shared.spoof.ClientType.VISIONOS;
@@ -18,8 +19,9 @@ public class SpoofVideoStreamsPatch {
     public static void setClientOrderToUse() {
         List<ClientType> availableClients = List.of(
                 ANDROID_VR_1_43_32,
-                ANDROID_VR_1_61_48,
-                VISIONOS
+                ANDROID_NO_SDK,
+                VISIONOS,
+                ANDROID_VR_1_61_48
         );
 
         app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.setClientsToUse(

extensions/music/src/main/java/app/revanced/extension/music/patches/theme/ThemePatch.java

@@ -0,0 +1,27 @@
+package app.revanced.extension.music.patches.theme;
+
+import app.revanced.extension.shared.theme.BaseThemePatch;
+
+@SuppressWarnings("unused")
+public class ThemePatch extends BaseThemePatch {
+
+    // Color constants used in relation with litho components.
+    private static final int[] DARK_VALUES = {
+            0xFF212121, // Comments box background.
+            0xFF030303, // Button container background in album.
+            0xFF000000, // Button container background in playlist.
+    };
+
+    /**
+     * Injection point.
+     * <p>
+     * Change the color of Litho components.
+     * If the color of the component matches one of the values, return the background color.
+     *
+     * @param originalValue The original color value.
+     * @return The new or original color value.
+     */
+    public static int getValue(int originalValue) {
+        return processColorValue(originalValue, DARK_VALUES, null);
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/settings/MusicActivityHook.java

@@ -11,6 +11,7 @@ import android.widget.Toolbar;
 import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
 import app.revanced.extension.music.settings.search.MusicSearchViewController;
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseActivityHook;
 
@@ -46,15 +47,7 @@ public class MusicActivityHook extends BaseActivityHook {
         // Override the default YouTube Music theme to increase start padding of list items.
         // Custom style located in resources/music/values/style.xml
         activity.setTheme(Utils.getResourceIdentifierOrThrow(
-                "Theme.ReVanced.YouTubeMusic.Settings", "style"));
-    }
-
-    /**
-     * Returns the resource ID for the YouTube Music settings layout.
-     */
-    @Override
-    protected int getContentViewResourceId() {
-        return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
+                ResourceType.STYLE, "Theme.ReVanced.YouTubeMusic.Settings"));
     }
 
     /**

extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java

@@ -16,8 +16,11 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_GET_PREMIUM_LABEL = new BooleanSetting("revanced_music_hide_get_premium_label", TRUE, true);
 
     // General
-    public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", TRUE, false);
+    public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", TRUE, true);
     public static final BooleanSetting HIDE_CATEGORY_BAR = new BooleanSetting("revanced_music_hide_category_bar", FALSE, true);
+    public static final BooleanSetting HIDE_HISTORY_BUTTON = new BooleanSetting("revanced_music_hide_history_button", FALSE, true);
+    public static final BooleanSetting HIDE_SEARCH_BUTTON = new BooleanSetting("revanced_music_hide_search_button", FALSE, true);
+    public static final BooleanSetting HIDE_NOTIFICATION_BUTTON = new BooleanSetting("revanced_music_hide_notification_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_BAR_HOME_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_home_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_BAR_SAMPLES_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_samples_button", FALSE, true);
     public static final BooleanSetting HIDE_NAVIGATION_BAR_EXPLORE_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_explore_button", FALSE, true);
@@ -27,9 +30,12 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_NAVIGATION_BAR_LABEL = new BooleanSetting("revanced_music_hide_navigation_bar_labels", FALSE, true);
 
     // Player
+    public static final BooleanSetting CHANGE_MINIPLAYER_COLOR = new BooleanSetting("revanced_music_change_miniplayer_color", FALSE, true);
     public static final BooleanSetting PERMANENT_REPEAT = new BooleanSetting("revanced_music_play_permanent_repeat", FALSE, true);
 
     // Miscellaneous
     public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type",
             ClientType.ANDROID_VR_1_43_32, true, parent(SPOOF_VIDEO_STREAMS));
+
+    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", TRUE, true);
 }

extensions/music/src/main/java/app/revanced/extension/music/settings/preference/MusicPreferenceFragment.java

@@ -5,8 +5,10 @@ import android.preference.PreferenceScreen;
 import android.widget.Toolbar;
 
 import app.revanced.extension.music.settings.MusicActivityHook;
+import app.revanced.extension.shared.GmsCoreSupport;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
 
 /**
@@ -30,6 +32,17 @@ public class MusicPreferenceFragment extends ToolbarPreferenceFragment {
             preferenceScreen = getPreferenceScreen();
             Utils.sortPreferenceGroups(preferenceScreen);
             setPreferenceScreenToolbar(preferenceScreen);
+
+            // Clunky work around until preferences are custom classes that manage themselves.
+            // Custom branding only works with non-root install. But the preferences must be
+            // added during patched because of difficulties detecting during patching if it's
+            // a root install. So instead the non-functional preferences are removed during
+            // runtime if the app is mount (root) installation.
+            if (GmsCoreSupport.isPackageNameOriginal()) {
+                removePreferences(
+                        BaseSettings.CUSTOM_BRANDING_ICON.key,
+                        BaseSettings.CUSTOM_BRANDING_NAME.key);
+            }
         } catch (Exception ex) {
             Logger.printException(() -> "initialize failure", ex);
         }

extensions/primevideo/src/main/java/app/revanced/extension/primevideo/videoplayer/PlaybackSpeedPatch.java

@@ -16,6 +16,7 @@ import java.util.Arrays;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.Dim;
 
 import com.amazon.video.sdk.player.Player;
 
@@ -64,9 +65,8 @@ public class PlaybackSpeedPatch {
         SpeedIconDrawable speedIcon = new SpeedIconDrawable();
         speedButton.setImageDrawable(speedIcon);
 
-        int buttonSize = Utils.dipToPixels(48);
-        speedButton.setMinimumWidth(buttonSize);
-        speedButton.setMinimumHeight(buttonSize);
+        speedButton.setMinimumWidth(Dim.dp48);
+        speedButton.setMinimumHeight(Dim.dp48);
 
         return speedButton;
     }
@@ -197,11 +197,11 @@ class SpeedIconDrawable extends Drawable {
 
     @Override
     public int getIntrinsicWidth() {
-        return Utils.dipToPixels(32);
+        return Dim.dp32;
     }
 
     @Override
     public int getIntrinsicHeight() {
-        return Utils.dipToPixels(32);
+        return Dim.dp32;
     }
-}
+}

extensions/samsung/radio/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:samsung:radio:stub"))
+}

extensions/samsung/radio/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/misc/fix/crash/FixCrashPatch.java

@@ -0,0 +1,24 @@
+package app.revanced.extension.samsung.radio.misc.fix.crash;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public final class FixCrashPatch {
+    /**
+     * Injection point.
+     * <p>
+     * Add the required permissions to the request list to avoid crashes on API 34+.
+     **/
+    public static final String[] fixPermissionRequestList(String[] perms) {
+        List<String> permsList = new ArrayList<>(Arrays.asList(perms));
+        if (permsList.contains("android.permission.POST_NOTIFICATIONS")) {
+            permsList.addAll(Arrays.asList("android.permission.RECORD_AUDIO", "android.permission.READ_PHONE_STATE", "android.permission.FOREGROUND_SERVICE_MICROPHONE"));
+        }
+        if (permsList.contains("android.permission.RECORD_AUDIO")) {
+            permsList.add("android.permission.FOREGROUND_SERVICE_MICROPHONE");
+        }
+        return permsList.toArray(new String[0]);
+    }
+}

extensions/samsung/radio/src/main/java/app/revanced/extension/samsung/radio/restrictions/device/BypassDeviceChecksPatch.java

@@ -0,0 +1,19 @@
+package app.revanced.extension.samsung.radio.restrictions.device;
+
+import android.os.SemSystemProperties;
+
+import java.util.Arrays;
+
+@SuppressWarnings("unused")
+public final class BypassDeviceChecksPatch {
+
+    /**
+     * Injection point.
+     * <p>
+     * Check if the device has the required hardware
+     **/
+    public static final boolean checkIfDeviceIsIncompatible(String[] deviceList) {
+        String currentDevice = SemSystemProperties.getSalesCode();
+        return Arrays.asList(deviceList).contains(currentDevice);
+    }
+}

extensions/samsung/radio/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    alias(libs.plugins.android.library)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/samsung/radio/stub/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest/>

extensions/samsung/radio/stub/src/main/java/android/os/SemSystemProperties.java

@@ -0,0 +1,7 @@
+package android.os;
+
+public class SemSystemProperties {
+    public static String getSalesCode() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/GmsCoreSupport.java

@@ -31,9 +31,6 @@ import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings("unused")
 public class GmsCoreSupport {
-    private static final String PACKAGE_NAME_YOUTUBE = "com.google.android.youtube";
-    private static final String PACKAGE_NAME_YOUTUBE_MUSIC = "com.google.android.apps.youtube.music";
-
     private static final String GMS_CORE_PACKAGE_NAME
             = getGmsCoreVendorGroupId() + ".android.gms";
     private static final Uri GMS_CORE_PROVIDER
@@ -53,6 +50,20 @@ public class GmsCoreSupport {
     @Nullable
     private static volatile Boolean DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
 
+    private static String getOriginalPackageName() {
+       return null; // Modified during patching.
+    }
+
+    /**
+     * @return If the current package name is the same as the original unpatched app.
+     *         If `GmsCore support` was not included during patching, this returns true;
+     */
+    public static boolean isPackageNameOriginal() {
+        String originalPackageName = getOriginalPackageName();
+        return originalPackageName == null
+                || originalPackageName.equals(Utils.getContext().getPackageName());
+    }
+
     private static void open(String queryOrLink) {
         Logger.printInfo(() -> "Opening link: " + queryOrLink);
 
@@ -113,11 +124,10 @@ public class GmsCoreSupport {
             // Verify the user has not included GmsCore for a root installation.
             // GmsCore Support changes the package name, but with a mounted installation
             // all manifest changes are ignored and the original package name is used.
-            String packageName = context.getPackageName();
-            if (packageName.equals(PACKAGE_NAME_YOUTUBE) || packageName.equals(PACKAGE_NAME_YOUTUBE_MUSIC)) {
+            if (isPackageNameOriginal()) {
                 Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
-                // Cannot use localize text here, since the app will load
-                // resources from the unpatched app and all patch strings are missing.
+                // Cannot use localize text here, since the app will load resources
+                // from the unpatched app and all patch strings are missing.
                 Utils.showToastLong("The 'GmsCore support' patch breaks mount installations");
 
                 // Do not exit. If the app exits before launch completes (and without
@@ -250,8 +260,7 @@ public class GmsCoreSupport {
         };
     }
 
-    // Modified by a patch. Do not touch.
     private static String getGmsCoreVendorGroupId() {
-        return "app.revanced";
+        return "app.revanced"; // Modified during patching.
     }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/ResourceType.java

@@ -0,0 +1,57 @@
+package app.revanced.extension.shared;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ResourceType {
+    ANIM("anim"),
+    ANIMATOR("animator"),
+    ARRAY("array"),
+    ATTR("attr"),
+    BOOL("bool"),
+    COLOR("color"),
+    DIMEN("dimen"),
+    DRAWABLE("drawable"),
+    FONT("font"),
+    FRACTION("fraction"),
+    ID("id"),
+    INTEGER("integer"),
+    INTERPOLATOR("interpolator"),
+    LAYOUT("layout"),
+    MENU("menu"),
+    MIPMAP("mipmap"),
+    NAVIGATION("navigation"),
+    PLURALS("plurals"),
+    RAW("raw"),
+    STRING("string"),
+    STYLE("style"),
+    STYLEABLE("styleable"),
+    TRANSITION("transition"),
+    VALUES("values"),
+    XML("xml");
+
+    private static final Map<String, ResourceType> VALUE_MAP;
+
+    static {
+        ResourceType[] values = values();
+        VALUE_MAP = new HashMap<>(2 * values.length);
+
+        for (ResourceType type : values) {
+            VALUE_MAP.put(type.value, type);
+        }
+    }
+
+    public final String value;
+
+    public static ResourceType fromValue(String value) {
+        ResourceType type = VALUE_MAP.get(value);
+        if (type == null) {
+            throw new IllegalArgumentException("Unknown resource type: " + value);
+        }
+        return type;
+    }
+
+    ResourceType(String value) {
+        this.value = value;
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java

@@ -15,6 +15,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.net.ConnectivityManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -22,9 +23,7 @@ import android.os.Looper;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.util.DisplayMetrics;
 import android.util.Pair;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,10 +43,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.text.Bidi;
+import java.text.Collator;
+import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -60,6 +63,7 @@ import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
+import app.revanced.extension.shared.ui.Dim;
 
 @SuppressWarnings("NewApi")
 public class Utils {
@@ -78,6 +82,17 @@ public class Utils {
     @Nullable
     private static Boolean isDarkModeEnabled;
 
+    private static boolean appIsUsingBoldIcons;
+
+    // Cached Collator instance with its locale.
+    @Nullable
+    private static Locale cachedCollatorLocale;
+    @Nullable
+    private static Collator cachedCollator;
+
+    private static final Pattern PUNCTUATION_PATTERN = Pattern.compile("\\p{P}+");
+    private static final Pattern DIACRITICS_PATTERN = Pattern.compile("\\p{M}");
+
     private Utils() {
     } // utility class
 
@@ -141,12 +156,12 @@ public class Utils {
     /**
      * Hide a view by setting its layout height and width to 1dp.
      *
-     * @param condition The setting to check for hiding the view.
+     * @param setting   The setting to check for hiding the view.
      * @param view      The view to hide.
      */
-    public static void hideViewBy0dpUnderCondition(BooleanSetting condition, View view) {
-        if (hideViewBy0dpUnderCondition(condition.get(), view)) {
-            Logger.printDebug(() -> "View hidden by setting: " + condition);
+    public static void hideViewBy0dpUnderCondition(BooleanSetting setting, View view) {
+        if (hideViewBy0dpUnderCondition(setting.get(), view)) {
+            Logger.printDebug(() -> "View hidden by setting: " + setting);
         }
     }
 
@@ -158,22 +173,47 @@ public class Utils {
      */
     public static boolean hideViewBy0dpUnderCondition(boolean condition, View view) {
         if (condition) {
-            hideViewByLayoutParams(view);
+            hideViewBy0dp(view);
             return true;
         }
 
         return false;
     }
 
+    /**
+     * Hide a view by setting its layout params to 0x0
+     * @param view The view to hide.
+     */
+    public static void hideViewBy0dp(View view) {
+        if (view instanceof LinearLayout) {
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(0, 0);
+            view.setLayoutParams(layoutParams);
+        } else if (view instanceof FrameLayout) {
+            FrameLayout.LayoutParams layoutParams2 = new FrameLayout.LayoutParams(0, 0);
+            view.setLayoutParams(layoutParams2);
+        } else if (view instanceof RelativeLayout) {
+            RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(0, 0);
+            view.setLayoutParams(layoutParams3);
+        } else if (view instanceof Toolbar) {
+            Toolbar.LayoutParams layoutParams4 = new Toolbar.LayoutParams(0, 0);
+            view.setLayoutParams(layoutParams4);
+        } else {
+            ViewGroup.LayoutParams params = view.getLayoutParams();
+            params.width = 0;
+            params.height = 0;
+            view.setLayoutParams(params);
+        }
+    }
+
     /**
      * Hide a view by setting its visibility to GONE.
      *
-     * @param condition The setting to check for hiding the view.
+     * @param setting The setting to check for hiding the view.
      * @param view      The view to hide.
      */
-    public static void hideViewUnderCondition(BooleanSetting condition, View view) {
-        if (hideViewUnderCondition(condition.get(), view)) {
-            Logger.printDebug(() -> "View hidden by setting: " + condition);
+    public static void hideViewUnderCondition(BooleanSetting setting, View view) {
+        if (hideViewUnderCondition(setting.get(), view)) {
+            Logger.printDebug(() -> "View hidden by setting: " + setting);
         }
     }
 
@@ -192,14 +232,14 @@ public class Utils {
         return false;
     }
 
-    public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting condition, View view) {
-        if (hideViewByRemovingFromParentUnderCondition(condition.get(), view)) {
-            Logger.printDebug(() -> "View hidden by setting: " + condition);
+    public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting setting, View view) {
+        if (hideViewByRemovingFromParentUnderCondition(setting.get(), view)) {
+            Logger.printDebug(() -> "View hidden by setting: " + setting);
         }
     }
 
-    public static boolean hideViewByRemovingFromParentUnderCondition(boolean setting, View view) {
-        if (setting) {
+    public static boolean hideViewByRemovingFromParentUnderCondition(boolean condition, View view) {
+        if (condition) {
             ViewParent parent = view.getParent();
             if (parent instanceof ViewGroup parentGroup) {
                 parentGroup.removeView(view);
@@ -271,12 +311,13 @@ public class Utils {
      * @return zero, if the resource is not found.
      */
     @SuppressLint("DiscouragedApi")
-    public static int getResourceIdentifier(Context context, String resourceIdentifierName, @Nullable String type) {
-        return context.getResources().getIdentifier(resourceIdentifierName, type, context.getPackageName());
+    public static int getResourceIdentifier(Context context, @Nullable ResourceType type, String resourceIdentifierName) {
+        return context.getResources().getIdentifier(resourceIdentifierName,
+                type == null ? null : type.value, context.getPackageName());
     }
 
-    public static int getResourceIdentifierOrThrow(Context context, String resourceIdentifierName, @Nullable String type) {
-        final int resourceId = getResourceIdentifier(context, resourceIdentifierName, type);
+    public static int getResourceIdentifierOrThrow(Context context, @Nullable ResourceType type, String resourceIdentifierName) {
+        final int resourceId = getResourceIdentifier(context, type, resourceIdentifierName);
         if (resourceId == 0) {
             throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
                     + " type: " + type);
@@ -286,48 +327,44 @@ public class Utils {
 
     /**
      * @return zero, if the resource is not found.
-     * @see #getResourceIdentifierOrThrow(String, String)
+     * @see #getResourceIdentifierOrThrow(ResourceType, String)
      */
-    public static int getResourceIdentifier(String resourceIdentifierName, @Nullable String type) {
-        return getResourceIdentifier(getContext(), resourceIdentifierName, type);
+    public static int getResourceIdentifier(@Nullable ResourceType type, String resourceIdentifierName) {
+        return getResourceIdentifier(getContext(), type, resourceIdentifierName);
     }
 
     /**
-     * @return The resource identifier, or throws an exception if not found.
+     * @return zero, if the resource is not found.
+     * @see #getResourceIdentifier(ResourceType, String)
      */
-    public static int getResourceIdentifierOrThrow(String resourceIdentifierName, @Nullable String type) {
-        final int resourceId = getResourceIdentifier(getContext(), resourceIdentifierName, type);
-        if (resourceId == 0) {
-            throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
-                    + " type: " + type);
-        }
-        return resourceId;
+    public static int getResourceIdentifierOrThrow(@Nullable ResourceType type, String resourceIdentifierName) {
+        return getResourceIdentifierOrThrow(getContext(), type, resourceIdentifierName);
     }
 
     public static int getResourceInteger(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getInteger(getResourceIdentifierOrThrow(resourceIdentifierName, "integer"));
+        return getContext().getResources().getInteger(getResourceIdentifierOrThrow(ResourceType.INTEGER, resourceIdentifierName));
     }
 
     public static Animation getResourceAnimation(String resourceIdentifierName) throws Resources.NotFoundException {
-        return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(resourceIdentifierName, "anim"));
+        return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(ResourceType.ANIM, resourceIdentifierName));
     }
 
     @ColorInt
     public static int getResourceColor(String resourceIdentifierName) throws Resources.NotFoundException {
         //noinspection deprecation
-        return getContext().getResources().getColor(getResourceIdentifierOrThrow(resourceIdentifierName, "color"));
+        return getContext().getResources().getColor(getResourceIdentifierOrThrow(ResourceType.COLOR, resourceIdentifierName));
     }
 
     public static int getResourceDimensionPixelSize(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
+        return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(ResourceType.DIMEN, resourceIdentifierName));
     }
 
     public static float getResourceDimension(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getDimension(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
+        return getContext().getResources().getDimension(getResourceIdentifierOrThrow(ResourceType.DIMEN, resourceIdentifierName));
     }
 
     public static String[] getResourceStringArray(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(resourceIdentifierName, "array"));
+        return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(ResourceType.ARRAY, resourceIdentifierName));
     }
 
     public interface MatchFilter<T> {
@@ -338,7 +375,7 @@ public class Utils {
      * Includes sub children.
      */
     public static <R extends View> R getChildViewByResourceName(View view, String str) {
-        var child = view.findViewById(Utils.getResourceIdentifierOrThrow(str, "id"));
+        var child = view.findViewById(Utils.getResourceIdentifierOrThrow(ResourceType.ID, str));
         //noinspection unchecked
         return (R) child;
     }
@@ -696,6 +733,18 @@ public class Utils {
         }
     }
 
+    public static void openLink(String url) {
+        try {
+            Intent intent = new Intent("android.intent.action.VIEW", Uri.parse(url));
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            Logger.printInfo(() -> "Opening link with external browser: " + intent);
+            getContext().startActivity(intent);
+        } catch (Exception ex) {
+            Logger.printException(() -> "openLink failure", ex);
+        }
+    }
+
     public enum NetworkType {
         NONE,
         MOBILE,
@@ -736,31 +785,25 @@ public class Utils {
     }
 
     /**
-     * Hide a view by setting its layout params to 0x0
-     * @param view The view to hide.
+     * Hides a view by setting its layout width and height to 0dp.
+     * Handles null layout params safely.
+     *
+     * @param view The view to hide. If null, does nothing.
      */
-    public static void hideViewByLayoutParams(View view) {
-        if (view instanceof LinearLayout) {
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(0, 0);
-            view.setLayoutParams(layoutParams);
-        } else if (view instanceof FrameLayout) {
-            FrameLayout.LayoutParams layoutParams2 = new FrameLayout.LayoutParams(0, 0);
-            view.setLayoutParams(layoutParams2);
-        } else if (view instanceof RelativeLayout) {
-            RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(0, 0);
-            view.setLayoutParams(layoutParams3);
-        } else if (view instanceof Toolbar) {
-            Toolbar.LayoutParams layoutParams4 = new Toolbar.LayoutParams(0, 0);
-            view.setLayoutParams(layoutParams4);
-        } else if (view instanceof ViewGroup) {
-            ViewGroup.LayoutParams layoutParams5 = new ViewGroup.LayoutParams(0, 0);
-            view.setLayoutParams(layoutParams5);
+    public static void hideViewByLayoutParams(@Nullable View view) {
+        if (view == null) return;
+
+        ViewGroup.LayoutParams params = view.getLayoutParams();
+
+        if (params == null) {
+            // Create generic 0x0 layout params accepted by all ViewGroups.
+            params = new ViewGroup.LayoutParams(0, 0);
         } else {
-            ViewGroup.LayoutParams params = view.getLayoutParams();
             params.width = 0;
             params.height = 0;
-            view.setLayoutParams(params);
         }
+
+        view.setLayoutParams(params);
     }
 
     /**
@@ -777,13 +820,10 @@ public class Utils {
     public static void setDialogWindowParameters(Window window, int gravity, int yOffsetDip, int widthPercentage, boolean dimAmount) {
         WindowManager.LayoutParams params = window.getAttributes();
 
-        DisplayMetrics displayMetrics = Resources.getSystem().getDisplayMetrics();
-        int portraitWidth = Math.min(displayMetrics.widthPixels, displayMetrics.heightPixels);
-
-        params.width = (int) (portraitWidth * (widthPercentage / 100.0f)); // Set width based on parameters.
+        params.width = Dim.pctPortraitWidth(widthPercentage);
         params.height = WindowManager.LayoutParams.WRAP_CONTENT;
         params.gravity = gravity;
-        params.y = yOffsetDip > 0 ? dipToPixels(yOffsetDip) : 0;
+        params.y = yOffsetDip > 0 ? Dim.dp(yOffsetDip) : 0;
         if (dimAmount) {
             params.dimAmount = 0f;
         }
@@ -793,15 +833,18 @@ public class Utils {
     }
 
     /**
-     * Creates an array of corner radii for a rounded rectangle shape.
-     *
-     * @param dp Radius in density-independent pixels (dip) to apply to all corners.
-     * @return An array of eight float values representing the corner radii
-     * (top-left, top-right, bottom-right, bottom-left).
+     * @return If the unpatched app is currently using bold icons.
      */
-    public static float[] createCornerRadii(float dp) {
-        final float radius = dipToPixels(dp);
-        return new float[]{radius, radius, radius, radius, radius, radius, radius, radius};
+    public static boolean appIsUsingBoldIcons() {
+        return appIsUsingBoldIcons;
+    }
+
+    /**
+     * Controls if ReVanced bold icons are shown in various places.
+     * @param boldIcons If the app is currently using bold icons.
+     */
+    public static void setAppIsUsingBoldIcons(boolean boldIcons) {
+        appIsUsingBoldIcons = boldIcons;
     }
 
     /**
@@ -963,30 +1006,60 @@ public class Utils {
         }
     }
 
-    private static final Pattern punctuationPattern = Pattern.compile("\\p{P}+");
-
     /**
-     * Strips all punctuation and converts to lower case.  A null parameter returns an empty string.
+     * Removes punctuation and converts text to lowercase. Returns an empty string if input is null.
      */
     public static String removePunctuationToLowercase(@Nullable CharSequence original) {
         if (original == null) return "";
-        return punctuationPattern.matcher(original).replaceAll("")
+        return PUNCTUATION_PATTERN.matcher(original).replaceAll("")
                 .toLowerCase(BaseSettings.REVANCED_LANGUAGE.get().getLocale());
     }
 
     /**
-     * Sort a PreferenceGroup and all it's sub groups by title or key.
+     * Normalizes text for search: applies NFD, removes diacritics, and lowercases (locale-neutral).
+     * Returns an empty string if input is null.
+     */
+    public static String normalizeTextToLowercase(@Nullable CharSequence original) {
+        if (original == null) return "";
+        return DIACRITICS_PATTERN.matcher(Normalizer.normalize(original, Normalizer.Form.NFD))
+                .replaceAll("").toLowerCase(Locale.ROOT);
+    }
+
+    /**
+     * Returns a cached Collator for the current locale, or creates a new one if locale changed.
+     */
+    private static Collator getCollator() {
+        Locale currentLocale = BaseSettings.REVANCED_LANGUAGE.get().getLocale();
+
+        if (cachedCollator == null || !currentLocale.equals(cachedCollatorLocale)) {
+            cachedCollatorLocale = currentLocale;
+            cachedCollator = Collator.getInstance(currentLocale);
+            cachedCollator.setStrength(Collator.SECONDARY); // Case-insensitive, diacritic-insensitive.
+        }
+
+        return cachedCollator;
+    }
+
+    /**
+     * Sorts a {@link PreferenceGroup} and all nested subgroups by title or key.
      * <p>
-     * Sort order is determined by the preferences key {@link Sort} suffix.
+     * The sort order is controlled by the {@link Sort} suffix present in the preference key.
+     * Preferences without a key or without a {@link Sort} suffix remain in their original order.
      * <p>
-     * If a preference has no key or no {@link Sort} suffix,
-     * then the preferences are left unsorted.
+     * Sorting is performed using {@link Collator} with the current user locale,
+     * ensuring correct alphabetical ordering for all supported languages
+     * (e.g., Ukrainian "і", German "ß", French accented characters, etc.).
+     *
+     * @param group the {@link PreferenceGroup} to sort
      */
     @SuppressWarnings("deprecation")
     public static void sortPreferenceGroups(PreferenceGroup group) {
         Sort groupSort = Sort.fromKey(group.getKey(), Sort.UNSORTED);
         List<Pair<String, Preference>> preferences = new ArrayList<>();
 
+        // Get cached Collator for locale-aware string comparison.
+        Collator collator = getCollator();
+
         for (int i = 0, prefCount = group.getPreferenceCount(); i < prefCount; i++) {
             Preference preference = group.getPreference(i);
 
@@ -1017,10 +1090,11 @@ public class Utils {
             preferences.add(new Pair<>(sortValue, preference));
         }
 
-        //noinspection ComparatorCombinators
+        // Sort the list using locale-specific collation rules.
         Collections.sort(preferences, (pair1, pair2)
-                -> pair1.first.compareTo(pair2.first));
+                -> collator.compare(pair1.first, pair2.first));
 
+        // Reassign order values to reflect the new sorted sequence
         int index = 0;
         for (Pair<String, Preference> pair : preferences) {
             int order = index++;
@@ -1077,42 +1151,6 @@ public class Utils {
         return getResourceColor(colorString);
     }
 
-    /**
-     * Converts dip value to actual device pixels.
-     *
-     * @param dip The density-independent pixels value.
-     * @return The device pixel value.
-     */
-    public static int dipToPixels(float dip) {
-        return (int) TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                dip,
-                Resources.getSystem().getDisplayMetrics()
-        );
-    }
-
-    /**
-     * Converts a percentage of the screen height to actual device pixels.
-     *
-     * @param percentage The percentage of the screen height (e.g., 30 for 30%).
-     * @return The device pixel value corresponding to the percentage of screen height.
-     */
-    public static int percentageHeightToPixels(int percentage) {
-        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        return (int) (metrics.heightPixels * (percentage / 100.0f));
-    }
-
-    /**
-     * Converts a percentage of the screen width to actual device pixels.
-     *
-     * @param percentage The percentage of the screen width (e.g., 30 for 30%).
-     * @return The device pixel value corresponding to the percentage of screen width.
-     */
-    public static int percentageWidthToPixels(int percentage) {
-        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        return (int) (metrics.widthPixels * (percentage / 100.0f));
-    }
-
     /**
      * Uses {@link #adjustColorBrightness(int, float)} depending if light or dark mode is active.
      */
@@ -1170,4 +1208,18 @@ public class Utils {
     public static float clamp(float value, float lower, float upper) {
         return Math.max(lower, Math.min(value, upper));
     }
+
+    /**
+     * @param maxSize The maximum number of elements to keep in the map.
+     * @return A {@link LinkedHashMap} that automatically evicts the oldest entry
+     *        when the size exceeds {@code maxSize}.
+     */
+    public static <T, V> Map<T, V> createSizeRestrictedMap(int maxSize) {
+        return new LinkedHashMap<>(2 * maxSize) {
+            @Override
+            protected boolean removeEldestEntry(Entry eldest) {
+                return size() > maxSize;
+            }
+        };
+    }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java

@@ -23,6 +23,7 @@ import androidx.annotation.Nullable;
 import java.util.Collection;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.ui.CustomDialog;
@@ -128,7 +129,7 @@ abstract class Check {
             // Add icon to the dialog.
             ImageView iconView = new ImageView(activity);
             iconView.setImageResource(Utils.getResourceIdentifierOrThrow(
-                    "revanced_ic_dialog_alert", "drawable"));
+                    ResourceType.DRAWABLE, "revanced_ic_dialog_alert"));
             iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
             iconView.setPadding(0, 0, 0, 0);
             LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams(

extensions/shared/library/src/main/java/app/revanced/extension/shared/fixes/redgifs/BaseFixRedgifsApiPatch.java

@@ -15,7 +15,6 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-
 public abstract class BaseFixRedgifsApiPatch implements Interceptor {
     protected static BaseFixRedgifsApiPatch INSTANCE;
     public abstract String getDefaultUserAgent();

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CheckWatchHistoryDomainNameResolutionPatch.java

@@ -46,7 +46,7 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
     /**
      * Injection point.
      *
-     * Checks if s.youtube.com is blacklisted and playback history will fail to work.
+     * Checks if YouTube watch history endpoint cannot be reached.
      */
     public static void checkDnsResolver(Activity context) {
         if (!Utils.isNetworkConnected() || !BaseSettings.CHECK_WATCH_HISTORY_DOMAIN_NAME.get()) return;
@@ -61,34 +61,30 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
                 // Prevent this false positive by verify youtube.com resolves.
                 // If youtube.com does not resolve, then it's not a watch history domain resolving error
                 // because the entire app will not work since no domains are resolving.
-                if (!domainResolvesToValidIP("youtube.com")
+                String domainYouTube = "youtube.com";
+                if (!domainResolvesToValidIP(domainYouTube)
+                        || domainResolvesToValidIP(HISTORY_TRACKING_ENDPOINT)
+                        // Check multiple times, so a false positive from a flaky connection is almost impossible.
+                        || !domainResolvesToValidIP(domainYouTube)
                         || domainResolvesToValidIP(HISTORY_TRACKING_ENDPOINT)) {
                     return;
                 }
 
                 Utils.runOnMainThread(() -> {
-                    try {
-                        // Create the custom dialog.
-                        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
-                                context,
-                                str("revanced_check_watch_history_domain_name_dialog_title"), // Title.
-                                Html.fromHtml(str("revanced_check_watch_history_domain_name_dialog_message")), // Message (HTML).
-                                null, // No EditText.
-                                null, // OK button text.
-                                () -> {}, // OK button action (just dismiss).
-                                () -> {}, // Cancel button action (just dismiss).
-                                str("revanced_check_watch_history_domain_name_dialog_ignore"), // Neutral button text.
-                                () -> BaseSettings.CHECK_WATCH_HISTORY_DOMAIN_NAME.save(false),    // Neutral button action (Ignore).
-                                true // Dismiss dialog on Neutral button click.
-                        );
+                    Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                            context,
+                            str("revanced_check_watch_history_domain_name_dialog_title"), // Title.
+                            Html.fromHtml(str("revanced_check_watch_history_domain_name_dialog_message")), // Message (HTML).
+                            null, // No EditText.
+                            null, // OK button text.
+                            () -> {}, // OK button action (just dismiss).
+                            null, // No cancel button.
+                            str("revanced_check_watch_history_domain_name_dialog_ignore"), // Neutral button text.
+                            () -> BaseSettings.CHECK_WATCH_HISTORY_DOMAIN_NAME.save(false),    // Neutral button action (Ignore).
+                            true // Dismiss dialog on Neutral button click.
+                    );
 
-                        // Show the dialog.
-                        Dialog dialog = dialogPair.first;
-
-                        Utils.showDialog(context, dialog, false, null);
-                    } catch (Exception ex) {
-                        Logger.printException(() -> "checkDnsResolver dialog creation failure", ex);
-                    }
+                    Utils.showDialog(context, dialogPair.first, false, null);
                 });
             } catch (Exception ex) {
                 Logger.printException(() -> "checkDnsResolver failure", ex);

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CustomBrandingPatch.java

@@ -0,0 +1,180 @@
+package app.revanced.extension.shared.patches;
+
+import android.app.Notification;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import app.revanced.extension.shared.GmsCoreSupport;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
+
+/**
+ * Patch shared by YouTube and YT Music.
+ */
+@SuppressWarnings("unused")
+public class CustomBrandingPatch {
+
+    // Important: In the future, additional branding themes can be added but all existing and prior
+    // themes cannot be removed or renamed.
+    //
+    // This is because if a user has a branding theme selected, then only that launch alias is enabled.
+    // If a future update removes or renames that alias, then after updating the app is effectively
+    // broken and it cannot be opened and not even clearing the app data will fix it.
+    // In that situation the only fix is to completely uninstall and reinstall again.
+    //
+    // The most that can be done is to hide a theme from the UI and keep the alias with dummy data.
+    public enum BrandingTheme {
+        /**
+         * Original unpatched icon.
+         */
+        ORIGINAL,
+        ROUNDED,
+        MINIMAL,
+        SCALED,
+        /**
+         * User provided custom icon.
+         */
+        CUSTOM;
+
+        private String packageAndNameIndexToClassAlias(String packageName, int appIndex) {
+            if (appIndex <= 0) {
+                throw new IllegalArgumentException("App index starts at index 1");
+            }
+            return packageName + ".revanced_" + name().toLowerCase(Locale.US) + '_' + appIndex;
+        }
+    }
+
+    private static final int notificationSmallIcon;
+
+    static {
+        BrandingTheme branding = BaseSettings.CUSTOM_BRANDING_ICON.get();
+        if (branding == BrandingTheme.ORIGINAL) {
+            notificationSmallIcon = 0;
+        } else {
+            // Original icon is quantum_ic_video_youtube_white_24
+            String iconName = "revanced_notification_icon";
+            if (branding == BrandingTheme.CUSTOM) {
+                iconName += "_custom";
+            }
+
+            notificationSmallIcon = Utils.getResourceIdentifier(ResourceType.DRAWABLE, iconName);
+            if (notificationSmallIcon == 0) {
+                Logger.printException(() -> "Could not load notification small icon");
+            }
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static View getLottieViewOrNull(View lottieStartupView) {
+        if (BaseSettings.CUSTOM_BRANDING_ICON.get() == BrandingTheme.ORIGINAL) {
+            return lottieStartupView;
+        }
+
+        return null;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static void setNotificationIcon(Notification.Builder builder) {
+        try {
+            if (notificationSmallIcon != 0) {
+                builder.setSmallIcon(notificationSmallIcon)
+                        .setColor(Color.TRANSPARENT); // Remove YT red tint.
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "setNotificationIcon failure", ex);
+        }
+    }
+
+    /**
+     * Injection point.
+     *
+     * The total number of app name aliases, including dummy aliases.
+     */
+    private static int numberOfPresetAppNames() {
+        // Modified during patching.
+        throw new IllegalStateException();
+    }
+
+    /**
+     * Injection point.
+     */
+    @SuppressWarnings("ConstantConditions")
+    public static void setBranding() {
+        try {
+            if (GmsCoreSupport.isPackageNameOriginal()) {
+                Logger.printInfo(() -> "App is root mounted. Cannot dynamically change app icon");
+                return;
+            }
+
+            Context context = Utils.getContext();
+            PackageManager pm = context.getPackageManager();
+            String packageName = context.getPackageName();
+
+            BrandingTheme selectedBranding = BaseSettings.CUSTOM_BRANDING_ICON.get();
+            final int selectedNameIndex = BaseSettings.CUSTOM_BRANDING_NAME.get();
+            ComponentName componentToEnable = null;
+            ComponentName defaultComponent = null;
+            List<ComponentName> componentsToDisable = new ArrayList<>();
+
+            for (BrandingTheme theme : BrandingTheme.values()) {
+                // Must always update all aliases including custom alias (last index).
+                final int numberOfPresetAppNames = numberOfPresetAppNames();
+
+                // App name indices starts at 1.
+                for (int index = 1; index <= numberOfPresetAppNames; index++) {
+                    String aliasClass = theme.packageAndNameIndexToClassAlias(packageName, index);
+                    ComponentName component = new ComponentName(packageName, aliasClass);
+                    if (defaultComponent == null) {
+                        // Default is always the first alias.
+                        defaultComponent = component;
+                    }
+
+                    if (index == selectedNameIndex && theme == selectedBranding) {
+                        componentToEnable = component;
+                    } else {
+                        componentsToDisable.add(component);
+                    }
+                }
+            }
+
+            if (componentToEnable == null) {
+                // User imported a bad app name index value. Either the imported data
+                // was corrupted, or they previously had custom name enabled and the app
+                // no longer has a custom name specified.
+                Utils.showToastLong("Custom branding reset");
+                BaseSettings.CUSTOM_BRANDING_ICON.resetToDefault();
+                BaseSettings.CUSTOM_BRANDING_NAME.resetToDefault();
+
+                componentToEnable = defaultComponent;
+                componentsToDisable.remove(defaultComponent);
+            }
+
+            for (ComponentName disable : componentsToDisable) {
+                pm.setComponentEnabledSetting(disable,
+                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+            }
+
+            // Use info logging because if the alias status become corrupt the app cannot launch.
+            ComponentName componentToEnableFinal = componentToEnable;
+            Logger.printInfo(() -> "Enabling:  " + componentToEnableFinal.getClassName());
+
+            pm.setComponentEnabledSetting(componentToEnable,
+                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
+        } catch (Exception ex) {
+            Logger.printException(() -> "setBranding failure", ex);
+        }
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/EnableDebuggingPatch.java

@@ -1,5 +1,9 @@
 package app.revanced.extension.shared.patches;
 
+import static java.lang.Boolean.TRUE;
+
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -21,12 +25,28 @@ public final class EnableDebuggingPatch {
             ? new ConcurrentHashMap<>(800, 0.5f, 1)
             : null;
 
+    private static final Set<Long> DISABLED_FEATURE_FLAGS = parseFlags(BaseSettings.DISABLED_FEATURE_FLAGS.get());
+
+    // Log all disabled flags on app startup.
+    static {
+        if (LOG_FEATURE_FLAGS && !DISABLED_FEATURE_FLAGS.isEmpty()) {
+            StringBuilder sb = new StringBuilder("Disabled feature flags:\n");
+            for (Long flag : DISABLED_FEATURE_FLAGS) {
+                sb.append("  ").append(flag).append('\n');
+            }
+            Logger.printDebug(sb::toString);
+        }
+    }
+
     /**
      * Injection point.
      */
     public static boolean isBooleanFeatureFlagEnabled(boolean value, Long flag) {
         if (LOG_FEATURE_FLAGS && value) {
-            if (featureFlags.putIfAbsent(flag, true) == null) {
+            if (DISABLED_FEATURE_FLAGS.contains(flag)) {
+                return false;
+            }
+            if (featureFlags.putIfAbsent(flag, TRUE) == null) {
                 Logger.printDebug(() -> "boolean feature is enabled: " + flag);
             }
         }
@@ -70,10 +90,44 @@ public final class EnableDebuggingPatch {
         if (LOG_FEATURE_FLAGS && !defaultValue.equals(value)) {
             if (featureFlags.putIfAbsent(flag, true) == null) {
                 Logger.printDebug(() -> " string feature is enabled: " + flag
-                        + " value: " + value +  (defaultValue.isEmpty() ? "" : " default: " + defaultValue));
+                        + " value: " + value + (defaultValue.isEmpty() ? "" : " default: " + defaultValue));
             }
         }
 
         return value;
     }
+
+    /**
+     * Get all logged feature flags.
+     * @return Set of all known flags
+     */
+    public static Set<Long> getAllLoggedFlags() {
+        if (featureFlags != null) {
+            return new HashSet<>(featureFlags.keySet());
+        }
+
+        return new HashSet<>();
+    }
+
+    /**
+     * Public method for parsing flags.
+     * @param flags String containing newline-separated flag IDs
+     * @return Set of parsed flag IDs
+     */
+    public static Set<Long> parseFlags(String flags) {
+        Set<Long> parsedFlags = new HashSet<>();
+        if (!flags.isBlank()) {
+            for (String flag : flags.split("\n")) {
+                String trimmedFlag = flag.trim();
+                if (trimmedFlag.isEmpty()) continue; // Skip empty lines.
+                try {
+                    parsedFlags.add(Long.parseLong(trimmedFlag));
+                } catch (NumberFormatException e) {
+                    Logger.printException(() -> "Invalid flag ID: " + flag);
+                }
+            }
+        }
+
+        return parsedFlags;
+    }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/ForceOriginalAudioPatch.java

@@ -0,0 +1,71 @@
+package app.revanced.extension.shared.patches;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.AppLanguage;
+import app.revanced.extension.shared.spoof.ClientType;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
+
+@SuppressWarnings("unused")
+public class ForceOriginalAudioPatch {
+
+    private static final String DEFAULT_AUDIO_TRACKS_SUFFIX = ".4";
+
+    private static volatile boolean enabled;
+
+    public static void setEnabled(boolean isEnabled, ClientType client) {
+        enabled = isEnabled;
+
+        if (isEnabled && !client.useAuth && !client.supportsMultiAudioTracks) {
+            // If client spoofing does not use authentication and lacks multi-audio streams,
+            // then can use any language code for the request and if that requested language is
+            // not available YT uses the original audio language. Authenticated requests ignore
+            // the language code and always use the account language. Use a language that is
+            // not auto-dubbed by YouTube: https://support.google.com/youtube/answer/15569972
+            // but the language is also supported natively by the Meta Quest device that
+            // Android VR is spoofing.
+            AppLanguage override = AppLanguage.NB; // Norwegian Bokmal.
+            Logger.printDebug(() -> "Setting language override: " + override);
+            SpoofVideoStreamsPatch.setLanguageOverride(override);
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean ignoreDefaultAudioStream(boolean original) {
+        if (enabled) {
+            return false;
+        }
+        return original;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean isDefaultAudioStream(boolean isDefault, String audioTrackId, String audioTrackDisplayName) {
+        try {
+            if (!enabled) {
+                return isDefault;
+            }
+
+            if (audioTrackId.isEmpty()) {
+                // Older app targets can have empty audio tracks and these might be placeholders.
+                // The real audio tracks are called after these.
+                return isDefault;
+            }
+
+            Logger.printDebug(() -> "default: " + String.format("%-5s", isDefault) + " id: "
+                    + String.format("%-8s", audioTrackId) + " name:" + audioTrackDisplayName);
+
+            final boolean isOriginal = audioTrackId.endsWith(DEFAULT_AUDIO_TRACKS_SUFFIX);
+            if (isOriginal) {
+                Logger.printDebug(() -> "Using audio: " + audioTrackId);
+            }
+
+            return isOriginal;
+        } catch (Exception ex) {
+            Logger.printException(() -> "isDefaultAudioStream failure", ex);
+            return isDefault;
+        }
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/SanitizeSharingLinksPatch.java

@@ -1,5 +1,6 @@
 package app.revanced.extension.shared.patches;
 
+import app.revanced.extension.shared.privacy.LinkSanitizer;
 import app.revanced.extension.shared.settings.BaseSettings;
 
 /**
@@ -7,17 +8,18 @@ import app.revanced.extension.shared.settings.BaseSettings;
  */
 @SuppressWarnings("unused")
 public final class SanitizeSharingLinksPatch {
-    private static final String NEW_TRACKING_PARAMETER_REGEX = ".si=.+";
-    private static final String OLD_TRACKING_PARAMETER_REGEX = ".feature=.+";
+
+    private static final LinkSanitizer sanitizer = new LinkSanitizer(
+            "si",
+            "feature" // Old tracking parameter name, and may be obsolete.
+    );
 
     /**
      * Injection point.
      */
     public static String sanitize(String url) {
         if (BaseSettings.SANITIZE_SHARED_LINKS.get()) {
-            url = url
-                    .replaceAll(NEW_TRACKING_PARAMETER_REGEX, "")
-                    .replaceAll(OLD_TRACKING_PARAMETER_REGEX, "");
+            url = sanitizer.sanitizeUrlString(url);
         }
 
         if (BaseSettings.REPLACE_MUSIC_LINKS_WITH_YOUTUBE.get()) {

extensions/shared/library/src/main/java/app/revanced/extension/shared/privacy/LinkSanitizer.java

@@ -0,0 +1,68 @@
+package app.revanced.extension.shared.privacy;
+
+import android.net.Uri;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import app.revanced.extension.shared.Logger;
+
+/**
+ * Strips away specific parameters from URLs.
+ */
+public class LinkSanitizer {
+
+    private final Collection<String> parametersToRemove;
+
+    public LinkSanitizer(String ... parametersToRemove) {
+        final int parameterCount = parametersToRemove.length;
+
+        // List is faster if only checking a few parameters.
+        this.parametersToRemove = parameterCount > 4
+                ? Set.of(parametersToRemove)
+                : List.of(parametersToRemove);
+    }
+
+    public String sanitizeUrlString(String url) {
+        try {
+            return sanitizeUri(Uri.parse(url)).toString();
+        } catch (Exception ex) {
+            Logger.printException(() -> "sanitizeUrlString failure: " + url, ex);
+            return url;
+        }
+    }
+
+    public Uri sanitizeUri(Uri uri) {
+        try {
+            String scheme = uri.getScheme();
+            if (scheme == null || !(scheme.equals("http") || scheme.equals("https"))) {
+                // Opening YouTube share sheet 'other' option passes the video title as a URI.
+                // Checking !uri.isHierarchical() works for all cases, except if the
+                // video title starts with / and then it's hierarchical but still an invalid URI.
+                Logger.printDebug(() -> "Ignoring uri: " + uri);
+                return uri;
+            }
+
+            Uri.Builder builder = uri.buildUpon().clearQuery();
+
+            if (!parametersToRemove.isEmpty()) {
+                for (String paramName : uri.getQueryParameterNames()) {
+                    if (!parametersToRemove.contains(paramName)) {
+                        for (String value : uri.getQueryParameters(paramName)) {
+                            builder.appendQueryParameter(paramName, value);
+                        }
+                    }
+                }
+            }
+
+            Uri sanitizedUrl = builder.build();
+            Logger.printInfo(() -> "Sanitized url: " + uri + " to: " + sanitizedUrl);
+
+            return sanitizedUrl;
+        } catch (Exception ex) {
+            Logger.printException(() -> "sanitizeUri failure: " + uri, ex);
+            return uri;
+        }
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/AppLanguage.java

@@ -36,8 +36,8 @@ public enum AppLanguage {
     FR,
     GL,
     GU,
-    HI,
     HE, // App uses obsolete 'IW' and not the modern 'HE' ISO code.
+    HI,
     HR,
     HU,
     HY,
@@ -60,9 +60,9 @@ public enum AppLanguage {
     MR,
     MS,
     MY,
+    NB,
     NE,
     NL,
-    NB,
     OR,
     PA,
     PL,

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseActivityHook.java

@@ -7,15 +7,16 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.preference.PreferenceFragment;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toolbar;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+import app.revanced.extension.shared.ui.Dim;
 
 /**
  * Base class for hooking activities to inject a custom PreferenceFragment with a toolbar.
@@ -25,13 +26,13 @@ import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragme
 public abstract class BaseActivityHook extends Activity {
 
     private static final int ID_REVANCED_SETTINGS_FRAGMENTS =
-            getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
+            getResourceIdentifierOrThrow(ResourceType.ID, "revanced_settings_fragments");
     private static final int ID_REVANCED_TOOLBAR_PARENT =
-            getResourceIdentifierOrThrow("revanced_toolbar_parent", "id");
+            getResourceIdentifierOrThrow(ResourceType.ID, "revanced_toolbar_parent");
     public static final int LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR =
-            getResourceIdentifierOrThrow("revanced_settings_with_toolbar", "layout");
+            getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_settings_with_toolbar");
     private static final int STRING_REVANCED_SETTINGS_TITLE =
-            getResourceIdentifierOrThrow("revanced_settings_title", "string");
+            getResourceIdentifierOrThrow(ResourceType.STRING, "revanced_settings_title");
 
     /**
      * Layout parameters for the toolbar, extracted from the dummy toolbar.
@@ -109,13 +110,12 @@ public abstract class BaseActivityHook extends Activity {
         toolbar.setNavigationOnClickListener(getNavigationClickListener(activity));
         toolbar.setTitle(STRING_REVANCED_SETTINGS_TITLE);
 
-        final int margin = Utils.dipToPixels(16);
-        toolbar.setTitleMarginStart(margin);
-        toolbar.setTitleMarginEnd(margin);
+        toolbar.setTitleMarginStart(Dim.dp16);
+        toolbar.setTitleMarginEnd(Dim.dp16);
         TextView toolbarTextView = Utils.getChildView(toolbar, false, view -> view instanceof TextView);
         if (toolbarTextView != null) {
             toolbarTextView.setTextColor(Utils.getAppForegroundColor());
-            toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+            toolbarTextView.setTextSize(20);
         }
         setToolbarLayoutParams(toolbar);
 
@@ -124,16 +124,18 @@ public abstract class BaseActivityHook extends Activity {
         toolBarParent.addView(toolbar, 0);
     }
 
+    /**
+     * Returns the resource ID for the content view layout.
+     */
+    protected int getContentViewResourceId() {
+        return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
+    }
+
     /**
      * Customizes the activity's theme.
      */
     protected abstract void customizeActivityTheme(Activity activity);
 
-    /**
-     * Returns the resource ID for the content view layout.
-     */
-    protected abstract int getContentViewResourceId();
-
     /**
      * Returns the background color for the toolbar.
      */

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java

@@ -2,8 +2,10 @@ package app.revanced.extension.shared.settings;
 
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
+import static app.revanced.extension.shared.patches.CustomBrandingPatch.BrandingTheme;
 import static app.revanced.extension.shared.settings.Setting.parent;
-import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.AudioStreamLanguageOverrideAvailability;
+
+import app.revanced.extension.shared.Logger;
 
 /**
  * Settings shared across multiple apps.
@@ -24,20 +26,42 @@ public class BaseSettings {
      * Use the icons declared in the preferences created during patching. If no icons or styles are declared then this setting does nothing.
      */
     public static final BooleanSetting SHOW_MENU_ICONS = new BooleanSetting("revanced_show_menu_icons", TRUE, true);
+    /**
+     * Do not use this setting directly. Instead use {@link app.revanced.extension.shared.Utils#appIsUsingBoldIcons()}
+     */
+    public static final BooleanSetting SETTINGS_DISABLE_BOLD_ICONS = new BooleanSetting("revanced_settings_disable_bold_icons", FALSE, true);
 
     public static final BooleanSetting SETTINGS_SEARCH_HISTORY = new BooleanSetting("revanced_settings_search_history", TRUE, true);
     public static final StringSetting SETTINGS_SEARCH_ENTRIES = new StringSetting("revanced_settings_search_entries", "");
 
+    /**
+     * The first time the app was launched with no previous app data (either a clean install, or after wiping app data).
+     */
+    public static final LongSetting FIRST_TIME_APP_LAUNCHED = new LongSetting("revanced_last_time_app_was_launched", -1L, false, false);
+
     //
     // Settings shared by YouTube and YouTube Music.
     //
 
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
-    public static final EnumSetting<AppLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AppLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
     public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
 
     public static final BooleanSetting SANITIZE_SHARED_LINKS = new BooleanSetting("revanced_sanitize_sharing_links", TRUE);
     public static final BooleanSetting REPLACE_MUSIC_LINKS_WITH_YOUTUBE = new BooleanSetting("revanced_replace_music_with_youtube", FALSE);
 
     public static final BooleanSetting CHECK_WATCH_HISTORY_DOMAIN_NAME = new BooleanSetting("revanced_check_watch_history_domain_name", TRUE, false, false);
+
+    public static final EnumSetting<BrandingTheme> CUSTOM_BRANDING_ICON = new EnumSetting<>("revanced_custom_branding_icon", BrandingTheme.ORIGINAL, true);
+    public static final IntegerSetting CUSTOM_BRANDING_NAME = new IntegerSetting("revanced_custom_branding_name", 1, true);
+
+    public static final StringSetting DISABLED_FEATURE_FLAGS = new StringSetting("revanced_disabled_feature_flags", "", true, parent(DEBUG));
+
+    static {
+        final long now = System.currentTimeMillis();
+
+        if (FIRST_TIME_APP_LAUNCHED.get() < 0) {
+            Logger.printInfo(() -> "First launch of installation with no prior app data");
+            FIRST_TIME_APP_LAUNCHED.save(now);
+        }
+    }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/Setting.java

@@ -392,10 +392,13 @@ public abstract class Setting<T> {
 
     /**
      * Get the parent Settings that this setting depends on.
-     * @return List of parent Settings (e.g., BooleanSetting or EnumSetting), or empty list if no dependencies exist.
+     * @return List of parent Settings, or empty list if no dependencies exist.
+     *         Defensive: handles null availability or missing getParentSettings() override.
      */
     public List<Setting<?>> getParentSettings() {
-        return availability == null ? Collections.emptyList() : availability.getParentSettings();
+        return availability == null
+                ? Collections.emptyList()
+                : Objects.requireNonNullElse(availability.getParentSettings(), Collections.emptyList());
     }
 
     /**

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java

@@ -23,6 +23,7 @@ import androidx.annotation.Nullable;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
@@ -53,7 +54,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * Set by subclasses if Strings cannot be added as a resource.
      */
     @Nullable
-    protected static String restartDialogTitle, restartDialogMessage, restartDialogButtonText, confirmDialogTitle;
+    protected static CharSequence restartDialogTitle, restartDialogMessage, restartDialogButtonText, confirmDialogTitle;
 
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
@@ -103,10 +104,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * so all app specific {@link Setting} instances are loaded before this method returns.
      */
     protected void initialize() {
-        String preferenceResourceName = BaseSettings.SHOW_MENU_ICONS.get()
-                ? "revanced_prefs_icons"
-                : "revanced_prefs";
-        final var identifier = Utils.getResourceIdentifier(preferenceResourceName, "xml");
+        String preferenceResourceName;
+        if (BaseSettings.SHOW_MENU_ICONS.get()) {
+            preferenceResourceName = Utils.appIsUsingBoldIcons()
+                    ? "revanced_prefs_icons_bold"
+                    : "revanced_prefs_icons";
+        } else {
+            preferenceResourceName = "revanced_prefs";
+        }
+
+        final var identifier = Utils.getResourceIdentifier(ResourceType.XML, preferenceResourceName);
         if (identifier == 0) return;
         addPreferencesFromResource(identifier);
 
@@ -125,10 +132,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
         showingUserDialogMessage = true;
 
+        CharSequence message = BulletPointPreference.formatIntoBulletPoints(
+                Objects.requireNonNull(setting.userDialogMessage).toString());
+
         Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
                 confirmDialogTitle, // Title.
-                Objects.requireNonNull(setting.userDialogMessage).toString(), // No message.
+                message,
                 null, // No EditText.
                 null, // OK button text.
                 () -> {

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/BulletPointPreference.java

@@ -15,7 +15,15 @@ import android.util.AttributeSet;
 @SuppressWarnings({"unused", "deprecation"})
 public class BulletPointPreference extends Preference {
 
-    public static SpannedString formatIntoBulletPoints(CharSequence source) {
+    /**
+     * Replaces bullet points with styled spans.
+     */
+    public static CharSequence formatIntoBulletPoints(CharSequence source) {
+        final char bulletPoint = '•';
+        if (TextUtils.indexOf(source, bulletPoint) < 0) {
+            return source; // Nothing to do.
+        }
+
         SpannableStringBuilder builder = new SpannableStringBuilder(source);
 
         int lineStart = 0;
@@ -26,7 +34,7 @@ public class BulletPointPreference extends Preference {
             if (lineEnd < 0) lineEnd = length;
 
             // Apply BulletSpan only if the line starts with the '•' character.
-            if (lineEnd > lineStart && builder.charAt(lineStart) == '•') {
+            if (lineEnd > lineStart && builder.charAt(lineStart) == bulletPoint) {
                 int deleteEnd = lineStart + 1; // remove the bullet itself
 
                 // If there's a single space right after the bullet, remove that too.

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerPreference.java

@@ -1,7 +1,6 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
 
 import android.app.Dialog;
@@ -32,11 +31,13 @@ import java.util.Locale;
 import java.util.regex.Pattern;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.StringSetting;
 import app.revanced.extension.shared.ui.ColorDot;
 import app.revanced.extension.shared.ui.CustomDialog;
+import app.revanced.extension.shared.ui.Dim;
 
 /**
  * A custom preference for selecting a color via a hexadecimal code or a color picker dialog.
@@ -81,13 +82,13 @@ public class ColorPickerPreference extends EditTextPreference {
     private boolean opacitySliderEnabled = false;
 
     public static final int ID_REVANCED_COLOR_PICKER_VIEW =
-            getResourceIdentifierOrThrow("revanced_color_picker_view", "id");
+            getResourceIdentifierOrThrow(ResourceType.ID, "revanced_color_picker_view");
     public static final int ID_PREFERENCE_COLOR_DOT =
-            getResourceIdentifierOrThrow("preference_color_dot", "id");
+            getResourceIdentifierOrThrow(ResourceType.ID, "preference_color_dot");
     public static final int LAYOUT_REVANCED_COLOR_DOT_WIDGET =
-            getResourceIdentifierOrThrow("revanced_color_dot_widget", "layout");
+            getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_color_dot_widget");
     public static final int LAYOUT_REVANCED_COLOR_PICKER =
-            getResourceIdentifierOrThrow("revanced_color_picker", "layout");
+            getResourceIdentifierOrThrow(ResourceType.LAYOUT, "revanced_color_picker");
 
     /**
      * Removes non valid hex characters, converts to all uppercase,
@@ -310,11 +311,8 @@ public class ColorPickerPreference extends EditTextPreference {
         inputLayout.setGravity(Gravity.CENTER_VERTICAL);
 
         dialogColorDot = new View(context);
-        LinearLayout.LayoutParams previewParams = new LinearLayout.LayoutParams(
-                dipToPixels(20),
-                dipToPixels(20)
-        );
-        previewParams.setMargins(dipToPixels(16), 0, dipToPixels(10), 0);
+        LinearLayout.LayoutParams previewParams = new LinearLayout.LayoutParams(Dim.dp20,Dim.dp20);
+        previewParams.setMargins(Dim.dp16, 0, Dim.dp10, 0);
         dialogColorDot.setLayoutParams(previewParams);
         inputLayout.addView(dialogColorDot);
         updateDialogColorDot();

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ColorPickerView.java

@@ -1,6 +1,5 @@
 package app.revanced.extension.shared.settings.preference;
 
-import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.getColorString;
 
 import android.annotation.SuppressLint;
@@ -21,6 +20,7 @@ import androidx.annotation.ColorInt;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.Dim;
 
 /**
  * A custom color picker view that allows the user to select a color using a hue slider, a saturation-value selector
@@ -54,28 +54,28 @@ public class ColorPickerView extends View {
     }
 
     /** Expanded touch area for the hue and opacity bars to increase the touch-sensitive area. */
-    public static final float TOUCH_EXPANSION = dipToPixels(20f);
+    public static final float TOUCH_EXPANSION = Dim.dp20;
 
     /** Margin between different areas of the view (saturation-value selector, hue bar, and opacity slider). */
-    private static final float MARGIN_BETWEEN_AREAS = dipToPixels(24);
+    private static final float MARGIN_BETWEEN_AREAS = Dim.dp24;
 
     /** Padding around the view. */
-    private static final float VIEW_PADDING = dipToPixels(16);
+    private static final float VIEW_PADDING = Dim.dp16;
 
     /** Height of the hue bar. */
-    private static final float HUE_BAR_HEIGHT = dipToPixels(12);
+    private static final float HUE_BAR_HEIGHT = Dim.dp12;
 
     /** Height of the opacity slider. */
-    private static final float OPACITY_BAR_HEIGHT = dipToPixels(12);
+    private static final float OPACITY_BAR_HEIGHT = Dim.dp12;
 
     /** Corner radius for the hue bar. */
-    private static final float HUE_CORNER_RADIUS = dipToPixels(6);
+    private static final float HUE_CORNER_RADIUS = Dim.dp6;
 
     /** Corner radius for the opacity slider. */
-    private static final float OPACITY_CORNER_RADIUS = dipToPixels(6);
+    private static final float OPACITY_CORNER_RADIUS = Dim.dp6;
 
     /** Radius of the selector handles. */
-    private static final float SELECTOR_RADIUS = dipToPixels(12);
+    private static final float SELECTOR_RADIUS = Dim.dp12;
 
     /** Stroke width for the selector handle outlines. */
     private static final float SELECTOR_STROKE_WIDTH = 8;
@@ -202,7 +202,7 @@ public class ColorPickerView extends View {
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final float DESIRED_ASPECT_RATIO = 0.8f; // height = width * 0.8
 
-        final int minWidth = dipToPixels(250);
+        final int minWidth = Dim.dp(250);
         final int minHeight = (int) (minWidth * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS)
                 + (opacitySliderEnabled ? (int) (OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS) : 0);
 

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/CustomDialogListPreference.java

@@ -20,6 +20,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.ui.CustomDialog;
 
@@ -30,14 +31,18 @@ import app.revanced.extension.shared.ui.CustomDialog;
 @SuppressWarnings({"unused", "deprecation"})
 public class CustomDialogListPreference extends ListPreference {
 
-    public static final int ID_REVANCED_CHECK_ICON =
-            getResourceIdentifierOrThrow("revanced_check_icon", "id");
-    public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER =
-            getResourceIdentifierOrThrow("revanced_check_icon_placeholder", "id");
-    public static final int ID_REVANCED_ITEM_TEXT =
-            getResourceIdentifierOrThrow("revanced_item_text", "id");
-    public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED =
-            getResourceIdentifierOrThrow("revanced_custom_list_item_checked", "layout");
+    public static final int ID_REVANCED_CHECK_ICON = getResourceIdentifierOrThrow(
+            ResourceType.ID, "revanced_check_icon");
+    public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER = getResourceIdentifierOrThrow(
+            ResourceType.ID, "revanced_check_icon_placeholder");
+    public static final int ID_REVANCED_ITEM_TEXT = getResourceIdentifierOrThrow(
+            ResourceType.ID, "revanced_item_text");
+    public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED = getResourceIdentifierOrThrow(
+            ResourceType.LAYOUT, "revanced_custom_list_item_checked");
+    public static final int DRAWABLE_CHECKMARK = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_custom_checkmark");
+    public static final int DRAWABLE_CHECKMARK_BOLD = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_custom_checkmark_bold");
 
     private String staticSummary = null;
     private CharSequence[] highlightedEntriesForDialog = null;
@@ -125,9 +130,13 @@ public class CustomDialogListPreference extends ListPreference {
                 LayoutInflater inflater = LayoutInflater.from(getContext());
                 view = inflater.inflate(layoutResourceId, parent, false);
                 holder = new SubViewDataContainer();
-                holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON);
                 holder.placeholder = view.findViewById(ID_REVANCED_CHECK_ICON_PLACEHOLDER);
                 holder.itemText = view.findViewById(ID_REVANCED_ITEM_TEXT);
+                holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON);
+                holder.checkIcon.setImageResource(Utils.appIsUsingBoldIcons()
+                        ? DRAWABLE_CHECKMARK_BOLD
+                        : DRAWABLE_CHECKMARK
+                );
                 view.setTag(holder);
             } else {
                 holder = (SubViewDataContainer) view.getTag();

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/FeatureFlagsManagerPreference.java

@@ -0,0 +1,625 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.preference.Preference;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.Pair;
+import android.util.SparseBooleanArray;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.Space;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.patches.EnableDebuggingPatch;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.ui.CustomDialog;
+import app.revanced.extension.shared.ui.Dim;
+
+/**
+ * A custom preference that opens a dialog for managing feature flags.
+ * Allows moving boolean flags between active and blocked states with advanced selection.
+ */
+@SuppressWarnings({"deprecation", "unused"})
+public class FeatureFlagsManagerPreference extends Preference {
+
+    private static final int DRAWABLE_REVANCED_SETTINGS_SELECT_ALL =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_select_all");
+    private static final int DRAWABLE_REVANCED_SETTINGS_DESELECT_ALL =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_deselect_all");
+    private static final int DRAWABLE_REVANCED_SETTINGS_COPY_ALL =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_copy_all");
+    private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_RIGHT_ONE =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_right_one");
+    private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_RIGHT_DOUBLE =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_right_double");
+    private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_LEFT_ONE =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_left_one");
+    private static final int DRAWABLE_REVANCED_SETTINGS_ARROW_LEFT_DOUBLE =
+            getResourceIdentifierOrThrow(ResourceType.DRAWABLE, "revanced_settings_arrow_left_double");
+
+    /**
+     * Flags to hide from the UI.
+     */
+    private static final Set<Long> FLAGS_TO_IGNORE = Set.of(
+            45386834L, // 'You' tab settings icon.
+            45685201L  // Bold icons. Forcing off interferes with patch changes and YT icons are broken.
+    );
+
+    /**
+     * Tracks state for range selection in ListView.
+     */
+    private static class ListViewSelectionState {
+        int lastClickedPosition = -1; // Position of the last clicked item.
+        boolean isRangeSelecting = false; // True while a range is being selected.
+    }
+
+    /**
+     * Helper class to pass ListView and Adapter together.
+     */
+    private record ColumnViews(ListView listView, FlagAdapter adapter) {}
+
+    {
+        setOnPreferenceClickListener(pref -> {
+            showFlagsManagerDialog();
+            return true;
+        });
+    }
+
+    public FeatureFlagsManagerPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public FeatureFlagsManagerPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public FeatureFlagsManagerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FeatureFlagsManagerPreference(Context context) {
+        super(context);
+    }
+
+    /**
+     * Shows the main dialog for managing feature flags.
+     */
+    private void showFlagsManagerDialog() {
+        if (!BaseSettings.DEBUG.get()) {
+            Utils.showToastShort(str("revanced_debug_logs_disabled"));
+            return;
+        }
+
+        Context context = getContext();
+
+        // Load all known and disabled flags.
+        TreeSet<Long> allKnownFlags = new TreeSet<>(EnableDebuggingPatch.getAllLoggedFlags());
+        allKnownFlags.removeAll(FLAGS_TO_IGNORE);
+
+        TreeSet<Long> disabledFlags = new TreeSet<>(EnableDebuggingPatch.parseFlags(
+                BaseSettings.DISABLED_FEATURE_FLAGS.get()));
+        disabledFlags.removeAll(FLAGS_TO_IGNORE);
+
+        if (allKnownFlags.isEmpty() && disabledFlags.isEmpty()) {
+            // String does not need to be localized because it's basically impossible
+            // to reach the settings menu without encountering at least 1 flag.
+            Utils.showToastShort("No feature flags logged yet");
+            return;
+        }
+
+        TreeSet<Long> availableFlags = new TreeSet<>(allKnownFlags);
+        availableFlags.removeAll(disabledFlags);
+        TreeSet<Long> blockedFlags = new TreeSet<>(disabledFlags);
+
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                context,
+                getTitle() != null ? getTitle().toString() : "",
+                null,
+                null,
+                str("revanced_settings_save"),
+                () -> saveFlags(blockedFlags),
+                () -> {},
+                str("revanced_settings_reset"),
+                this::resetFlags,
+                true
+        );
+
+        LinearLayout mainLayout = dialogPair.second;
+        LinearLayout.LayoutParams contentParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, 0, 1.0f);
+
+        // Insert content before the dialog button row.
+        View contentView = createContentView(context, availableFlags, blockedFlags);
+        mainLayout.addView(contentView, mainLayout.getChildCount() - 1, contentParams);
+
+        Dialog dialog = dialogPair.first;
+        dialog.show();
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            Utils.setDialogWindowParameters(window, Gravity.CENTER, 0, 100, false);
+        }
+    }
+
+    /**
+     * Creates the main content view with two columns.
+     */
+    private View createContentView(Context context, TreeSet<Long> availableFlags, TreeSet<Long> blockedFlags) {
+        LinearLayout contentLayout = new LinearLayout(context);
+        contentLayout.setOrientation(LinearLayout.VERTICAL);
+
+        // Headers.
+        TextView availableHeader = createHeader(context, "revanced_debug_feature_flags_manager_active_header");
+        TextView blockedHeader = createHeader(context, "revanced_debug_feature_flags_manager_blocked_header");
+
+        LinearLayout headersLayout = new LinearLayout(context);
+        headersLayout.setOrientation(LinearLayout.HORIZONTAL);
+        headersLayout.addView(availableHeader, new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
+        headersLayout.addView(blockedHeader, new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
+
+        // Columns.
+        View leftColumn = createColumn(context, availableFlags, availableHeader);
+        View rightColumn = createColumn(context, blockedFlags, blockedHeader);
+
+        ColumnViews leftViews = (ColumnViews) leftColumn.getTag();
+        ColumnViews rightViews = (ColumnViews) rightColumn.getTag();
+
+        updateHeaderCount(availableHeader, leftViews.adapter);
+        updateHeaderCount(blockedHeader, rightViews.adapter);
+
+        // Main columns layout.
+        LinearLayout columnsLayout = new LinearLayout(context);
+        columnsLayout.setOrientation(LinearLayout.HORIZONTAL);
+        columnsLayout.setLayoutParams(new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
+        columnsLayout.addView(leftColumn, new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.MATCH_PARENT, 1f));
+
+        Space spaceBetweenColumns = new Space(context);
+        spaceBetweenColumns.setLayoutParams(new LinearLayout.LayoutParams(Dim.dp8, ViewGroup.LayoutParams.MATCH_PARENT));
+        columnsLayout.addView(spaceBetweenColumns);
+
+        columnsLayout.addView(rightColumn, new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.MATCH_PARENT, 1f));
+
+        // Move buttons below columns.
+        Pair<LinearLayout, LinearLayout> moveButtons = createMoveButtons(context,
+                leftViews.listView, rightViews.listView,
+                availableFlags, blockedFlags, availableHeader, blockedHeader);
+
+        // Layout for buttons row.
+        LinearLayout buttonsRow = new LinearLayout(context);
+        buttonsRow.setOrientation(LinearLayout.HORIZONTAL);
+        buttonsRow.setLayoutParams(new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+        buttonsRow.addView(moveButtons.first, new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
+
+        Space spaceBetweenButtons = new Space(context);
+        spaceBetweenButtons.setLayoutParams(new LinearLayout.LayoutParams(Dim.dp8, ViewGroup.LayoutParams.WRAP_CONTENT));
+        buttonsRow.addView(spaceBetweenButtons);
+
+        buttonsRow.addView(moveButtons.second, new LinearLayout.LayoutParams(
+                0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f));
+
+        contentLayout.addView(headersLayout);
+        contentLayout.addView(columnsLayout);
+        contentLayout.addView(buttonsRow);
+
+        return contentLayout;
+    }
+
+    /**
+     * Creates a header TextView.
+     */
+    private TextView createHeader(Context context, String tag) {
+        TextView textview = new TextView(context);
+        textview.setTag(tag);
+        textview.setTextSize(16);
+        textview.setTextColor(Utils.getAppForegroundColor());
+        textview.setGravity(Gravity.CENTER);
+
+        return textview;
+    }
+
+    /**
+     * Creates a single column (search + buttons + list).
+     */
+    private View createColumn(Context context, TreeSet<Long> flags, TextView countText) {
+        LinearLayout wrapper = new LinearLayout(context);
+        wrapper.setOrientation(LinearLayout.VERTICAL);
+
+        Pair<ListView, FlagAdapter> pair = createListView(context, flags, countText);
+        ListView listView = pair.first;
+        FlagAdapter adapter = pair.second;
+
+        EditText search = createSearchBox(context, adapter, listView, countText);
+        LinearLayout buttons = createActionButtons(context, listView, adapter);
+
+        listView.setLayoutParams(new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Dim.roundedCorners(10), null, null));
+        background.getPaint().setColor(Utils.getEditTextBackground());
+        listView.setPadding(0, Dim.dp4, 0, Dim.dp4);
+        listView.setBackground(background);
+        listView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+
+        wrapper.addView(search);
+        wrapper.addView(buttons);
+        wrapper.addView(listView);
+
+        // Save references for move buttons.
+        wrapper.setTag(new ColumnViews(listView, adapter));
+
+        return wrapper;
+    }
+
+    /**
+     * Updates the header text with the current count.
+     */
+    private void updateHeaderCount(TextView header, FlagAdapter adapter) {
+        header.setText(str((String) header.getTag(), adapter.getCount()));
+    }
+
+    /**
+     * Creates a search box that filters the list.
+     */
+    @SuppressLint("ClickableViewAccessibility")
+    private EditText createSearchBox(Context context, FlagAdapter adapter, ListView listView, TextView countText) {
+        EditText search = new EditText(context);
+        search.setInputType(InputType.TYPE_CLASS_NUMBER);
+        search.setTextSize(16);
+        search.setHint(str("revanced_debug_feature_flags_manager_search_hint"));
+        search.setHapticFeedbackEnabled(false);
+        search.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+
+        search.addTextChangedListener(new TextWatcher() {
+            @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            @Override public void onTextChanged(CharSequence s, int start, int before, int count) {
+                adapter.setSearchQuery(s.toString());
+                listView.clearChoices();
+                updateHeaderCount(countText, adapter);
+                Drawable clearIcon = context.getResources().getDrawable(android.R.drawable.ic_menu_close_clear_cancel);
+                clearIcon.setBounds(0, 0, Dim.dp20, Dim.dp20);
+                search.setCompoundDrawables(null, null, TextUtils.isEmpty(s) ? null : clearIcon, null);
+            }
+            @Override public void afterTextChanged(Editable s) {}
+        });
+
+        search.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                Drawable[] compoundDrawables = search.getCompoundDrawables();
+                if (compoundDrawables[2] != null &&
+                        event.getRawX() >= (search.getRight() - compoundDrawables[2].getBounds().width())) {
+                    search.setText("");
+                    return true;
+                }
+            }
+            return false;
+        });
+
+        return search;
+    }
+
+    /**
+     * Creates action buttons.
+     */
+    private LinearLayout createActionButtons(Context context, ListView listView, FlagAdapter adapter) {
+        LinearLayout row = new LinearLayout(context);
+        row.setOrientation(LinearLayout.HORIZONTAL);
+        row.setGravity(Gravity.CENTER);
+        row.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+
+        ImageButton selectAll = createButton(context, DRAWABLE_REVANCED_SETTINGS_SELECT_ALL,
+                () -> {
+                    for (int i = 0, count = adapter.getCount(); i < count; i++) {
+                        listView.setItemChecked(i, true);
+                    }
+                });
+
+        ImageButton clearAll = createButton(context, DRAWABLE_REVANCED_SETTINGS_DESELECT_ALL,
+                () -> {
+                    listView.clearChoices();
+                    adapter.notifyDataSetChanged();
+                });
+
+        ImageButton copy = createButton(context, DRAWABLE_REVANCED_SETTINGS_COPY_ALL,
+                () -> {
+                    List<String> items = new ArrayList<>();
+                    SparseBooleanArray checked = listView.getCheckedItemPositions();
+
+                    if (checked.size() > 0) {
+                        for (int i = 0, count = adapter.getCount(); i < count; i++) {
+                            if (checked.get(i)) {
+                                items.add(adapter.getItem(i));
+                            }
+                        }
+                    } else {
+                        for (Long flag : adapter.getFullFlags()) {
+                            items.add(String.valueOf(flag));
+                        }
+                    }
+
+                    Utils.setClipboard(TextUtils.join("\n", items));
+
+                    Utils.showToastShort(str("revanced_debug_feature_flags_manager_toast_copied"));
+                });
+
+        row.addView(selectAll);
+        row.addView(clearAll);
+        row.addView(copy);
+
+        return row;
+    }
+
+    /**
+     * Creates the move buttons (left and right groups).
+     */
+    private Pair<LinearLayout, LinearLayout> createMoveButtons(Context context,
+                                                               ListView availableListView, ListView blockedListView,
+                                                               TreeSet<Long> availableFlags, TreeSet<Long> blockedFlags,
+                                                               TextView availableCountText, TextView blockedCountText) {
+        // Left group: >> >
+        LinearLayout leftButtons = new LinearLayout(context);
+        leftButtons.setOrientation(LinearLayout.HORIZONTAL);
+        leftButtons.setGravity(Gravity.CENTER);
+
+        ImageButton moveAllRight = createButton(context, DRAWABLE_REVANCED_SETTINGS_ARROW_RIGHT_DOUBLE,
+                () -> moveFlags(availableListView, blockedListView, availableFlags, blockedFlags,
+                        availableCountText, blockedCountText, true));
+
+        ImageButton moveOneRight = createButton(context, DRAWABLE_REVANCED_SETTINGS_ARROW_RIGHT_ONE,
+                () -> moveFlags(availableListView, blockedListView, availableFlags, blockedFlags,
+                        availableCountText, blockedCountText, false));
+
+        leftButtons.addView(moveAllRight);
+        leftButtons.addView(moveOneRight);
+
+        // Right group: < <<
+        LinearLayout rightButtons = new LinearLayout(context);
+        rightButtons.setOrientation(LinearLayout.HORIZONTAL);
+        rightButtons.setGravity(Gravity.CENTER);
+
+        ImageButton moveOneLeft = createButton(context, DRAWABLE_REVANCED_SETTINGS_ARROW_LEFT_ONE,
+                () -> moveFlags(blockedListView, availableListView, blockedFlags, availableFlags,
+                        blockedCountText, availableCountText, false));
+
+        ImageButton moveAllLeft = createButton(context, DRAWABLE_REVANCED_SETTINGS_ARROW_LEFT_DOUBLE,
+                () -> moveFlags(blockedListView, availableListView, blockedFlags, availableFlags,
+                        blockedCountText, availableCountText, true));
+
+        rightButtons.addView(moveOneLeft);
+        rightButtons.addView(moveAllLeft);
+
+        return new Pair<>(leftButtons, rightButtons);
+    }
+
+    /**
+     * Creates a styled ImageButton.
+     */
+    @SuppressLint("ResourceType")
+    private ImageButton createButton(Context context, int drawableResId, Runnable action) {
+        ImageButton button = new ImageButton(context);
+
+        button.setImageResource(drawableResId);
+        button.setScaleType(ImageView.ScaleType.CENTER);
+        int[] attrs = {android.R.attr.selectableItemBackgroundBorderless};
+        //noinspection Recycle
+        TypedArray ripple = context.obtainStyledAttributes(attrs);
+        button.setBackgroundDrawable(ripple.getDrawable(0));
+        ripple.close();
+
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(Dim.dp32, Dim.dp32);
+        params.setMargins(Dim.dp8, Dim.dp8, Dim.dp8, Dim.dp8);
+        button.setLayoutParams(params);
+
+        button.setOnClickListener(v -> action.run());
+
+        return button;
+    }
+
+    /**
+     * Custom adapter with search filtering.
+     */
+    private static class FlagAdapter extends ArrayAdapter<String> {
+        private final TreeSet<Long> fullFlags;
+        private String searchQuery = "";
+
+        public FlagAdapter(Context context, TreeSet<Long> fullFlags) {
+            super(context, android.R.layout.simple_list_item_multiple_choice, new ArrayList<>());
+            this.fullFlags = fullFlags;
+            updateFiltered();
+        }
+
+        public void setSearchQuery(String query) {
+            searchQuery = query == null ? "" : query.trim();
+            updateFiltered();
+        }
+
+        private void updateFiltered() {
+            clear();
+            for (Long flag : fullFlags) {
+                String flagString = String.valueOf(flag);
+                if (searchQuery.isEmpty() || flagString.contains(searchQuery)) {
+                    add(flagString);
+                }
+            }
+            notifyDataSetChanged();
+        }
+
+        public void refresh() {
+            updateFiltered();
+        }
+
+        public List<Long> getFullFlags() {
+            return new ArrayList<>(fullFlags);
+        }
+    }
+
+    /**
+     * Creates a ListView with filtering, multi-select, and range selection.
+     */
+    @SuppressLint("ClickableViewAccessibility")
+    private Pair<ListView, FlagAdapter> createListView(Context context,
+                                                       TreeSet<Long> flags, TextView countText) {
+        ListView listView = new ListView(context);
+        listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+        listView.setDividerHeight(0);
+
+        FlagAdapter adapter = new FlagAdapter(context, flags);
+        listView.setAdapter(adapter);
+
+        final ListViewSelectionState state = new ListViewSelectionState();
+
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            if (!state.isRangeSelecting) {
+                state.lastClickedPosition = position;
+            } else {
+                state.isRangeSelecting = false;
+            }
+        });
+
+        listView.setOnItemLongClickListener((parent, view, position, id) -> {
+            if (state.lastClickedPosition == -1) {
+                listView.setItemChecked(position, true);
+                state.lastClickedPosition = position;
+            } else {
+                int start = Math.min(state.lastClickedPosition, position);
+                int end = Math.max(state.lastClickedPosition, position);
+                for (int i = start; i <= end; i++) {
+                    listView.setItemChecked(i, true);
+                }
+                state.isRangeSelecting = true;
+            }
+            return true;
+        });
+
+        listView.setOnTouchListener((view, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_UP && state.isRangeSelecting) {
+                state.isRangeSelecting = false;
+            }
+            return false;
+        });
+
+        return new Pair<>(listView, adapter);
+    }
+
+    /**
+     * Moves selected or all flags from one list to another.
+     *
+     * @param fromListView  Source ListView.
+     * @param toListView    Destination ListView.
+     * @param fromFlags     Source flag set.
+     * @param toFlags       Destination flag set.
+     * @param fromCountText Header showing count of source items.
+     * @param toCountText   Header showing count of destination items.
+     * @param moveAll       If true, move all items; if false, move only selected.
+     */
+    private void moveFlags(ListView fromListView, ListView toListView,
+                           TreeSet<Long> fromFlags, TreeSet<Long> toFlags,
+                           TextView fromCountText, TextView toCountText,
+                           boolean moveAll) {
+        if (fromListView == null || toListView == null) return;
+
+        List<Long> flagsToMove = new ArrayList<>();
+        FlagAdapter fromAdapter = (FlagAdapter) fromListView.getAdapter();
+
+        if (moveAll) {
+            flagsToMove.addAll(fromFlags);
+        } else {
+            SparseBooleanArray checked = fromListView.getCheckedItemPositions();
+            for (int i = 0, count = fromAdapter.getCount(); i < count; i++) {
+                if (checked.get(i)) {
+                    String item = fromAdapter.getItem(i);
+                    if (item != null) {
+                        flagsToMove.add(Long.parseLong(item));
+                    }
+                }
+            }
+        }
+
+        if (flagsToMove.isEmpty()) return;
+
+        for (Long flag : flagsToMove) {
+            fromFlags.remove(flag);
+            toFlags.add(flag);
+        }
+
+        // Clear selections before refreshing.
+        fromListView.clearChoices();
+        toListView.clearChoices();
+
+        // Refresh both adapters.
+        fromAdapter.refresh();
+        ((FlagAdapter) toListView.getAdapter()).refresh();
+
+        // Update headers.
+        updateHeaderCount(fromCountText, fromAdapter);
+        updateHeaderCount(toCountText, (FlagAdapter) toListView.getAdapter());
+    }
+
+    /**
+     * Saves blocked flags to settings.
+     */
+    private void saveFlags(TreeSet<Long> blockedFlags) {
+        StringBuilder flagsString = new StringBuilder();
+        for (Long flag : blockedFlags) {
+            if (flagsString.length() > 0) {
+                flagsString.append("\n");
+            }
+            flagsString.append(flag);
+        }
+
+        BaseSettings.DISABLED_FEATURE_FLAGS.save(flagsString.toString());
+        Utils.showToastShort(str("revanced_debug_feature_flags_manager_toast_saved"));
+        Logger.printDebug(() -> "Feature flags saved. Blocked: " + blockedFlags.size());
+
+        AbstractPreferenceFragment.showRestartDialog(getContext());
+    }
+
+    /**
+     * Resets all blocked flags.
+     */
+    private void resetFlags() {
+        BaseSettings.DISABLED_FEATURE_FLAGS.save("");
+        Utils.showToastShort(str("revanced_debug_feature_flags_manager_toast_reset"));
+
+        AbstractPreferenceFragment.showRestartDialog(getContext());
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ForceOriginalAudioSwitchPreference.java

@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.settings.preference;
+package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
 
@@ -6,17 +6,17 @@ import android.content.Context;
 import android.preference.SwitchPreference;
 import android.util.AttributeSet;
 
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.spoof.ClientType;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
-import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings({"deprecation", "unused"})
 public class ForceOriginalAudioSwitchPreference extends SwitchPreference {
 
     // Spoof stream patch is not included, or is not currently spoofing to Android Studio.
     private static final boolean available = !SpoofVideoStreamsPatch.isPatchIncluded()
-            || !(Settings.SPOOF_VIDEO_STREAMS.get()
-            && Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.ANDROID_CREATOR);
+            || !(BaseSettings.SPOOF_VIDEO_STREAMS.get()
+            && SpoofVideoStreamsPatch.getPreferredClient() == ClientType.ANDROID_CREATOR);
 
     {
         if (!available) {

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ImportExportPreference.java

@@ -11,7 +11,6 @@ import android.preference.Preference;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.Pair;
-import android.util.TypedValue;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -35,7 +34,7 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
             editText.setAutofillHints((String) null);
         }
         editText.setInputType(editText.getInputType() | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-        editText.setTextSize(TypedValue.COMPLEX_UNIT_PT, 7); // Use a smaller font to reduce text wrap.
+        editText.setTextSize(14);
 
         setOnPreferenceClickListener(this);
     }

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ReVancedAboutPreference.java

@@ -1,10 +1,10 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -40,6 +40,7 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.ui.Dim;
 
 /**
  * Opens a dialog showing official links.
@@ -125,6 +126,8 @@ public class ReVancedAboutPreference extends Preference {
 
     {
         setOnPreferenceClickListener(pref -> {
+            Context context = pref.getContext();
+
             // Show a progress spinner if the social links are not fetched yet.
             if (!AboutLinksRoutes.hasFetchedLinks() && Utils.isNetworkConnected()) {
                 // Show a progress spinner, but only if the api fetch takes more than a half a second.
@@ -137,17 +140,18 @@ public class ReVancedAboutPreference extends Preference {
                 handler.postDelayed(showDialogRunnable, delayToShowProgressSpinner);
 
                 Utils.runOnBackgroundThread(() ->
-                        fetchLinksAndShowDialog(handler, showDialogRunnable, progress));
+                        fetchLinksAndShowDialog(context, handler, showDialogRunnable, progress));
             } else {
                 // No network call required and can run now.
-                fetchLinksAndShowDialog(null, null, null);
+                fetchLinksAndShowDialog(context, null, null, null);
             }
 
             return false;
         });
     }
 
-    private void fetchLinksAndShowDialog(@Nullable Handler handler,
+    private void fetchLinksAndShowDialog(Context context,
+                                         @Nullable Handler handler,
                                          Runnable showDialogRunnable,
                                          @Nullable ProgressDialog progress) {
         WebLink[] links = AboutLinksRoutes.fetchAboutLinks();
@@ -164,7 +168,17 @@ public class ReVancedAboutPreference extends Preference {
             if (handler != null) {
                 handler.removeCallbacks(showDialogRunnable);
             }
-            if (progress != null) {
+
+            // Don't continue if the activity is done. To test this tap the
+            // about dialog and immediately press back before the dialog can show.
+            if (context instanceof Activity activity) {
+                if (activity.isFinishing() || activity.isDestroyed()) {
+                    Logger.printDebug(() -> "Not showing about dialog, activity is closed");
+                    return;
+                }
+            }
+
+            if (progress != null && progress.isShowing()) {
                 progress.dismiss();
             }
             new WebViewDialog(getContext(), htmlDialog).show();
@@ -208,11 +222,10 @@ class WebViewDialog extends Dialog {
         LinearLayout mainLayout = new LinearLayout(getContext());
         mainLayout.setOrientation(LinearLayout.VERTICAL);
 
-        final int padding = dipToPixels(10);
-        mainLayout.setPadding(padding, padding, padding, padding);
+        mainLayout.setPadding(Dim.dp10, Dim.dp10, Dim.dp10, Dim.dp10);
         // Set rounded rectangle background.
         ShapeDrawable mainBackground = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(28), null, null));
+                Dim.roundedCorners(28), null, null));
         mainBackground.getPaint().setColor(Utils.getDialogBackgroundColor());
         mainLayout.setBackground(mainBackground);
 

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/preference/ToolbarPreferenceFragment.java

@@ -6,8 +6,8 @@ import android.graphics.Insets;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.preference.Preference;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowInsets;
@@ -17,11 +17,32 @@ import android.widget.Toolbar;
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseActivityHook;
+import app.revanced.extension.shared.ui.Dim;
+import app.revanced.extension.shared.settings.BaseSettings;
 
 @SuppressWarnings({"deprecation", "NewApi"})
 public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
+
+    /**
+     * Removes the list of preferences from this fragment, if they exist.
+     * @param keys Preference keys.
+     */
+    protected void removePreferences(String ... keys) {
+        for (String key : keys) {
+            Preference pref = findPreference(key);
+            if (pref != null) {
+                PreferenceGroup parent = pref.getParent();
+                if (parent != null) {
+                    Logger.printDebug(() -> "Removing preference: " + key);
+                    parent.removePreference(pref);
+                }
+            }
+        }
+    }
+
     /**
      * Sets toolbar for all nested preference screens.
      */
@@ -69,14 +90,13 @@ public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
                             toolbar.setNavigationIcon(getBackButtonDrawable());
                             toolbar.setNavigationOnClickListener(view -> preferenceScreenDialog.dismiss());
 
-                            final int margin = Utils.dipToPixels(16);
-                            toolbar.setTitleMargin(margin, 0, margin, 0);
+                            toolbar.setTitleMargin(Dim.dp16, 0, Dim.dp16, 0);
 
                             TextView toolbarTextView = Utils.getChildView(toolbar,
                                     true, TextView.class::isInstance);
                             if (toolbarTextView != null) {
                                 toolbarTextView.setTextColor(Utils.getAppForegroundColor());
-                                toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+                                toolbarTextView.setTextSize(20);
                             }
 
                             // Allow package-specific toolbar customization.
@@ -115,8 +135,10 @@ public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
      */
     @SuppressLint("UseCompatLoadingForDrawables")
     public static Drawable getBackButtonDrawable() {
-        final int backButtonResource = Utils.getResourceIdentifierOrThrow(
-                "revanced_settings_toolbar_arrow_left", "drawable");
+        final int backButtonResource = Utils.getResourceIdentifierOrThrow(ResourceType.DRAWABLE,
+                Utils.appIsUsingBoldIcons()
+                        ? "revanced_settings_toolbar_arrow_left_bold"
+                        : "revanced_settings_toolbar_arrow_left");
         Drawable drawable = Utils.getContext().getResources().getDrawable(backButtonResource);
         customizeBackButtonDrawable(drawable);
         return drawable;

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultItem.java

@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
 import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
@@ -38,18 +39,18 @@ public abstract class BaseSearchResultItem {
         // Get the corresponding layout resource ID.
         public int getLayoutResourceId() {
             return switch (this) {
-                case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular");
-                case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch");
-                case LIST   -> getResourceIdentifier("revanced_preference_search_result_list");
-                case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color");
-                case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header");
-                case NO_RESULTS   -> getResourceIdentifier("revanced_preference_search_no_result");
+                case REGULAR, URL_LINK ->   getResourceIdentifier("revanced_preference_search_result_regular");
+                case SWITCH ->              getResourceIdentifier("revanced_preference_search_result_switch");
+                case LIST   ->              getResourceIdentifier("revanced_preference_search_result_list");
+                case COLOR_PICKER ->        getResourceIdentifier("revanced_preference_search_result_color");
+                case GROUP_HEADER ->        getResourceIdentifier("revanced_preference_search_result_group_header");
+                case NO_RESULTS   ->        getResourceIdentifier("revanced_preference_search_no_result");
             };
         }
 
         private static int getResourceIdentifier(String name) {
             // Placeholder for actual resource identifier retrieval.
-            return Utils.getResourceIdentifierOrThrow(name, "layout");
+            return Utils.getResourceIdentifierOrThrow(ResourceType.LAYOUT, name);
         }
     }
 
@@ -75,7 +76,7 @@ public abstract class BaseSearchResultItem {
 
     // Shared method for highlighting text with search query.
     protected static CharSequence highlightSearchQuery(CharSequence text, Pattern queryPattern) {
-        if (TextUtils.isEmpty(text)) return text;
+        if (TextUtils.isEmpty(text) || queryPattern == null) return text;
 
         final int adjustedColor = Utils.adjustColorBrightness(
                 Utils.getAppBackgroundColor(), 0.95f, 1.20f);
@@ -84,7 +85,10 @@ public abstract class BaseSearchResultItem {
 
         Matcher matcher = queryPattern.matcher(text);
         while (matcher.find()) {
-            spannable.setSpan(highlightSpan, matcher.start(), matcher.end(),
+            int start = matcher.start();
+            int end = matcher.end();
+            if (start == end) continue; // Skip zero matches.
+            spannable.setSpan(highlightSpan, start, end,
                     SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
@@ -224,10 +228,14 @@ public abstract class BaseSearchResultItem {
             return searchBuilder.toString();
         }
 
+        /**
+         * Appends normalized searchable text to the builder.
+         * Uses full Unicode normalization for accurate search across all languages.
+         */
         private void appendText(StringBuilder builder, CharSequence text) {
             if (!TextUtils.isEmpty(text)) {
                 if (builder.length() > 0) builder.append(" ");
-                builder.append(Utils.removePunctuationToLowercase(text));
+                builder.append(Utils.normalizeTextToLowercase(text));
             }
         }
 
@@ -272,7 +280,7 @@ public abstract class BaseSearchResultItem {
          */
         @Override
         boolean matchesQuery(String query) {
-            return searchableText.contains(Utils.removePunctuationToLowercase(query));
+            return searchableText.contains(Utils.normalizeTextToLowercase(query));
         }
 
         /**

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchResultsAdapter.java

@@ -1,7 +1,6 @@
 package app.revanced.extension.shared.settings.search;
 
 import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
-import static app.revanced.extension.shared.settings.search.BaseSearchViewController.DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON;
 
 import android.animation.AnimatorSet;
 import android.animation.ArgbEvaluator;
@@ -33,6 +32,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
 import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
@@ -54,15 +54,15 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchRe
     protected static final int PAUSE_BETWEEN_BLINKS = 100;
 
     protected static final int ID_PREFERENCE_TITLE = getResourceIdentifierOrThrow(
-            "preference_title", "id");
+            ResourceType.ID, "preference_title");
     protected static final int ID_PREFERENCE_SUMMARY = getResourceIdentifierOrThrow(
-            "preference_summary", "id");
+            ResourceType.ID, "preference_summary");
     protected static final int ID_PREFERENCE_PATH = getResourceIdentifierOrThrow(
-            "preference_path", "id");
+            ResourceType.ID, "preference_path");
     protected static final int ID_PREFERENCE_SWITCH = getResourceIdentifierOrThrow(
-            "preference_switch", "id");
+            ResourceType.ID, "preference_switch");
     protected static final int ID_PREFERENCE_COLOR_DOT = getResourceIdentifierOrThrow(
-            "preference_color_dot", "id");
+            ResourceType.ID, "preference_color_dot");
 
     protected static class RegularViewHolder {
         TextView titleView;
@@ -275,7 +275,7 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchRe
         holder.titleView.setText(item.highlightedTitle);
         holder.summaryView.setText(item.highlightedSummary);
         holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
-        holder.iconView.setImageResource(DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON);
+        holder.iconView.setImageResource(BaseSearchViewController.getSearchIcon());
     }
 
     /**
@@ -484,7 +484,7 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchRe
             return -1;
         }
 
-        for (int i = 0; i < adapter.getCount(); i++) {
+        for (int i = 0, count = adapter.getCount(); i < count; i++) {
             Object item = adapter.getItem(i);
             if (item == targetPreference) {
                 return i;
@@ -522,8 +522,8 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchRe
         if (currentAnimator != null && currentAnimator.isRunning()) {
             currentAnimator.cancel();
         }
-        int startColor = Utils.getAppBackgroundColor();
-        int highlightColor = Utils.adjustColorBrightness(
+        final int startColor = Utils.getAppBackgroundColor();
+        final int highlightColor = Utils.adjustColorBrightness(
                 startColor,
                 Utils.isDarkModeEnabled() ? 1.25f : 0.8f
         );
@@ -566,7 +566,7 @@ public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchRe
         }
 
         // First search on current level.
-        for (int i = 0; i < group.getPreferenceCount(); i++) {
+        for (int i = 0, count = group.getPreferenceCount(); i < count; i++) {
             Preference pref = group.getPreference(i);
             if (key.equals(pref.getKey())) {
                 return pref;

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/BaseSearchViewController.java

@@ -13,8 +13,8 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
@@ -38,6 +38,7 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
@@ -45,6 +46,7 @@ import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
 import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
 import app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory;
+import app.revanced.extension.shared.ui.Dim;
 
 /**
  * Abstract controller for managing the overlay search view in ReVanced settings.
@@ -70,14 +72,29 @@ public abstract class BaseSearchViewController {
 
     protected static final int MAX_SEARCH_RESULTS = 50; // Maximum number of search results displayed.
 
-    protected static final int ID_REVANCED_SEARCH_VIEW = getResourceIdentifierOrThrow("revanced_search_view", "id");
-    protected static final int ID_REVANCED_SEARCH_VIEW_CONTAINER = getResourceIdentifierOrThrow("revanced_search_view_container", "id");
-    protected static final int ID_ACTION_SEARCH = getResourceIdentifierOrThrow("action_search", "id");
-    protected static final int ID_REVANCED_SETTINGS_FRAGMENTS = getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
-    public static final int DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON =
-            getResourceIdentifierOrThrow("revanced_settings_search_icon", "drawable");
-    protected static final int MENU_REVANCED_SEARCH_MENU =
-            getResourceIdentifierOrThrow("revanced_search_menu", "menu");
+    protected static final int ID_REVANCED_SEARCH_VIEW = getResourceIdentifierOrThrow(
+            ResourceType.ID, "revanced_search_view");
+    protected static final int ID_REVANCED_SEARCH_VIEW_CONTAINER = getResourceIdentifierOrThrow(
+            ResourceType.ID, "revanced_search_view_container");
+    protected static final int ID_ACTION_SEARCH = getResourceIdentifierOrThrow(
+            ResourceType.ID, "action_search");
+    protected static final int ID_REVANCED_SETTINGS_FRAGMENTS = getResourceIdentifierOrThrow(
+            ResourceType.ID, "revanced_settings_fragments");
+    private static final int DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_search_icon");
+    private static final int DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON_BOLD = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_search_icon_bold");
+    protected static final int MENU_REVANCED_SEARCH_MENU = getResourceIdentifierOrThrow(
+            ResourceType.MENU, "revanced_search_menu");
+
+    /**
+     * @return The search icon, either bold or not bold, depending on the ReVanced UI setting.
+     */
+    public static int getSearchIcon() {
+        return Utils.appIsUsingBoldIcons()
+                ? DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON_BOLD
+                : DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON;
+    }
 
     /**
      * Constructs a new BaseSearchViewController instance.
@@ -112,7 +129,7 @@ public abstract class BaseSearchViewController {
         // Retrieve SearchView and container from XML.
         searchView = activity.findViewById(ID_REVANCED_SEARCH_VIEW);
         EditText searchEditText = searchView.findViewById(Utils.getResourceIdentifierOrThrow(
-                "android:id/search_src_text", null));
+                null, "android:id/search_src_text"));
         // Disable fullscreen keyboard mode.
         searchEditText.setImeOptions(searchEditText.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
 
@@ -123,7 +140,7 @@ public abstract class BaseSearchViewController {
         searchView.setQueryHint(str("revanced_settings_search_hint"));
 
         // Set text size.
-        searchEditText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        searchEditText.setTextSize(16);
 
         // Set cursor color.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -149,7 +166,7 @@ public abstract class BaseSearchViewController {
         // Create cursor drawable.
         GradientDrawable cursorDrawable = new GradientDrawable();
         cursorDrawable.setShape(GradientDrawable.RECTANGLE);
-        cursorDrawable.setSize(Utils.dipToPixels(2), -1); // Width: 2dp, Height: match text height.
+        cursorDrawable.setSize(Dim.dp2, -1); // Width: 2dp, Height: match text height.
         cursorDrawable.setColor(cursorColor);
 
         // Set cursor drawable.
@@ -164,7 +181,7 @@ public abstract class BaseSearchViewController {
         overlayContainer = new FrameLayout(activity);
         overlayContainer.setVisibility(View.GONE);
         overlayContainer.setBackgroundColor(Utils.getAppBackgroundColor());
-        overlayContainer.setElevation(Utils.dipToPixels(8));
+        overlayContainer.setElevation(Dim.dp8);
 
         // Container for search results.
         FrameLayout searchResultsContainer = new FrameLayout(activity);
@@ -248,6 +265,10 @@ public abstract class BaseSearchViewController {
             }
             return false;
         });
+
+        // Set bold icon if needed.
+        MenuItem search = toolbar.getMenu().findItem(ID_ACTION_SEARCH);
+        search.setIcon(getSearchIcon());
     }
 
     /**
@@ -450,7 +471,7 @@ public abstract class BaseSearchViewController {
 
         filteredSearchItems.clear();
 
-        String queryLower = Utils.removePunctuationToLowercase(query);
+        String queryLower = Utils.normalizeTextToLowercase(query);
         Pattern queryPattern = Pattern.compile(Pattern.quote(queryLower), Pattern.CASE_INSENSITIVE);
 
         // Clear highlighting only for items that were previously visible.
@@ -524,7 +545,7 @@ public abstract class BaseSearchViewController {
             noResultsPreference.setTitle(str("revanced_settings_search_no_results_title", query));
             noResultsPreference.setSummary(str("revanced_settings_search_no_results_summary"));
             noResultsPreference.setSelectable(false);
-            noResultsPreference.setIcon(DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON);
+            noResultsPreference.setIcon(getSearchIcon());
             filteredSearchItems.add(new BaseSearchResultItem.PreferenceSearchItem(noResultsPreference, "", Collections.emptyList()));
         }
 
@@ -669,7 +690,7 @@ public abstract class BaseSearchViewController {
     protected static GradientDrawable createBackgroundDrawable() {
         GradientDrawable background = new GradientDrawable();
         background.setShape(GradientDrawable.RECTANGLE);
-        background.setCornerRadius(Utils.dipToPixels(28));
+        background.setCornerRadius(Dim.dp28);
         background.setColor(getSearchViewBackground());
         return background;
     }

extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/search/SearchHistoryManager.java

@@ -24,6 +24,8 @@ import java.util.Deque;
 import java.util.LinkedList;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.preference.BulletPointPreference;
 import app.revanced.extension.shared.ui.CustomDialog;
 
@@ -37,25 +39,35 @@ public class SearchHistoryManager {
     private static final int MAX_HISTORY_SIZE = 5;  // Maximum history items stored.
 
     private static final int ID_CLEAR_HISTORY_BUTTON = getResourceIdentifierOrThrow(
-            "clear_history_button", "id");
+            ResourceType.ID, "clear_history_button");
     private static final int ID_HISTORY_TEXT = getResourceIdentifierOrThrow(
-            "history_text", "id");
+            ResourceType.ID, "history_text");
+    private static final int ID_HISTORY_ICON = getResourceIdentifierOrThrow(
+            ResourceType.ID, "history_icon");
     private static final int ID_DELETE_ICON = getResourceIdentifierOrThrow(
-            "delete_icon", "id");
+            ResourceType.ID, "delete_icon");
     private static final int ID_EMPTY_HISTORY_TITLE = getResourceIdentifierOrThrow(
-            "empty_history_title", "id");
+            ResourceType.ID, "empty_history_title");
     private static final int ID_EMPTY_HISTORY_SUMMARY = getResourceIdentifierOrThrow(
-            "empty_history_summary", "id");
+            ResourceType.ID, "empty_history_summary");
     private static final int ID_SEARCH_HISTORY_HEADER = getResourceIdentifierOrThrow(
-            "search_history_header", "id");
+            ResourceType.ID, "search_history_header");
     private static final int ID_SEARCH_TIPS_SUMMARY = getResourceIdentifierOrThrow(
-            "revanced_settings_search_tips_summary", "id");
+            ResourceType.ID, "revanced_settings_search_tips_summary");
     private static final int LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN = getResourceIdentifierOrThrow(
-            "revanced_preference_search_history_screen", "layout");
+            ResourceType.LAYOUT, "revanced_preference_search_history_screen");
     private static final int LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM = getResourceIdentifierOrThrow(
-            "revanced_preference_search_history_item", "layout");
+            ResourceType.LAYOUT, "revanced_preference_search_history_item");
     private static final int ID_SEARCH_HISTORY_LIST = getResourceIdentifierOrThrow(
-            "search_history_list", "id");
+            ResourceType.ID, "search_history_list");
+    private static final int ID_SEARCH_REMOVE_ICON = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_search_remove");
+    private static final int ID_SEARCH_REMOVE_ICON_BOLD = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_search_remove_bold");
+    private static final int ID_SEARCH_ARROW_TIME_ICON = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_arrow_time");
+    private static final int ID_SEARCH_ARROW_TIME_ICON_BOLD = getResourceIdentifierOrThrow(
+            ResourceType.DRAWABLE, "revanced_settings_arrow_time_bold");
 
     private final Deque<String> searchHistory;
     private final Activity activity;
@@ -97,7 +109,8 @@ public class SearchHistoryManager {
 
         // Inflate search history layout.
         LayoutInflater inflater = LayoutInflater.from(activity);
-        View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN, searchHistoryContainer, false);
+        View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN,
+                searchHistoryContainer, false);
         searchHistoryContainer.addView(historyView, new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT,
                 FrameLayout.LayoutParams.MATCH_PARENT));
@@ -320,17 +333,29 @@ public class SearchHistoryManager {
         public void notifyDataSetChanged() {
             container.removeAllViews();
             for (String query : history) {
-                View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM, container, false);
-
-                TextView historyText = view.findViewById(ID_HISTORY_TEXT);
-                ImageView deleteIcon = view.findViewById(ID_DELETE_ICON);
-
-                historyText.setText(query);
-
+                View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM,
+                        container, false);
                 // Set click listener for main item (select query).
                 view.setOnClickListener(v -> onSelectHistoryItemListener.onSelectHistoryItem(query));
 
+                // Set history icon.
+                ImageView historyIcon = view.findViewById(ID_HISTORY_ICON);
+                historyIcon.setImageResource(Utils.appIsUsingBoldIcons()
+                        ? ID_SEARCH_ARROW_TIME_ICON_BOLD
+                        : ID_SEARCH_ARROW_TIME_ICON
+                );
+
+                TextView historyText = view.findViewById(ID_HISTORY_TEXT);
+                historyText.setText(query);
+
                 // Set click listener for delete icon.
+                ImageView deleteIcon = view.findViewById(ID_DELETE_ICON);
+
+                deleteIcon.setImageResource(Utils.appIsUsingBoldIcons()
+                                ? ID_SEARCH_REMOVE_ICON_BOLD
+                                : ID_SEARCH_REMOVE_ICON
+                );
+
                 deleteIcon.setOnClickListener(v -> createAndShowDialog(
                         query,
                         str("revanced_settings_search_remove_message"),

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java

@@ -31,6 +31,7 @@ public enum ClientType {
             "132.0.6808.3",
             "1.61.48",
             false,
+            false,
             "Android VR 1.61"
     ),
     /**
@@ -50,8 +51,36 @@ public enum ClientType {
             "107.0.5284.2",
             "1.43.32",
             ANDROID_VR_1_61_48.useAuth,
+            ANDROID_VR_1_61_48.supportsMultiAudioTracks,
             "Android VR 1.43"
     ),
+    /**
+     * Video not playable: Paid / Movie / Private / Age-restricted.
+     * Note: The 'Authorization' key must be excluded from the header.
+     *
+     * According to TeamNewPipe in 2022, if the 'androidSdkVersion' field is missing,
+     * the GVS did not return a valid response:
+     * [NewPipe#8713 (comment)](https://github.com/TeamNewPipe/NewPipe/issues/8713#issuecomment-1207443550).
+     *
+     * According to the latest commit in yt-dlp, the GVS returns a valid response
+     * even if the 'androidSdkVersion' field is missing:
+     * [yt-dlp#14693](https://github.com/yt-dlp/yt-dlp/pull/14693).
+     *
+     * For some reason, PoToken is not required.
+     */
+    ANDROID_NO_SDK(
+            3,
+            "ANDROID",
+            "",
+            "",
+            "",
+            Build.VERSION.RELEASE,
+            "20.05.46",
+            "com.google.android.youtube/20.05.46 (Linux; U; Android " + Build.VERSION.RELEASE + ") gzip",
+            false,
+            true,
+            "Android No SDK"
+    ),
     /**
      * Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
      * <a href="https://dumps.tadiphone.dev/dumps/google/barbet">Google Pixel 9 Pro Fold</a>
@@ -69,6 +98,7 @@ public enum ClientType {
             "132.0.6779.0",
             "23.47.101",
             true,
+            false,
             "Android Studio"
     ),
     /**
@@ -83,6 +113,7 @@ public enum ClientType {
             "0.1",
             "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
             false,
+            false,
             "visionOS"
     ),
     /**
@@ -107,6 +138,7 @@ public enum ClientType {
             "19.22.3",
             "com.google.ios.youtube/19.22.3 (iPad7,6; U; CPU iPadOS 17_7_10 like Mac OS X; " + Locale.getDefault() + ")",
             false,
+            true,
             "iPadOS"
     );
 
@@ -180,6 +212,11 @@ public enum ClientType {
      */
     public final boolean useAuth;
 
+    /**
+     * If the client supports multiple audio tracks.
+     */
+    public final boolean supportsMultiAudioTracks;
+
     /**
      * Friendly name displayed in stats for nerds.
      */
@@ -200,6 +237,7 @@ public enum ClientType {
                @NonNull String cronetVersion,
                String clientVersion,
                boolean useAuth,
+               boolean supportsMultiAudioTracks,
                String friendlyName) {
         this.id = id;
         this.clientName = clientName;
@@ -213,6 +251,7 @@ public enum ClientType {
         this.cronetVersion = cronetVersion;
         this.clientVersion = clientVersion;
         this.useAuth = useAuth;
+        this.supportsMultiAudioTracks = supportsMultiAudioTracks;
         this.friendlyName = friendlyName;
 
         Locale defaultLocale = Locale.getDefault();
@@ -238,6 +277,7 @@ public enum ClientType {
                String clientVersion,
                String userAgent,
                boolean useAuth,
+               boolean supportsMultiAudioTracks,
                String friendlyName) {
         this.id = id;
         this.clientName = clientName;
@@ -248,6 +288,7 @@ public enum ClientType {
         this.clientVersion = clientVersion;
         this.userAgent = userAgent;
         this.useAuth = useAuth;
+        this.supportsMultiAudioTracks = supportsMultiAudioTracks;
         this.friendlyName = friendlyName;
         this.packageName = null;
         this.androidSdkVersion = null;

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/SpoofVideoStreamsPatch.java

@@ -14,11 +14,11 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
 
 @SuppressWarnings("unused")
 public class SpoofVideoStreamsPatch {
+
     /**
      * Domain used for internet connectivity verification.
      * It has an empty response body and is only used to check for a 204 response code.
@@ -39,7 +39,7 @@ public class SpoofVideoStreamsPatch {
     @Nullable
     private static volatile AppLanguage languageOverride;
 
-    private static volatile ClientType preferredClient = ClientType.ANDROID_VR_1_61_48;
+    private static volatile ClientType preferredClient = ClientType.ANDROID_VR_1_43_32;
 
     /**
      * @return If this patch was included during patching.
@@ -54,8 +54,7 @@ public class SpoofVideoStreamsPatch {
     }
 
     /**
-     * @param language Language override for non-authenticated requests. If this is null then
-     *                 {@link BaseSettings#SPOOF_VIDEO_STREAMS_LANGUAGE} is used.
+     * @param language Language override for non-authenticated requests.
      */
     public static void setLanguageOverride(@Nullable AppLanguage language) {
         languageOverride = language;
@@ -66,10 +65,14 @@ public class SpoofVideoStreamsPatch {
         StreamingDataRequest.setClientOrderToUse(availableClients, client);
     }
 
+    public static ClientType getPreferredClient() {
+        return preferredClient;
+    }
+
     public static boolean spoofingToClientWithNoMultiAudioStreams() {
         return isPatchIncluded()
                 && SPOOF_STREAMING_DATA
-                && preferredClient != ClientType.IPADOS;
+                && !preferredClient.supportsMultiAudioTracks;
     }
 
     /**
@@ -317,11 +320,4 @@ public class SpoofVideoStreamsPatch {
 
         return videoFormat;
     }
-
-    public static final class AudioStreamLanguageOverrideAvailability implements Setting.Availability {
-        @Override
-        public boolean isAvailable() {
-            return BaseSettings.SPOOF_VIDEO_STREAMS.get() && !preferredClient.useAuth;
-        }
-    }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java

@@ -1,7 +1,5 @@
 package app.revanced.extension.shared.spoof.requests;
 
-import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -13,7 +11,6 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
 import app.revanced.extension.shared.settings.AppLanguage;
-import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.spoof.ClientType;
 import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 
@@ -42,12 +39,9 @@ final class PlayerRoutes {
             JSONObject context = new JSONObject();
 
             AppLanguage language = SpoofVideoStreamsPatch.getLanguageOverride();
-            if (language == null || clientType == ANDROID_VR_1_43_32) {
+            if (language == null) {
                 // Force original audio has not overrode the language.
-                // Or if YT has fallen over to the last unauthenticated client (VR 1.43), then
-                // always use the app language because forcing an audio stream of specific languages
-                // can sometimes fail so it's better to try and load something rather than nothing.
-                language = BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get();
+                language = AppLanguage.DEFAULT;
             }
             //noinspection ExtractMethodRecommender
             Locale streamLocale = language.getLocale();

extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/StreamingDataRequest.java

@@ -16,7 +16,6 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -83,22 +82,15 @@ public class StreamingDataRequest {
      */
     private static final int MAX_MILLISECONDS_TO_WAIT_FOR_FETCH = 20 * 1000;
 
+    /**
+     * Cache limit must be greater than the maximum number of videos open at once,
+     * which theoretically is more than 4 (3 Shorts + one regular minimized video).
+     * But instead use a much larger value, to handle if a video viewed a while ago
+     * is somehow still referenced.  Each stream is a small array of Strings
+     * so memory usage is not a concern.
+     */
     private static final Map<String, StreamingDataRequest> cache = Collections.synchronizedMap(
-            new LinkedHashMap<>(100) {
-                /**
-                 * Cache limit must be greater than the maximum number of videos open at once,
-                 * which theoretically is more than 4 (3 Shorts + one regular minimized video).
-                 * But instead use a much larger value, to handle if a video viewed a while ago
-                 * is somehow still referenced.  Each stream is a small array of Strings
-                 * so memory usage is not a concern.
-                 */
-                private static final int CACHE_LIMIT = 50;
-
-                @Override
-                protected boolean removeEldestEntry(Entry eldest) {
-                    return size() > CACHE_LIMIT; // Evict the oldest entry if over the cache limit.
-                }
-            });
+            Utils.createSizeRestrictedMap(50));
 
     /**
      * Strings found in the response if the video is a livestream.

extensions/shared/library/src/main/java/app/revanced/extension/shared/theme/BaseThemePatch.java

@@ -0,0 +1,48 @@
+package app.revanced.extension.shared.theme;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.shared.Utils;
+
+@SuppressWarnings("unused")
+public abstract class BaseThemePatch {
+    // Background colors.
+    protected static final int BLACK_COLOR = Utils.getResourceColor("yt_black1");
+    protected static final int WHITE_COLOR = Utils.getResourceColor("yt_white1");
+
+    /**
+     * Check if a value matches any of the provided values.
+     *
+     * @param value The value to check.
+     * @param of    The array of values to compare against.
+     * @return True if the value matches any of the provided values.
+     */
+    protected static boolean anyEquals(int value, int... of) {
+        for (int v : of) {
+            if (value == v) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Helper method to process color values for Litho components.
+     *
+     * @param originalValue The original color value.
+     * @param darkValues    Array of dark mode color values to match.
+     * @param lightValues   Array of light mode color values to match.
+     * @return The new or original color value.
+     */
+    protected static int processColorValue(int originalValue, int[] darkValues, @Nullable int[] lightValues) {
+        if (Utils.isDarkModeEnabled()) {
+            if (anyEquals(originalValue, darkValues)) {
+                return BLACK_COLOR;
+            }
+        } else if (lightValues != null && anyEquals(originalValue, lightValues)) {
+            return WHITE_COLOR;
+        }
+
+        return originalValue;
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/ColorDot.java

@@ -1,7 +1,6 @@
 package app.revanced.extension.shared.ui;
 
 import static app.revanced.extension.shared.Utils.adjustColorBrightness;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.shared.Utils.getAppBackgroundColor;
 import static app.revanced.extension.shared.Utils.isDarkModeEnabled;
 import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.DISABLED_ALPHA;
@@ -13,7 +12,7 @@ import android.view.View;
 import androidx.annotation.ColorInt;
 
 public class ColorDot {
-    private static final int STROKE_WIDTH = dipToPixels(1.5f); // Stroke width in dp.
+    private static final int STROKE_WIDTH = Dim.dp(1.5f);
 
     /**
      * Creates a circular drawable with a main fill and a stroke.
@@ -55,7 +54,7 @@ public class ColorDot {
         targetView.setAlpha(enabled ? 1.0f : DISABLED_ALPHA);
         if (!isDarkModeEnabled()) {
             targetView.setClipToOutline(true);
-            targetView.setElevation(dipToPixels(2));
+            targetView.setElevation(Dim.dp2);
         }
     }
 }

extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/CustomDialog.java

@@ -1,7 +1,5 @@
 package app.revanced.extension.shared.ui;
 
-import static app.revanced.extension.shared.Utils.dipToPixels;
-
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
@@ -37,7 +35,6 @@ public class CustomDialog {
     private final Context context;
     private final Dialog dialog;
     private final LinearLayout mainLayout;
-    private final int dip4, dip8, dip16, dip24, dip36;
 
     /**
      * Creates a custom dialog with a styled layout, including a title, message, buttons, and an optional EditText.
@@ -58,10 +55,10 @@ public class CustomDialog {
      * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
      * @return The Dialog and its main LinearLayout container.
      */
-    public static Pair<Dialog, LinearLayout> create(Context context, String title, CharSequence message,
-                                                    @Nullable EditText editText, String okButtonText,
+    public static Pair<Dialog, LinearLayout> create(Context context, CharSequence title, CharSequence message,
+                                                    @Nullable EditText editText, CharSequence okButtonText,
                                                     Runnable onOkClick, Runnable onCancelClick,
-                                                    @Nullable String neutralButtonText,
+                                                    @Nullable CharSequence neutralButtonText,
                                                     @Nullable Runnable onNeutralClick,
                                                     boolean dismissDialogOnNeutralClick) {
         Logger.printDebug(() -> "Creating custom dialog with title: " + title);
@@ -85,21 +82,14 @@ public class CustomDialog {
      * @param onNeutralClick              Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
      * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
      */
-    private CustomDialog(Context context, String title, CharSequence message, @Nullable EditText editText,
-                         String okButtonText, Runnable onOkClick, Runnable onCancelClick,
-                         @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
+    private CustomDialog(Context context, CharSequence title, CharSequence message, @Nullable EditText editText,
+                         CharSequence okButtonText, Runnable onOkClick, Runnable onCancelClick,
+                         @Nullable CharSequence neutralButtonText, @Nullable Runnable onNeutralClick,
                          boolean dismissDialogOnNeutralClick) {
         this.context = context;
         this.dialog = new Dialog(context);
         this.dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
 
-        // Preset size constants.
-        dip4 = dipToPixels(4);
-        dip8 = dipToPixels(8);
-        dip16 = dipToPixels(16);
-        dip24 = dipToPixels(24);
-        dip36 = dipToPixels(36);
-
         // Create main layout.
         mainLayout = createMainLayout();
         addTitle(title);
@@ -122,11 +112,11 @@ public class CustomDialog {
     private LinearLayout createMainLayout() {
         LinearLayout layout = new LinearLayout(context);
         layout.setOrientation(LinearLayout.VERTICAL);
-        layout.setPadding(dip24, dip16, dip24, dip24);
+        layout.setPadding(Dim.dp24, Dim.dp16, Dim.dp24, Dim.dp24);
 
         // Set rounded rectangle background.
         ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(28), null, null));
+                Dim.roundedCorners(28), null, null));
         // Dialog background.
         background.getPaint().setColor(Utils.getDialogBackgroundColor());
         layout.setBackground(background);
@@ -139,7 +129,7 @@ public class CustomDialog {
      *
      * @param title The title text to display.
      */
-    private void addTitle(String title) {
+    private void addTitle(CharSequence title) {
         if (TextUtils.isEmpty(title)) return;
 
         TextView titleView = new TextView(context);
@@ -152,7 +142,7 @@ public class CustomDialog {
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0, 0, 0, dip16);
+        params.setMargins(0, 0, 0, Dim.dp16);
         titleView.setLayoutParams(params);
 
         mainLayout.addView(titleView);
@@ -180,9 +170,9 @@ public class CustomDialog {
         // EditText (if provided).
         if (editText != null) {
             ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
-                    Utils.createCornerRadii(10), null, null));
+                    Dim.roundedCorners(10), null, null));
             background.getPaint().setColor(Utils.getEditTextBackground());
-            scrollView.setPadding(dip8, dip8, dip8, dip8);
+            scrollView.setPadding(Dim.dp8, Dim.dp8, Dim.dp8, Dim.dp8);
             scrollView.setBackground(background);
             scrollView.setClipToOutline(true);
 
@@ -232,8 +222,8 @@ public class CustomDialog {
      * @param onNeutralClick              Action for the Neutral button click, or null if no Neutral button.
      * @param dismissDialogOnNeutralClick If the dialog should dismiss on Neutral button click.
      */
-    private void addButtons(String okButtonText, Runnable onOkClick, Runnable onCancelClick,
-                            @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
+    private void addButtons(CharSequence okButtonText, Runnable onOkClick, Runnable onCancelClick,
+                            @Nullable CharSequence neutralButtonText, @Nullable Runnable onNeutralClick,
                             boolean dismissDialogOnNeutralClick) {
         // Button container.
         LinearLayout buttonContainer = new LinearLayout(context);
@@ -241,7 +231,7 @@ public class CustomDialog {
         LinearLayout.LayoutParams buttonContainerParams = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT);
-        buttonContainerParams.setMargins(0, dip16, 0, 0);
+        buttonContainerParams.setMargins(0, Dim.dp16, 0, 0);
         buttonContainer.setLayoutParams(buttonContainerParams);
 
         List<Button> buttons = new ArrayList<>();
@@ -280,7 +270,7 @@ public class CustomDialog {
      * @param dismissDialog If the dialog should dismiss when the button is clicked.
      * @return The created Button.
      */
-    private Button createButton(String text, Runnable onClick, boolean isOkButton, boolean dismissDialog) {
+    private Button createButton(CharSequence text, Runnable onClick, boolean isOkButton, boolean dismissDialog) {
         Button button = new Button(context, null, 0);
         button.setText(text);
         button.setTextSize(14);
@@ -289,12 +279,12 @@ public class CustomDialog {
         button.setEllipsize(TextUtils.TruncateAt.END);
         button.setGravity(Gravity.CENTER);
         // Set internal padding.
-        button.setPadding(dip16, 0, dip16, 0);
+        button.setPadding(Dim.dp16, 0, Dim.dp16, 0);
 
         // Background color for OK button (inversion).
         // Background color for Cancel or Neutral buttons.
         ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(20), null, null));
+                Dim.roundedCorners(20), null, null));
         background.getPaint().setColor(isOkButton
                 ? Utils.getOkButtonBackgroundColor()
                 : Utils.getCancelOrNeutralButtonBackgroundColor());
@@ -331,20 +321,19 @@ public class CustomDialog {
         if (buttons.isEmpty()) return;
 
         // Check if buttons fit in one row.
-        int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
         int totalWidth = 0;
         for (Integer width : buttonWidths) {
             totalWidth += width;
         }
         if (buttonWidths.size() > 1) {
             // Add margins for gaps.
-            totalWidth += (buttonWidths.size() - 1) * dip8;
+            totalWidth += (buttonWidths.size() - 1) * Dim.dp8;
         }
 
         // Single button: stretch to full width.
         if (buttons.size() == 1) {
             layoutSingleButton(buttonContainer, buttons.get(0));
-        } else if (totalWidth <= screenWidth * 0.8) {
+        } else if (totalWidth <= Dim.pctWidth(80)) {
             // Single row: Neutral, Cancel, OK.
             layoutButtonsInRow(buttonContainer, buttons, buttonWidths);
         } else {
@@ -369,7 +358,7 @@ public class CustomDialog {
 
         button.setLayoutParams(new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
-                dip36));
+                Dim.dp36));
         singleContainer.addView(button);
         buttonContainer.addView(singleContainer);
     }
@@ -405,17 +394,17 @@ public class CustomDialog {
         if (parent != null) parent.removeView(button);
 
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                0, dip36, buttonWidths.get(i));
+                0, Dim.dp36, buttonWidths.get(i));
 
         // Set margins based on button type and combination.
         if (buttons.size() == 2) {
             // Neutral + OK or Cancel + OK.
-            params.setMargins(i == 0 ? 0 : dip4, 0, i == 0 ? dip4 : 0, 0);
+            params.setMargins(i == 0 ? 0 : Dim.dp4, 0, i == 0 ? Dim.dp4 : 0, 0);
         } else if (buttons.size() == 3) {
             // Neutral.
             // Cancel.
             // OK.
-            params.setMargins(i == 0 ? 0 : dip4, 0, i == 2 ? 0 : dip4, 0);
+            params.setMargins(i == 0 ? 0 : Dim.dp4, 0, i == 2 ? 0 : Dim.dp4, 0);
         }
 
         button.setLayoutParams(params);
@@ -447,14 +436,14 @@ public class CustomDialog {
             singleContainer.setGravity(Gravity.CENTER);
             singleContainer.setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
-                    dip36));
+                    Dim.dp36));
 
             ViewGroup parent = (ViewGroup) button.getParent();
             if (parent != null) parent.removeView(button);
 
             button.setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
-                    dip36));
+                    Dim.dp36));
             singleContainer.addView(button);
             buttonContainer.addView(singleContainer);
 
@@ -463,7 +452,7 @@ public class CustomDialog {
                 View spacer = new View(context);
                 LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
                         LinearLayout.LayoutParams.MATCH_PARENT,
-                        dip8);
+                        Dim.dp8);
                 spacer.setLayoutParams(spacerParams);
                 buttonContainer.addView(spacer);
             }

extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/Dim.java

@@ -0,0 +1,89 @@
+package app.revanced.extension.shared.ui;
+
+import android.content.res.Resources;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+
+/**
+ * Utility class for converting design units (dp) and screen percentages to pixels.
+ */
+public final class Dim {
+    private Dim() {} // Prevent instantiation.
+
+    private static final DisplayMetrics METRICS = Resources.getSystem().getDisplayMetrics();
+    public static final int SCREEN_WIDTH = METRICS.widthPixels;
+    public static final int SCREEN_HEIGHT = METRICS.heightPixels;
+
+    // DP constants (density-independent pixels).
+    public static final int dp1  = dp(1);
+    public static final int dp2  = dp(2);
+    public static final int dp4  = dp(4);
+    public static final int dp6  = dp(6);
+    public static final int dp7  = dp(7);
+    public static final int dp8  = dp(8);
+    public static final int dp10 = dp(10);
+    public static final int dp12 = dp(12);
+    public static final int dp16 = dp(16);
+    public static final int dp20 = dp(20);
+    public static final int dp24 = dp(24);
+    public static final int dp28 = dp(28);
+    public static final int dp32 = dp(32);
+    public static final int dp36 = dp(36);
+    public static final int dp40 = dp(40);
+    public static final int dp48 = dp(48);
+
+    /**
+     * Converts dp (density-independent pixels) to actual device pixels.
+     * Uses Android's official TypedValue.applyDimension() for accurate rounding.
+     *
+     * @param dp The dp value to convert (supports float, e.g. 1.2f).
+     * @return The equivalent pixel value as int.
+     */
+    public static int dp(float dp) {
+        return (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP, dp, METRICS);
+    }
+
+    /**
+     * Converts a percentage of the screen height to pixels.
+     *
+     * @param percent The percentage (0–100).
+     * @return The pixel value corresponding to the percentage of screen height.
+     */
+    public static int pctHeight(int percent) {
+        return (SCREEN_HEIGHT * percent) / 100;
+    }
+
+    /**
+     * Converts a percentage of the screen width to pixels.
+     *
+     * @param percent The percentage (0–100).
+     * @return The pixel value corresponding to the percentage of screen width.
+     */
+    public static int pctWidth(int percent) {
+        return (SCREEN_WIDTH * percent) / 100;
+    }
+
+    /**
+     * Converts a percentage of the screen's portrait width (min side) to pixels.
+     *
+     * @param percent The percentage (0–100).
+     * @return The pixel value.
+     */
+    public static int pctPortraitWidth(int percent) {
+        final int portraitWidth = Math.min(SCREEN_WIDTH, SCREEN_HEIGHT);
+        return (int) (portraitWidth * (percent / 100.0f));
+    }
+
+    /**
+     * Creates an array of corner radii for a rounded rectangle.
+     * All corners use the same radius.
+     *
+     * @param dp radius in density-independent pixels
+     * @return array of 8 floats: [top-left-x, top-left-y, top-right-x, top-right-y, ...]
+     */
+    public static float[] roundedCorners(float dp) {
+        final float r = dp(dp);
+        return new float[]{r, r, r, r, r, r, r, r};
+    }
+}

extensions/shared/library/src/main/java/app/revanced/extension/shared/ui/SheetBottomDialog.java

@@ -1,7 +1,5 @@
 package app.revanced.extension.shared.ui;
 
-import static app.revanced.extension.shared.Utils.dipToPixels;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
@@ -63,9 +61,8 @@ public class SheetBottomDialog {
 
         // Add top spacer.
         View spacer = new View(context);
-        final int dip40 = dipToPixels(40);
         LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT, dip40);
+                LinearLayout.LayoutParams.MATCH_PARENT, Dim.dp40);
         spacer.setLayoutParams(spacerParams);
         spacer.setClickable(true);
         dragContainer.addView(spacer);
@@ -105,20 +102,15 @@ public class SheetBottomDialog {
      * @return A configured {@link DraggableLinearLayout} with a handle bar and styled background.
      */
     public static DraggableLinearLayout createMainLayout(@NonNull Context context, @Nullable Integer backgroundColor) {
-        // Preset size constants.
-        final int dip4 = dipToPixels(4);   // Handle bar height.
-        final int dip8 = dipToPixels(8);   // Dialog padding.
-        final int dip40 = dipToPixels(40); // Handle bar width.
-
         DraggableLinearLayout mainLayout = new DraggableLinearLayout(context);
         mainLayout.setOrientation(LinearLayout.VERTICAL);
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-        layoutParams.setMargins(dip8, 0, dip8, dip8);
+        layoutParams.setMargins(Dim.dp8, 0, Dim.dp8, Dim.dp8);
         mainLayout.setLayoutParams(layoutParams);
 
         ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(12), null, null));
+                Dim.roundedCorners(12), null, null));
         int color = (backgroundColor != null) ? backgroundColor : Utils.getDialogBackgroundColor();
         background.getPaint().setColor(color);
         mainLayout.setBackground(background);
@@ -127,14 +119,14 @@ public class SheetBottomDialog {
         LinearLayout handleContainer = new LinearLayout(context);
         LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-        containerParams.setMargins(0, dip8, 0, 0);
+        containerParams.setMargins(0, Dim.dp8, 0, 0);
         handleContainer.setLayoutParams(containerParams);
         handleContainer.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
         View handleBar = new View(context);
         ShapeDrawable handleBackground = new ShapeDrawable(new RoundRectShape(
-                Utils.createCornerRadii(4), null, null));
+                Dim.roundedCorners(4), null, null));
         handleBackground.getPaint().setColor(Utils.adjustColorBrightness(color, 0.9f, 1.25f));
-        LinearLayout.LayoutParams handleParams = new LinearLayout.LayoutParams(dip40, dip4);
+        LinearLayout.LayoutParams handleParams = new LinearLayout.LayoutParams(Dim.dp40, Dim.dp4);
         handleBar.setLayoutParams(handleParams);
         handleBar.setBackground(handleBackground);
 

extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/hide/createbutton/HideCreateButtonPatch.java

@@ -1,12 +1,14 @@
 package app.revanced.extension.spotify.layout.hide.createbutton;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.spotify.shared.ComponentFilters.ComponentFilter;
 import app.revanced.extension.spotify.shared.ComponentFilters.ResourceIdComponentFilter;
 import app.revanced.extension.spotify.shared.ComponentFilters.StringComponentFilter;
 
 import java.util.List;
 
+@Deprecated(forRemoval = true)
 @SuppressWarnings("unused")
 public final class HideCreateButtonPatch {
 
@@ -15,7 +17,7 @@ public final class HideCreateButtonPatch {
      * The main approach used is matching the resource id for the Create button title.
      */
     private static final List<ComponentFilter> CREATE_BUTTON_COMPONENT_FILTERS = List.of(
-            new ResourceIdComponentFilter("navigationbar_musicappitems_create_title", "string"),
+            new ResourceIdComponentFilter(ResourceType.STRING, "navigationbar_musicappitems_create_title"),
             // Temporary fallback and fix for APKs merged with AntiSplit-M not having resources properly encoded,
             // and thus getting the resource identifier for the Create button title always return 0.
             // FIXME: Remove this once the above issue is no longer relevant.
@@ -27,7 +29,7 @@ public final class HideCreateButtonPatch {
      * Used in older versions of the app.
      */
     private static final ResourceIdComponentFilter OLD_CREATE_BUTTON_COMPONENT_FILTER =
-            new ResourceIdComponentFilter("bottom_navigation_bar_create_tab_title", "string");
+            new ResourceIdComponentFilter(ResourceType.STRING, "bottom_navigation_bar_create_tab_title");
 
     /**
      * Injection point. This method is called on every navigation bar item to check whether it is the Create button.

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/privacy/SanitizeSharingLinksPatch.java

@@ -1,18 +1,11 @@
 package app.revanced.extension.spotify.misc.privacy;
 
-import android.net.Uri;
-
-import java.util.List;
-
-import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.privacy.LinkSanitizer;
 
 @SuppressWarnings("unused")
 public final class SanitizeSharingLinksPatch {
 
-    /**
-     * Parameters that are considered undesirable and should be stripped away.
-     */
-    private static final List<String> SHARE_PARAMETERS_TO_REMOVE = List.of(
+    private static final LinkSanitizer sanitizer = new LinkSanitizer(
             "si", // Share tracking parameter.
             "utm_source" // Share source, such as "copy-link".
     );
@@ -20,25 +13,7 @@ public final class SanitizeSharingLinksPatch {
     /**
      * Injection point.
      */
-    public static String sanitizeUrl(String url) {
-        try {
-            Uri uri = Uri.parse(url);
-            Uri.Builder builder = uri.buildUpon().clearQuery();
-
-            for (String paramName : uri.getQueryParameterNames()) {
-                if (!SHARE_PARAMETERS_TO_REMOVE.contains(paramName)) {
-                    for (String value : uri.getQueryParameters(paramName)) {
-                        builder.appendQueryParameter(paramName, value);
-                    }
-                }
-            }
-
-            String sanitizedUrl = builder.build().toString();
-            Logger.printInfo(() -> "Sanitized url " + url + " to " + sanitizedUrl);
-            return sanitizedUrl;
-        } catch (Exception ex) {
-            Logger.printException(() -> "sanitizeUrl failure with " + url, ex);
-            return url;
-        }
+    public static String sanitizeSharingLink(String url) {
+        return sanitizer.sanitizeUrlString(url);
     }
 }

extensions/spotify/src/main/java/app/revanced/extension/spotify/shared/ComponentFilters.java

@@ -3,6 +3,7 @@ package app.revanced.extension.spotify.shared;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 
 public final class ComponentFilters {
@@ -19,21 +20,26 @@ public final class ComponentFilters {
     public static final class ResourceIdComponentFilter implements ComponentFilter {
 
         public final String resourceName;
-        public final String resourceType;
+        public final ResourceType resourceType;
         // Android resources are always positive, so -1 is a valid sentinel value to indicate it has not been loaded.
         // 0 is returned when a resource has not been found.
         private int resourceId = -1;
         @Nullable
         private String stringfiedResourceId;
 
+        @Deprecated
         public ResourceIdComponentFilter(String resourceName, String resourceType) {
+            this(ResourceType.valueOf(resourceType), resourceName);
+        }
+
+        public ResourceIdComponentFilter(ResourceType resourceType, String resourceName) {
             this.resourceName = resourceName;
             this.resourceType = resourceType;
         }
 
         public int getResourceId() {
             if (resourceId == -1) {
-                resourceId = Utils.getResourceIdentifier(resourceName, resourceType);
+                resourceId = Utils.getResourceIdentifier(resourceType, resourceName);
             }
             return resourceId;
         }

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/settings/preference/categories/ExtensionPreferenceCategory.java

@@ -23,6 +23,12 @@ public class ExtensionPreferenceCategory extends ConditionalPreferenceCategory {
     public void addPreferences(Context context) {
         addPreference(new ReVancedTikTokAboutPreference(context));
 
+        addPreference(new TogglePreference(context,
+                "Sanitize sharing links",
+                "Remove tracking parameters from shared links.",
+                BaseSettings.SANITIZE_SHARED_LINKS
+        ));
+
         addPreference(new TogglePreference(context,
                 "Enable debug log",
                 "Show extension debug log.",

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/share/ShareUrlSanitizer.java

@@ -0,0 +1,29 @@
+package app.revanced.extension.tiktok.share;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.privacy.LinkSanitizer;
+import app.revanced.extension.shared.settings.BaseSettings;
+
+@SuppressWarnings("unused")
+public final class ShareUrlSanitizer {
+
+    private static final LinkSanitizer sanitizer = new LinkSanitizer();
+
+    /**
+     * Injection point for setting check.
+     */
+    public static boolean shouldSanitize() {
+        return BaseSettings.SANITIZE_SHARED_LINKS.get();
+    }
+
+    /**
+     * Injection point for URL sanitization.
+     */
+    public static String sanitizeShareUrl(final String url) {
+        if (url == null || url.isEmpty()) {
+            return url;
+        }
+
+        return sanitizer.sanitizeUrlString(url);
+    }
+}

extensions/twitch/src/main/java/app/revanced/extension/twitch/Utils.java

@@ -1,14 +1,18 @@
 package app.revanced.extension.twitch;
 
+import app.revanced.extension.shared.ResourceType;
+
 public class Utils {
 
     /* Called from SettingsPatch smali */
     public static int getStringId(String name) {
-        return app.revanced.extension.shared.Utils.getResourceIdentifier(name, "string");
+        return app.revanced.extension.shared.Utils.getResourceIdentifier(
+                ResourceType.STRING, name);
     }
 
     /* Called from SettingsPatch smali */
     public static int getDrawableId(String name) {
-        return app.revanced.extension.shared.Utils.getResourceIdentifier(name, "drawable");
+        return app.revanced.extension.shared.Utils.getResourceIdentifier(
+                ResourceType.DRAWABLE, name);
     }
 }

extensions/twitch/src/main/java/app/revanced/extension/twitch/settings/TwitchActivityHook.java

@@ -4,19 +4,21 @@ import static app.revanced.extension.twitch.Utils.getStringId;
 
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.twitch.settings.preference.TwitchPreferenceFragment;
 
 import tv.twitch.android.feature.settings.menu.SettingsMenuGroup;
 import tv.twitch.android.settings.SettingsActivity;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Hooks AppCompatActivity to inject a custom {@link TwitchPreferenceFragment}.
  */
@@ -108,7 +110,7 @@ public class TwitchActivityHook {
 
         base.getFragmentManager()
                 .beginTransaction()
-                .replace(Utils.getResourceIdentifier("fragment_container", "id"), fragment)
+                .replace(Utils.getResourceIdentifier(ResourceType.ID, "fragment_container"), fragment)
                 .commit();
         return true;
     }

extensions/twitter/build.gradle.kts

@@ -1 +1,3 @@
-// Do not remove. Necessary for the extension plugin to be applied to the project.
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+}

extensions/twitter/src/main/java/app/revanced/twitter/patches/links/ChangeLinkSharingDomainPatch.java

@@ -1,16 +1,30 @@
 package app.revanced.twitter.patches.links;
 
+@SuppressWarnings("unused")
 public final class ChangeLinkSharingDomainPatch {
-    private static final String DOMAIN_NAME = "https://fxtwitter.com";
-    private static final String LINK_FORMAT = "%s/%s/status/%s";
+    private static final String LINK_FORMAT = "https://%s/%s/status/%s";
 
+    /**
+     * Method is modified during patching.  Do not change.
+     */
+    private static String getShareDomain() {
+        return "";
+    }
+
+    // TODO remove this once changeLinkSharingDomainResourcePatch is restored
+    /**
+     * Injection point.
+     */
     public static String formatResourceLink(Object... formatArgs) {
         String username = (String) formatArgs[0];
         String tweetId = (String) formatArgs[1];
-        return String.format(LINK_FORMAT, DOMAIN_NAME, username, tweetId);
+        return String.format(LINK_FORMAT, getShareDomain(), username, tweetId);
     }
 
+    /**
+     * Injection point.
+     */
     public static String formatLink(long tweetId, String username) {
-        return String.format(LINK_FORMAT, DOMAIN_NAME, username, tweetId);
+        return String.format(LINK_FORMAT, getShareDomain(), username, tweetId);
     }
 }

extensions/twitter/src/main/java/app/revanced/twitter/patches/links/OpenLinksWithAppChooserPatch.java

@@ -2,11 +2,18 @@ package app.revanced.twitter.patches.links;
 
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+@Deprecated(forRemoval = true)
 public final class OpenLinksWithAppChooserPatch {
+
+    /**
+     * Injection point.
+     */
     public static void openWithChooser(final Context context, final Intent intent) {
-        Log.d("ReVanced", "Opening intent with chooser: " + intent);
+        Logger.printInfo(() -> "Opening intent with chooser: " + intent);
 
         intent.setAction("android.intent.action.VIEW");
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/AlternativeThumbnailsPatch.java

@@ -528,14 +528,8 @@ public final class AlternativeThumbnailsPatch {
          * Cache used to verify if an alternative thumbnails exists for a given video id.
          */
         @GuardedBy("itself")
-        private static final Map<String, VerifiedQualities> altVideoIdLookup = new LinkedHashMap<>(100) {
-            private static final int CACHE_LIMIT = 1000;
-
-            @Override
-            protected boolean removeEldestEntry(Entry eldest) {
-                return size() > CACHE_LIMIT; // Evict the oldest entry if over the cache limit.
-            }
-        };
+        private static final Map<String, VerifiedQualities> altVideoIdLookup =
+                Utils.createSizeRestrictedMap(1000);
 
         private static VerifiedQualities getVerifiedQualities(@NonNull String videoId, boolean returnNullIfDoesNotExist) {
             synchronized (altVideoIdLookup) {

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ChangeHeaderPatch.java

@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -17,15 +18,25 @@ public class ChangeHeaderPatch {
         DEFAULT(null, null),
         REGULAR("ytWordmarkHeader", "yt_ringo2_wordmark_header"),
         PREMIUM("ytPremiumWordmarkHeader", "yt_ringo2_premium_wordmark_header"),
-        REVANCED("revanced_header_logo", "revanced_header_logo"),
-        REVANCED_MINIMAL("revanced_header_logo_minimal", "revanced_header_logo_minimal"),
-        CUSTOM("custom_header", "custom_header");
+        ROUNDED("revanced_header_rounded"),
+        MINIMAL("revanced_header_minimal"),
+        CUSTOM("revanced_header_custom"),
+
+        // Old enum names for data migration. TODO: Eventually delete these.
+        @Deprecated
+        REVANCED(ROUNDED.attributeName),
+        @Deprecated
+        REVANCED_MINIMAL(MINIMAL.attributeName);
 
         @Nullable
         private final String attributeName;
         @Nullable
         private final String drawableName;
 
+        HeaderLogo(String attributeName) {
+            this(Objects.requireNonNull(attributeName), Objects.requireNonNull(attributeName));
+        }
+
         HeaderLogo(@Nullable String attributeName, @Nullable String drawableName) {
             this.attributeName = attributeName;
             this.drawableName = drawableName;
@@ -40,11 +51,10 @@ public class ChangeHeaderPatch {
                 return null;
             }
 
-            final int identifier = Utils.getResourceIdentifier(attributeName, "attr");
+            final int identifier = Utils.getResourceIdentifier(ResourceType.ATTR, attributeName);
             if (identifier == 0) {
-                // Identifier is zero if custom header setting was included in imported settings
-                // and a custom image was not included during patching.
-                Logger.printDebug(() -> "Could not find attribute: " + drawableName);
+                // Should never happen.
+                Logger.printException(() -> "Could not find attribute: " + drawableName);
                 Settings.HEADER_LOGO.resetToDefault();
                 return null;
             }
@@ -62,13 +72,15 @@ public class ChangeHeaderPatch {
                     ? "_dark"
                     : "_light");
 
-            final int identifier = Utils.getResourceIdentifier(drawableFullName, "drawable");
-            if (identifier == 0) {
-                Logger.printDebug(() -> "Could not find drawable: " + drawableFullName);
-                Settings.HEADER_LOGO.resetToDefault();
-                return null;
+            final int identifier = Utils.getResourceIdentifier(ResourceType.DRAWABLE, drawableFullName);
+            if (identifier != 0) {
+                return Utils.getContext().getDrawable(identifier);
             }
-            return Utils.getContext().getDrawable(identifier);
+
+            // Should never happen.
+            Logger.printException(() -> "Could not find drawable: " + drawableFullName);
+            Settings.HEADER_LOGO.resetToDefault();
+            return null;
         }
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableVideoCodecsPatch.java

@@ -5,7 +5,7 @@ import android.view.Display;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
-public class DisableHdrPatch {
+public class DisableVideoCodecsPatch {
 
     /**
      * Injection point.
@@ -15,5 +15,12 @@ public class DisableHdrPatch {
                 ? new int[0]
                 : capabilities.getSupportedHdrTypes();
     }
+
+    /**
+     * Injection point.
+     */
+    public static boolean allowVP9() {
+        return !Settings.FORCE_AVC_CODEC.get();
+    }
 }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DownloadsPatch.java

@@ -21,7 +21,7 @@ public final class DownloadsPatch {
     /**
      * Injection point.
      */
-    public static void activityCreated(Activity mainActivity) {
+    public static void setMainActivity(Activity mainActivity) {
         activityRef = new WeakReference<>(mainActivity);
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/FixContentProviderPatch.java

@@ -0,0 +1,24 @@
+package app.revanced.extension.youtube.patches;
+
+import java.util.Map;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class FixContentProviderPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void removeNullMapEntries(Map<?, ?> map) {
+        map.entrySet().removeIf(entry -> {
+            Object value = entry.getValue();
+            if (value == null) {
+                Logger.printDebug(() -> "Removing content provider key with null value: " + entry.getKey());
+                return true;
+            }
+            return false;
+        });
+    }
+}
+

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ForceOriginalAudioPatch.java

@@ -1,71 +1,17 @@
 package app.revanced.extension.youtube.patches;
 
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.AppLanguage;
-import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
 public class ForceOriginalAudioPatch {
 
-    private static final String DEFAULT_AUDIO_TRACKS_SUFFIX = ".4";
-
     /**
      * Injection point.
      */
-    public static void setPreferredLanguage() {
-        if (Settings.FORCE_ORIGINAL_AUDIO.get()
-                && SpoofVideoStreamsPatch.spoofingToClientWithNoMultiAudioStreams()) {
-            // If client spoofing does not use authentication and lacks multi-audio streams,
-            // then can use any language code for the request and if that requested language is
-            // not available YT uses the original audio language. Authenticated requests ignore
-            // the language code and always use the account language. Use a language that is
-            // not auto-dubbed by YouTube: https://support.google.com/youtube/answer/15569972
-            // but the language is also supported natively by the Meta Quest device that
-            // Android VR is spoofing.
-            AppLanguage override = AppLanguage.SV;
-            Logger.printDebug(() -> "Setting language override: " + override);
-            SpoofVideoStreamsPatch.setLanguageOverride(override);
-        }
-    }
-
-    /**
-     * Injection point.
-     */
-    public static boolean ignoreDefaultAudioStream(boolean original) {
-        if (Settings.FORCE_ORIGINAL_AUDIO.get()) {
-            return false;
-        }
-        return original;
-    }
-
-    /**
-     * Injection point.
-     */
-    public static boolean isDefaultAudioStream(boolean isDefault, String audioTrackId, String audioTrackDisplayName) {
-        try {
-            if (!Settings.FORCE_ORIGINAL_AUDIO.get()) {
-                return isDefault;
-            }
-
-            if (audioTrackId.isEmpty()) {
-                // Older app targets can have empty audio tracks and these might be placeholders.
-                // The real audio tracks are called after these.
-                return isDefault;
-            }
-
-            Logger.printDebug(() -> "default: " + String.format("%-5s", isDefault) + " id: "
-                    + String.format("%-8s", audioTrackId) + " name:" + audioTrackDisplayName);
-
-            final boolean isOriginal = audioTrackId.endsWith(DEFAULT_AUDIO_TRACKS_SUFFIX);
-            if (isOriginal) {
-                Logger.printDebug(() -> "Using audio: " + audioTrackId);
-            }
-
-            return isOriginal;
-        } catch (Exception ex) {
-            Logger.printException(() -> "isDefaultAudioStream failure", ex);
-            return isDefault;
-        }
+    public static void setEnabled() {
+        app.revanced.extension.shared.patches.ForceOriginalAudioPatch.setEnabled(
+                Settings.FORCE_ORIGINAL_AUDIO.get(),
+                Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get()
+        );
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndScreenCardsPatch.java

@@ -0,0 +1,24 @@
+package app.revanced.extension.youtube.patches;
+
+import android.view.View;
+
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideEndScreenCardsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void hideEndScreenCardView(View view) {
+        Utils.hideViewUnderCondition(Settings.HIDE_ENDSCREEN_CARDS, view);
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean hideEndScreenCards() {
+        return Settings.HIDE_ENDSCREEN_CARDS.get();
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideEndscreenCardsPatch.java

@@ -1,14 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import android.view.View;
-
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public class HideEndscreenCardsPatch {
-    //Used by app.revanced.patches.youtube.layout.hideendscreencards.bytecode.patch.HideEndscreenCardsPatch
-    public static void hideEndscreen(View view) {
-        if (!Settings.HIDE_ENDSCREEN_CARDS.get()) return;
-        view.setVisibility(View.GONE);
-    }
-}

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HidePlayerOverlayButtonsPatch.java

@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -29,6 +30,15 @@ public final class HidePlayerOverlayButtonsPatch {
         return Settings.HIDE_CAST_BUTTON.get() ? View.GONE : original;
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean getCastButtonOverrideV2(boolean original) {
+        if (Settings.HIDE_CAST_BUTTON.get()) return false;
+
+        return original;
+    }
+
     /**
      * Injection point.
      */
@@ -40,10 +50,10 @@ public final class HidePlayerOverlayButtonsPatch {
             = Settings.HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS.get();
 
     private static final int PLAYER_CONTROL_PREVIOUS_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow(
-            "player_control_previous_button_touch_area", "id");
+            ResourceType.ID, "player_control_previous_button_touch_area");
 
     private static final int PLAYER_CONTROL_NEXT_BUTTON_TOUCH_AREA_ID = getResourceIdentifierOrThrow(
-            "player_control_next_button_touch_area", "id");
+            ResourceType.ID, "player_control_next_button_touch_area");
 
     /**
      * Injection point.

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/HideSeekbarPatch.java

@@ -4,7 +4,17 @@ import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
 public class HideSeekbarPatch {
+    /**
+     * Injection point.
+     */
     public static boolean hideSeekbar() {
         return Settings.HIDE_SEEKBAR.get();
     }
+
+    /**
+     * Injection point.
+     */
+    public static boolean useFullscreenLargeSeekbar(boolean original) {
+        return Settings.FULLSCREEN_LARGE_SEEKBAR.get();
+    }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/MiniplayerPatch.java

@@ -15,11 +15,12 @@ import androidx.annotation.Nullable;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.ResourceType;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.youtube.settings.Settings;
 
-@SuppressWarnings("SpellCheckingInspection")
+@SuppressWarnings({"unused", "SpellCheckingInspection"})
 public final class MiniplayerPatch {
 
     /**
@@ -115,7 +116,7 @@ public final class MiniplayerPatch {
      * Resource is not present in older targets, and this field will be zero.
      */
     private static final int MODERN_OVERLAY_SUBTITLE_TEXT
-            = Utils.getResourceIdentifier("modern_miniplayer_subtitle_text", "id");
+            = Utils.getResourceIdentifier(ResourceType.ID, "modern_miniplayer_subtitle_text");
 
     private static final MiniplayerType CURRENT_TYPE = Settings.MINIPLAYER_TYPE.get();
 
@@ -129,7 +130,7 @@ public final class MiniplayerPatch {
                     (CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get());
 
     private static final boolean DRAG_AND_DROP_ENABLED =
-            CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
+            CURRENT_TYPE.isModern() && !Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get();
 
     private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED =
             Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get()
@@ -145,10 +146,10 @@ public final class MiniplayerPatch {
             && (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());
 
     private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED =
-            CURRENT_TYPE.isModern() && Settings.MINIPLAYER_ROUNDED_CORNERS.get();
+            CURRENT_TYPE.isModern() && !Settings.MINIPLAYER_DISABLE_ROUNDED_CORNERS.get();
 
     private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED =
-            DRAG_AND_DROP_ENABLED && Settings.MINIPLAYER_HORIZONTAL_DRAG.get();
+            DRAG_AND_DROP_ENABLED && !Settings.MINIPLAYER_DISABLE_HORIZONTAL_DRAG.get();
 
     /**
      * Remove a broken and always present subtitle text that is only
@@ -173,14 +174,14 @@ public final class MiniplayerPatch {
     public static final class MiniplayerHorizontalDragAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {
-            return Settings.MINIPLAYER_TYPE.get().isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
+            return Settings.MINIPLAYER_TYPE.get().isModern() && !Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get();
         }
 
         @Override
         public List<Setting<?>> getParentSettings() {
             return List.of(
                     Settings.MINIPLAYER_TYPE,
-                    Settings.MINIPLAYER_DRAG_AND_DROP
+                    Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP
             );
         }
     }
@@ -192,7 +193,7 @@ public final class MiniplayerPatch {
             return type == MODERN_4
                     || (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
                     || (!IS_19_26_OR_GREATER && type == MODERN_1
-                    && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get())
+                    && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP.get())
                     || (IS_19_29_OR_GREATER && type == MODERN_3);
         }
 
@@ -201,7 +202,7 @@ public final class MiniplayerPatch {
             return List.of(
                     Settings.MINIPLAYER_TYPE,
                     Settings.MINIPLAYER_DOUBLE_TAP_ACTION,
-                    Settings.MINIPLAYER_DRAG_AND_DROP
+                    Settings.MINIPLAYER_DISABLE_DRAG_AND_DROP
             );
         }
     }
@@ -378,6 +379,19 @@ public final class MiniplayerPatch {
         return original;
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean allowBoldIcons(boolean original) {
+        if (CURRENT_TYPE == MINIMAL) {
+            // Minimal player does not have the correct pause/play icon (it's too large).
+            // Use the non bold icons instead.
+            return false;
+        }
+
+        return original;
+    }
+
     /**
      * Injection point.
      */

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/NavigationButtonsPatch.java

@@ -5,12 +5,11 @@ import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButt
 
 import android.os.Build;
 import android.view.View;
+import android.widget.TextView;
 
 import java.util.EnumMap;
 import java.util.Map;
 
-import android.widget.TextView;
-
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -30,13 +29,13 @@ public final class NavigationButtonsPatch {
     private static final boolean SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON
             = Settings.SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON.get();
 
-    private static final Boolean DISABLE_TRANSLUCENT_STATUS_BAR
+    private static final boolean DISABLE_TRANSLUCENT_STATUS_BAR
             = Settings.DISABLE_TRANSLUCENT_STATUS_BAR.get();
 
-    private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
+    private static final boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT
             = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT.get();
 
-    private static final Boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
+    private static final boolean DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
             = Settings.DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK.get();
 
     /**
@@ -62,6 +61,13 @@ public final class NavigationButtonsPatch {
         hideViewUnderCondition(Settings.HIDE_NAVIGATION_BUTTON_LABELS, navigationLabelsView);
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean useAnimatedNavigationButtons(boolean original) {
+        return Settings.NAVIGATION_BAR_ANIMATIONS.get();
+    }
+
     /**
      * Injection point.
      */

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch.java

@@ -20,15 +20,6 @@ public class OpenShortsInRegularPlayerPatch {
         REGULAR_PLAYER_FULLSCREEN
     }
 
-    static {
-        if (!VersionCheckPatch.IS_19_46_OR_GREATER
-                && Settings.SHORTS_PLAYER_TYPE.get() == ShortsPlayerType.REGULAR_PLAYER_FULLSCREEN) {
-            // User imported newer settings to an older app target.
-            Logger.printInfo(() -> "Resetting " + Settings.SHORTS_PLAYER_TYPE);
-            Settings.SHORTS_PLAYER_TYPE.resetToDefault();
-        }
-    }
-
     private static WeakReference<Activity> mainActivityRef = new WeakReference<>(null);
 
     private static volatile boolean overrideBackPressToExit;

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch.java

@@ -24,18 +24,20 @@ public class OpenVideosFullscreenHookPatch {
 
     /**
      * Injection point.
+     *
+     * Returns negated value.
      */
-    public static boolean openVideoFullscreenPortrait(boolean original) {
+    public static boolean doNotOpenVideoFullscreenPortrait(boolean original) {
         Boolean openFullscreen = openNextVideoFullscreen;
         if (openFullscreen != null) {
             openNextVideoFullscreen = null;
-            return openFullscreen;
+            return !openFullscreen;
         }
 
         if (!isFullScreenPatchIncluded()) {
             return original;
         }
 
-        return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
+        return !Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/PlayerControlsPatch.java

@@ -42,7 +42,7 @@ public class PlayerControlsPatch {
 
                         Logger.printDebug(() -> "fullscreen button visibility: "
                                 + (visibility == View.VISIBLE ? "VISIBLE" :
-                                        visibility == View.GONE ? "GONE" : "INVISIBLE"));
+                                visibility == View.GONE ? "GONE" : "INVISIBLE"));
 
                         fullscreenButtonVisibilityChanged(visibility == View.VISIBLE);
                     }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/RemoveViewerDiscretionDialogPatch.java

@@ -1,19 +1,29 @@
 package app.revanced.extension.youtube.patches;
 
 import android.app.AlertDialog;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
-/** @noinspection unused*/
+@SuppressWarnings("unused")
 public class RemoveViewerDiscretionDialogPatch {
+
+    /**
+     * Injection point.
+     */
     public static void confirmDialog(AlertDialog dialog) {
-        if (!Settings.REMOVE_VIEWER_DISCRETION_DIALOG.get()) {
-            // Since the patch replaces the AlertDialog#show() method, we need to call the original method here.
-            dialog.show();
+        if (Settings.REMOVE_VIEWER_DISCRETION_DIALOG.get()) {
+            Logger.printDebug(() -> "Clicking alert dialog dismiss button");
+
+            final var button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            button.setSoundEffectsEnabled(false);
+            button.performClick();
             return;
         }
 
-        final var button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
-        button.setSoundEffectsEnabled(false);
-        button.performClick();
+        // Since the patch replaces the AlertDialog#show() method, we need to call the original method here.
+        Logger.printDebug(() -> "Showing alert dialog");
+        dialog.show();
     }
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ReturnYouTubeDislikePatch.java

@@ -13,9 +13,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.Objects;
+import java.util.Set;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilter;
 import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
 import app.revanced.extension.youtube.settings.Settings;
@@ -131,11 +133,15 @@ public class ReturnYouTubeDislikePatch {
 
             String conversionContextString = conversionContext.toString();
 
-            if (isRollingNumber && !conversionContextString.contains("video_action_bar.eml")) {
+            if (Settings.RYD_ENABLED.get()) { // FIXME: Remove this.
+                Logger.printDebug(() -> "RYD conversion context: " + conversionContext);
+            }
+
+            if (isRollingNumber && !conversionContextString.contains("video_action_bar.e")) {
                 return original;
             }
 
-            if (conversionContextString.contains("segmented_like_dislike_button.eml")) {
+            if (conversionContextString.contains("segmented_like_dislike_button.e")) {
                 // Regular video.
                 ReturnYouTubeDislike videoData = currentVideoData;
                 if (videoData == null) {
@@ -153,12 +159,12 @@ public class ReturnYouTubeDislikePatch {
             }
 
             if (Utils.containsAny(conversionContextString,
-                    "|shorts_dislike_button.eml", "|reel_dislike_button.eml")) {
+                    "|shorts_dislike_button.e", "|reel_dislike_button.e")) {
                 return getShortsSpan(original, true);
             }
 
             if (Utils.containsAny(conversionContextString,
-                    "|shorts_like_button.eml", "|reel_like_button.eml")) {
+                    "|shorts_like_button.e", "|reel_like_button.e")) {
                 if (!Utils.containsNumber(original)) {
                     Logger.printDebug(() -> "Replacing hidden likes count");
                     return getShortsSpan(original, false);

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/ShortsAutoplayPatch.java

@@ -2,8 +2,6 @@ package app.revanced.extension.youtube.patches;
 
 import android.app.Activity;
 
-import androidx.annotation.Nullable;
-
 import java.lang.ref.WeakReference;
 import java.util.Objects;
 
@@ -78,7 +76,7 @@ public class ShortsAutoplayPatch {
     /**
      * Injection point.
      */
-    public static Enum<?> changeShortsRepeatBehavior(@Nullable Enum<?> original) {
+    public static Enum<?> changeShortsRepeatBehavior(Enum<?> original) {
         try {
             final boolean autoplay;
 
@@ -95,19 +93,19 @@ public class ShortsAutoplayPatch {
                 autoplay = Settings.SHORTS_AUTOPLAY.get();
             }
 
-            final ShortsLoopBehavior behavior = autoplay
+            Enum<?> overrideBehavior = (autoplay
                     ? ShortsLoopBehavior.SINGLE_PLAY
-                    : ShortsLoopBehavior.REPEAT;
+                    : ShortsLoopBehavior.REPEAT).ytEnumValue;
 
-            if (behavior.ytEnumValue != null) {
+            if (overrideBehavior != null) {
                 Logger.printDebug(() -> {
                     String name = (original == null ? "unknown (null)" : original.name());
-                    return behavior == original
+                    return overrideBehavior == original
                             ? "Behavior setting is same as original. Using original: " + name
-                            : "Changing Shorts repeat behavior from: " + name + " to: " + behavior.name();
+                            : "Changing Shorts repeat behavior from: " + name + " to: " + overrideBehavior.name();
                 });
 
-                return behavior.ytEnumValue;
+                return overrideBehavior;
             }
 
             if (original == null) {
@@ -118,13 +116,12 @@ public class ShortsAutoplayPatch {
                 return unknown;
             }
         } catch (Exception ex) {
-            Logger.printException(() -> "changeShortsRepeatBehavior failure", ex);
+            Logger.printException(() -> "changeShortsRepeatState failure", ex);
         }
 
         return original;
     }
 
-
     /**
      * Injection point.
      */

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/VersionCheckPatch.java

@@ -19,5 +19,12 @@ public class VersionCheckPatch {
     public static final boolean IS_19_29_OR_GREATER = isVersionOrGreater("19.29.00");
     @Deprecated
     public static final boolean IS_19_34_OR_GREATER = isVersionOrGreater("19.34.00");
-    public static final boolean IS_19_46_OR_GREATER = isVersionOrGreater("19.46.00");
+
+    public static final boolean IS_20_21_OR_GREATER = isVersionOrGreater("20.21.00");
+
+    public static final boolean IS_20_22_OR_GREATER = isVersionOrGreater("20.22.00");
+
+    public static final boolean IS_20_31_OR_GREATER = isVersionOrGreater("20.31.00");
+
+    public static final boolean IS_20_37_OR_GREATER = isVersionOrGreater("20.37.00");
 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/WideSearchbarPatch.java

@@ -4,6 +4,7 @@ import android.view.View;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.Dim;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -31,7 +32,7 @@ public final class WideSearchbarPatch {
             final int paddingRight = searchBarView.getPaddingRight();
             final int paddingTop = searchBarView.getPaddingTop();
             final int paddingBottom = searchBarView.getPaddingBottom();
-            final int paddingStart = Utils.dipToPixels(8);
+            final int paddingStart = Dim.dp8;
 
             if (Utils.isRightToLeftLocale()) {
                 searchBarView.setPadding(paddingLeft, paddingTop, paddingStart, paddingBottom);

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/announcements/AnnouncementsPatch.java

@@ -2,7 +2,6 @@ package app.revanced.extension.youtube.patches.announcements;
 
 import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENTS;
 import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT_IDS;
 
@@ -24,6 +23,7 @@ import java.time.LocalDateTime;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.ui.Dim;
 import app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -148,7 +148,7 @@ public final class AnnouncementsPatch {
                         if (child instanceof TextView childTextView && finalTitle.equals(childTextView.getText().toString())) {
                             childTextView.setCompoundDrawablesWithIntrinsicBounds(
                                     finalLevel.icon, 0, 0, 0);
-                            childTextView.setCompoundDrawablePadding(dipToPixels(8));
+                            childTextView.setCompoundDrawablePadding(Dim.dp8);
                         }
                     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdsFilter.java

@@ -105,17 +105,17 @@ public final class AdsFilter extends Filter {
                 Settings.HIDE_VIEW_PRODUCTS_BANNER,
                 "product_item",
                 "products_in_video",
-                "shopping_overlay.eml" // Video player overlay shopping links.
+                "shopping_overlay.e" // Video player overlay shopping links.
         );
 
         final var shoppingLinks = new StringFilterGroup(
                 Settings.HIDE_SHOPPING_LINKS,
-                "shopping_description_shelf.eml"
+                "shopping_description_shelf.e"
         );
 
         playerShoppingShelf = new StringFilterGroup(
                 Settings.HIDE_CREATOR_STORE_SHELF,
-                "horizontal_shelf.eml"
+                "horizontal_shelf.e"
         );
 
         playerShoppingShelfBuffer = new ByteArrayFilterGroup(
@@ -131,7 +131,7 @@ public final class AdsFilter extends Filter {
         final var merchandise = new StringFilterGroup(
                 Settings.HIDE_MERCHANDISE_BANNERS,
                 "product_carousel",
-                "shopping_carousel.eml" // Channel profile shopping shelf.
+                "shopping_carousel.e" // Channel profile shopping shelf.
         );
 
         final var selfSponsor = new StringFilterGroup(

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/AdvancedVideoQualityMenuFilter.java

@@ -14,7 +14,7 @@ public final class AdvancedVideoQualityMenuFilter extends Filter {
     public AdvancedVideoQualityMenuFilter() {
         addPathCallbacks(new StringFilterGroup(
                 Settings.ADVANCED_VIDEO_QUALITY_MENU,
-                "quick_quality_sheet_content.eml-js"
+                "quick_quality_sheet_content.e"
         ));
     }