chore: Release v5.26.0-dev.2 [skip ci]

# [5.26.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.26.0-dev.1...v5.26.0-dev.2) (2025-06-01)

### Bug Fixes

* **YouTube:** Support A/B Shorts layout for RYD and component hiding ([#5081](https://github.com/ReVanced/revanced-patches/issues/5081)) ([ff903ba](ff903ba9ac))

.github/workflows/build_pull_request.yml

@@ -19,11 +19,11 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
 
       - name: Build
         env:

.github/workflows/release.yml

@@ -13,24 +13,23 @@ jobs:
     permissions:
       contents: write
       packages: write
+      id-token: write
+      attestations: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          # Make sure the release step uses its own credentials:
-          # https://github.com/cycjimmy/semantic-release-action#private-packages
-          persist-credentials: false
           fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
 
       - name: Build
         env:
@@ -40,7 +39,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "lts/*"
+          node-version: 'lts/*'
           cache: 'npm'
 
       - name: Install dependencies
@@ -54,6 +53,14 @@ jobs:
           fingerprint: ${{ vars.GPG_FINGERPRINT }}
 
       - name: Release
+        uses: cycjimmy/semantic-release-action@v4
+        id: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npm exec semantic-release
+
+      - name: Attest
+        if: steps.release.outputs.new_release_published == 'true'
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-name: 'ReVanced Patches ${{ steps.release.outputs.new_release_git_tag }}'
+          subject-path: patches/build/libs/patches-*.rvp

.releaserc

@@ -22,7 +22,7 @@
       {
         "assets": [
           "CHANGELOG.md",
-          "gradle.properties",
+          "gradle.properties"
         ],
         "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
@@ -33,16 +33,16 @@
         "assets": [
           {
             "path": "patches/build/libs/patches-!(*sources*|*javadoc*).rvp?(.asc)"
-          },
+          }
         ],
-        successComment: false
+        "successComment": false
       }
     ],
     [
       "@saithodev/semantic-release-backmerge",
       {
-        backmergeBranches: [{"from": "main", "to": "dev"}],
-        clearWorkspace: true
+        "backmergeBranches": [{"from": "main", "to": "dev"}],
+        "clearWorkspace": true
       }
     ]
   ]

CHANGELOG.md

@@ -1,3 +1,191 @@
+# [5.26.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.26.0-dev.1...v5.26.0-dev.2) (2025-06-01)
+
+
+### Bug Fixes
+
+* **YouTube:** Support A/B Shorts layout for RYD and component hiding ([#5081](https://github.com/ReVanced/revanced-patches/issues/5081)) ([8ecacaa](https://github.com/ReVanced/revanced-patches/commit/8ecacaad27162d9380014a9a13ac9220b12257b2))
+
+# [5.26.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.25.0...v5.26.0-dev.1) (2025-05-30)
+
+
+### Features
+
+* **Proton Mail:** Add `Remove free accounts limit` patch ([#4970](https://github.com/ReVanced/revanced-patches/issues/4970)) ([b0440ad](https://github.com/ReVanced/revanced-patches/commit/b0440ad6af0e190e516974ce896dcc54c8d2e122))
+
+# [5.25.0](https://github.com/ReVanced/revanced-patches/compare/v5.24.0...v5.25.0) (2025-05-29)
+
+
+### Bug Fixes
+
+* **Disable Pairip license check:** Change patch to default off ([74b6a94](https://github.com/ReVanced/revanced-patches/commit/74b6a94577ac3f73b04bd0cce98fb7011a6607fd))
+* **Hide ADB status:** Resolve app crash on startup ([#5029](https://github.com/ReVanced/revanced-patches/issues/5029)) ([1abebd5](https://github.com/ReVanced/revanced-patches/commit/1abebd5f3b73250c6638d2d8a274b92ea8268924))
+* **Messenger:** Remove outdated `Disable switching emoji to sticker` patch ([#5044](https://github.com/ReVanced/revanced-patches/issues/5044)) ([7b182ca](https://github.com/ReVanced/revanced-patches/commit/7b182cab825ee3a4a3ca528c744c9d2a351c7cf8))
+* **Spotify Lite:** Remove obsolete `Enable on demand` patch ([#5046](https://github.com/ReVanced/revanced-patches/issues/5046)) ([4886d47](https://github.com/ReVanced/revanced-patches/commit/4886d47506c94b03c1f190ecc4947d3d91df6a47))
+* **YouTube - GmsCore support:** Restore patch functionality from prior merge ([7686bbe](https://github.com/ReVanced/revanced-patches/commit/7686bbe975644e1e582fa52f166879da5694ed93))
+* **YouTube - Hide ads:** Hide new type of general ad ([#5004](https://github.com/ReVanced/revanced-patches/issues/5004)) ([37e59d2](https://github.com/ReVanced/revanced-patches/commit/37e59d2771528c631dc13e73dac095fec95c6485))
+* **YouTube - Open Shorts in regular player:** Do not exit app when pressing back button in regular player ([#5020](https://github.com/ReVanced/revanced-patches/issues/5020)) ([3384f8d](https://github.com/ReVanced/revanced-patches/commit/3384f8dd0ff2a345f2e387f4ed1570079a83ccb6))
+* **YouTube:** Better handle incorrect duplicate translations ([20abac5](https://github.com/ReVanced/revanced-patches/commit/20abac52121fbecb65d87d0982f3380e1cf4e20e))
+* **Yuka - Unlock premium:** Remove broken patch that is no longer supported ([#5018](https://github.com/ReVanced/revanced-patches/issues/5018)) ([fac6e59](https://github.com/ReVanced/revanced-patches/commit/fac6e59d281e21e57abdcfc899cd1aeb18e5c2b8))
+
+
+### Features
+
+* Add `Disable pairip license check` patch ([#4927](https://github.com/ReVanced/revanced-patches/issues/4927)) ([42d2c27](https://github.com/ReVanced/revanced-patches/commit/42d2c277982ef63e6ad42d85e46f13c3ab50243c))
+* **Messenger:** Add `Remove Meta AI` patch ([#4945](https://github.com/ReVanced/revanced-patches/issues/4945)) ([012dff7](https://github.com/ReVanced/revanced-patches/commit/012dff7b6511b9e519ccac96f6713cf1a1b327b4))
+* **Prime Video:** Add `Rename shared permissions` patch ([#5049](https://github.com/ReVanced/revanced-patches/issues/5049)) ([80f1fc6](https://github.com/ReVanced/revanced-patches/commit/80f1fc629e30e391bd5877f07dbdf4b6613bd1cf))
+* **Spotify:** Add `Fix Facebook login` patch ([#5023](https://github.com/ReVanced/revanced-patches/issues/5023)) ([34932dc](https://github.com/ReVanced/revanced-patches/commit/34932dc43933d346a5a3adadc62c0dbd38a633b5))
+* **Threads:** Hide Ads ([#5064](https://github.com/ReVanced/revanced-patches/issues/5064)) ([3c4cecb](https://github.com/ReVanced/revanced-patches/commit/3c4cecb966c2f99bfde99552686dda19ade5f67e))
+* **YouTube - Enable debugging:** Add settings menu to share debug logs ([#5021](https://github.com/ReVanced/revanced-patches/issues/5021)) ([1ec4a88](https://github.com/ReVanced/revanced-patches/commit/1ec4a88464a2a2810c02cf072950b618d183779a))
+* **YouTube - Settings:** Add a color picker ([#4981](https://github.com/ReVanced/revanced-patches/issues/4981)) ([1e0e398](https://github.com/ReVanced/revanced-patches/commit/1e0e398574329173aff11a4dc9acfc3fcdeabe16))
+* **YouTube - Swipe controls:** Add separate color settings for the brightness and volume bars ([#5043](https://github.com/ReVanced/revanced-patches/issues/5043)) ([80f50e8](https://github.com/ReVanced/revanced-patches/commit/80f50e8c50ca6a8366b7fd7b01459fb16fa1074a))
+* **YouTube:** Add `Disable haptic feedback` patch ([#5033](https://github.com/ReVanced/revanced-patches/issues/5033)) ([bbe7974](https://github.com/ReVanced/revanced-patches/commit/bbe79744a513c96f9016476e8435f999e94c45d7))
+
+# [5.25.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.13...v5.25.0-dev.14) (2025-05-29)
+
+
+### Features
+
+* **Threads:** Hide Ads ([#5064](https://github.com/ReVanced/revanced-patches/issues/5064)) ([3c4cecb](https://github.com/ReVanced/revanced-patches/commit/3c4cecb966c2f99bfde99552686dda19ade5f67e))
+
+# [5.25.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.12...v5.25.0-dev.13) (2025-05-28)
+
+
+### Features
+
+* **Prime Video:** Add `Rename shared permissions` patch ([#5049](https://github.com/ReVanced/revanced-patches/issues/5049)) ([80f1fc6](https://github.com/ReVanced/revanced-patches/commit/80f1fc629e30e391bd5877f07dbdf4b6613bd1cf))
+
+# [5.25.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.11...v5.25.0-dev.12) (2025-05-28)
+
+
+### Features
+
+* **YouTube - Swipe controls:** Add separate color settings for the brightness and volume bars ([#5043](https://github.com/ReVanced/revanced-patches/issues/5043)) ([80f50e8](https://github.com/ReVanced/revanced-patches/commit/80f50e8c50ca6a8366b7fd7b01459fb16fa1074a))
+
+# [5.25.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.10...v5.25.0-dev.11) (2025-05-27)
+
+
+### Features
+
+* **YouTube - Enable debugging:** Add settings menu to share debug logs ([#5021](https://github.com/ReVanced/revanced-patches/issues/5021)) ([1ec4a88](https://github.com/ReVanced/revanced-patches/commit/1ec4a88464a2a2810c02cf072950b618d183779a))
+* **YouTube:** Add `Disable haptic feedback` patch ([#5033](https://github.com/ReVanced/revanced-patches/issues/5033)) ([bbe7974](https://github.com/ReVanced/revanced-patches/commit/bbe79744a513c96f9016476e8435f999e94c45d7))
+
+# [5.25.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.9...v5.25.0-dev.10) (2025-05-27)
+
+
+### Bug Fixes
+
+* **Messenger:** Remove outdated `Disable switching emoji to sticker` patch ([#5044](https://github.com/ReVanced/revanced-patches/issues/5044)) ([7b182ca](https://github.com/ReVanced/revanced-patches/commit/7b182cab825ee3a4a3ca528c744c9d2a351c7cf8))
+* **Spotify Lite:** Remove obsolete `Enable on demand` patch ([#5046](https://github.com/ReVanced/revanced-patches/issues/5046)) ([4886d47](https://github.com/ReVanced/revanced-patches/commit/4886d47506c94b03c1f190ecc4947d3d91df6a47))
+
+# [5.25.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.8...v5.25.0-dev.9) (2025-05-26)
+
+
+### Features
+
+* **Spotify:** Add `Fix Facebook login` patch ([#5023](https://github.com/ReVanced/revanced-patches/issues/5023)) ([34932dc](https://github.com/ReVanced/revanced-patches/commit/34932dc43933d346a5a3adadc62c0dbd38a633b5))
+* **YouTube - Settings:** Add a color picker ([#4981](https://github.com/ReVanced/revanced-patches/issues/4981)) ([1e0e398](https://github.com/ReVanced/revanced-patches/commit/1e0e398574329173aff11a4dc9acfc3fcdeabe16))
+
+# [5.25.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.8...v5.25.0-dev.9) (2025-05-26)
+
+
+### Features
+
+* **Spotify:** Add `Fix Facebook login` patch ([#5023](https://github.com/ReVanced/revanced-patches/issues/5023)) ([34932dc](https://github.com/ReVanced/revanced-patches/commit/34932dc43933d346a5a3adadc62c0dbd38a633b5))
+* **YouTube - Settings:** Add a color picker ([#4981](https://github.com/ReVanced/revanced-patches/issues/4981)) ([1e0e398](https://github.com/ReVanced/revanced-patches/commit/1e0e398574329173aff11a4dc9acfc3fcdeabe16))
+
+# [5.25.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.8...v5.25.0-dev.9) (2025-05-26)
+
+
+### Features
+
+* **Spotify:** Add `Fix Facebook login` patch ([#5023](https://github.com/ReVanced/revanced-patches/issues/5023)) ([34932dc](https://github.com/ReVanced/revanced-patches/commit/34932dc43933d346a5a3adadc62c0dbd38a633b5))
+* **YouTube - Settings:** Add a color picker ([#4981](https://github.com/ReVanced/revanced-patches/issues/4981)) ([1e0e398](https://github.com/ReVanced/revanced-patches/commit/1e0e398574329173aff11a4dc9acfc3fcdeabe16))
+
+# [5.25.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.7...v5.25.0-dev.8) (2025-05-25)
+
+
+### Bug Fixes
+
+* **Hide ADB status:** Resolve app crash on startup ([#5029](https://github.com/ReVanced/revanced-patches/issues/5029)) ([1abebd5](https://github.com/ReVanced/revanced-patches/commit/1abebd5f3b73250c6638d2d8a274b92ea8268924))
+
+# [5.25.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.6...v5.25.0-dev.7) (2025-05-24)
+
+
+### Bug Fixes
+
+* **YouTube - Open Shorts in regular player:** Do not exit app when pressing back button in regular player ([#5020](https://github.com/ReVanced/revanced-patches/issues/5020)) ([3384f8d](https://github.com/ReVanced/revanced-patches/commit/3384f8dd0ff2a345f2e387f4ed1570079a83ccb6))
+
+# [5.25.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.5...v5.25.0-dev.6) (2025-05-23)
+
+
+### Bug Fixes
+
+* **Yuka - Unlock premium:** Remove broken patch that is no longer supported ([#5018](https://github.com/ReVanced/revanced-patches/issues/5018)) ([fac6e59](https://github.com/ReVanced/revanced-patches/commit/fac6e59d281e21e57abdcfc899cd1aeb18e5c2b8))
+
+# [5.25.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.4...v5.25.0-dev.5) (2025-05-22)
+
+
+### Bug Fixes
+
+* **YouTube:** Better handle incorrect duplicate translations ([20abac5](https://github.com/ReVanced/revanced-patches/commit/20abac52121fbecb65d87d0982f3380e1cf4e20e))
+
+# [5.25.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.3...v5.25.0-dev.4) (2025-05-22)
+
+
+### Bug Fixes
+
+* **YouTube - GmsCore support:** Restore patch functionality from prior merge ([7686bbe](https://github.com/ReVanced/revanced-patches/commit/7686bbe975644e1e582fa52f166879da5694ed93))
+
+# [5.25.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.2...v5.25.0-dev.3) (2025-05-22)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Hide new type of general ad ([#5004](https://github.com/ReVanced/revanced-patches/issues/5004)) ([37e59d2](https://github.com/ReVanced/revanced-patches/commit/37e59d2771528c631dc13e73dac095fec95c6485))
+
+# [5.25.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.25.0-dev.1...v5.25.0-dev.2) (2025-05-22)
+
+
+### Bug Fixes
+
+* **Disable Pairip license check:** Change patch to default off ([74b6a94](https://github.com/ReVanced/revanced-patches/commit/74b6a94577ac3f73b04bd0cce98fb7011a6607fd))
+
+# [5.25.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.24.0...v5.25.0-dev.1) (2025-05-22)
+
+
+### Features
+
+* Add `Disable pairip license check` patch ([#4927](https://github.com/ReVanced/revanced-patches/issues/4927)) ([42d2c27](https://github.com/ReVanced/revanced-patches/commit/42d2c277982ef63e6ad42d85e46f13c3ab50243c))
+* **Messenger:** Add `Remove Meta AI` patch ([#4945](https://github.com/ReVanced/revanced-patches/issues/4945)) ([012dff7](https://github.com/ReVanced/revanced-patches/commit/012dff7b6511b9e519ccac96f6713cf1a1b327b4))
+
+# [5.24.0](https://github.com/ReVanced/revanced-patches/compare/v5.23.0...v5.24.0) (2025-05-19)
+
+
+### Bug Fixes
+
+* **Spotify - Fix third party launchers widgets:** Add missing compatibility annotation ([0493f80](https://github.com/ReVanced/revanced-patches/commit/0493f8035b26b90c5f8e42be2e2a5ce73d8685a5))
+* **YouTube - Hide layout components:** Fix `Hide video recommendation labels` ([#4956](https://github.com/ReVanced/revanced-patches/issues/4956)) ([ae05ac3](https://github.com/ReVanced/revanced-patches/commit/ae05ac38151ebd3197953af97ca0dd847a04cc2d))
+* **YouTube - Settings:** Correctly show summary text if search box is closed before searching ([d0ae835](https://github.com/ReVanced/revanced-patches/commit/d0ae835d3381fc659c9bb4a2d130d4db8a1499cf))
+* **YouTube - SponsorBlock:** Fix segment category summary not showing category description ([06934a6](https://github.com/ReVanced/revanced-patches/commit/06934a60d91b40a5cdf7f4cd92deae4a136c149b))
+
+
+### Features
+
+* **GmsCore support:** Open vendor specific DontKillMyApp if available ([#4952](https://github.com/ReVanced/revanced-patches/issues/4952)) ([b89927a](https://github.com/ReVanced/revanced-patches/commit/b89927a10e3b909a3c37fbb75c16a7abbce44560))
+* **NU.nl:** Support version `11.3.0` ([#4925](https://github.com/ReVanced/revanced-patches/issues/4925)) ([bedde60](https://github.com/ReVanced/revanced-patches/commit/bedde60fc1a52b0fd491174b3b5b887435eb621a))
+* **Spotify:** Add `Fix third party launchers widgets` patch ([#4893](https://github.com/ReVanced/revanced-patches/issues/4893)) ([23bfdc9](https://github.com/ReVanced/revanced-patches/commit/23bfdc98fbbcc8ecf0ffbf8704f58dd2272e4af2))
+* **YouTube - Hide description components:** Add `Hide Ask` ([#4972](https://github.com/ReVanced/revanced-patches/issues/4972)) ([ebc94a5](https://github.com/ReVanced/revanced-patches/commit/ebc94a5da6214b67399c9c01515689bd4b20547c))
+* **YouTube - Hide layout components:** Add `Hide ticket shelf` ([#4969](https://github.com/ReVanced/revanced-patches/issues/4969)) ([6436af7](https://github.com/ReVanced/revanced-patches/commit/6436af7e77c77d2034dfceba8bc51132ad7632be))
+* **YouTube - Hide player components:** Hide related video overlay in fullscreen ([#4938](https://github.com/ReVanced/revanced-patches/issues/4938)) ([ac9be97](https://github.com/ReVanced/revanced-patches/commit/ac9be9760c9965e54df196b227a310d64ead4bf5))
+* **YouTube - Settings:** Add ability to search in settings ([#4881](https://github.com/ReVanced/revanced-patches/issues/4881)) ([aca8b20](https://github.com/ReVanced/revanced-patches/commit/aca8b207c15f254bcc9ad94bc7dfb895f21d4058))
+
+# [5.24.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.8...v5.24.0-dev.9) (2025-05-18)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Fix segment category summary not showing category description ([06934a6](https://github.com/ReVanced/revanced-patches/commit/06934a60d91b40a5cdf7f4cd92deae4a136c149b))
+
 # [5.24.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.24.0-dev.7...v5.24.0-dev.8) (2025-05-17)
 
 

extensions/messenger/build.gradle.kts

@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+}

extensions/messenger/src/main/AndroidManifest.xml

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

extensions/messenger/src/main/java/app/revanced/extension/messenger/metaai/RemoveMetaAIPatch.java

@@ -0,0 +1,15 @@
+package app.revanced.extension.messenger.metaai;
+
+@SuppressWarnings("unused")
+public class RemoveMetaAIPatch {
+    public static boolean overrideConfigBool(long id, boolean value) {
+        // It seems like all configs starting with 363219 are related to Meta AI. 
+        // A list of specific ones that need disabling would probably be better,
+        // but these config numbers seem to change slightly with each update.
+        // These first 6 digits don't though.
+        if (Long.toString(id).startsWith("363219"))
+            return false;
+
+        return value;
+    }
+}

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

@@ -1,15 +1,26 @@
 package app.revanced.extension.shared;
 
+import static app.revanced.extension.shared.settings.BaseSettings.DEBUG;
+import static app.revanced.extension.shared.settings.BaseSettings.DEBUG_STACKTRACE;
+import static app.revanced.extension.shared.settings.BaseSettings.DEBUG_TOAST_ON_ERROR;
+
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.revanced.extension.shared.settings.BaseSettings;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import static app.revanced.extension.shared.settings.BaseSettings.*;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.preference.LogBufferManager;
 
+/**
+ * ReVanced specific logger.  Logging is done to standard device log (accessible thru ADB),
+ * and additionally accessible thru {@link LogBufferManager}.
+ *
+ * All methods are thread safe.
+ */
 public class Logger {
 
     /**
@@ -17,99 +28,159 @@ public class Logger {
      */
     @FunctionalInterface
     public interface LogMessage {
+        /**
+         * @return Logger string message. This method is only called if logging is enabled.
+         */
         @NonNull
         String buildMessageString();
+    }
 
-        /**
-         * @return For outer classes, this returns {@link Class#getSimpleName()}.
-         * For static, inner, or anonymous classes, this returns the simple name of the enclosing class.
-         * <br>
-         * For example, each of these classes return 'SomethingView':
-         * <code>
-         * com.company.SomethingView
-         * com.company.SomethingView$StaticClass
-         * com.company.SomethingView$1
-         * </code>
-         */
-        private String findOuterClassSimpleName() {
-            var selfClass = this.getClass();
+    private enum LogLevel {
+        DEBUG,
+        INFO,
+        ERROR
+    }
 
-            String fullClassName = selfClass.getName();
-            final int dollarSignIndex = fullClassName.indexOf('$');
-            if (dollarSignIndex < 0) {
-                return selfClass.getSimpleName(); // Already an outer class.
+    /**
+     * Log tag prefix. Only used for system logging.
+     */
+    private static final String REVANCED_LOG_TAG_PREFIX = "revanced: ";
+
+    private static final String LOGGER_CLASS_NAME = Logger.class.getName();
+
+    /**
+     * @return For outer classes, this returns {@link Class#getSimpleName()}.
+     * For static, inner, or anonymous classes, this returns the simple name of the enclosing class.
+     * <br>
+     * For example, each of these classes returns 'SomethingView':
+     * <code>
+     * com.company.SomethingView
+     * com.company.SomethingView$StaticClass
+     * com.company.SomethingView$1
+     * </code>
+     */
+    private static String getOuterClassSimpleName(Object obj) {
+        Class<?> logClass = obj.getClass();
+        String fullClassName = logClass.getName();
+        final int dollarSignIndex = fullClassName.indexOf('$');
+        if (dollarSignIndex < 0) {
+            return logClass.getSimpleName(); // Already an outer class.
+        }
+
+        // Class is inner, static, or anonymous.
+        // Parse the simple name full name.
+        // A class with no package returns index of -1, but incrementing gives index zero which is correct.
+        final int simpleClassNameStartIndex = fullClassName.lastIndexOf('.') + 1;
+        return fullClassName.substring(simpleClassNameStartIndex, dollarSignIndex);
+    }
+
+    /**
+     * Internal method to handle logging to Android Log and {@link LogBufferManager}.
+     * Appends the log message, stack trace (if enabled), and exception (if present) to logBuffer
+     * with class name but without 'revanced:' prefix.
+     *
+     * @param logLevel          The log level.
+     * @param message           Log message object.
+     * @param ex                Optional exception.
+     * @param includeStackTrace If the current stack should be included.
+     * @param showToast         If a toast is to be shown.
+     */
+    private static void logInternal(LogLevel logLevel, LogMessage message, @Nullable Throwable ex,
+                                    boolean includeStackTrace, boolean showToast) {
+        // It's very important that no Settings are used in this method,
+        // as this code is used when a context is not set and thus referencing
+        // a setting will crash the app.
+        String messageString = message.buildMessageString();
+        String className = getOuterClassSimpleName(message);
+
+        String logText = messageString;
+
+        // Append exception message if present.
+        if (ex != null) {
+            var exceptionMessage = ex.getMessage();
+            if (exceptionMessage != null) {
+                logText += "\nException: " + exceptionMessage;
             }
+        }
 
-            // Class is inner, static, or anonymous.
-            // Parse the simple name full name.
-            // A class with no package returns index of -1, but incrementing gives index zero which is correct.
-            final int simpleClassNameStartIndex = fullClassName.lastIndexOf('.') + 1;
-            return fullClassName.substring(simpleClassNameStartIndex, dollarSignIndex);
+        if (includeStackTrace) {
+            var sw = new StringWriter();
+            new Throwable().printStackTrace(new PrintWriter(sw));
+            String stackTrace = sw.toString();
+            // Remove the stacktrace elements of this class.
+            final int loggerIndex = stackTrace.lastIndexOf(LOGGER_CLASS_NAME);
+            final int loggerBegins = stackTrace.indexOf('\n', loggerIndex);
+            logText += stackTrace.substring(loggerBegins);
+        }
+
+        // Do not include "revanced:" prefix in clipboard logs.
+        String managerToastString = className + ": " + logText;
+        LogBufferManager.appendToLogBuffer(managerToastString);
+
+        String logTag = REVANCED_LOG_TAG_PREFIX + className;
+        switch (logLevel) {
+            case DEBUG:
+                if (ex == null) Log.d(logTag, logText);
+                else Log.d(logTag, logText, ex);
+                break;
+            case INFO:
+                if (ex == null) Log.i(logTag, logText);
+                else Log.i(logTag, logText, ex);
+                break;
+            case ERROR:
+                if (ex == null) Log.e(logTag, logText);
+                else Log.e(logTag, logText, ex);
+                break;
+        }
+
+        if (showToast) {
+            Utils.showToastLong(managerToastString);
         }
     }
 
-    private static final String REVANCED_LOG_PREFIX = "revanced: ";
-
     /**
      * Logs debug messages under the outer class name of the code calling this method.
-     * Whenever possible, the log string should be constructed entirely inside {@link LogMessage#buildMessageString()}
-     * so the performance cost of building strings is paid only if {@link BaseSettings#DEBUG} is enabled.
+     * <p>
+     * Whenever possible, the log string should be constructed entirely inside
+     * {@link LogMessage#buildMessageString()} so the performance cost of
+     * building strings is paid only if {@link BaseSettings#DEBUG} is enabled.
      */
-    public static void printDebug(@NonNull LogMessage message) {
+    public static void printDebug(LogMessage message) {
         printDebug(message, null);
     }
 
     /**
      * Logs debug messages under the outer class name of the code calling this method.
-     * Whenever possible, the log string should be constructed entirely inside {@link LogMessage#buildMessageString()}
-     * so the performance cost of building strings is paid only if {@link BaseSettings#DEBUG} is enabled.
+     * <p>
+     * Whenever possible, the log string should be constructed entirely inside
+     * {@link LogMessage#buildMessageString()} so the performance cost of
+     * building strings is paid only if {@link BaseSettings#DEBUG} is enabled.
      */
-    public static void printDebug(@NonNull LogMessage message, @Nullable Exception ex) {
+    public static void printDebug(LogMessage message, @Nullable Exception ex) {
         if (DEBUG.get()) {
-            String logMessage = message.buildMessageString();
-            String logTag = REVANCED_LOG_PREFIX + message.findOuterClassSimpleName();
-
-            if (DEBUG_STACKTRACE.get()) {
-                var builder = new StringBuilder(logMessage);
-                var sw = new StringWriter();
-                new Throwable().printStackTrace(new PrintWriter(sw));
-
-                builder.append('\n').append(sw);
-                logMessage = builder.toString();
-            }
-
-            if (ex == null) {
-                Log.d(logTag, logMessage);
-            } else {
-                Log.d(logTag, logMessage, ex);
-            }
+            logInternal(LogLevel.DEBUG, message, ex, DEBUG_STACKTRACE.get(), false);
         }
     }
 
     /**
      * Logs information messages using the outer class name of the code calling this method.
      */
-    public static void printInfo(@NonNull LogMessage message) {
+    public static void printInfo(LogMessage message) {
         printInfo(message, null);
     }
 
     /**
      * Logs information messages using the outer class name of the code calling this method.
      */
-    public static void printInfo(@NonNull LogMessage message, @Nullable Exception ex) {
-        String logTag = REVANCED_LOG_PREFIX + message.findOuterClassSimpleName();
-        String logMessage = message.buildMessageString();
-        if (ex == null) {
-            Log.i(logTag, logMessage);
-        } else {
-            Log.i(logTag, logMessage, ex);
-        }
+    public static void printInfo(LogMessage message, @Nullable Exception ex) {
+        logInternal(LogLevel.INFO, message, ex, DEBUG_STACKTRACE.get(), false);
     }
 
     /**
      * Logs exceptions under the outer class name of the code calling this method.
+     * Appends the log message, exception (if present), and toast message (if enabled) to logBuffer.
      */
-    public static void printException(@NonNull LogMessage message) {
+    public static void printException(LogMessage message) {
         printException(message, null);
     }
 
@@ -122,35 +193,23 @@ public class Logger {
      * @param message          log message
      * @param ex               exception (optional)
      */
-    public static void printException(@NonNull LogMessage message, @Nullable Throwable ex) {
-        String messageString = message.buildMessageString();
-        String outerClassSimpleName = message.findOuterClassSimpleName();
-        String logMessage = REVANCED_LOG_PREFIX + outerClassSimpleName;
-        if (ex == null) {
-            Log.e(logMessage, messageString);
-        } else {
-            Log.e(logMessage, messageString, ex);
-        }
-        if (DEBUG_TOAST_ON_ERROR.get()) {
-            Utils.showToastLong(outerClassSimpleName + ": " + messageString);
-        }
+    public static void printException(LogMessage message, @Nullable Throwable ex) {
+        logInternal(LogLevel.ERROR, message, ex, DEBUG_STACKTRACE.get(), DEBUG_TOAST_ON_ERROR.get());
     }
 
     /**
      * Logging to use if {@link BaseSettings#DEBUG} or {@link Utils#getContext()} may not be initialized.
      * Normally this method should not be used.
      */
-    public static void initializationInfo(@NonNull Class<?> callingClass, @NonNull String message) {
-        Log.i(REVANCED_LOG_PREFIX + callingClass.getSimpleName(), message);
+    public static void initializationInfo(LogMessage message) {
+        logInternal(LogLevel.INFO, message, null, false, false);
     }
 
     /**
      * Logging to use if {@link BaseSettings#DEBUG} or {@link Utils#getContext()} may not be initialized.
      * Normally this method should not be used.
      */
-    public static void initializationException(@NonNull Class<?> callingClass, @NonNull String message,
-                                               @Nullable Exception ex) {
-        Log.e(REVANCED_LOG_PREFIX + callingClass.getSimpleName(), message, ex);
+    public static void initializationException(LogMessage message, @Nullable Exception ex) {
+        logInternal(LogLevel.ERROR, message, ex, false, false);
     }
-
-}
+}

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

@@ -1,7 +1,11 @@
 package app.revanced.extension.shared;
 
 import android.annotation.SuppressLint;
-import android.app.*;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -18,6 +22,8 @@ import android.os.Looper;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.util.Pair;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
@@ -357,15 +363,17 @@ public class Utils {
 
     public static Context getContext() {
         if (context == null) {
-            Logger.initializationException(Utils.class, "Context is not set by extension hook, returning null",  null);
+            Logger.initializationException(() -> "Context is not set by extension hook, returning null",  null);
         }
         return context;
     }
 
     public static void setContext(Context appContext) {
+        // Intentionally use logger before context is set,
+        // to expose any bugs in the 'no context available' logger method.
+        Logger.initializationInfo(() -> "Set context: " + appContext);
         // Must initially set context to check the app language.
         context = appContext;
-        Logger.initializationInfo(Utils.class, "Set context: " + appContext);
 
         AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
         if (language != AppLanguage.DEFAULT) {
@@ -377,8 +385,9 @@ public class Utils {
         }
     }
 
-    public static void setClipboard(@NonNull String text) {
-        android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+    public static void setClipboard(CharSequence text) {
+        android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context
+                .getSystemService(Context.CLIPBOARD_SERVICE);
         android.content.ClipData clip = android.content.ClipData.newPlainText("ReVanced", text);
         clipboard.setPrimaryClip(clip);
     }
@@ -542,24 +551,25 @@ public class Utils {
     private static void showToast(@NonNull String messageToToast, int toastDuration) {
         Objects.requireNonNull(messageToToast);
         runOnMainThreadNowOrLater(() -> {
-                    if (context == null) {
-                        Logger.initializationException(Utils.class, "Cannot show toast (context is null): " + messageToToast, null);
-                    } else {
-                        Logger.printDebug(() -> "Showing toast: " + messageToToast);
-                        Toast.makeText(context, messageToToast, toastDuration).show();
-                    }
-                }
-        );
+            Context currentContext = context;
+
+            if (currentContext == null) {
+                Logger.initializationException(() -> "Cannot show toast (context is null): " + messageToToast, null);
+            } else {
+                Logger.printDebug(() -> "Showing toast: " + messageToToast);
+                Toast.makeText(currentContext, messageToToast, toastDuration).show();
+            }
+        });
     }
 
-    public static boolean isDarkModeEnabled(Context context) {
-        Configuration config = context.getResources().getConfiguration();
+    public static boolean isDarkModeEnabled() {
+        Configuration config = Resources.getSystem().getConfiguration();
         final int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
         return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
     }
 
     public static boolean isLandscapeOrientation() {
-        final int orientation = context.getResources().getConfiguration().orientation;
+        final int orientation = Resources.getSystem().getConfiguration().orientation;
         return orientation == Configuration.ORIENTATION_LANDSCAPE;
     }
 
@@ -573,7 +583,7 @@ public class Utils {
     }
 
     /**
-     * Automatically logs any exceptions the runnable throws
+     * Automatically logs any exceptions the runnable throws.
      */
     public static void runOnMainThreadDelayed(@NonNull Runnable runnable, long delayMillis) {
         Runnable loggingRunnable = () -> {
@@ -599,14 +609,14 @@ public class Utils {
     }
 
     /**
-     * @return if the calling thread is on the main thread
+     * @return if the calling thread is on the main thread.
      */
     public static boolean isCurrentlyOnMainThread() {
         return Looper.getMainLooper().isCurrentThread();
     }
 
     /**
-     * @throws IllegalStateException if the calling thread is _off_ the main thread
+     * @throws IllegalStateException if the calling thread is _off_ the main thread.
      */
     public static void verifyOnMainThread() throws IllegalStateException {
         if (!isCurrentlyOnMainThread()) {
@@ -615,7 +625,7 @@ public class Utils {
     }
 
     /**
-     * @throws IllegalStateException if the calling thread is _on_ the main thread
+     * @throws IllegalStateException if the calling thread is _on_ the main thread.
      */
     public static void verifyOffMainThread() throws IllegalStateException {
         if (isCurrentlyOnMainThread()) {
@@ -629,13 +639,23 @@ public class Utils {
         OTHER,
     }
 
+    /**
+     * Calling extension code must ensure the un-patched app has the permission
+     * <code>android.permission.ACCESS_NETWORK_STATE</code>, otherwise the app will crash
+     * if this method is used.
+     */
     public static boolean isNetworkConnected() {
         NetworkType networkType = getNetworkType();
         return networkType == NetworkType.MOBILE
                 || networkType == NetworkType.OTHER;
     }
 
-    @SuppressLint({"MissingPermission", "deprecation"}) // Permission already included in YouTube.
+    /**
+     * Calling extension code must ensure the un-patched app has the permission
+     * <code>android.permission.ACCESS_NETWORK_STATE</code>, otherwise the app will crash
+     * if this method is used.
+     */
+    @SuppressLint({"MissingPermission", "deprecation"})
     public static NetworkType getNetworkType() {
         Context networkContext = getContext();
         if (networkContext == null) {
@@ -738,9 +758,9 @@ public class Utils {
      * then the preferences are left unsorted.
      */
     @SuppressWarnings("deprecation")
-    public static void sortPreferenceGroups(@NonNull PreferenceGroup group) {
+    public static void sortPreferenceGroups(PreferenceGroup group) {
         Sort groupSort = Sort.fromKey(group.getKey(), Sort.UNSORTED);
-        SortedMap<String, Preference> preferences = new TreeMap<>();
+        List<Pair<String, Preference>> preferences = new ArrayList<>();
 
         for (int i = 0, prefCount = group.getPreferenceCount(); i < prefCount; i++) {
             Preference preference = group.getPreference(i);
@@ -769,17 +789,22 @@ public class Utils {
                     throw new IllegalStateException();
             }
 
-            preferences.put(sortValue, preference);
+            preferences.add(new Pair<>(sortValue, preference));
         }
 
+        //noinspection ComparatorCombinators
+        Collections.sort(preferences, (pair1, pair2)
+                -> pair1.first.compareTo(pair2.first));
+
         int index = 0;
-        for (Preference pref : preferences.values()) {
+        for (Pair<String, Preference> pair : preferences) {
             int order = index++;
+            Preference pref = pair.second;
 
             // Move any screens, intents, and the one off About preference to the top.
             if (pref instanceof PreferenceScreen || pref instanceof ReVancedAboutPreference
                     || pref.getIntent() != null) {
-                // Arbitrary high number.
+                // Any arbitrary large number.
                 order -= 1000;
             }
 
@@ -843,6 +868,20 @@ 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()
+        );
+    }
+
     public static int clamp(int value, int lower, int upper) {
         return Math.max(lower, Math.min(value, upper));
     }

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

@@ -0,0 +1,442 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.StringSetting;
+
+/**
+ * A custom preference for selecting a color via a hexadecimal code or a color picker dialog.
+ * Extends {@link EditTextPreference} to display a colored dot in the widget area,
+ * reflecting the currently selected color. The dot is dimmed when the preference is disabled.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class ColorPickerPreference extends EditTextPreference {
+
+    /**
+     * Character to show the color appearance.
+     */
+    public static final String COLOR_DOT_STRING = "⬤";
+
+    /**
+     * Length of a valid color string of format #RRGGBB.
+     */
+    public static final int COLOR_STRING_LENGTH = 7;
+
+    /**
+     * Matches everything that is not a hex number/letter.
+     */
+    private static final Pattern PATTERN_NOT_HEX = Pattern.compile("[^0-9A-Fa-f]");
+
+    /**
+     * Alpha for dimming when the preference is disabled.
+     */
+    private static final float DISABLED_ALPHA = 0.5f; // 50%
+
+    /**
+     * View displaying a colored dot in the widget area.
+     */
+    private View widgetColorDot;
+
+    /**
+     * Current color in RGB format (without alpha).
+     */
+    @ColorInt
+    private int currentColor;
+
+    /**
+     * Associated setting for storing the color value.
+     */
+    private StringSetting colorSetting;
+
+    /**
+     * Dialog TextWatcher for the EditText to monitor color input changes.
+     */
+    private TextWatcher colorTextWatcher;
+
+    /**
+     * Dialog TextView displaying a colored dot for the selected color preview in the dialog.
+     */
+    private TextView dialogColorPreview;
+
+    /**
+     * Dialog color picker view.
+     */
+    private ColorPickerView dialogColorPickerView;
+
+    /**
+     * Removes non valid hex characters, converts to all uppercase,
+     * and adds # character to the start if not present.
+     */
+    public static String cleanupColorCodeString(String colorString) {
+        // Remove non-hex chars, convert to uppercase, and ensure correct length
+        String result = "#" + PATTERN_NOT_HEX.matcher(colorString)
+                .replaceAll("").toUpperCase(Locale.ROOT);
+
+        if (result.length() < COLOR_STRING_LENGTH) {
+            return result;
+        }
+
+        return result.substring(0, COLOR_STRING_LENGTH);
+    }
+
+    /**
+     * @param color RGB color, without an alpha channel.
+     * @return #RRGGBB hex color string
+     */
+    public static String getColorString(@ColorInt int color) {
+        String colorString = String.format("#%06X", color);
+        if ((color & 0xFF000000) != 0) {
+            // Likely a bug somewhere.
+            Logger.printException(() -> "getColorString: color has alpha channel: " + colorString);
+        }
+        return colorString;
+    }
+
+    /**
+     * Creates a Spanned object for a colored dot using SpannableString.
+     *
+     * @param color The RGB color (without alpha).
+     * @return A Spanned object with the colored dot.
+     */
+    public static Spanned getColorDot(@ColorInt int color) {
+        SpannableString spannable = new SpannableString(COLOR_DOT_STRING);
+        spannable.setSpan(new ForegroundColorSpan(color | 0xFF000000), 0, COLOR_DOT_STRING.length(),
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        spannable.setSpan(new RelativeSizeSpan(1.5f), 0, 1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return spannable;
+    }
+
+    public ColorPickerPreference(Context context) {
+        super(context);
+        init();
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    /**
+     * Initializes the preference by setting up the EditText, loading the color, and set the widget layout.
+     */
+    private void init() {
+        colorSetting = (StringSetting) Setting.getSettingFromPath(getKey());
+        if (colorSetting == null) {
+            Logger.printException(() -> "Could not find color setting for: " + getKey());
+        }
+
+        EditText editText = getEditText();
+        editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
+                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            editText.setAutofillHints((String) null);
+        }
+
+        // Set the widget layout to a custom layout containing the colored dot.
+        setWidgetLayoutResource(getResourceIdentifier("revanced_color_dot_widget", "layout"));
+    }
+
+    /**
+     * Sets the selected color and updates the UI and settings.
+     *
+     * @param colorString The color in hexadecimal format (e.g., "#RRGGBB").
+     * @throws IllegalArgumentException If the color string is invalid.
+     */
+    @Override
+    public final void setText(String colorString)  {
+        try {
+            Logger.printDebug(() -> "setText: " + colorString);
+            super.setText(colorString);
+
+            currentColor = Color.parseColor(colorString) & 0x00FFFFFF;
+            if (colorSetting != null) {
+                colorSetting.save(getColorString(currentColor));
+            }
+            updateColorPreview();
+            updateWidgetColorDot();
+        } catch (IllegalArgumentException ex) {
+            // This code is reached if the user pastes settings json with an invalid color
+            // since this preference is updated with the new setting text.
+            Logger.printDebug(() -> "Parse color error: " + colorString, ex);
+            Utils.showToastShort(str("revanced_settings_color_invalid"));
+            setText(colorSetting.resetToDefault());
+        } catch (Exception ex) {
+            Logger.printException(() -> "setText failure: " + colorString, ex);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        widgetColorDot = view.findViewById(getResourceIdentifier(
+                "revanced_color_dot_widget", "id"));
+        widgetColorDot.setBackgroundResource(getResourceIdentifier(
+                "revanced_settings_circle_background", "drawable"));
+        widgetColorDot.getBackground().setTint(currentColor | 0xFF000000);
+        widgetColorDot.setAlpha(isEnabled() ? 1.0f : DISABLED_ALPHA);
+    }
+
+    /**
+     * Creates a layout with a color preview and EditText for hex color input.
+     *
+     * @param context The context for creating the layout.
+     * @return A LinearLayout containing the color preview and EditText.
+     */
+    private LinearLayout createDialogLayout(Context context) {
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(70, 0, 70, 0);
+
+        // Inflate color picker.
+        View colorPicker = LayoutInflater.from(context).inflate(
+                getResourceIdentifier("revanced_color_picker", "layout"), null);
+        dialogColorPickerView = colorPicker.findViewById(
+                getResourceIdentifier("color_picker_view", "id"));
+        dialogColorPickerView.setColor(currentColor);
+        layout.addView(colorPicker);
+
+        // Horizontal layout for preview and EditText.
+        LinearLayout inputLayout = new LinearLayout(context);
+        inputLayout.setOrientation(LinearLayout.HORIZONTAL);
+        inputLayout.setPadding(0, 20, 0, 0);
+
+        dialogColorPreview = new TextView(context);
+        inputLayout.addView(dialogColorPreview);
+        updateColorPreview();
+
+        EditText editText = getEditText();
+        ViewParent parent = editText.getParent();
+        if (parent instanceof ViewGroup parentViewGroup) {
+            parentViewGroup.removeView(editText);
+        }
+        editText.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        ));
+        String currentColorString = getColorString(currentColor);
+        editText.setText(currentColorString);
+        editText.setSelection(currentColorString.length());
+        editText.setTypeface(Typeface.MONOSPACE);
+        colorTextWatcher = createColorTextWatcher(dialogColorPickerView);
+        editText.addTextChangedListener(colorTextWatcher);
+        inputLayout.addView(editText);
+
+        // Add a dummy view to take up remaining horizontal space,
+        // otherwise it will show an oversize underlined text view.
+        View paddingView = new View(context);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                0,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                1f
+        );
+        paddingView.setLayoutParams(params);
+        inputLayout.addView(paddingView);
+
+        layout.addView(inputLayout);
+
+        // Set up color picker listener with debouncing.
+        // Add listener last to prevent callbacks from set calls above.
+        dialogColorPickerView.setOnColorChangedListener(color -> {
+            // Check if it actually changed, since this callback
+            // can be caused by updates in afterTextChanged().
+            if (currentColor == color) {
+                return;
+            }
+
+            String updatedColorString = getColorString(color);
+            Logger.printDebug(() -> "onColorChanged: " + updatedColorString);
+            currentColor = color;
+            editText.setText(updatedColorString);
+            editText.setSelection(updatedColorString.length());
+
+            updateColorPreview();
+            updateWidgetColorDot();
+        });
+
+        return layout;
+    }
+
+    /**
+     * Updates the color preview TextView with a colored dot.
+     */
+    private void updateColorPreview() {
+        if (dialogColorPreview != null) {
+            dialogColorPreview.setText(getColorDot(currentColor));
+        }
+    }
+
+    private void updateWidgetColorDot() {
+        if (widgetColorDot != null) {
+            widgetColorDot.getBackground().setTint(currentColor | 0xFF000000);
+            widgetColorDot.setAlpha(isEnabled() ? 1.0f : DISABLED_ALPHA);
+        }
+    }
+
+    /**
+     * Creates a TextWatcher to monitor changes in the EditText for color input.
+     *
+     * @return A TextWatcher that updates the color preview on valid input.
+     */
+    private TextWatcher createColorTextWatcher(ColorPickerView colorPickerView) {
+        return 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) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable edit) {
+                try {
+                    String colorString = edit.toString();
+
+                    String sanitizedColorString = cleanupColorCodeString(colorString);
+                    if (!sanitizedColorString.equals(colorString)) {
+                        edit.replace(0, colorString.length(), sanitizedColorString);
+                        return;
+                    }
+
+                    if (sanitizedColorString.length() != COLOR_STRING_LENGTH) {
+                        // User is still typing out the color.
+                        return;
+                    }
+
+                    final int newColor = Color.parseColor(colorString);
+                    if (currentColor != newColor) {
+                        Logger.printDebug(() -> "afterTextChanged: " + sanitizedColorString);
+                        currentColor = newColor;
+                        updateColorPreview();
+                        updateWidgetColorDot();
+                        colorPickerView.setColor(newColor);
+                    }
+                } catch (Exception ex) {
+                    // Should never be reached since input is validated before using.
+                    Logger.printException(() -> "afterTextChanged failure", ex);
+                }
+            }
+        };
+    }
+
+    /**
+     * Prepares the dialog builder with a custom view and reset button.
+     *
+     * @param builder The AlertDialog.Builder to configure.
+     */
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        Utils.setEditTextDialogTheme(builder);
+        LinearLayout dialogLayout = createDialogLayout(builder.getContext());
+        builder.setView(dialogLayout);
+        final int originalColor = currentColor;
+
+        builder.setNeutralButton(str("revanced_settings_reset_color"), null);
+
+        builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+            try {
+                String colorString = getEditText().getText().toString();
+
+                if (colorString.length() != COLOR_STRING_LENGTH) {
+                    Utils.showToastShort(str("revanced_settings_color_invalid"));
+                    setText(getColorString(originalColor));
+                    return;
+                }
+
+                setText(colorString);
+            } catch (Exception ex) {
+                // Should never happen due to a bad color string,
+                // since the text is validated and fixed while the user types.
+                Logger.printException(() -> "setPositiveButton failure", ex);
+            }
+        });
+
+        builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+            try {
+                // Restore the original color.
+                setText(getColorString(originalColor));
+            } catch (Exception ex) {
+                Logger.printException(() -> "setNegativeButton failure", ex);
+            }
+        });
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        AlertDialog dialog = (AlertDialog) getDialog();
+        dialog.setCanceledOnTouchOutside(false);
+
+        // Do not close dialog when reset is pressed.
+        Button button = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+        button.setOnClickListener(view -> {
+            try {
+                final int defaultColor = Color.parseColor(colorSetting.defaultValue) & 0x00FFFFFF;
+                // Setting view color causes listener callback into this class.
+                dialogColorPickerView.setColor(defaultColor);
+            } catch (Exception ex) {
+                Logger.printException(() -> "setOnClickListener failure", ex);
+            }
+        });
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        if (colorTextWatcher != null) {
+            getEditText().removeTextChangedListener(colorTextWatcher);
+            colorTextWatcher = null;
+        }
+
+        dialogColorPreview = null;
+        dialogColorPickerView = null;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        updateWidgetColorDot();
+    }
+}

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

@@ -0,0 +1,500 @@
+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;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ComposeShader;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.ColorInt;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+/**
+ * A custom color picker view that allows the user to select a color using a hue slider and a saturation-value selector.
+ * This implementation is density-independent and responsive across different screen sizes and DPIs.
+ *
+ * <p>
+ * This view displays two main components for color selection:
+ * <ul>
+ *     <li><b>Hue Bar:</b> A vertical bar on the right that allows the user to select the hue component of the color.
+ *     <li><b>Saturation-Value Selector:</b> A rectangular area that allows the user to select the saturation and value (brightness)
+ *     components of the color based on the selected hue.
+ * </ul>
+ *
+ * <p>
+ * The view uses {@link LinearGradient} and {@link ComposeShader} to create the color gradients for the hue bar and the
+ * saturation-value selector. It also uses {@link Paint} to draw the selectors (draggable handles).
+ *
+ * <p>
+ * The selected color can be retrieved using {@link #getColor()} and can be set using {@link #setColor(int)}.
+ * An {@link OnColorChangedListener} can be registered to receive notifications when the selected color changes.
+ */
+public class ColorPickerView extends View {
+
+    /**
+     * Interface definition for a callback to be invoked when the selected color changes.
+     */
+    public interface OnColorChangedListener {
+        /**
+         * Called when the selected color has changed.
+         *
+         * Important: Callback color uses RGB format with zero alpha channel.
+         *
+         * @param color The new selected color.
+         */
+        void onColorChanged(@ColorInt int color);
+    }
+
+    /** Expanded touch area for the hue bar to increase the touch-sensitive area. */
+    public static final float TOUCH_EXPANSION = dipToPixels(20f);
+
+    private static final float MARGIN_BETWEEN_AREAS = dipToPixels(24);
+    private static final float VIEW_PADDING = dipToPixels(16);
+    private static final float HUE_BAR_WIDTH = dipToPixels(12);
+    private static final float HUE_CORNER_RADIUS = dipToPixels(6);
+    private static final float SELECTOR_RADIUS = dipToPixels(12);
+    private static final float SELECTOR_STROKE_WIDTH = 8;
+    /**
+     * Hue fill radius.  Use slightly smaller radius for the selector handle fill,
+     * otherwise the anti-aliasing causes the fill color to bleed past the selector outline.
+     */
+    private static final float SELECTOR_FILL_RADIUS = SELECTOR_RADIUS - SELECTOR_STROKE_WIDTH / 2;
+    /** Thin dark outline stroke width for the selector rings. */
+    private static final float SELECTOR_EDGE_STROKE_WIDTH = 1;
+    public static final float SELECTOR_EDGE_RADIUS =
+            SELECTOR_RADIUS + SELECTOR_STROKE_WIDTH / 2 + SELECTOR_EDGE_STROKE_WIDTH / 2;
+
+    /** Selector outline inner color. */
+    @ColorInt
+    private static final int SELECTOR_OUTLINE_COLOR = Color.WHITE;
+
+    /** Dark edge color for the selector rings. */
+    @ColorInt
+    private static final int SELECTOR_EDGE_COLOR = Color.parseColor("#CFCFCF");
+
+    private static final int[] HUE_COLORS = new int[361];
+    static {
+        for (int i = 0; i < 361; i++) {
+            HUE_COLORS[i] = Color.HSVToColor(new float[]{i, 1, 1});
+        }
+    }
+
+    /** Hue bar. */
+    private final Paint huePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    /** Saturation-value selector. */
+    private final Paint saturationValuePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    /** Draggable selector. */
+    private final Paint selectorPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    {
+        selectorPaint.setStrokeWidth(SELECTOR_STROKE_WIDTH);
+    }
+
+    /** Bounds of the hue bar. */
+    private final RectF hueRect = new RectF();
+    /** Bounds of the saturation-value selector. */
+    private final RectF saturationValueRect = new RectF();
+
+    /** HSV color calculations to avoid allocations during drawing. */
+    private final float[] hsvArray = {1, 1, 1};
+
+    /** Current hue value (0-360). */
+    private float hue = 0f;
+    /** Current saturation value (0-1). */
+    private float saturation = 1f;
+    /** Current value (brightness) value (0-1). */
+    private float value = 1f;
+
+    /** The currently selected color in RGB format with no alpha channel. */
+    @ColorInt
+    private int selectedColor;
+
+    private OnColorChangedListener colorChangedListener;
+
+    /** Track if we're currently dragging the hue or saturation handle. */
+    private boolean isDraggingHue;
+    private boolean isDraggingSaturation;
+
+    public ColorPickerView(Context context) {
+        super(context);
+    }
+
+    public ColorPickerView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ColorPickerView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final float DESIRED_ASPECT_RATIO = 0.8f; // height = width * 0.8
+
+        final int minWidth = Utils.dipToPixels(250);
+        final int minHeight = (int) (minWidth * DESIRED_ASPECT_RATIO);
+
+        int width = resolveSize(minWidth, widthMeasureSpec);
+        int height = resolveSize(minHeight, heightMeasureSpec);
+
+        // Ensure minimum dimensions for usability
+        width = Math.max(width, minWidth);
+        height = Math.max(height, minHeight);
+
+        // Adjust height to maintain desired aspect ratio if possible
+        final int desiredHeight = (int) (width * DESIRED_ASPECT_RATIO);
+        if (MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY) {
+            height = desiredHeight;
+        }
+
+        setMeasuredDimension(width, height);
+    }
+
+    /**
+     * Called when the size of the view changes.
+     * This method calculates and sets the bounds of the hue bar and saturation-value selector.
+     * It also creates the necessary shaders for the gradients.
+     */
+    @Override
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+
+        // Calculate bounds with hue bar on the right
+        final float effectiveWidth = width - (2 * VIEW_PADDING);
+        final float selectorWidth = effectiveWidth - HUE_BAR_WIDTH - MARGIN_BETWEEN_AREAS;
+
+        // Adjust rectangles to account for padding and density-independent dimensions
+        saturationValueRect.set(
+                VIEW_PADDING,
+                VIEW_PADDING,
+                VIEW_PADDING + selectorWidth,
+                height - VIEW_PADDING
+        );
+
+        hueRect.set(
+                width - VIEW_PADDING - HUE_BAR_WIDTH,
+                VIEW_PADDING,
+                width - VIEW_PADDING,
+                height - VIEW_PADDING
+        );
+
+        // Update the shaders.
+        updateHueShader();
+        updateSaturationValueShader();
+    }
+
+    /**
+     * Updates the hue full spectrum (0-360 degrees).
+     */
+    private void updateHueShader() {
+        LinearGradient hueShader = new LinearGradient(
+                hueRect.left, hueRect.top,
+                hueRect.left, hueRect.bottom,
+                HUE_COLORS,
+                null,
+                Shader.TileMode.CLAMP
+        );
+
+        huePaint.setShader(hueShader);
+    }
+
+    /**
+     * Updates the shader for the saturation-value selector based on the currently selected hue.
+     * This method creates a combined shader that blends a saturation gradient with a value gradient.
+     */
+    private void updateSaturationValueShader() {
+        // Create a saturation-value gradient based on the current hue.
+        // Calculate the start color (white with the selected hue) for the saturation gradient.
+        final int startColor = Color.HSVToColor(new float[]{hue, 0f, 1f});
+
+        // Calculate the middle color (fully saturated color with the selected hue) for the saturation gradient.
+        final int midColor = Color.HSVToColor(new float[]{hue, 1f, 1f});
+
+        // Create a linear gradient for the saturation from startColor to midColor (horizontal).
+        LinearGradient satShader = new LinearGradient(
+                saturationValueRect.left, saturationValueRect.top,
+                saturationValueRect.right, saturationValueRect.top,
+                startColor,
+                midColor,
+                Shader.TileMode.CLAMP
+        );
+
+        // Create a linear gradient for the value (brightness) from white to black (vertical).
+        //noinspection ExtractMethodRecommender
+        LinearGradient valShader = new LinearGradient(
+                saturationValueRect.left, saturationValueRect.top,
+                saturationValueRect.left, saturationValueRect.bottom,
+                Color.WHITE,
+                Color.BLACK,
+                Shader.TileMode.CLAMP
+        );
+
+        // Combine the saturation and value shaders using PorterDuff.Mode.MULTIPLY to create the final color.
+        ComposeShader combinedShader = new ComposeShader(satShader, valShader, PorterDuff.Mode.MULTIPLY);
+
+        // Set the combined shader for the saturation-value paint.
+        saturationValuePaint.setShader(combinedShader);
+    }
+
+    /**
+     * Draws the color picker view on the canvas.
+     * This method draws the saturation-value selector, the hue bar with rounded corners,
+     * and the draggable handles.
+     *
+     * @param canvas The canvas on which to draw.
+     */
+    @Override
+    protected void onDraw(Canvas canvas) {
+        // Draw the saturation-value selector rectangle.
+        canvas.drawRect(saturationValueRect, saturationValuePaint);
+
+        // Draw the hue bar.
+        canvas.drawRoundRect(hueRect, HUE_CORNER_RADIUS, HUE_CORNER_RADIUS, huePaint);
+
+        final float hueSelectorX = hueRect.centerX();
+        final float hueSelectorY = hueRect.top + (hue / 360f) * hueRect.height();
+
+        final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
+        final float satSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
+
+        // Draw the saturation and hue selector handle filled with the selected color.
+        hsvArray[0] = hue;
+        final int hueHandleColor = Color.HSVToColor(0xFF, hsvArray);
+        selectorPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+
+        selectorPaint.setColor(hueHandleColor);
+        canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
+
+        selectorPaint.setColor(selectedColor | 0xFF000000);
+        canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
+
+        // Draw white outlines for the handles.
+        selectorPaint.setColor(SELECTOR_OUTLINE_COLOR);
+        selectorPaint.setStyle(Paint.Style.STROKE);
+        selectorPaint.setStrokeWidth(SELECTOR_STROKE_WIDTH);
+        canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_RADIUS, selectorPaint);
+        canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_RADIUS, selectorPaint);
+
+        // Draw thin dark outlines for the handles at the outer edge of the white outline.
+        selectorPaint.setColor(SELECTOR_EDGE_COLOR);
+        selectorPaint.setStrokeWidth(SELECTOR_EDGE_STROKE_WIDTH);
+        canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_EDGE_RADIUS, selectorPaint);
+        canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_EDGE_RADIUS, selectorPaint);
+    }
+
+    /**
+     * Handles touch events on the view.
+     * This method determines whether the touch event occurred within the hue bar or the saturation-value selector,
+     * updates the corresponding values (hue, saturation, value), and invalidates the view to trigger a redraw.
+     * <p>
+     * In addition to testing if the touch is within the strict rectangles, an expanded hit area (by selectorRadius)
+     * is used so that the draggable handles remain active even when half of the handle is outside the drawn bounds.
+     *
+     * @param event The motion event.
+     * @return True if the event was handled, false otherwise.
+     */
+    @SuppressLint("ClickableViewAccessibility") // performClick is not overridden, but not needed in this case.
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        try {
+            final float x = event.getX();
+            final float y = event.getY();
+            final int action = event.getAction();
+            Logger.printDebug(() -> "onTouchEvent action: " + action + " x: " + x + " y: " + y);
+
+            // Define touch expansion for the hue bar.
+            RectF expandedHueRect = new RectF(
+                    hueRect.left - TOUCH_EXPANSION,
+                    hueRect.top,
+                    hueRect.right + TOUCH_EXPANSION,
+                    hueRect.bottom
+            );
+
+            switch (action) {
+                case MotionEvent.ACTION_DOWN:
+                    // Calculate current handle positions.
+                    final float hueSelectorX = hueRect.centerX();
+                    final float hueSelectorY = hueRect.top + (hue / 360f) * hueRect.height();
+
+                    final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
+                    final float valSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
+
+                    // Create hit areas for both handles.
+                    RectF hueHitRect = new RectF(
+                            hueSelectorX - SELECTOR_RADIUS,
+                            hueSelectorY - SELECTOR_RADIUS,
+                            hueSelectorX + SELECTOR_RADIUS,
+                            hueSelectorY + SELECTOR_RADIUS
+                    );
+                    RectF satValHitRect = new RectF(
+                            satSelectorX - SELECTOR_RADIUS,
+                            valSelectorY - SELECTOR_RADIUS,
+                            satSelectorX + SELECTOR_RADIUS,
+                            valSelectorY + SELECTOR_RADIUS
+                    );
+
+                    // Check if the touch started on a handle or within the expanded hue bar area.
+                    if (hueHitRect.contains(x, y)) {
+                        isDraggingHue = true;
+                        updateHueFromTouch(y);
+                    } else if (satValHitRect.contains(x, y)) {
+                        isDraggingSaturation = true;
+                        updateSaturationValueFromTouch(x, y);
+                    } else if (expandedHueRect.contains(x, y)) {
+                        // Handle touch within the expanded hue bar area.
+                        isDraggingHue = true;
+                        updateHueFromTouch(y);
+                    } else if (saturationValueRect.contains(x, y)) {
+                        isDraggingSaturation = true;
+                        updateSaturationValueFromTouch(x, y);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_MOVE:
+                    // Continue updating values even if touch moves outside the view.
+                    if (isDraggingHue) {
+                        updateHueFromTouch(y);
+                    } else if (isDraggingSaturation) {
+                        updateSaturationValueFromTouch(x, y);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    isDraggingHue = false;
+                    isDraggingSaturation = false;
+                    break;
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "onTouchEvent failure", ex);
+        }
+
+        return true;
+    }
+
+    /**
+     * Updates the hue value based on touch position, clamping to valid range.
+     *
+     * @param y The y-coordinate of the touch position.
+     */
+    private void updateHueFromTouch(float y) {
+        // Clamp y to the hue rectangle bounds.
+        final float clampedY = Utils.clamp(y, hueRect.top, hueRect.bottom);
+        final float updatedHue = ((clampedY - hueRect.top) / hueRect.height()) * 360f;
+        if (hue == updatedHue) {
+            return;
+        }
+
+        hue = updatedHue;
+        updateSaturationValueShader();
+        updateSelectedColor();
+    }
+
+    /**
+     * Updates saturation and value based on touch position, clamping to valid range.
+     *
+     * @param x The x-coordinate of the touch position.
+     * @param y The y-coordinate of the touch position.
+     */
+    private void updateSaturationValueFromTouch(float x, float y) {
+        // Clamp x and y to the saturation-value rectangle bounds.
+        final float clampedX = Utils.clamp(x, saturationValueRect.left, saturationValueRect.right);
+        final float clampedY = Utils.clamp(y, saturationValueRect.top, saturationValueRect.bottom);
+
+        final float updatedSaturation = (clampedX - saturationValueRect.left) / saturationValueRect.width();
+        final float updatedValue = 1 - ((clampedY - saturationValueRect.top) / saturationValueRect.height());
+
+        if (saturation == updatedSaturation && value == updatedValue) {
+            return;
+        }
+        saturation = updatedSaturation;
+        value = updatedValue;
+        updateSelectedColor();
+    }
+
+    /**
+     * Updates the selected color and notifies listeners.
+     */
+    private void updateSelectedColor() {
+        final int updatedColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+
+        if (selectedColor != updatedColor) {
+            selectedColor = updatedColor;
+
+            if (colorChangedListener != null) {
+                colorChangedListener.onColorChanged(updatedColor);
+            }
+        }
+
+        // Must always redraw, otherwise if saturation is pure grey or black
+        // then the hue slider cannot be changed.
+        invalidate();
+    }
+
+    /**
+     * Sets the currently selected color.
+     *
+     * @param color The color to set in either ARGB or RGB format.
+     */
+    public void setColor(@ColorInt int color) {
+        color &= 0x00FFFFFF;
+        if (selectedColor == color) {
+            return;
+        }
+
+        // Update the selected color.
+        selectedColor = color;
+        Logger.printDebug(() -> "setColor: " + getColorString(selectedColor));
+
+        // Convert the ARGB color to HSV values.
+        float[] hsv = new float[3];
+        Color.colorToHSV(color, hsv);
+
+        // Update the hue, saturation, and value.
+        hue = hsv[0];
+        saturation = hsv[1];
+        value = hsv[2];
+
+        // Update the saturation-value shader based on the new hue.
+        updateSaturationValueShader();
+
+        // Notify the listener if it's set.
+        if (colorChangedListener != null) {
+            colorChangedListener.onColorChanged(selectedColor);
+        }
+
+        // Invalidate the view to trigger a redraw.
+        invalidate();
+    }
+
+    /**
+     * Gets the currently selected color.
+     *
+     * @return The selected color in RGB format with no alpha channel.
+     */
+    @ColorInt
+    public int getColor() {
+        return selectedColor;
+    }
+
+    /**
+     * Sets the listener to be notified when the selected color changes.
+     *
+     * @param listener The listener to set.
+     */
+    public void setOnColorChangedListener(OnColorChangedListener listener) {
+        colorChangedListener = listener;
+    }
+}

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

@@ -70,7 +70,7 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
 
             // Show the user the settings in JSON format.
             builder.setNeutralButton(str("revanced_settings_import_copy"), (dialog, which) -> {
-                Utils.setClipboard(getEditText().getText().toString());
+                Utils.setClipboard(getEditText().getText());
             }).setPositiveButton(str("revanced_settings_import"), (dialog, which) -> {
                 importSettings(builder.getContext(), getEditText().getText().toString());
             });

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

@@ -0,0 +1,113 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import java.util.Deque;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
+
+/**
+ * Manages a buffer for storing debug logs from {@link Logger}.
+ * Stores just under 1MB of the most recent log data.
+ *
+ * All methods are thread-safe.
+ */
+public final class LogBufferManager {
+    /** Maximum byte size of all buffer entries. Must be less than Android's 1 MB Binder transaction limit. */
+    private static final int BUFFER_MAX_BYTES = 900_000;
+    /** Limit number of log lines. */
+    private static final int BUFFER_MAX_SIZE = 10_000;
+
+    private static final Deque<String> logBuffer = new ConcurrentLinkedDeque<>();
+    private static final AtomicInteger logBufferByteSize = new AtomicInteger();
+
+    /**
+     * Appends a log message to the internal buffer if debugging is enabled.
+     * The buffer is limited to approximately {@link #BUFFER_MAX_BYTES} or {@link #BUFFER_MAX_SIZE}
+     * to prevent excessive memory usage.
+     *
+     * @param message The log message to append.
+     */
+    public static void appendToLogBuffer(String message) {
+        Objects.requireNonNull(message);
+
+        // It's very important that no Settings are used in this method,
+        // as this code is used when a context is not set and thus referencing
+        // a setting will crash the app.
+        logBuffer.addLast(message);
+        int newSize = logBufferByteSize.addAndGet(message.length());
+
+        // Remove oldest entries if over the log size limits.
+        while (newSize > BUFFER_MAX_BYTES || logBuffer.size() > BUFFER_MAX_SIZE) {
+            String removed = logBuffer.pollFirst();
+            if (removed == null) {
+                // Thread race of two different calls to this method, and the other thread won.
+                return;
+            }
+
+            newSize = logBufferByteSize.addAndGet(-removed.length());
+        }
+    }
+
+    /**
+     * Exports all logs from the internal buffer to the clipboard.
+     * Displays a toast with the result.
+     */
+    public static void exportToClipboard() {
+        try {
+            if (!BaseSettings.DEBUG.get()) {
+                Utils.showToastShort(str("revanced_debug_logs_disabled"));
+                return;
+            }
+
+            if (logBuffer.isEmpty()) {
+                Utils.showToastShort(str("revanced_debug_logs_none_found"));
+                clearLogBufferData(); // Clear toast log entry that was just created.
+                return;
+            }
+
+            // Most (but not all) Android 13+ devices always show a "copied to clipboard" toast
+            // and there is no way to programmatically detect if a toast will show or not.
+            // Show a toast even if using Android 13+, but show ReVanced toast first (before copying to clipboard).
+            Utils.showToastShort(str("revanced_debug_logs_copied_to_clipboard"));
+
+            Utils.setClipboard(String.join("\n", logBuffer));
+        } catch (Exception ex) {
+            // Handle security exception if clipboard access is denied.
+            String errorMessage = String.format(str("revanced_debug_logs_failed_to_export"), ex.getMessage());
+            Utils.showToastLong(errorMessage);
+            Logger.printDebug(() -> errorMessage, ex);
+        }
+    }
+
+    private static void clearLogBufferData() {
+        // Cannot simply clear the log buffer because there is no
+        // write lock for both the deque and the atomic int.
+        // Instead pop off log entries and decrement the size one by one.
+        while (!logBuffer.isEmpty()) {
+            String removed = logBuffer.pollFirst();
+            if (removed != null) {
+                logBufferByteSize.addAndGet(-removed.length());
+            }
+        }
+    }
+
+    /**
+     * Clears the internal log buffer and displays a toast with the result.
+     */
+    public static void clearLogBuffer() {
+        if (!BaseSettings.DEBUG.get()) {
+            Utils.showToastShort(str("revanced_debug_logs_disabled"));
+            return;
+        }
+
+        // Show toast before clearing, otherwise toast log will still remain.
+        Utils.showToastShort(str("revanced_debug_logs_clear_toast"));
+        clearLogBufferData();
+    }
+}

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

@@ -8,7 +8,6 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
@@ -54,7 +53,7 @@ public class ReVancedAboutPreference extends Preference {
     }
 
     protected boolean isDarkModeEnabled() {
-        return Utils.isDarkModeEnabled(getContext());
+        return Utils.isDarkModeEnabled();
     }
 
     /**

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

@@ -6,9 +6,8 @@ import android.util.AttributeSet;
 import android.util.Pair;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
 
 import app.revanced.extension.shared.Utils;
 
@@ -46,17 +45,25 @@ public class SortedListPreference extends ListPreference {
         }
 
         List<Pair<CharSequence, CharSequence>> firstEntries = new ArrayList<>(firstEntriesToPreserve);
-        SortedMap<String, Pair<CharSequence, CharSequence>> lastEntries = new TreeMap<>();
+
+        // Android does not have a triple class like Kotlin, So instead use a nested pair.
+        // Cannot easily use a SortedMap, because if two entries incorrectly have
+        // identical names then the duplicates entries are not preserved.
+        List<Pair<String, Pair<CharSequence, CharSequence>>> lastEntries = new ArrayList<>();
 
         for (int i = 0; i < entrySize; i++) {
             Pair<CharSequence, CharSequence> pair = new Pair<>(entries[i], entryValues[i]);
             if (i < firstEntriesToPreserve) {
                 firstEntries.add(pair);
             } else {
-                lastEntries.put(Utils.removePunctuationToLowercase(pair.first), pair);
+                lastEntries.add(new Pair<>(Utils.removePunctuationToLowercase(pair.first), pair));
             }
         }
 
+        //noinspection ComparatorCombinators
+        Collections.sort(lastEntries, (pair1, pair2)
+                -> pair1.first.compareTo(pair2.first));
+
         CharSequence[] sortedEntries = new CharSequence[entrySize];
         CharSequence[] sortedEntryValues = new CharSequence[entrySize];
 
@@ -67,9 +74,10 @@ public class SortedListPreference extends ListPreference {
             i++;
         }
 
-        for (Pair<CharSequence, CharSequence> pair : lastEntries.values()) {
-            sortedEntries[i] = pair.first;
-            sortedEntryValues[i] = pair.second;
+        for (Pair<String, Pair<CharSequence, CharSequence>> outer : lastEntries) {
+            Pair<CharSequence, CharSequence> inner = outer.second;
+            sortedEntries[i] = inner.first;
+            sortedEntryValues[i] = inner.second;
             i++;
         }
 

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

@@ -2,7 +2,6 @@ package app.revanced.extension.tiktok;
 
 import static app.revanced.extension.shared.Utils.isDarkModeEnabled;
 
-import android.content.Context;
 import android.graphics.Color;
 import android.view.View;
 import android.widget.TextView;
@@ -43,8 +42,8 @@ public class Utils {
     private static final @ColorInt int TEXT_LIGHT_MODE_SUMMARY
             = Color.argb(255, 80, 80, 80);
 
-    public static void setTitleAndSummaryColor(Context context, View view) {
-        final boolean darkModeEnabled = isDarkModeEnabled(context);
+    public static void setTitleAndSummaryColor(View view) {
+        final boolean darkModeEnabled = isDarkModeEnabled();
 
         TextView title = view.findViewById(android.R.id.title);
         title.setTextColor(darkModeEnabled

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

@@ -101,7 +101,7 @@ public class DownloadPathPreference extends DialogPreference {
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        Utils.setTitleAndSummaryColor(getContext(), view);
+        Utils.setTitleAndSummaryColor(view);
     }
 
     @Override

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

@@ -22,6 +22,6 @@ public class InputTextPreference extends EditTextPreference {
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        Utils.setTitleAndSummaryColor(getContext(), view);
+        Utils.setTitleAndSummaryColor(view);
     }
 }

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

@@ -127,7 +127,7 @@ public class RangeValuePreference extends DialogPreference {
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        Utils.setTitleAndSummaryColor(getContext(), view);
+        Utils.setTitleAndSummaryColor(view);
     }
 
     @Override

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

@@ -48,6 +48,6 @@ public class ReVancedTikTokAboutPreference extends ReVancedAboutPreference {
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        Utils.setTitleAndSummaryColor(getContext(), view);
+        Utils.setTitleAndSummaryColor(view);
     }
 }

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

@@ -22,6 +22,6 @@ public class TogglePreference extends SwitchPreference {
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        Utils.setTitleAndSummaryColor(getContext(), view);
+        Utils.setTitleAndSummaryColor(view);
     }
 }

extensions/tiktok/src/main/java/app/revanced/extension/tiktok/spoof/sim/SpoofSimPatch.java

@@ -16,9 +16,7 @@ public class SpoofSimPatch {
             return false;
         }
 
-        Logger.initializationException(SpoofSimPatch.class,
-                "Context is not yet set, cannot spoof: " + fieldSpoofed, null);
-
+        Logger.initializationException(() -> "Context is not yet set, cannot spoof: " + fieldSpoofed, null);
         return true;
     }
 

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

@@ -0,0 +1,35 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class DisableHapticFeedbackPatch {
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableChapterVibrate() {
+        return Settings.DISABLE_HAPTIC_FEEDBACK_CHAPTERS.get();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableSeekUndoVibrate() {
+        return Settings.DISABLE_HAPTIC_FEEDBACK_SEEK_UNDO.get();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disablePreciseSeekingVibrate() {
+        return Settings.DISABLE_HAPTIC_FEEDBACK_PRECISE_SEEKING.get();
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableZoomVibrate() {
+        return Settings.DISABLE_HAPTIC_FEEDBACK_ZOOM.get();
+    }
+}

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

@@ -95,7 +95,7 @@ public final class NavigationButtonsPatch {
             return false;
         }
 
-        return Utils.isDarkModeEnabled(Utils.getContext())
+        return Utils.isDarkModeEnabled()
                 ? !DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK
                 : !DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT;
     }

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

@@ -31,6 +31,8 @@ public class OpenShortsInRegularPlayerPatch {
 
     private static WeakReference<Activity> mainActivityRef = new WeakReference<>(null);
 
+    private static volatile boolean overrideBackPressToExit;
+
     /**
      * Injection point.
      */
@@ -38,6 +40,18 @@ public class OpenShortsInRegularPlayerPatch {
         mainActivityRef = new WeakReference<>(activity);
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean overrideBackPressToExit(boolean original) {
+        if (overrideBackPressToExit) {
+            Logger.printDebug(() -> "Overriding back press to exit activity");
+            return false;
+        }
+
+        return original;
+    }
+
     /**
      * Injection point.
      */
@@ -45,6 +59,7 @@ public class OpenShortsInRegularPlayerPatch {
         try {
             ShortsPlayerType type = Settings.SHORTS_PLAYER_TYPE.get();
             if (type == ShortsPlayerType.SHORTS_PLAYER) {
+                overrideBackPressToExit = false;
                 return false; // Default unpatched behavior.
             }
 
@@ -61,13 +76,17 @@ public class OpenShortsInRegularPlayerPatch {
                 // set to open in the regular player, so it's ignored as
                 // checking the map makes the patch more complicated.
                 Logger.printDebug(() -> "Ignoring Short with no videoId");
+                overrideBackPressToExit = false;
                 return false;
             }
             
             if (NavigationButton.getSelectedNavigationButton() == NavigationButton.SHORTS) {
+                overrideBackPressToExit = false;
                 return false; // Always use Shorts player for the Shorts nav button.
             }
 
+            overrideBackPressToExit = true;
+
             final boolean forceFullScreen = (type == ShortsPlayerType.REGULAR_PLAYER_FULLSCREEN);
             OpenVideosFullscreenHookPatch.setOpenNextVideoFullscreen(forceFullScreen);
 

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

@@ -33,7 +33,7 @@ public class OpenVideosFullscreenHookPatch {
         }
 
         if (!isFullScreenPatchIncluded()) {
-            return false;
+            return original;
         }
 
         return Settings.OPEN_VIDEOS_FULLSCREEN_PORTRAIT.get();

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

@@ -152,11 +152,15 @@ public class ReturnYouTubeDislikePatch {
                 return original; // No need to check for Shorts in the context.
             }
 
-            if (conversionContextString.contains("|shorts_dislike_button.eml")) {
+            if (Utils.containsAny(conversionContextString,
+                    "|shorts_dislike_button.eml", "|reel_dislike_button.eml"
+            )) {
                 return getShortsSpan(original, true);
             }
 
-            if (conversionContextString.contains("|shorts_like_button.eml")) {
+            if (Utils.containsAny(conversionContextString,
+                    "|shorts_like_button.eml", "|reel_like_button.eml"
+            )) {
                 if (!Utils.containsNumber(original)) {
                     Logger.printDebug(() -> "Replacing hidden likes count");
                     return getShortsSpan(original, false);

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches;
 
-import android.content.res.Resources;
-import android.util.TypedValue;
 import android.view.View;
 
 import app.revanced.extension.shared.Logger;
@@ -33,8 +31,7 @@ public final class WideSearchbarPatch {
             final int paddingRight = searchBarView.getPaddingRight();
             final int paddingTop = searchBarView.getPaddingTop();
             final int paddingBottom = searchBarView.getPaddingBottom();
-            final int paddingStart = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                    8, Resources.getSystem().getDisplayMetrics());
+            final int paddingStart = Utils.dipToPixels(8);
 
             if (Utils.isRightToLeftLocale()) {
                 searchBarView.setPadding(paddingLeft, paddingTop, paddingStart, paddingBottom);

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

@@ -1,10 +0,0 @@
-package app.revanced.extension.youtube.patches;
-
-import app.revanced.extension.youtube.settings.Settings;
-
-@SuppressWarnings("unused")
-public class ZoomHapticsPatch {
-    public static boolean shouldVibrate() {
-        return !Settings.DISABLE_ZOOM_HAPTICS.get();
-    }
-}

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

@@ -64,48 +64,45 @@ public final class AdsFilter extends Filter {
                 "_interstitial"
         );
 
-        final var buttonedAd = new StringFilterGroup(
-                Settings.HIDE_BUTTONED_ADS,
-                "_ad_with",
-                "_buttoned_layout",
-                // text_image_button_group_layout, landscape_image_button_group_layout, full_width_square_image_button_group_layout
-                "image_button_group_layout",
-                "full_width_square_image_layout",
-                "video_display_button_group_layout",
-                "landscape_image_wide_button_layout",
-                "video_display_carousel_button_group_layout",
-                "video_display_full_buttoned_short_dr_layout",
-                "compact_landscape_image_layout", // Tablet layout search results.
-                "text_image_no_button_layout" // Tablet layout search results.
-        );
-
         final var generalAds = new StringFilterGroup(
                 Settings.HIDE_GENERAL_ADS,
+                "_ad_with",
+                "_buttoned_layout",
                 "ads_video_with_context",
                 "banner_text_icon",
-                "square_image_layout",
-                "watch_metadata_app_promo",
-                "video_display_full_layout",
-                "hero_promo_image",
-                "statement_banner",
+                "brand_video_shelf",
+                "brand_video_singleton",
                 "carousel_footered_layout",
-                "text_image_button_layout",
+                "carousel_headered_layout",
+                "compact_landscape_image_layout", // Tablet layout search results.
+                "composite_concurrent_carousel_layout",
+                "full_width_portrait_image_layout",
+                "full_width_square_image_carousel_layout",
+                "full_width_square_image_layout",
+                "hero_promo_image",
+                // text_image_button_group_layout, landscape_image_button_group_layout, full_width_square_image_button_group_layout
+                "image_button_group_layout",
+                "landscape_image_wide_button_layout",
                 "primetime_promo",
                 "product_details",
-                "composite_concurrent_carousel_layout",
-                "carousel_headered_layout",
-                "full_width_portrait_image_layout",
-                "brand_video_shelf",
-                "brand_video_singleton"
+                "square_image_layout",
+                "statement_banner",
+                "text_image_button_layout",
+                "text_image_no_button_layout", // Tablet layout search results.
+                "video_display_button_group_layout",
+                "video_display_carousel_button_group_layout",
+                "video_display_full_buttoned_short_dr_layout",
+                "video_display_full_layout",
+                "watch_metadata_app_promo"
         );
 
         final var movieAds = new StringFilterGroup(
                 Settings.HIDE_MOVIES_SECTION,
                 "browsy_bar",
                 "compact_movie",
+                "compact_tvfilm_item",
                 "horizontal_movie_shelf",
                 "movie_and_show_upsell_card",
-                "compact_tvfilm_item",
                 "offer_module_root"
         );
 
@@ -160,7 +157,6 @@ public final class AdsFilter extends Filter {
 
         addPathCallbacks(
                 generalAds,
-                buttonedAd,
                 merchandise,
                 viewProducts,
                 selfSponsor,
@@ -181,17 +177,19 @@ public final class AdsFilter extends Filter {
         }
 
         // Check for the index because of likelihood of false positives.
-        if (matchedGroup == shoppingLinks && contentIndex != 0) {
+        if (contentIndex != 0 && matchedGroup == shoppingLinks) {
             return false;
         }
 
-        if (exceptions.matches(path))
+        if (exceptions.matches(path)) {
             return false;
+        }
 
         if (matchedGroup == fullscreenAd) {
             if (path.contains("|ImageType|")) closeFullscreenAd();
 
-            return false; // Do not actually filter the fullscreen ad otherwise it will leave a dimmed screen.
+            // Do not actually filter the fullscreen ad otherwise it will leave a dimmed screen.
+            return false;
         }
 
         if (matchedGroup == channelProfile) {

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

@@ -143,12 +143,14 @@ public final class ShortsFilter extends Filter {
 
         StringFilterGroup likeButton = new StringFilterGroup(
                 Settings.HIDE_SHORTS_LIKE_BUTTON,
-                "shorts_like_button.eml"
+                "shorts_like_button.eml",
+                "reel_like_button.eml"
         );
 
         StringFilterGroup dislikeButton = new StringFilterGroup(
                 Settings.HIDE_SHORTS_DISLIKE_BUTTON,
-                "shorts_dislike_button.eml"
+                "shorts_dislike_button.eml",
+                "reel_dislike_button.eml"
         );
 
         joinButton = new StringFilterGroup(
@@ -168,12 +170,13 @@ public final class ShortsFilter extends Filter {
 
         shortsActionBar = new StringFilterGroup(
                 null,
-                "shorts_action_bar.eml"
+                "shorts_action_bar.eml",
+                "reel_action_bar.eml"
         );
 
         actionButton = new StringFilterGroup(
                 null,
-                // Can be simply 'button.eml' or 'shorts_video_action_button.eml'
+                // Can be simply 'button.eml', 'shorts_video_action_button.eml' or 'reel_action_button.eml'
                 "button.eml"
         );
 
@@ -195,15 +198,18 @@ public final class ShortsFilter extends Filter {
         videoActionButtonGroupList.addAll(
                 new ByteArrayFilterGroup(
                         Settings.HIDE_SHORTS_COMMENTS_BUTTON,
-                        "reel_comment_button"
+                        "reel_comment_button",
+                        "youtube_shorts_comment_outline"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_SHORTS_SHARE_BUTTON,
-                        "reel_share_button"
+                        "reel_share_button",
+                        "youtube_shorts_share_outline"
                 ),
                 new ByteArrayFilterGroup(
                         Settings.HIDE_SHORTS_REMIX_BUTTON,
-                        "reel_remix_button"
+                        "reel_remix_button",
+                        "youtube_shorts_remix_outline"
                 )
         );
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/ProgressBarDrawable.java

@@ -20,13 +20,16 @@ import app.revanced.extension.youtube.settings.Settings;
 public class ProgressBarDrawable extends Drawable {
 
     private final Paint paint = new Paint();
+    {
+        paint.setColor(SeekbarColorPatch.getSeekbarColor());
+    }
 
     @Override
     public void draw(@NonNull Canvas canvas) {
         if (Settings.HIDE_SEEKBAR_THUMBNAIL.get()) {
             return;
         }
-        paint.setColor(SeekbarColorPatch.getSeekbarColor());
+
         canvas.drawRect(getBounds(), paint);
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/theme/SeekbarColorPatch.java

@@ -179,7 +179,7 @@ public final class SeekbarColorPatch {
             //noinspection ConstantConditions
             if (false) { // Set true to force slow animation for development.
                 final int longAnimation = Utils.getResourceIdentifier(
-                        Utils.isDarkModeEnabled(Utils.getContext())
+                        Utils.isDarkModeEnabled()
                                 ? "startup_animation_5s_30fps_dark"
                                 : "startup_animation_5s_30fps_light",
                         "raw");

extensions/youtube/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/ReturnYouTubeDislike.java

@@ -21,8 +21,6 @@ import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
 import android.text.style.ReplacementSpan;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
 
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
@@ -120,16 +118,13 @@ public class ReturnYouTubeDislike {
     private static final ShapeDrawable leftSeparatorShape;
 
     static {
-        DisplayMetrics dp = Objects.requireNonNull(Utils.getContext()).getResources().getDisplayMetrics();
-
         leftSeparatorBounds = new Rect(0, 0,
-                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1.2f, dp),
-                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14, dp));
-        final int middleSeparatorSize =
-                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3.7f, dp);
+                Utils.dipToPixels(1.2f),
+                Utils.dipToPixels(14f));
+        final int middleSeparatorSize = Utils.dipToPixels(3.7f);
         middleSeparatorBounds = new Rect(0, 0, middleSeparatorSize, middleSeparatorSize);
 
-        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8.4f, dp);
+        leftSeparatorShapePaddingPixels = Utils.dipToPixels(8.4f);
 
         leftSeparatorShape = new ShapeDrawable(new RectShape());
         leftSeparatorShape.setBounds(leftSeparatorBounds);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/LicenseActivityHook.java

@@ -6,7 +6,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.preference.PreferenceFragment;
-import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toolbar;
@@ -119,8 +118,7 @@ public class LicenseActivityHook {
         toolbar.setNavigationIcon(ReVancedPreferenceFragment.getBackButtonDrawable());
         toolbar.setTitle(getResourceIdentifier("revanced_settings_title", "string"));
 
-        final int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16,
-                Utils.getContext().getResources().getDisplayMetrics());
+        final int margin = Utils.dipToPixels(16);
         toolbar.setTitleMarginStart(margin);
         toolbar.setTitleMarginEnd(margin);
         TextView toolbarTextView = Utils.getChildView(toolbar, false,

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

@@ -68,7 +68,6 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", FALSE, new ForceOriginalAudioAvailability());
 
     // Ads
-    public static final BooleanSetting HIDE_BUTTONED_ADS = new BooleanSetting("revanced_hide_buttoned_ads", TRUE);
     public static final BooleanSetting HIDE_END_SCREEN_STORE_BANNER = new BooleanSetting("revanced_hide_end_screen_store_banner", TRUE, true);
     public static final BooleanSetting HIDE_FULLSCREEN_ADS = new BooleanSetting("revanced_hide_fullscreen_ads", TRUE);
     public static final BooleanSetting HIDE_GENERAL_ADS = new BooleanSetting("revanced_hide_general_ads", TRUE);
@@ -310,16 +309,16 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting AUTO_REPEAT = new BooleanSetting("revanced_auto_repeat", FALSE);
     public static final BooleanSetting BYPASS_URL_REDIRECTS = new BooleanSetting("revanced_bypass_url_redirects", TRUE);
     public static final BooleanSetting CHECK_WATCH_HISTORY_DOMAIN_NAME = new BooleanSetting("revanced_check_watch_history_domain_name", TRUE, false, false);
-    public static final BooleanSetting DISABLE_ZOOM_HAPTICS = new BooleanSetting("revanced_disable_zoom_haptics", TRUE);
+    public static final BooleanSetting DISABLE_HAPTIC_FEEDBACK_CHAPTERS = new BooleanSetting("revanced_disable_haptic_feedback_chapters", FALSE);
+    public static final BooleanSetting DISABLE_HAPTIC_FEEDBACK_PRECISE_SEEKING = new BooleanSetting("revanced_disable_haptic_feedback_precise_seeking", FALSE);
+    public static final BooleanSetting DISABLE_HAPTIC_FEEDBACK_SEEK_UNDO = new BooleanSetting("revanced_disable_haptic_feedback_seek_undo", FALSE);
+    public static final BooleanSetting DISABLE_HAPTIC_FEEDBACK_ZOOM = new BooleanSetting("revanced_disable_haptic_feedback_zoom", FALSE);
     public static final BooleanSetting EXTERNAL_BROWSER = new BooleanSetting("revanced_external_browser", TRUE, true);
     public static final BooleanSetting REMOVE_TRACKING_QUERY_PARAMETER = new BooleanSetting("revanced_remove_tracking_query_parameter", TRUE);
     public static final BooleanSetting SPOOF_DEVICE_DIMENSIONS = new BooleanSetting("revanced_spoof_device_dimensions", FALSE, true,
             "revanced_spoof_device_dimensions_user_dialog_message");
-    /**
-     * When enabled, share the debug logs with care.
-     * The buffer contains select user data, including the client ip address and information that could identify the end user.
-     */
-    public static final BooleanSetting DEBUG_PROTOBUFFER = new BooleanSetting("revanced_debug_protobuffer", FALSE, parent(BaseSettings.DEBUG));
+    public static final BooleanSetting DEBUG_PROTOBUFFER = new BooleanSetting("revanced_debug_protobuffer", FALSE, false,
+            "revanced_debug_protobuffer_user_dialog_message", parent(BaseSettings.DEBUG));
 
     // Swipe controls
     public static final BooleanSetting SWIPE_CHANGE_VIDEO = new BooleanSetting("revanced_swipe_change_video", FALSE, true);
@@ -338,13 +337,17 @@ public class Settings extends BaseSettings {
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
     public static final IntegerSetting SWIPE_OVERLAY_OPACITY = new IntegerSetting("revanced_swipe_overlay_background_opacity", 60, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-    public static final StringSetting SWIPE_OVERLAY_PROGRESS_COLOR = new StringSetting("revanced_swipe_overlay_progress_color", "#FFFFFF", true,
-            parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
+    public static final StringSetting SWIPE_OVERLAY_BRIGHTNESS_COLOR = new StringSetting("revanced_swipe_overlay_progress_brightness_color", "#FFFFFF", true,
+            parent(SWIPE_BRIGHTNESS));
+    public static final StringSetting SWIPE_OVERLAY_VOLUME_COLOR = new StringSetting("revanced_swipe_overlay_progress_volume_color", "#FFFFFF", true,
+            parent(SWIPE_VOLUME));
     public static final LongSetting SWIPE_OVERLAY_TIMEOUT = new LongSetting("revanced_swipe_overlay_timeout", 500L, true,
             parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-    public static final BooleanSetting SWIPE_SAVE_AND_RESTORE_BRIGHTNESS = new BooleanSetting("revanced_swipe_save_and_restore_brightness", TRUE, true, parent(SWIPE_BRIGHTNESS));
+    public static final BooleanSetting SWIPE_SAVE_AND_RESTORE_BRIGHTNESS = new BooleanSetting("revanced_swipe_save_and_restore_brightness", TRUE, true,
+            parent(SWIPE_BRIGHTNESS));
     public static final FloatSetting SWIPE_BRIGHTNESS_VALUE = new FloatSetting("revanced_swipe_brightness_value", -1f);
-    public static final BooleanSetting SWIPE_LOWEST_VALUE_ENABLE_AUTO_BRIGHTNESS = new BooleanSetting("revanced_swipe_lowest_value_enable_auto_brightness", FALSE, true, parent(SWIPE_BRIGHTNESS));
+    public static final BooleanSetting SWIPE_LOWEST_VALUE_ENABLE_AUTO_BRIGHTNESS = new BooleanSetting("revanced_swipe_lowest_value_enable_auto_brightness", FALSE, true,
+            parent(SWIPE_BRIGHTNESS));
 
     // ReturnYoutubeDislike
     public static final BooleanSetting RYD_ENABLED = new BooleanSetting("revanced_ryd_enabled", TRUE);

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ClearLogBufferPreference.java

@@ -0,0 +1,34 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.preference.Preference;
+import app.revanced.extension.shared.settings.preference.LogBufferManager;
+
+/**
+ * A custom preference that clears the ReVanced debug log buffer when clicked.
+ * Invokes the {@link LogBufferManager#clearLogBuffer} method.
+ */
+@SuppressWarnings("unused")
+public class ClearLogBufferPreference extends Preference {
+
+    {
+        setOnPreferenceClickListener(pref -> {
+            LogBufferManager.clearLogBuffer();
+            return true;
+        });
+    }
+
+    public ClearLogBufferPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public ClearLogBufferPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public ClearLogBufferPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public ClearLogBufferPreference(Context context) {
+        super(context);
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ExportLogToClipboardPreference.java

@@ -0,0 +1,34 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.preference.Preference;
+import app.revanced.extension.shared.settings.preference.LogBufferManager;
+
+/**
+ * A custom preference that triggers exporting ReVanced debug logs to the clipboard when clicked.
+ * Invokes the {@link LogBufferManager#exportToClipboard} method.
+ */
+@SuppressWarnings({"deprecation", "unused"})
+public class ExportLogToClipboardPreference extends Preference {
+
+    {
+        setOnPreferenceClickListener(pref -> {
+            LogBufferManager.exportToClipboard();
+            return true;
+        });
+    }
+
+    public ExportLogToClipboardPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public ExportLogToClipboardPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public ExportLogToClipboardPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public ExportLogToClipboardPreference(Context context) {
+        super(context);
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/ReVancedPreferenceFragment.java

@@ -17,7 +17,6 @@ import android.preference.SwitchPreference;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.BackgroundColorSpan;
-import android.util.TypedValue;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.TextView;
@@ -245,9 +244,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                             toolbar.setNavigationIcon(getBackButtonDrawable());
                             toolbar.setNavigationOnClickListener(view -> preferenceScreenDialog.dismiss());
 
-                            final int margin = (int) TypedValue.applyDimension(
-                                    TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics()
-                            );
+                            final int margin = Utils.dipToPixels(16);
                             toolbar.setTitleMargin(margin, 0, margin, 0);
 
                             TextView toolbarTextView = Utils.getChildView(toolbar,

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/SegmentPlaybackController.java

@@ -5,7 +5,6 @@ import static app.revanced.extension.shared.StringRef.str;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.text.TextUtils;
-import android.util.TypedValue;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -727,15 +726,11 @@ public class SegmentPlaybackController {
         }
     }
 
-    private static int highlightSegmentTimeBarScreenWidth = -1; // actual pixel width to use
-    private static int getHighlightSegmentTimeBarScreenWidth() {
-        if (highlightSegmentTimeBarScreenWidth == -1) {
-            highlightSegmentTimeBarScreenWidth = (int) TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP, HIGHLIGHT_SEGMENT_DRAW_BAR_WIDTH,
-                    Objects.requireNonNull(Utils.getContext()).getResources().getDisplayMetrics());
-        }
-        return highlightSegmentTimeBarScreenWidth;
-    }
+    /**
+     * Actual screen pixel width to use for the highlight segment time bar.
+     */
+    private static final int highlightSegmentTimeBarScreenWidth
+            = Utils.dipToPixels(HIGHLIGHT_SEGMENT_DRAW_BAR_WIDTH);
 
     /**
      * Injection point.
@@ -757,7 +752,7 @@ public class SegmentPlaybackController {
                 final float left = leftPadding + segment.start * videoMillisecondsToPixels;
                 final float right;
                 if (segment.category == SegmentCategory.HIGHLIGHT) {
-                    right = left + getHighlightSegmentTimeBarScreenWidth();
+                    right = left + highlightSegmentTimeBarScreenWidth;
                 } else {
                      right = leftPadding + segment.end * videoMillisecondsToPixels;
                 }

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategory.java

@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
 import static app.revanced.extension.shared.StringRef.sf;
+import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.COLOR_DOT_STRING;
 import static app.revanced.extension.youtube.settings.Settings.*;
 
 import android.graphics.Color;
@@ -9,7 +10,9 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -134,7 +137,8 @@ public enum SegmentCategory {
         updateEnabledCategories();
     }
 
-    public static int applyOpacityToColor(int color, float opacity) {
+    @ColorInt
+    public static int applyOpacityToColor(@ColorInt int color, float opacity) {
         if (opacity < 0 || opacity > 1.0f) {
             throw new IllegalArgumentException("Invalid opacity: " + opacity);
         }
@@ -165,29 +169,28 @@ public enum SegmentCategory {
     /**
      * Skipped segment toast, if the skip occurred in the first quarter of the video
      */
-    @NonNull
     public final StringRef skippedToastBeginning;
     /**
      * Skipped segment toast, if the skip occurred in the middle half of the video
      */
-    @NonNull
     public final StringRef skippedToastMiddle;
     /**
      * Skipped segment toast, if the skip occurred in the last quarter of the video
      */
-    @NonNull
     public final StringRef skippedToastEnd;
 
-    @NonNull
     public final Paint paint;
 
+    /**
+     * Category color with opacity applied.
+     */
+    @ColorInt
     private int color;
 
     /**
      * Value must be changed using {@link #setBehaviour(CategoryBehaviour)}.
      * Caller must also {@link #updateEnabledCategories()}.
      */
-    @NonNull
     public CategoryBehaviour behaviour = CategoryBehaviour.IGNORE;
 
     SegmentCategory(String keyValue, StringRef title, StringRef description,
@@ -247,7 +250,7 @@ public enum SegmentCategory {
         }
     }
 
-    public void setBehaviour(@NonNull CategoryBehaviour behaviour) {
+    public void setBehaviour(CategoryBehaviour behaviour) {
         this.behaviour = Objects.requireNonNull(behaviour);
         this.behaviorSetting.save(behaviour.reVancedKeyValue);
     }
@@ -273,6 +276,10 @@ public enum SegmentCategory {
         return opacitySetting.get();
     }
 
+    public float getOpacityDefault() {
+        return opacitySetting.defaultValue;
+    }
+
     public void resetColorAndOpacity() {
         setColor(colorSetting.defaultValue);
         setOpacity(opacitySetting.defaultValue);
@@ -291,10 +298,19 @@ public enum SegmentCategory {
     /**
      * @return Integer color of #RRGGBB format.
      */
+    @ColorInt
     public int getColorNoOpacity() {
         return color & 0x00FFFFFF;
     }
 
+    /**
+     * @return Integer color of #RRGGBB format.
+     */
+    @ColorInt
+    public int getColorNoOpacityDefault() {
+        return Color.parseColor(colorSetting.defaultValue) & 0x00FFFFFF;
+    }
+
     /**
      * @return Hex color string of #RRGGBB format with no opacity level.
      */
@@ -302,22 +318,27 @@ public enum SegmentCategory {
         return String.format(Locale.US, "#%06X", getColorNoOpacity());
     }
 
-    private static SpannableString getCategoryColorDotSpan(String text, int color) {
-        SpannableString dotSpan = new SpannableString('⬤' + text);
+    private static SpannableString getCategoryColorDotSpan(String text, @ColorInt int color) {
+        SpannableString dotSpan = new SpannableString(COLOR_DOT_STRING + text);
         dotSpan.setSpan(new ForegroundColorSpan(color), 0, 1,
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         return dotSpan;
     }
 
-    public static SpannableString getCategoryColorDot(int color) {
-        return getCategoryColorDotSpan("", color);
+    public static SpannableString getCategoryColorDot(@ColorInt int color) {
+        SpannableString dotSpan = new SpannableString(COLOR_DOT_STRING);
+        dotSpan.setSpan(new ForegroundColorSpan(color), 0, 1,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        dotSpan.setSpan(new RelativeSizeSpan(1.5f), 0, 1,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return dotSpan;
     }
 
     public SpannableString getCategoryColorDot() {
         return getCategoryColorDot(color);
     }
 
-    public SpannableString getTitleWithColorDot(int categoryColor) {
+    public SpannableString getTitleWithColorDot(@ColorInt int categoryColor) {
         return getCategoryColorDotSpan(" " + title, categoryColor);
     }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/objects/SegmentCategoryListPreference.java

@@ -1,35 +1,46 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.getColorString;
 import static app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory.applyOpacityToColor;
 
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
 import android.preference.ListPreference;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.GridLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+
 import java.util.Locale;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.ColorPickerView;
 
 @SuppressWarnings("deprecation")
 public class SegmentCategoryListPreference extends ListPreference {
     private final SegmentCategory category;
-    private TextView colorDotView;
-    private EditText colorEditText;
-    private EditText opacityEditText;
+
     /**
-     * #RRGGBB
+     * RGB format (no alpha).
      */
+    @ColorInt
     private int categoryColor;
     /**
      * [0, 1]
@@ -37,6 +48,11 @@ public class SegmentCategoryListPreference extends ListPreference {
     private float categoryOpacity;
     private int selectedDialogEntryIndex;
 
+    private TextView dialogColorDotView;
+    private EditText dialogColorEditText;
+    private EditText dialogOpacityEditText;
+    private ColorPickerView dialogColorPickerView;
+
     public SegmentCategoryListPreference(Context context, SegmentCategory category) {
         super(context);
         this.category = Objects.requireNonNull(category);
@@ -53,7 +69,7 @@ public class SegmentCategoryListPreference extends ListPreference {
         setEntryValues(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorKeyValuesWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorKeyValues());
-        setSummary(category.description.toString());
+        super.setSummary(category.description.toString());
 
         updateUI();
     }
@@ -67,8 +83,20 @@ public class SegmentCategoryListPreference extends ListPreference {
             categoryOpacity = category.getOpacity();
 
             Context context = builder.getContext();
+            LinearLayout mainLayout = new LinearLayout(context);
+            mainLayout.setOrientation(LinearLayout.VERTICAL);
+            mainLayout.setPadding(70, 0, 70, 0);
+
+            // Inflate the color picker view.
+            View colorPickerContainer = LayoutInflater.from(context)
+                    .inflate(getResourceIdentifier("revanced_color_picker", "layout"), null);
+            dialogColorPickerView = colorPickerContainer.findViewById(
+                    getResourceIdentifier("color_picker_view", "id"));
+            dialogColorPickerView.setColor(categoryColor);
+            mainLayout.addView(colorPickerContainer);
+
+            // Grid layout for color and opacity inputs.
             GridLayout gridLayout = new GridLayout(context);
-            gridLayout.setPadding(70, 0, 150, 0); // Padding for the entire layout.
             gridLayout.setColumnCount(3);
             gridLayout.setRowCount(2);
 
@@ -84,19 +112,22 @@ public class SegmentCategoryListPreference extends ListPreference {
             gridParams.rowSpec = GridLayout.spec(0); // First row.
             gridParams.columnSpec = GridLayout.spec(1); // Second column.
             gridParams.setMargins(0, 0, 10, 0);
-            colorDotView = new TextView(context);
-            colorDotView.setLayoutParams(gridParams);
-            gridLayout.addView(colorDotView);
+            dialogColorDotView = new TextView(context);
+            dialogColorDotView.setLayoutParams(gridParams);
+            gridLayout.addView(dialogColorDotView);
             updateCategoryColorDot();
 
             gridParams = new GridLayout.LayoutParams();
             gridParams.rowSpec = GridLayout.spec(0); // First row.
             gridParams.columnSpec = GridLayout.spec(2); // Third column.
-            colorEditText = new EditText(context);
-            colorEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
-            colorEditText.setTextLocale(Locale.US);
-            colorEditText.setText(category.getColorString());
-            colorEditText.addTextChangedListener(new TextWatcher() {
+            dialogColorEditText = new EditText(context);
+            dialogColorEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
+                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+            dialogColorEditText.setAutofillHints((String) null);
+            dialogColorEditText.setTypeface(Typeface.MONOSPACE);
+            dialogColorEditText.setTextLocale(Locale.US);
+            dialogColorEditText.setText(getColorString(categoryColor));
+            dialogColorEditText.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -109,28 +140,30 @@ public class SegmentCategoryListPreference extends ListPreference {
                 public void afterTextChanged(Editable edit) {
                     try {
                         String colorString = edit.toString();
-                        final int colorStringLength = colorString.length();
+                        String normalizedColorString = ColorPickerPreference.cleanupColorCodeString(colorString);
 
-                        if (!colorString.startsWith("#")) {
-                            edit.insert(0, "#"); // Recursively calls back into this method.
+                        if (!normalizedColorString.equals(colorString)) {
+                            edit.replace(0, colorString.length(), normalizedColorString);
                             return;
                         }
 
-                        final int maxColorStringLength = 7; // #RRGGBB
-                        if (colorStringLength > maxColorStringLength) {
-                            edit.delete(maxColorStringLength, colorStringLength);
+                        if (normalizedColorString.length() != ColorPickerPreference.COLOR_STRING_LENGTH) {
+                            // User is still typing out the color.
                             return;
                         }
 
-                        categoryColor = Color.parseColor(colorString);
-                        updateCategoryColorDot();
-                    } catch (IllegalArgumentException ex) {
-                        // Ignore.
+                        // Remove the alpha channel.
+                        final int newColor = Color.parseColor(colorString) & 0x00FFFFFF;
+                        // Changing view color causes callback into this class.
+                        dialogColorPickerView.setColor(newColor);
+                    } catch (Exception ex) {
+                        // Should never be reached since input is validated before using.
+                        Logger.printException(() -> "colorEditText afterTextChanged failure", ex);
                     }
                 }
             });
-            colorEditText.setLayoutParams(gridParams);
-            gridLayout.addView(colorEditText);
+            dialogColorEditText.setLayoutParams(gridParams);
+            gridLayout.addView(dialogColorEditText);
 
             gridParams = new GridLayout.LayoutParams();
             gridParams.rowSpec = GridLayout.spec(1); // Second row.
@@ -143,9 +176,13 @@ public class SegmentCategoryListPreference extends ListPreference {
             gridParams = new GridLayout.LayoutParams();
             gridParams.rowSpec = GridLayout.spec(1); // Second row.
             gridParams.columnSpec = GridLayout.spec(2); // Third column.
-            opacityEditText = new EditText(context);
-            opacityEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
-            opacityEditText.addTextChangedListener(new TextWatcher() {
+            dialogOpacityEditText = new EditText(context);
+            dialogOpacityEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL
+                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+            dialogOpacityEditText.setAutofillHints((String) null);
+            dialogOpacityEditText.setTypeface(Typeface.MONOSPACE);
+            dialogOpacityEditText.setTextLocale(Locale.US);
+            dialogOpacityEditText.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -183,31 +220,40 @@ public class SegmentCategoryListPreference extends ListPreference {
                         }
 
                         updateCategoryColorDot();
-                    } catch (NumberFormatException ex) {
+                    } catch (Exception ex) {
                         // Should never happen.
-                        Logger.printException(() -> "Could not parse opacity string", ex);
+                        Logger.printException(() -> "opacityEditText afterTextChanged failure", ex);
                     }
                 }
             });
-            opacityEditText.setLayoutParams(gridParams);
-            gridLayout.addView(opacityEditText);
+            dialogOpacityEditText.setLayoutParams(gridParams);
+            gridLayout.addView(dialogOpacityEditText);
             updateOpacityText();
 
-            builder.setView(gridLayout);
+            mainLayout.addView(gridLayout);
+
+            // Set up color picker listener.
+            // Do last to prevent listener callbacks while setting up view.
+            dialogColorPickerView.setOnColorChangedListener(color -> {
+                if (categoryColor == color) {
+                    return;
+                }
+                categoryColor = color;
+                String hexColor = getColorString(color);
+                Logger.printDebug(() -> "onColorChanged: " + hexColor);
+
+                updateCategoryColorDot();
+                dialogColorEditText.setText(hexColor);
+                dialogColorEditText.setSelection(hexColor.length());
+            });
+
+            builder.setView(mainLayout);
             builder.setTitle(category.title.toString());
 
             builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
                 onClick(dialog, DialogInterface.BUTTON_POSITIVE);
             });
-            builder.setNeutralButton(str("revanced_sb_reset_color"), (dialog, which) -> {
-                try {
-                    category.resetColorAndOpacity();
-                    updateUI();
-                    Utils.showToastShort(str("revanced_sb_color_reset"));
-                } catch (Exception ex) {
-                    Logger.printException(() -> "setNeutralButton failure", ex);
-                }
-            });
+            builder.setNeutralButton(str("revanced_settings_reset_color"), null);
             builder.setNegativeButton(android.R.string.cancel, null);
 
             selectedDialogEntryIndex = findIndexOfValue(getValue());
@@ -218,6 +264,25 @@ public class SegmentCategoryListPreference extends ListPreference {
         }
     }
 
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        // Do not close dialog when reset is pressed.
+        Button button = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_NEUTRAL);
+        button.setOnClickListener(view -> {
+            try {
+                // Setting view color causes callback to update the UI.
+                dialogColorPickerView.setColor(category.getColorNoOpacityDefault());
+
+                categoryOpacity = category.getOpacityDefault();
+                updateOpacityText();
+            } catch (Exception ex) {
+                Logger.printException(() -> "setOnClickListener failure", ex);
+            }
+        });
+    }
+
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         try {
@@ -230,42 +295,50 @@ public class SegmentCategoryListPreference extends ListPreference {
                 }
 
                 try {
-                    String colorString = colorEditText.getText().toString();
-                    if (!colorString.equals(category.getColorString()) || categoryOpacity != category.getOpacity()) {
-                        category.setColor(colorString);
-                        category.setOpacity(categoryOpacity);
-                        Utils.showToastShort(str("revanced_sb_color_changed"));
-                    }
+                    category.setColor(dialogColorEditText.getText().toString());
+                    category.setOpacity(categoryOpacity);
                 } catch (IllegalArgumentException ex) {
-                    Utils.showToastShort(str("revanced_sb_color_invalid"));
+                    Utils.showToastShort(str("revanced_settings_color_invalid"));
                 }
 
                 updateUI();
             }
         } catch (Exception ex) {
             Logger.printException(() -> "onDialogClosed failure", ex);
+        } finally {
+            dialogColorDotView = null;
+            dialogColorEditText = null;
+            dialogOpacityEditText = null;
+            dialogColorPickerView = null;
         }
     }
 
-    private void applyOpacityToCategoryColor() {
-        categoryColor = applyOpacityToColor(categoryColor, categoryOpacity);
+    @ColorInt
+    private int applyOpacityToCategoryColor() {
+        return applyOpacityToColor(categoryColor, categoryOpacity);
     }
 
     public void updateUI() {
         categoryColor = category.getColorNoOpacity();
         categoryOpacity = category.getOpacity();
-        applyOpacityToCategoryColor();
 
-        setTitle(category.getTitleWithColorDot(categoryColor));
+        setTitle(category.getTitleWithColorDot(applyOpacityToCategoryColor()));
     }
 
     private void updateCategoryColorDot() {
-        applyOpacityToCategoryColor();
-
-        colorDotView.setText(SegmentCategory.getCategoryColorDot(categoryColor));
+        dialogColorDotView.setText(SegmentCategory.getCategoryColorDot(applyOpacityToCategoryColor()));
     }
 
     private void updateOpacityText() {
-        opacityEditText.setText(String.format(Locale.US, "%.2f", categoryOpacity));
+        dialogOpacityEditText.setText(String.format(Locale.US, "%.2f", categoryOpacity));
     }
-}
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        // Ignore calls to set the summary.
+        // Summary is always the description of the category.
+        //
+        // This is required otherwise the ReVanced preference fragment
+        // sets all ListPreference summaries to show the current selection.
+    }
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/sponsorblock/ui/SponsorBlockPreferenceGroup.java

@@ -376,7 +376,11 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                     Utils.setEditTextDialogTheme(builder);
 
                     builder.setNeutralButton(str("revanced_sb_settings_copy"), (dialog, which) -> {
-                        Utils.setClipboard(getEditText().getText().toString());
+                        try {
+                            Utils.setClipboard(getEditText().getText());
+                        } catch (Exception ex) {
+                            Logger.printException(() -> "Copy settings failure", ex);
+                        }
                     });
                 }
             };
@@ -421,7 +425,7 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                         .setTitle(apiUrl.getTitle())
                         .setView(editText)
                         .setNegativeButton(android.R.string.cancel, null)
-                        .setNeutralButton(str("revanced_sb_reset"), urlChangeListener)
+                        .setNeutralButton(str("revanced_settings_reset"), urlChangeListener)
                         .setPositiveButton(android.R.string.ok, urlChangeListener)
                         .show();
                 return true;
@@ -433,7 +437,11 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                     Utils.setEditTextDialogTheme(builder);
 
                     builder.setNeutralButton(str("revanced_sb_settings_copy"), (dialog, which) -> {
-                        Utils.setClipboard(getEditText().getText().toString());
+                        try {
+                            Utils.setClipboard(getEditText().getText());
+                        } catch (Exception ex) {
+                            Logger.printException(() -> "Copy settings failure", ex);
+                        }
                     });
                 }
             };

extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt

@@ -1,10 +1,10 @@
 package app.revanced.extension.youtube.swipecontrols
 
-import android.annotation.SuppressLint
 import android.graphics.Color
 import app.revanced.extension.shared.Logger
 import app.revanced.extension.shared.StringRef.str
 import app.revanced.extension.shared.Utils
+import app.revanced.extension.shared.settings.StringSetting
 import app.revanced.extension.youtube.settings.Settings
 import app.revanced.extension.youtube.shared.PlayerType
 
@@ -51,105 +51,112 @@ class SwipeControlsConfigurationProvider {
     /**
      * Indicates whether press-to-swipe mode is enabled, requiring a press before swiping to activate controls.
      */
-    val shouldEnablePressToSwipe: Boolean
-        get() = Settings.SWIPE_PRESS_TO_ENGAGE.get()
+    val shouldEnablePressToSwipe = Settings.SWIPE_PRESS_TO_ENGAGE.get()
 
     /**
      * The threshold for detecting swipe gestures, in pixels.
      * Loaded once to ensure consistent behavior during rapid scroll events.
      */
-    val swipeMagnitudeThreshold: Int
-        get() = Settings.SWIPE_MAGNITUDE_THRESHOLD.get()
+    val swipeMagnitudeThreshold = Settings.SWIPE_MAGNITUDE_THRESHOLD.get()
 
     /**
      * The sensitivity of volume swipe gestures, determining how much volume changes per swipe.
      * Resets to default if set to 0, as it would disable swiping.
      */
-    val volumeSwipeSensitivity: Int
-        get() {
-            val sensitivity = Settings.SWIPE_VOLUME_SENSITIVITY.get()
+    val volumeSwipeSensitivity: Int by lazy {
+        val sensitivity = Settings.SWIPE_VOLUME_SENSITIVITY.get()
 
-            if (sensitivity < 1) {
-                return Settings.SWIPE_VOLUME_SENSITIVITY.resetToDefault()
-            }
-
-            return sensitivity
+        if (sensitivity < 1) {
+            return@lazy Settings.SWIPE_VOLUME_SENSITIVITY.resetToDefault()
         }
+
+        sensitivity
+    }
     //endregion
 
     //region overlay adjustments
     /**
      * Indicates whether haptic feedback should be enabled for swipe control interactions.
      */
-    val shouldEnableHapticFeedback: Boolean
-        get() = Settings.SWIPE_HAPTIC_FEEDBACK.get()
+    val shouldEnableHapticFeedback = Settings.SWIPE_HAPTIC_FEEDBACK.get()
 
     /**
      * The duration in milliseconds that the overlay should remain visible after a change.
      */
-    val overlayShowTimeoutMillis: Long
-        get() = Settings.SWIPE_OVERLAY_TIMEOUT.get()
+    val overlayShowTimeoutMillis = Settings.SWIPE_OVERLAY_TIMEOUT.get()
 
     /**
      * The background opacity of the overlay, converted from a percentage (0-100) to an alpha value (0-255).
      * Resets to default and shows a toast if the value is out of range.
      */
-    val overlayBackgroundOpacity: Int
-        get() {
-            var opacity = Settings.SWIPE_OVERLAY_OPACITY.get()
+    val overlayBackgroundOpacity: Int by lazy {
+        var opacity = Settings.SWIPE_OVERLAY_OPACITY.get()
 
-            if (opacity < 0 || opacity > 100) {
-                Utils.showToastLong(str("revanced_swipe_overlay_background_opacity_invalid_toast"))
-                opacity = Settings.SWIPE_OVERLAY_OPACITY.resetToDefault()
-            }
-
-            opacity = opacity * 255 / 100
-            return Color.argb(opacity, 0, 0, 0)
+        if (opacity < 0 || opacity > 100) {
+            Utils.showToastLong(str("revanced_swipe_overlay_background_opacity_invalid_toast"))
+            opacity = Settings.SWIPE_OVERLAY_OPACITY.resetToDefault()
         }
 
+        opacity = opacity * 255 / 100
+        Color.argb(opacity, 0, 0, 0)
+    }
+
     /**
-     * The color of the progress bar in the overlay.
+     * The color of the progress bar in the overlay for brightness.
      * Resets to default and shows a toast if the color string is invalid or empty.
      */
-    val overlayProgressColor: Int
-        get() {
-            try {
-                @SuppressLint("UseKtx")
-                val color = Color.parseColor(Settings.SWIPE_OVERLAY_PROGRESS_COLOR.get())
-                return (0xBF000000.toInt() or (color and 0xFFFFFF))
-            } catch (ex: IllegalArgumentException) {
-                Logger.printDebug({ "Could not parse color" }, ex)
-                Utils.showToastLong(str("revanced_swipe_overlay_progress_color_invalid_toast"))
-                Settings.SWIPE_OVERLAY_PROGRESS_COLOR.resetToDefault()
-                return overlayProgressColor // Recursively return.
-            }
+    val overlayBrightnessProgressColor: Int by lazy {
+        // Use lazy to avoid repeat parsing. Changing color requires app restart.
+        getSettingColor(Settings.SWIPE_OVERLAY_BRIGHTNESS_COLOR)
+    }
+
+    /**
+     * The color of the progress bar in the overlay for volume.
+     * Resets to default and shows a toast if the color string is invalid or empty.
+     */
+    val overlayVolumeProgressColor: Int by lazy {
+        getSettingColor(Settings.SWIPE_OVERLAY_VOLUME_COLOR)
+    }
+
+    private fun getSettingColor(setting: StringSetting): Int {
+        try {
+            //noinspection UseKtx
+            val color = Color.parseColor(setting.get())
+            return (0xBF000000.toInt() or (color and 0x00FFFFFF))
+        } catch (ex: IllegalArgumentException) {
+            // This code should never be reached.
+            // Color picker rejects and will not save bad colors to a setting.
+            // If a user imports bad data, the color picker preference resets the
+            // bad color before this method can be called.
+            Logger.printDebug({ "Could not parse color: $setting" }, ex)
+            Utils.showToastLong(str("revanced_settings_color_invalid"))
+            setting.resetToDefault()
+            return getSettingColor(setting) // Recursively return.
         }
+    }
 
     /**
      * The background color used for the filled portion of the progress bar in the overlay.
      */
-    val overlayFillBackgroundPaint: Int
-        get() = 0x80D3D3D3.toInt()
+    val overlayFillBackgroundPaint = 0x80D3D3D3.toInt()
 
     /**
      * The color used for text and icons in the overlay.
      */
-    val overlayTextColor: Int
-        get() = Color.WHITE
+    val overlayTextColor = Color.WHITE
 
     /**
      * The text size in the overlay, in density-independent pixels (dp).
      * Must be between 1 and 30 dp; resets to default and shows a toast if invalid.
      */
-    val overlayTextSize: Int
-        get() {
-            val size = Settings.SWIPE_OVERLAY_TEXT_SIZE.get()
-            if (size < 1 || size > 30) {
-                Utils.showToastLong(str("revanced_swipe_text_overlay_size_invalid_toast"))
-                return Settings.SWIPE_OVERLAY_TEXT_SIZE.resetToDefault()
-            }
-            return size
+    val overlayTextSize: Int by lazy {
+        val size = Settings.SWIPE_OVERLAY_TEXT_SIZE.get()
+        if (size < 1 || size > 30) {
+            Utils.showToastLong(str("revanced_swipe_text_overlay_size_invalid_toast"))
+            return@lazy Settings.SWIPE_OVERLAY_TEXT_SIZE.resetToDefault()
         }
+        size
+    }
 
     /**
      * Defines the style of the swipe controls overlay, determining its layout and appearance.
@@ -199,28 +206,25 @@ class SwipeControlsConfigurationProvider {
         /**
          * A minimal vertical progress bar.
          */
-        VERTICAL_MINIMAL(isMinimal =  true, isVertical = true)
+        VERTICAL_MINIMAL(isMinimal = true, isVertical = true)
     }
 
     /**
      * The current style of the overlay, determining its layout and appearance.
      */
-    val overlayStyle: SwipeOverlayStyle
-        get() = Settings.SWIPE_OVERLAY_STYLE.get()
+    val overlayStyle = Settings.SWIPE_OVERLAY_STYLE.get()
     //endregion
 
     //region behaviour
     /**
      * Indicates whether the brightness level should be saved and restored when entering or exiting fullscreen mode.
      */
-    val shouldSaveAndRestoreBrightness: Boolean
-        get() = Settings.SWIPE_SAVE_AND_RESTORE_BRIGHTNESS.get()
+    val shouldSaveAndRestoreBrightness = Settings.SWIPE_SAVE_AND_RESTORE_BRIGHTNESS.get()
 
     /**
      * Indicates whether auto-brightness should be enabled when the brightness gesture reaches its lowest value.
      */
-    val shouldLowestValueEnableAutoBrightness: Boolean
-        get() = Settings.SWIPE_LOWEST_VALUE_ENABLE_AUTO_BRIGHTNESS.get()
+    val shouldLowestValueEnableAutoBrightness = Settings.SWIPE_LOWEST_VALUE_ENABLE_AUTO_BRIGHTNESS.get()
 
     /**
      * The saved brightness value for the swipe gesture, used to restore brightness in fullscreen mode.
@@ -229,4 +233,4 @@ class SwipeControlsConfigurationProvider {
         get() = Settings.SWIPE_BRIGHTNESS_VALUE.get()
         set(value) = Settings.SWIPE_BRIGHTNESS_VALUE.save(value)
     //endregion
-}
+}

extensions/youtube/src/main/java/app/revanced/extension/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt

@@ -39,7 +39,7 @@ class SwipeControlsOverlayLayout(
 
     constructor(context: Context) : this(context, SwipeControlsConfigurationProvider())
 
-    // Drawable icons for brightness and volume
+    // Drawable icons for brightness and volume.
     private val autoBrightnessIcon: Drawable = getDrawable("revanced_ic_sc_brightness_auto")
     private val lowBrightnessIcon: Drawable = getDrawable("revanced_ic_sc_brightness_low")
     private val mediumBrightnessIcon: Drawable = getDrawable("revanced_ic_sc_brightness_medium")
@@ -50,7 +50,7 @@ class SwipeControlsOverlayLayout(
     private val normalVolumeIcon: Drawable = getDrawable("revanced_ic_sc_volume_normal")
     private val fullVolumeIcon: Drawable = getDrawable("revanced_ic_sc_volume_high")
 
-    // Function to retrieve drawable resources by name
+    // Function to retrieve drawable resources by name.
     private fun getDrawable(name: String): Drawable {
         val drawable = resources.getDrawable(
             Utils.getResourceIdentifier(context, name, "drawable"),
@@ -60,19 +60,19 @@ class SwipeControlsOverlayLayout(
         return drawable
     }
 
-    // Initialize progress bars
+    // Initialize progress bars.
     private val circularProgressView: CircularProgressView
     private val horizontalProgressView: HorizontalProgressView
     private val verticalBrightnessProgressView: VerticalProgressView
     private val verticalVolumeProgressView: VerticalProgressView
 
     init {
-        // Initialize circular progress bar
+        // Initialize circular progress bar.
         circularProgressView = CircularProgressView(
             context,
             config.overlayBackgroundOpacity,
             config.overlayStyle.isMinimal,
-            config.overlayProgressColor,
+            config.overlayBrightnessProgressColor, // Placeholder, updated in showFeedbackView.
             config.overlayFillBackgroundPaint,
             config.overlayTextColor,
             config.overlayTextSize
@@ -80,18 +80,18 @@ class SwipeControlsOverlayLayout(
             layoutParams = LayoutParams(100f.toDisplayPixels().toInt(), 100f.toDisplayPixels().toInt()).apply {
                 addRule(CENTER_IN_PARENT, TRUE)
             }
-            visibility = GONE // Initially hidden
+            visibility = GONE // Initially hidden.
         }
         addView(circularProgressView)
 
-        // Initialize horizontal progress bar
+        // Initialize horizontal progress bar.
         val screenWidth = resources.displayMetrics.widthPixels
-        val layoutWidth = (screenWidth * 4 / 5).toInt() // Cap at ~360dp
+        val layoutWidth = (screenWidth * 4 / 5).toInt() // Cap at ~360dp.
         horizontalProgressView = HorizontalProgressView(
             context,
             config.overlayBackgroundOpacity,
             config.overlayStyle.isMinimal,
-            config.overlayProgressColor,
+            config.overlayBrightnessProgressColor, // Placeholder, updated in showFeedbackView.
             config.overlayFillBackgroundPaint,
             config.overlayTextColor,
             config.overlayTextSize
@@ -104,16 +104,16 @@ class SwipeControlsOverlayLayout(
                     topMargin = 20f.toDisplayPixels().toInt()
                 }
             }
-            visibility = GONE // Initially hidden
+            visibility = GONE // Initially hidden.
         }
         addView(horizontalProgressView)
 
-        // Initialize vertical progress bar for brightness (right side)
+        // Initialize vertical progress bar for brightness (right side).
         verticalBrightnessProgressView = VerticalProgressView(
             context,
             config.overlayBackgroundOpacity,
             config.overlayStyle.isMinimal,
-            config.overlayProgressColor,
+            config.overlayBrightnessProgressColor,
             config.overlayFillBackgroundPaint,
             config.overlayTextColor,
             config.overlayTextSize
@@ -123,16 +123,16 @@ class SwipeControlsOverlayLayout(
                 rightMargin = 40f.toDisplayPixels().toInt()
                 addRule(CENTER_VERTICAL)
             }
-            visibility = GONE // Initially hidden
+            visibility = GONE // Initially hidden.
         }
         addView(verticalBrightnessProgressView)
 
-        // Initialize vertical progress bar for volume (left side)
+        // Initialize vertical progress bar for volume (left side).
         verticalVolumeProgressView = VerticalProgressView(
             context,
             config.overlayBackgroundOpacity,
             config.overlayStyle.isMinimal,
-            config.overlayProgressColor,
+            config.overlayVolumeProgressColor,
             config.overlayFillBackgroundPaint,
             config.overlayTextColor,
             config.overlayTextSize
@@ -142,12 +142,12 @@ class SwipeControlsOverlayLayout(
                 leftMargin = 40f.toDisplayPixels().toInt()
                 addRule(CENTER_VERTICAL)
             }
-            visibility = GONE // Initially hidden
+            visibility = GONE // Initially hidden.
         }
         addView(verticalVolumeProgressView)
     }
 
-    // Handler and callback for hiding progress bars
+    // Handler and callback for hiding progress bars.
     private val feedbackHideHandler = Handler(Looper.getMainLooper())
     private val feedbackHideCallback = Runnable {
         circularProgressView.visibility = GONE
@@ -165,29 +165,42 @@ class SwipeControlsOverlayLayout(
 
         val viewToShow = when {
             config.overlayStyle.isCircular -> circularProgressView
-            config.overlayStyle.isVertical -> if (isBrightness) verticalBrightnessProgressView else verticalVolumeProgressView
+            config.overlayStyle.isVertical ->
+                if (isBrightness)
+                    verticalBrightnessProgressView
+                else
+                    verticalVolumeProgressView
             else -> horizontalProgressView
         }
         viewToShow.apply {
+            // Set the appropriate progress color.
+            if (this is CircularProgressView || this is HorizontalProgressView) {
+                setProgressColor(
+                    if (isBrightness)
+                        config.overlayBrightnessProgressColor
+                    else
+                        config.overlayVolumeProgressColor
+                )
+            }
             setProgress(progress, max, value, isBrightness)
             this.icon = icon
             visibility = VISIBLE
         }
     }
 
-    // Handle volume change
+    // Handle volume change.
     override fun onVolumeChanged(newVolume: Int, maximumVolume: Int) {
         val volumePercentage = (newVolume.toFloat() / maximumVolume) * 100
         val icon = when {
             newVolume == 0 -> mutedVolumeIcon
-            volumePercentage < 33 -> lowVolumeIcon
-            volumePercentage < 66 -> normalVolumeIcon
+            volumePercentage < 25 -> lowVolumeIcon
+            volumePercentage < 50 -> normalVolumeIcon
             else -> fullVolumeIcon
         }
         showFeedbackView("$newVolume", newVolume, maximumVolume, icon, isBrightness = false)
     }
 
-    // Handle brightness change
+    // Handle brightness change.
     override fun onBrightnessChanged(brightness: Double) {
         if (config.shouldLowestValueEnableAutoBrightness && brightness <= 0) {
             val displayText = if (config.overlayStyle.isVertical) "А"
@@ -195,18 +208,19 @@ class SwipeControlsOverlayLayout(
             showFeedbackView(displayText, 0, 100, autoBrightnessIcon, isBrightness = true)
         } else {
             val brightnessValue = round(brightness).toInt()
+            val clampedProgress = max(0, brightnessValue)
             val icon = when {
-                brightnessValue < 25 -> lowBrightnessIcon
-                brightnessValue < 50 -> mediumBrightnessIcon
-                brightnessValue < 75 -> highBrightnessIcon
+                clampedProgress < 25 -> lowBrightnessIcon
+                clampedProgress < 50 -> mediumBrightnessIcon
+                clampedProgress < 75 -> highBrightnessIcon
                 else -> fullBrightnessIcon
             }
-            val displayText = if (config.overlayStyle.isVertical) "$brightnessValue" else "$brightnessValue%"
-            showFeedbackView(displayText, brightnessValue, 100, icon, isBrightness = true)
+            val displayText = if (config.overlayStyle.isVertical) "$clampedProgress" else "$clampedProgress%"
+            showFeedbackView(displayText, clampedProgress, 100, icon, isBrightness = true)
         }
     }
 
-    // Begin swipe session
+    // Begin swipe session.
     override fun onEnterSwipeSession() {
         if (config.shouldEnableHapticFeedback) {
             @Suppress("DEPRECATION")
@@ -233,25 +247,41 @@ abstract class AbstractProgressView(
     defStyleAttr: Int = 0
 ) : View(context, attrs, defStyleAttr) {
 
-    // Combined paint creation function for both fill and stroke styles
-    private fun createPaint(color: Int, style: Paint.Style = Paint.Style.FILL, strokeCap: Paint.Cap = Paint.Cap.BUTT, strokeWidth: Float = 0f) = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+    // Combined paint creation function for both fill and stroke styles.
+    private fun createPaint(
+        color: Int,
+        style: Paint.Style = Paint.Style.FILL,
+        strokeCap: Paint.Cap = Paint.Cap.BUTT,
+        strokeWidth: Float = 0f
+    ) = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         this.style = style
         this.color = color
         this.strokeCap = strokeCap
         this.strokeWidth = strokeWidth
     }
 
-    // Initialize paints
-    val backgroundPaint     = createPaint(overlayBackgroundOpacity,   style = Paint.Style.FILL)
-    val progressPaint       = createPaint(overlayProgressColor,       style = Paint.Style.STROKE, strokeCap = Paint.Cap.ROUND, strokeWidth = 6f.toDisplayPixels())
-    val fillBackgroundPaint = createPaint(overlayFillBackgroundPaint, style = Paint.Style.FILL)
-    val textPaint           = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        color     = overlayTextColor
+    // Initialize paints.
+    val backgroundPaint = createPaint(
+        overlayBackgroundOpacity,
+        style = Paint.Style.FILL
+    )
+    val progressPaint = createPaint(
+        overlayProgressColor,
+        style = Paint.Style.STROKE,
+        strokeCap = Paint.Cap.ROUND,
+        strokeWidth = 6f.toDisplayPixels()
+    )
+    val fillBackgroundPaint = createPaint(
+        overlayFillBackgroundPaint,
+        style = Paint.Style.FILL
+    )
+    val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = overlayTextColor
         textAlign = Paint.Align.CENTER
-        textSize  = overlayTextSize.toFloat().toDisplayPixels()
+        textSize = overlayTextSize.toFloat().toDisplayPixels()
     }
 
-    // Rect for text measurement
+    // Rect for text measurement.
     protected val textBounds = Rect()
 
     protected var progress = 0
@@ -268,13 +298,18 @@ abstract class AbstractProgressView(
         invalidate()
     }
 
+    fun setProgressColor(color: Int) {
+        progressPaint.color = color
+        invalidate()
+    }
+
     protected fun measureTextWidth(text: String, paint: Paint): Int {
         paint.getTextBounds(text, 0, text.length, textBounds)
         return textBounds.width()
     }
 
     override fun onDraw(canvas: Canvas) {
-        // Base class implementation can be empty
+        // Base class implementation can be empty.
     }
 }
 
@@ -393,8 +428,8 @@ class HorizontalProgressView(
     }
 
     /**
-     * Calculate required width based on content
-     * @return Required width to display all elements
+     * Calculate required width based on content.
+     * @return Required width to display all elements.
      */
     private fun calculateRequiredWidth(): Float {
         textWidth = measureTextWidth(displayText, textPaint).toFloat()
@@ -537,8 +572,8 @@ class VerticalProgressView(
     }
 
     /**
-     * Calculate required height based on content
-     * @return Required height to display all elements
+     * Calculate required height based on content.
+     * @return Required height to display all elements.
      */
     private fun calculateRequiredHeight(): Float {
         return if (!isMinimalStyle) {
@@ -633,4 +668,4 @@ class VerticalProgressView(
         super.setProgress(value, max, text, isBrightnessMode)
         requestLayout()
     }
-}
+}

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.24.0-dev.8
+version = 5.26.0-dev.2

patches/api/patches.api

@@ -284,10 +284,22 @@ public final class app/revanced/patches/messenger/inputfield/DisableTypingIndica
 	public static final fun getDisableTypingIndicatorPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/messenger/metaai/RemoveMetaAIPatchKt {
+	public static final fun getRemoveMetaAIPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/messenger/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/messenger/navbar/RemoveMetaAITabPatchKt {
 	public static final fun getRemoveMetaAITabPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/meta/ads/HideAdsPatchKt {
+	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/mifitness/misc/locale/ForceEnglishLocalePatchKt {
 	public static final fun getForceEnglishLocalePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -432,6 +444,14 @@ public final class app/revanced/patches/primevideo/misc/extension/ExtensionPatch
 	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/primevideo/misc/permissions/RenamePermissionsPatchKt {
+	public static final fun getRenamePermissionsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
+public final class app/revanced/patches/protonmail/account/RemoveFreeAccountsLimitPatchKt {
+	public static final fun getRemoveFreeAccountsLimitPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
 public final class app/revanced/patches/protonmail/signature/RemoveSentFromSignaturePatchKt {
 	public static final fun getRemoveSentFromSignaturePatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
@@ -573,6 +593,7 @@ public final class app/revanced/patches/reddit/layout/disablescreenshotpopup/Dis
 
 public final class app/revanced/patches/reddit/layout/premiumicon/UnlockPremiumIconPatchKt {
 	public static final fun getUnlockPremiumIconPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun getUnlockPremiumIconsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/reddit/misc/extension/ExtensionPatchKt {
@@ -652,6 +673,10 @@ public final class app/revanced/patches/shared/misc/mapping/ResourceMappingPatch
 	public static final fun getResourceMappings ()Ljava/util/List;
 }
 
+public final class app/revanced/patches/shared/misc/pairip/license/DisableLicenseCheckPatchKt {
+	public static final fun getDisableLicenseCheckPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/shared/misc/settings/SettingsPatchKt {
 	public static final fun settingsPatch (Ljava/util/List;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
 	public static final fun settingsPatch (Lkotlin/Pair;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
@@ -872,6 +897,10 @@ public final class app/revanced/patches/spotify/misc/fix/SpoofSignaturePatchKt {
 	public static final fun getSpoofSignaturePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/spotify/misc/fix/login/FixFacebookLoginPatchKt {
+	public static final fun getFixFacebookLoginPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/spotify/misc/privacy/SanitizeSharingLinksPatchKt {
 	public static final fun getSanitizeSharingLinksPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1383,6 +1412,10 @@ public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatchKt {
 	public static final fun getGmsCoreSupportPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatchKt {
+	public static final fun getDisableHapticFeedbackPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/misc/imageurlhook/CronetImageUrlHookKt {
 	public static final fun addImageUrlErrorCallbackHook (Ljava/lang/String;)V
 	public static final fun addImageUrlHook (Ljava/lang/String;Z)V
@@ -1615,8 +1648,23 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun indexOfFirstResourceIdOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun injectHideViewCall (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;IILjava/lang/String;Ljava/lang/String;)V
 	public static final fun literal (Lapp/revanced/patcher/FingerprintBuilder;Lkotlin/jvm/functions/Function0;)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;B)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;C)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;D)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;F)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;J)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;S)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Z)V
 	public static synthetic fun returnEarly$default (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ZILjava/lang/Object;)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;B)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;C)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;D)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;F)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;J)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;S)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Z)V
 	public static final fun transformMethods (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lkotlin/jvm/functions/Function1;)V
 	public static final fun traverseClassHierarchy (Lapp/revanced/patcher/patch/BytecodePatchContext;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lkotlin/jvm/functions/Function1;)V
 }

patches/src/main/kotlin/app/revanced/patches/all/misc/adb/HideAdbPatch.kt

@@ -47,7 +47,7 @@ val hideAdbStatusPatch = bytecodePatch(
                     .takeIf { it.opcode == Opcode.INVOKE_STATIC }
                     ?.getReference<MethodReference>()
                     ?.takeIf {
-                        it.anyMethodSignatureMatches(it,
+                        it.anyMethodSignatureMatches(
                             SETTINGS_GLOBAL_GET_INT_OR_THROW_METHOD_REFERENCE,
                             SETTINGS_GLOBAL_GET_INT_OR_DEFAULT_METHOD_REFERENCE
                         )

patches/src/main/kotlin/app/revanced/patches/all/misc/build/SpoofBuildInfoPatch.kt

@@ -7,7 +7,7 @@ import app.revanced.patcher.patch.stringOption
 @Suppress("unused")
 val spoofBuildInfoPatch = bytecodePatch(
     name = "Spoof build info",
-    description = "Spoof the information about the current build.",
+    description = "Spoofs the information about the current build.",
     use = false,
 ) {
     val board by stringOption(
@@ -141,14 +141,14 @@ val spoofBuildInfoPatch = bytecodePatch(
     val socManufacturer by stringOption(
         key = "soc-manufacturer",
         default = null,
-        title = "SOC Manufacturer",
+        title = "SOC manufacturer",
         description = "The manufacturer of the device's primary system-on-chip.",
     )
 
     val socModel by stringOption(
         key = "soc-model",
         default = null,
-        title = "SOC Model",
+        title = "SOC model",
         description = "The model name of the device's primary system-on-chip.",
     )
 

patches/src/main/kotlin/app/revanced/patches/all/misc/connectivity/telephony/sim/spoof/SpoofSimCountryPatch.kt

@@ -36,12 +36,12 @@ val spoofSimCountryPatch = bytecodePatch(
 
     val networkCountryIso by isoCountryPatchOption(
         "networkCountryIso",
-        "Network ISO Country Code",
+        "Network ISO country code",
     )
 
     val simCountryIso by isoCountryPatchOption(
         "simCountryIso",
-        "Sim ISO Country Code",
+        "SIM ISO country code",
     )
 
     dependsOn(

patches/src/main/kotlin/app/revanced/patches/all/misc/shortcut/sharetargets/RemoveShareTargetsPatch.kt

@@ -17,7 +17,8 @@ val removeShareTargetsPatch = resourcePatch(
         try {
             document("res/xml/shortcuts.xml")
         } catch (_: FileNotFoundException) {
-            return@execute Logger.getLogger(this::class.java.name).warning("The app has no shortcuts")
+            return@execute Logger.getLogger(this::class.java.name).warning(
+                "The app has no shortcuts.  No changes applied.")
         }.use { document ->
             val rootNode = document.getNode("shortcuts") as? Element ?: return@use
 

patches/src/main/kotlin/app/revanced/patches/angulus/ads/RemoveAdsPatch.kt

@@ -1,14 +1,17 @@
 package app.revanced.patches.angulus.ads
 
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.shared.misc.pairip.license.disableLicenseCheckPatch
 import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val angulusPatch = bytecodePatch(name = "Hide ads") {
     compatibleWith("com.drinkplusplus.angulus")
 
+    dependsOn(disableLicenseCheckPatch)
+
     execute {
         // Always return 0 as the daily measurement count.
-        getDailyMeasurementCountFingerprint.method.returnEarly()
+        getDailyMeasurementCountFingerprint.method.returnEarly(0)
     }
 }

patches/src/main/kotlin/app/revanced/patches/instagram/ads/HideAdsPatch.kt

@@ -1,23 +1,9 @@
 package app.revanced.patches.instagram.ads
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 
+@Deprecated("Patch was moved to different package: app.revanced.patches.meta.ads.hideAdsPatch")
 @Suppress("unused")
-val hideAdsPatch = bytecodePatch(
-    name = "Hide ads",
-    description = "Hides ads in stories, discover, profile, etc. " +
-        "An ad can still appear once when refreshing the home feed.",
-) {
-    compatibleWith("com.instagram.android")
-
-    execute {
-        adInjectorFingerprint.method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x0
-                return v0
-            """,
-        )
-    }
+val hideAdsPatch = bytecodePatch {
+    dependsOn(app.revanced.patches.meta.ads.hideAdsPatch)
 }

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/UnlockPremiumPatch.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.bytecodePatch
 
 @Suppress("unused")
 val unlockPremiumPatch = bytecodePatch(
-    name = "Unlock premium",
+    name = "Unlock Premium",
 ) {
     compatibleWith("com.adobe.lrmobile"("10.0.2"))
 

patches/src/main/kotlin/app/revanced/patches/messenger/inputfield/DisableSwitchingEmojiToStickerPatch.kt

@@ -5,9 +5,14 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
+/**
+ * This patch will be deleted soon.
+ *
+ * Pull requests to update this patch to the latest app target are invited.
+ */
+@Deprecated("This patch only works with an outdated app target that is no longer fully supported by Facebook.")
 @Suppress("unused")
 val disableSwitchingEmojiToStickerPatch = bytecodePatch(
-    name = "Disable switching emoji to sticker",
     description = "Disables switching from emoji to sticker search mode in message input field.",
 ) {
     compatibleWith("com.facebook.orca"("439.0.0.29.119"))

patches/src/main/kotlin/app/revanced/patches/messenger/metaai/Fingerprints.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.messenger.metaai
+
+import com.android.tools.smali.dexlib2.Opcode
+import app.revanced.patcher.fingerprint
+
+internal val getMobileConfigBoolFingerprint = fingerprint {
+    parameters("J")
+    returns("Z")
+    opcodes(Opcode.RETURN) 
+    custom { method, classDef ->
+        method.implementation ?: return@custom false  // unsure if this is necessary
+        classDef.interfaces.contains("Lcom/facebook/mobileconfig/factory/MobileConfigUnsafeContext;")
+    }
+}

patches/src/main/kotlin/app/revanced/patches/messenger/metaai/RemoveMetaAIPatch.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.messenger.metaai
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.messenger.misc.extension.sharedExtensionPatch
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/messenger/metaai/RemoveMetaAIPatch;"
+
+@Suppress("unused")
+val removeMetaAIPatch = bytecodePatch(
+    name = "Remove Meta AI",
+    description = "Removes UI elements related to Meta AI."
+) {
+    compatibleWith("com.facebook.orca")
+
+    dependsOn(sharedExtensionPatch)
+
+    execute {
+        getMobileConfigBoolFingerprint.method.apply {
+            val returnIndex = getMobileConfigBoolFingerprint.patternMatch!!.startIndex
+            val returnRegister = getInstruction<OneRegisterInstruction>(returnIndex).registerA
+
+            addInstructions(
+                returnIndex,
+                """
+                    invoke-static { p1, p2, v$returnRegister }, $EXTENSION_CLASS_DESCRIPTOR->overrideConfigBool(JZ)Z
+                    move-result v$returnRegister
+                """
+            )
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/messenger/misc/extension/ExtensionPatch.kt

@@ -0,0 +1,5 @@
+package app.revanced.patches.messenger.misc.extension
+
+import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+
+val sharedExtensionPatch = sharedExtensionPatch("messenger", mainActivityOnCreateHook)

patches/src/main/kotlin/app/revanced/patches/messenger/misc/extension/Hooks.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.messenger.misc.extension
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val mainActivityOnCreateHook = extensionHook {
+    strings("MainActivity_onCreate_begin")
+}

patches/src/main/kotlin/app/revanced/patches/messenger/navbar/Fingerprints.kt

@@ -1,16 +0,0 @@
-package app.revanced.patches.messenger.navbar
-
-import app.revanced.patcher.fingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal val createTabConfigurationFingerprint = fingerprint {
-    strings("MessengerTabConfigurationCreator.createTabConfiguration")
-    opcodes(
-        Opcode.INVOKE_DIRECT,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_DIRECT,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-    )
-}

patches/src/main/kotlin/app/revanced/patches/messenger/navbar/RemoveMetaAITabPatch.kt

@@ -1,25 +1,12 @@
 package app.revanced.patches.messenger.navbar
 
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import app.revanced.patches.messenger.metaai.removeMetaAIPatch
 
+@Deprecated("Superseded by removeMetaAIPatch", ReplaceWith("removeMetaAIPatch"))
 @Suppress("unused")
 val removeMetaAITabPatch = bytecodePatch(
-    name = "Remove Meta AI tab",
     description = "Removes the 'Meta AI' tab from the navbar.",
 ) {
-    compatibleWith("com.facebook.orca")
-
-    execute {
-        createTabConfigurationFingerprint.let {
-            val moveResultIndex = it.patternMatch!!.startIndex + 1
-            val enabledRegister = it.method.getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-            it.method.replaceInstruction(
-                moveResultIndex,
-                "const/4 v$enabledRegister, 0x0"
-            )
-        }
-    }
+    dependsOn(removeMetaAIPatch)
 }

patches/src/main/kotlin/app/revanced/patches/meta/ads/Fingerprints.kt

@@ -1,13 +1,13 @@
-package app.revanced.patches.instagram.ads
-
-import app.revanced.patcher.fingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal val adInjectorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PRIVATE)
-    returns("Z")
-    parameters("L", "L")
-    strings(
-        "SponsoredContentController.insertItem",
-    )
-}
+package app.revanced.patches.meta.ads
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val adInjectorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE)
+    returns("Z")
+    parameters("L", "L")
+    strings(
+        "SponsoredContentController.insertItem",
+    )
+}

patches/src/main/kotlin/app/revanced/patches/meta/ads/HideAdsPatch.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.meta.ads
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
+
+@Suppress("unused")
+val hideAdsPatch = bytecodePatch(
+    name = "Hide ads",
+) {
+    /**
+     * Patch is identical for both Instagram and Threads app.
+     */
+    compatibleWith(
+        "com.instagram.android",
+        "com.instagram.barcelona",
+    )
+
+    execute {
+        adInjectorFingerprint.method.returnEarly(false)
+    }
+}

patches/src/main/kotlin/app/revanced/patches/primevideo/misc/permissions/RenamePermissionsPatch.kt

@@ -0,0 +1,44 @@
+package app.revanced.patches.primevideo.misc.permissions
+
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.util.asSequence
+import app.revanced.util.getNode
+import org.w3c.dom.Element
+
+@Suppress("unused")
+val renamePermissionsPatch = resourcePatch(
+    name = "Rename shared permissions",
+    description = "Rename certain permissions shared across Amazon apps. " +
+            "Applying this patch can fix installation errors, but can also break features in certain apps.",
+    use = false
+) {
+    compatibleWith("com.amazon.avod.thirdpartyclient")
+
+    val permissionNames = setOf(
+        "com.amazon.identity.permission.CAN_CALL_MAP_INFORMATION_PROVIDER",
+        "com.amazon.identity.auth.device.perm.AUTH_SDK",
+        "com.amazon.dcp.sso.permission.account.changed",
+        "com.amazon.dcp.sso.permission.AmazonAccountPropertyService.property.changed",
+        "com.amazon.identity.permission.CALL_AMAZON_DEVICE_INFORMATION_PROVIDER",
+        "com.amazon.appmanager.preload.permission.READ_PRELOAD_DEVICE_INFO_PROVIDER"
+    )
+
+    execute {
+        document("AndroidManifest.xml").use { document ->
+            val manifest = document.getNode("manifest") as Element
+
+            val permissions = manifest
+                .getElementsByTagName("permission")
+                .asSequence()
+                .map { Pair(it as Element, it.getAttribute("android:name")) }
+                .filter { (_, name) -> name in permissionNames }
+
+            if (permissions.none()) throw PatchException("Could not find any permissions to rename")
+
+            permissions.forEach { (element, name) ->
+                element.setAttribute("android:name", "revanced.$name")
+            }
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/protonmail/account/RemoveFreeAccountsLimitPatch.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.protonmail.account
+
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.util.findElementByAttributeValueOrThrow
+
+@Suppress("unused")
+val removeFreeAccountsLimitPatch = resourcePatch(
+    name = "Remove free accounts limit",
+    description = "Removes the limit for maximum free accounts logged in.",
+) {
+    compatibleWith("ch.protonmail.android")
+
+    execute {
+        document("res/values/integers.xml").use { document ->
+            document.documentElement.childNodes.findElementByAttributeValueOrThrow(
+                "name",
+                "core_feature_auth_user_check_max_free_user_count",
+            ).textContent = Int.MAX_VALUE.toString()
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/protonmail/signature/RemoveSentFromSignaturePatch.kt

@@ -39,4 +39,4 @@ val removeSentFromSignaturePatch = resourcePatch(
 
         if (!foundString) throw PatchException("Could not find 'sent from' string in resources")
     }
-}
+}

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

@@ -4,9 +4,9 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 
 @Suppress("unused")
-val unlockPremiumIconPatch = bytecodePatch(
-    name = "Unlock premium Reddit icons",
-    description = "Unlocks the premium Reddit icons.",
+val unlockPremiumIconsPatch = bytecodePatch(
+    name = "Unlock Premium icons",
+    description = "Unlocks the Reddit Premium icons.",
 ) {
     compatibleWith("com.reddit.frontpage")
 
@@ -20,3 +20,9 @@ val unlockPremiumIconPatch = bytecodePatch(
         )
     }
 }
+
+@Deprecated("Patch was renamed", ReplaceWith("unlockPremiumIconsPatch"))
+@Suppress("unused")
+val unlockPremiumIconPatch = bytecodePatch{
+    dependsOn(unlockPremiumIconsPatch)
+}

patches/src/main/kotlin/app/revanced/patches/shared/misc/gms/GmsCoreSupportPatch.kt

@@ -198,7 +198,7 @@ fun gmsCoreSupportPatch(
 
         // Google Play Utility is not present in all apps, so we need to check if it's present.
         if (googlePlayUtilityFingerprint.methodOrNull != null) {
-            googlePlayUtilityFingerprint.method.returnEarly()
+            googlePlayUtilityFingerprint.method.returnEarly(0)
         }
 
         // Verify GmsCore is installed and whitelisted for power optimizations and background usage.

patches/src/main/kotlin/app/revanced/patches/shared/misc/pairip/license/DisableLicenseCheckPatch.kt

@@ -0,0 +1,27 @@
+package app.revanced.patches.shared.misc.pairip.license
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
+import java.util.logging.Logger
+
+@Suppress("unused")
+val disableLicenseCheckPatch = bytecodePatch(
+    name = "Disable Pairip license check",
+    description = "Disables Play Integrity API (Pairip) client-side license check.",
+    use = false
+) {
+
+    execute {
+        if (processLicenseResponseFingerprint.methodOrNull == null || validateLicenseResponseFingerprint.methodOrNull == null) {
+            return@execute Logger.getLogger(this::class.java.name)
+                .warning("Could not find Pairip licensing check.  No changes applied.")
+        }
+
+        // Set first parameter (responseCode) to 0 (success status).
+        processLicenseResponseFingerprint.method.addInstruction(0, "const/4 p1, 0x0")
+
+        // Short-circuit the license response validation.
+        validateLicenseResponseFingerprint.method.returnEarly()
+    }
+}

patches/src/main/kotlin/app/revanced/patches/shared/misc/pairip/license/Fingerprints.kt

@@ -0,0 +1,17 @@
+package app.revanced.patches.shared.misc.pairip.license
+
+import app.revanced.patcher.fingerprint
+
+internal val processLicenseResponseFingerprint = fingerprint {
+    custom { method, classDef ->
+        classDef.type == "Lcom/pairip/licensecheck/LicenseClient;" &&
+                method.name == "processResponse"
+    }
+}
+
+internal val validateLicenseResponseFingerprint = fingerprint {
+    custom { method, classDef ->
+        classDef.type == "Lcom/pairip/licensecheck/ResponseValidator;" &&
+                method.name == "validateResponse"
+    }
+}

patches/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/OnDemandPatch.kt

@@ -3,9 +3,9 @@ package app.revanced.patches.spotify.lite.ondemand
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 
+@Deprecated("Patch no longer works and will be deleted soon")
 @Suppress("unused")
 val onDemandPatch = bytecodePatch(
-    name = "Enable on demand",
     description = "Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads.",
 ) {
     compatibleWith("com.spotify.lite")

patches/src/main/kotlin/app/revanced/patches/spotify/misc/Fingerprints.kt

@@ -65,8 +65,15 @@ internal val protobufListsFingerprint = fingerprint {
     custom { method, _ -> method.name == "emptyProtobufList" }
 }
 
-internal val protobufListRemoveFingerprint = fingerprint {
-    custom { method, _ -> method.name == "remove" }
+internal val abstractProtobufListEnsureIsMutableFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters()
+    returns("V")
+    custom { method, _ ->
+    	method.indexOfFirstInstruction {
+            getReference<TypeReference>()?.type == "Ljava/lang/UnsupportedOperationException;"
+        } >= 0
+    }
 }
 
 internal val homeSectionFingerprint = fingerprint {

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/SpoofSignaturePatch.kt

@@ -7,7 +7,5 @@ import app.revanced.patcher.patch.bytecodePatch
 val spoofSignaturePatch = bytecodePatch(
     description = "Spoofs the signature of the app fix various functions of the app.",
 ) {
-    compatibleWith("com.spotify.music")
-
     dependsOn(spoofPackageInfoPatch)
 }

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/login/Fingerprints.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.misc.fix.login
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
+
+internal val katanaProxyLoginMethodHandlerClassFingerprint = fingerprint {
+    strings("katana_proxy_auth")
+}
+
+internal val katanaProxyLoginMethodTryAuthorizeFingerprint = fingerprint {
+    strings("e2e")
+    literal { 0 }
+}

patches/src/main/kotlin/app/revanced/patches/spotify/misc/fix/login/FixFacebookLoginPatch.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.spotify.misc.fix.login
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
+
+@Suppress("unused")
+val fixFacebookLoginPatch = bytecodePatch(
+    name = "Fix Facebook login",
+    description =
+        "Fix logging in with Facebook when the app is patched by always opening the login in a web browser window.",
+) {
+    compatibleWith("com.spotify.music")
+
+    execute {
+        // The Facebook SDK tries to handle the login using the Facebook app in case it is installed.
+        // However, the Facebook app does signature checks with the app that is requesting the authentication,
+        // which ends up making the Facebook server reject with an invalid key hash for the app signature.
+        // Override the Faceboook SDK to always handle the login using the web browser, which does not perform
+        // signature checks.
+
+        val katanaProxyLoginMethodHandlerClass = katanaProxyLoginMethodHandlerClassFingerprint.originalClassDef
+        // Always return 0 (no Intent was launched) as the result of trying to authorize with the Facebook app to 
+        // make the login fallback to a web browser window.
+        katanaProxyLoginMethodTryAuthorizeFingerprint
+            .match(katanaProxyLoginMethodHandlerClass)
+            .method
+            .returnEarly(0)
+    }
+}

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

@@ -46,7 +46,6 @@ private val hideAdsResourcePatch = resourcePatch {
             SwitchPreference("revanced_hide_general_ads"),
             SwitchPreference("revanced_hide_end_screen_store_banner"),
             SwitchPreference("revanced_hide_fullscreen_ads"),
-            SwitchPreference("revanced_hide_buttoned_ads"),
             SwitchPreference("revanced_hide_paid_promotion_label"),
             SwitchPreference("revanced_hide_player_store_shelf"),
             SwitchPreference("revanced_hide_self_sponsor_ads"),

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

@@ -48,7 +48,12 @@ private val swipeControlsResourcePatch = resourcePatch {
                 summaryKey = null,
             ),
             TextPreference("revanced_swipe_overlay_background_opacity", inputType = InputType.NUMBER),
-            TextPreference("revanced_swipe_overlay_progress_color", inputType = InputType.TEXT_CAP_CHARACTERS),
+            TextPreference("revanced_swipe_overlay_progress_brightness_color",
+                tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
+                inputType = InputType.TEXT_CAP_CHARACTERS),
+            TextPreference("revanced_swipe_overlay_progress_volume_color",
+                tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
+                inputType = InputType.TEXT_CAP_CHARACTERS),
             TextPreference("revanced_swipe_text_overlay_size", inputType = InputType.NUMBER),
             TextPreference("revanced_swipe_overlay_timeout", inputType = InputType.NUMBER),
             TextPreference("revanced_swipe_threshold", inputType = InputType.NUMBER),

patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/Fingerprints.kt

@@ -15,9 +15,6 @@ internal val openVideosFullscreenPortraitFingerprint = fingerprint {
     }
 }
 
-/**
- * Used to enable opening regular videos fullscreen.
- */
 internal val openVideosFullscreenHookPatchExtensionFingerprint = fingerprint {
     accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
     returns("Z")

patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/Fingerprints.kt

@@ -53,4 +53,12 @@ internal val shortsPlaybackIntentFingerprint = fingerprint {
         "ReelWatchFragmentArgs",
         "reels_fragment_descriptor"
     )
+}
+
+internal val exitVideoPlayerFingerprint = fingerprint {
+    returns("V")
+    parameters()
+    literal {
+        mdx_drawer_layout_id
+    }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt

@@ -1,11 +1,16 @@
 package app.revanced.patches.youtube.layout.shortsplayer
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.mapping.get
+import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
+import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.shared.misc.settings.preference.ListPreference
 import app.revanced.patches.youtube.layout.player.fullscreen.openVideosFullscreenHookPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
@@ -19,12 +24,29 @@ import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
 import app.revanced.util.findFreeRegister
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/OpenShortsInRegularPlayerPatch;"
 
+internal var mdx_drawer_layout_id = -1L
+    private set
+
+private val openShortsInRegularPlayerResourcePatch = resourcePatch {
+    dependsOn(resourceMappingPatch)
+
+    execute {
+        mdx_drawer_layout_id = resourceMappings[
+            "id",
+            "mdx_drawer_layout",
+        ]
+
+    }
+}
+
 @Suppress("unused")
 val openShortsInRegularPlayerPatch = bytecodePatch(
     name = "Open Shorts in regular player",
@@ -36,7 +58,8 @@ val openShortsInRegularPlayerPatch = bytecodePatch(
         addResourcesPatch,
         openVideosFullscreenHookPatch,
         navigationBarHookPatch,
-        versionCheckPatch
+        versionCheckPatch,
+        openShortsInRegularPlayerResourcePatch
     )
 
     compatibleWith(
@@ -127,5 +150,28 @@ val openShortsInRegularPlayerPatch = bytecodePatch(
                 ${extensionInstructions(0, 1)}
             """
         )
+
+        // Fix issue with back button exiting the app instead of minimizing the player.
+        // Without this change this issue can be difficult to reproduce, but seems to occur
+        // most often with 'open video in regular player' and not open in fullscreen player.
+        exitVideoPlayerFingerprint.method.apply {
+            // Method call for Activity.finish()
+            val finishIndex = indexOfFirstInstructionOrThrow {
+                val reference = getReference<MethodReference>()
+                reference?.name == "finish"
+            }
+
+            // Index of PlayerType.isWatchWhileMaximizedOrFullscreen()
+            val index = indexOfFirstInstructionReversedOrThrow(finishIndex, Opcode.MOVE_RESULT)
+            val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+            addInstructions(
+                index + 1,
+                """
+                    invoke-static { v$register }, ${EXTENSION_CLASS_DESCRIPTOR}->overrideBackPressToExit(Z)Z    
+                    move-result v$register
+                """
+            )
+        }
     }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt

@@ -89,14 +89,15 @@ val themePatch = bytecodePatch(
             execute {
                 val preferences = mutableSetOf<BasePreference>(
                     SwitchPreference("revanced_seekbar_custom_color"),
-                    TextPreference("revanced_seekbar_custom_color_primary", inputType = InputType.TEXT_CAP_CHARACTERS),
+                    TextPreference("revanced_seekbar_custom_color_primary",
+                        tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
+                        inputType = InputType.TEXT_CAP_CHARACTERS),
                 )
 
                 if (is_19_25_or_greater) {
-                    preferences += TextPreference(
-                        "revanced_seekbar_custom_color_accent",
-                        inputType = InputType.TEXT_CAP_CHARACTERS
-                    )
+                    preferences += TextPreference("revanced_seekbar_custom_color_accent",
+                        tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
+                        inputType = InputType.TEXT_CAP_CHARACTERS)
                 }
 
                 PreferenceScreen.SEEKBAR.addPreferences(

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

@@ -5,6 +5,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
@@ -23,7 +24,7 @@ private const val EXTENSION_CLASS_DESCRIPTOR =
 
 val enableDebuggingPatch = bytecodePatch(
     name = "Enable debugging",
-    description = "Adds options for debugging.",
+    description = "Adds options for debugging and exporting ReVanced logs to the clipboard.",
 ) {
     dependsOn(
         sharedExtensionPatch,
@@ -56,6 +57,16 @@ val enableDebuggingPatch = bytecodePatch(
                     SwitchPreference("revanced_debug_protobuffer"),
                     SwitchPreference("revanced_debug_stacktrace"),
                     SwitchPreference("revanced_debug_toast_on_error"),
+                    NonInteractivePreference(
+                        "revanced_debug_export_logs_to_clipboard",
+                        tag = "app.revanced.extension.youtube.settings.preference.ExportLogToClipboardPreference",
+                        selectable = true,
+                    ),
+                    NonInteractivePreference(
+                        "revanced_debug_logs_clear_buffer",
+                        tag = "app.revanced.extension.youtube.settings.preference.ClearLogBufferPreference",
+                        selectable = true,
+                    ),
                 ),
             ),
         )
@@ -107,7 +118,6 @@ val enableDebuggingPatch = bytecodePatch(
                     return-wide v0
                 """
             )
-
         }
 
         experimentalStringFeatureFlagFingerprint.match(

patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatch.kt

@@ -0,0 +1,74 @@
+package app.revanced.patches.youtube.misc.hapticfeedback
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/DisableHapticFeedbackPatch;"
+
+@Suppress("unused")
+val disableHapticFeedbackPatch = bytecodePatch(
+    name = "Disable haptic feedback",
+    description = "Adds an option to disable haptic feedback in the player for various actions.",
+) {
+    dependsOn(
+        settingsPatch,
+        addResourcesPatch,
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.47.53",
+            "20.07.39",
+            "20.12.46",
+        )
+    )
+
+    execute {
+        addResources("youtube", "misc.hapticfeedback.disableHapticFeedbackPatch")
+
+        PreferenceScreen.PLAYER.addPreferences(
+            PreferenceScreenPreference(
+                "revanced_disable_haptic_feedback",
+                preferences = setOf(
+                    SwitchPreference("revanced_disable_haptic_feedback_chapters"),
+                    SwitchPreference("revanced_disable_haptic_feedback_precise_seeking"),
+                    SwitchPreference("revanced_disable_haptic_feedback_seek_undo"),
+                    SwitchPreference("revanced_disable_haptic_feedback_zoom"),
+                )
+            )
+        )
+
+        arrayOf(
+            markerHapticsFingerprint to "disableChapterVibrate",
+            scrubbingHapticsFingerprint to "disablePreciseSeekingVibrate",
+            seekUndoHapticsFingerprint to "disableSeekUndoVibrate",
+            zoomHapticsFingerprint to "disableZoomVibrate"
+        ).forEach { (fingerprint, methodName) ->
+            fingerprint.method.apply {
+                addInstructionsWithLabels(
+                    0,
+                    """
+                        invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->$methodName()Z
+                        move-result v0
+                        if-eqz v0, :vibrate
+                        return-void
+                    """,
+                    ExternalLabel("vibrate", getInstruction(0))
+                )
+            }
+        }
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/Fingerprints.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.misc.hapticfeedback
+
+import app.revanced.patcher.fingerprint
+
+internal val markerHapticsFingerprint = fingerprint {
+    returns("V")
+    strings("Failed to execute markers haptics vibrate.")
+}
+
+internal val scrubbingHapticsFingerprint = fingerprint {
+    returns("V")
+    strings("Failed to haptics vibrate for fine scrubbing.")
+}
+
+internal val seekUndoHapticsFingerprint = fingerprint {
+    returns("V")
+    strings("Failed to execute seek undo haptics vibrate.")
+}
+
+internal val zoomHapticsFingerprint = fingerprint {
+    returns("V")
+    strings("Failed to haptics vibrate for video zoom")
+}

patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt

@@ -74,6 +74,7 @@ private val settingsResourcePatch = resourcePatch {
 
         arrayOf(
             ResourceGroup("drawable",
+                "revanced_settings_circle_background.xml",
                 "revanced_settings_cursor.xml",
                 "revanced_settings_icon.xml",
                 "revanced_settings_screen_00_about.xml",
@@ -91,6 +92,8 @@ private val settingsResourcePatch = resourcePatch {
                 "revanced_settings_screen_12_video.xml",
             ),
             ResourceGroup("layout",
+                "revanced_color_dot_widget.xml",
+                "revanced_color_picker.xml",
                 "revanced_preference_with_icon_no_search_result.xml",
                 "revanced_search_suggestion_item.xml",
                 "revanced_settings_with_toolbar.xml"),

patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/Fingerprints.kt

@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.misc.zoomhaptics
-
-import app.revanced.patcher.fingerprint
-
-internal val zoomHapticsFingerprint = fingerprint {
-    strings("Failed to haptics vibrate for video zoom")
-}

patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt

@@ -1,54 +1,11 @@
 package app.revanced.patches.youtube.misc.zoomhaptics
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.all.misc.resources.addResources
-import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.PreferenceScreen
-import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.patches.youtube.misc.hapticfeedback.disableHapticFeedbackPatch
 
+@Deprecated("Superseded by disableHapticFeedbackPatch", ReplaceWith("disableHapticFeedbackPatch"))
 val zoomHapticsPatch = bytecodePatch(
-    name = "Disable zoom haptics",
     description = "Adds an option to disable haptics when zooming.",
 ) {
-    dependsOn(
-        settingsPatch,
-        addResourcesPatch,
-    )
-
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.47.53",
-            "20.07.39",
-            "20.12.46",
-        )
-    )
-
-    execute {
-        addResources("youtube", "misc.zoomhaptics.zoomHapticsPatch")
-
-        PreferenceScreen.MISC.addPreferences(
-            SwitchPreference("revanced_disable_zoom_haptics"),
-        )
-
-        zoomHapticsFingerprint.method.apply {
-            addInstructionsWithLabels(
-                0,
-                """
-                invoke-static { }, Lapp/revanced/extension/youtube/patches/ZoomHapticsPatch;->shouldVibrate()Z
-                move-result v0
-                if-nez v0, :vibrate
-                return-void
-            """,
-                ExternalLabel("vibrate", getInstruction(0)),
-            )
-        }
-    }
-}
+    dependsOn(disableHapticFeedbackPatch)
+}

patches/src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPatch.kt

@@ -3,10 +3,10 @@ package app.revanced.patches.yuka.misc.unlockpremium
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 
+@Deprecated("This patch no longer works and will be removed in the future.")
 @Suppress("unused")
-val unlockPremiumPatch = bytecodePatch(
-    name = "Unlock premium",
-) {
+val unlockPremiumPatch = bytecodePatch {
+
     compatibleWith("io.yuka.android"("4.29"))
 
     execute {

patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt

@@ -133,6 +133,7 @@ internal val Instruction.registersUsed: List<Int>
                 else -> listOf(registerC, registerD, registerE, registerF, registerG)
             }
         }
+
         is ThreeRegisterInstruction -> listOf(registerA, registerB, registerC)
         is TwoRegisterInstruction -> listOf(registerA, registerB)
         is OneRegisterInstruction -> listOf(registerA)
@@ -170,7 +171,7 @@ internal val Instruction.isReturnInstruction: Boolean
 /**
  * Adds public [AccessFlags] and removes private and protected flags (if present).
  */
-internal fun Int.toPublicAccessFlags() : Int {
+internal fun Int.toPublicAccessFlags(): Int {
     return this.or(AccessFlags.PUBLIC.value)
         .and(AccessFlags.PROTECTED.value.inv())
         .and(AccessFlags.PRIVATE.value.inv())
@@ -489,9 +490,10 @@ fun Method.indexOfFirstInstruction(targetOpcode: Opcode): Int = indexOfFirstInst
  * @return The index of the first opcode specified, or -1 if not found.
  * @see indexOfFirstInstructionOrThrow
  */
-fun Method.indexOfFirstInstruction(startIndex: Int = 0, targetOpcode: Opcode): Int = indexOfFirstInstruction(startIndex) {
-    opcode == targetOpcode
-}
+fun Method.indexOfFirstInstruction(startIndex: Int = 0, targetOpcode: Opcode): Int =
+    indexOfFirstInstruction(startIndex) {
+        opcode == targetOpcode
+    }
 
 /**
  * Get the index of the first [Instruction] that matches the predicate, starting from [startIndex].
@@ -526,9 +528,10 @@ fun Method.indexOfFirstInstructionOrThrow(targetOpcode: Opcode): Int = indexOfFi
  * @throws PatchException
  * @see indexOfFirstInstruction
  */
-fun Method.indexOfFirstInstructionOrThrow(startIndex: Int = 0, targetOpcode: Opcode): Int = indexOfFirstInstructionOrThrow(startIndex) {
-    opcode == targetOpcode
-}
+fun Method.indexOfFirstInstructionOrThrow(startIndex: Int = 0, targetOpcode: Opcode): Int =
+    indexOfFirstInstructionOrThrow(startIndex) {
+        opcode == targetOpcode
+    }
 
 /**
  * Get the index of the first [Instruction] that matches the predicate, starting from [startIndex].
@@ -554,9 +557,10 @@ fun Method.indexOfFirstInstructionOrThrow(startIndex: Int = 0, filter: Instructi
  * @return -1 if the instruction is not found.
  * @see indexOfFirstInstructionReversedOrThrow
  */
-fun Method.indexOfFirstInstructionReversed(startIndex: Int? = null, targetOpcode: Opcode): Int = indexOfFirstInstructionReversed(startIndex) {
-    opcode == targetOpcode
-}
+fun Method.indexOfFirstInstructionReversed(startIndex: Int? = null, targetOpcode: Opcode): Int =
+    indexOfFirstInstructionReversed(startIndex) {
+        opcode == targetOpcode
+    }
 
 /**
  * Get the index of matching instruction,
@@ -593,9 +597,10 @@ fun Method.indexOfFirstInstructionReversed(targetOpcode: Opcode): Int = indexOfF
  * @return The index of the instruction.
  * @see indexOfFirstInstructionReversed
  */
-fun Method.indexOfFirstInstructionReversedOrThrow(startIndex: Int? = null, targetOpcode: Opcode): Int = indexOfFirstInstructionReversedOrThrow(startIndex) {
-    opcode == targetOpcode
-}
+fun Method.indexOfFirstInstructionReversedOrThrow(startIndex: Int? = null, targetOpcode: Opcode): Int =
+    indexOfFirstInstructionReversedOrThrow(startIndex) {
+        opcode == targetOpcode
+    }
 
 /**
  * Get the index of matching instruction,
@@ -652,7 +657,8 @@ fun Method.findInstructionIndicesReversedOrThrow(filter: Instruction.() -> Boole
  *  _Returns an empty list if no indices are found_
  * @see findInstructionIndicesReversedOrThrow
  */
-fun Method.findInstructionIndicesReversed(opcode: Opcode): List<Int> = findInstructionIndicesReversed { this.opcode == opcode }
+fun Method.findInstructionIndicesReversed(opcode: Opcode): List<Int> =
+    findInstructionIndicesReversed { this.opcode == opcode }
 
 /**
  * @return An immutable list of indices of the opcode in reverse order.
@@ -726,43 +732,222 @@ fun BytecodePatchContext.forEachLiteralValueInstruction(
     }
 }
 
-/**
- * Overrides the first instruction of a method with a constant return value.
- * None of the method code will ever execute.
- */
-fun MutableMethod.returnEarly(overrideValue: Boolean = false) = overrideReturnValue(overrideValue, false)
+private const val RETURN_TYPE_MISMATCH = "Mismatch between override type and Method return type"
 
 /**
- * Overrides all return statements with a constant value.
+ * Overrides the first instruction of a method with a constant `Boolean` return value.
+ * None of the method code will ever execute.
+ *
+ * For methods that return an object or any array type, calling this method with `false`
+ * will force the method to return a `null` value.
+ */
+fun MutableMethod.returnEarly(value: Boolean = false) {
+    val returnType = returnType.first()
+    check(returnType == 'Z' || (!value && (returnType in setOf('V', 'L', '[')))) { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toHexString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Byte` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Byte) {
+    check(returnType.first() == 'B') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Short` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Short) {
+    check(returnType.first() == 'S') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Char` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Char) {
+    check(returnType.first() == 'C') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.code.toString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Int` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Int) {
+    check(returnType.first() == 'I') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Long` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Long) {
+    check(returnType.first() == 'J') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Float` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Float) {
+    check(returnType.first() == 'F') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), false)
+}
+
+/**
+ * Overrides the first instruction of a method with a constant `Double` return value.
+ * None of the method code will ever execute.
+ */
+fun MutableMethod.returnEarly(value: Double) {
+    check(returnType.first() == 'J') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), false)
+}
+
+/**
+ * Overrides all return statements with a constant `Boolean` value.
+ * All method code is executed the same as unpatched.
+ *
+ * For methods that return an object or any array type, calling this method with `false`
+ * will force the method to return a `null` value.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Boolean) {
+    val returnType = returnType.first()
+    if (returnType == 'V') {
+        error("Cannot return late for Method of void type")
+    }
+    check(returnType == 'Z' || (!value && returnType in setOf('L', '['))) { RETURN_TYPE_MISMATCH }
+
+    overrideReturnValue(value.toHexString(), true)
+}
+
+/**
+ * Overrides all return statements with a constant `Byte` value.
  * All method code is executed the same as unpatched.
  *
  * @see returnEarly
  */
-internal fun MutableMethod.returnLate(overrideValue: Boolean = false) = overrideReturnValue(overrideValue, true)
+fun MutableMethod.returnLate(value: Byte) {
+    check(returnType.first() == 'B') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), true)
+}
 
-private fun MutableMethod.overrideReturnValue(bool: Boolean, returnLate: Boolean) {
-    val const = if (bool) "0x1" else "0x0"
+/**
+ * Overrides all return statements with a constant `Short` value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Short) {
+    check(returnType.first() == 'S') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), true)
+}
 
+/**
+ * Overrides all return statements with a constant `Char` value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Char) {
+    check(returnType.first() == 'C') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.code.toString(), true)
+}
+
+/**
+ * Overrides all return statements with a constant `Int` value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Int) {
+    check(returnType.first() == 'I') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), true)
+}
+
+/**
+ * Overrides all return statements with a constant `Long` value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Long) {
+    check(returnType.first() == 'J') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), true)
+}
+
+/**
+ * Overrides all return statements with a constant `Float` value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Float) {
+    check(returnType.first() == 'F') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), true)
+}
+
+/**
+ * Overrides all return statements with a constant `Double` value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: Double) {
+    check(returnType.first() == 'D') { RETURN_TYPE_MISMATCH }
+    overrideReturnValue(value.toString(), true)
+}
+
+private fun MutableMethod.overrideReturnValue(value: String, returnLate: Boolean) {
     val instructions = when (returnType.first()) {
-        'L' -> {
+        // If return type is an object, always return null.
+        'L', '[' -> {
             """
-                const/4 v0, $const
+                const/4 v0, 0x0
                 return-object v0
             """
         }
 
         'V' -> {
-            if (returnLate) throw IllegalArgumentException("Cannot return late for method of void type")
             "return-void"
         }
 
-        'I', 'Z' -> {
+        'B', 'Z' -> {
             """
-                const/4 v0, $const
+                const/4 v0, $value
                 return v0
             """
         }
 
+        'S', 'C' -> {
+            """
+                const/16 v0, $value
+                return v0
+            """
+        }
+
+        'I', 'F' -> {
+            """
+                const v0, $value
+                return v0
+            """
+        }
+
+        'J', 'D' -> {
+            """
+                const-wide v0, $value
+                return-wide v0
+            """
+        }
+
         else -> throw Exception("Return type is not supported: $this")
     }
 

patches/src/main/kotlin/app/revanced/util/Utils.kt

@@ -6,3 +6,5 @@ internal object Utils {
             .joinToString("\n") { it.trimIndent() } // Remove the leading whitespace from each line.
             .trimIndent() // Remove the leading newline.
 }
+
+internal fun Boolean.toHexString(): String = if (this) "0x1" else "0x0"

patches/src/main/resources/addresources/values-af-rZA/strings.xml

@@ -199,6 +199,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.gms.gmsCoreSupportResourcePatch">
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   </patch>
   <patch id="misc.links.bypassURLRedirectsPatch">
@@ -207,8 +209,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   </patch>

patches/src/main/resources/addresources/values-am-rET/strings.xml

@@ -199,6 +199,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.gms.gmsCoreSupportResourcePatch">
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   </patch>
   <patch id="misc.links.bypassURLRedirectsPatch">
@@ -207,8 +209,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   </patch>

patches/src/main/resources/addresources/values-ar-rSA/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">الإعدادات</string>
   <string name="revanced_settings_confirm_user_dialog_title">هل ترغب في المتابعة؟</string>
   <string name="revanced_settings_reset">إعادة التعيين</string>
+  <string name="revanced_settings_reset_color">إعادة تعيين اللون</string>
+  <string name="revanced_settings_color_invalid">لون غير صالح</string>
   <string name="revanced_settings_restart_title">تحديث وإعادة التشغيل</string>
   <string name="revanced_settings_restart">إعادة التشغيل</string>
   <string name="revanced_settings_import">استيراد</string>
@@ -42,7 +44,7 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">إعادة تعيين إعدادات ReVanced إلى الوضع الافتراضي</string>
   <string name="revanced_settings_import_success">تم استيراد %d إعدادات</string>
   <string name="revanced_settings_import_failure_parse">فشل الاستيراد: %s</string>
-  <string name="revanced_settings_search_hint">إعدادات البحث</string>
+  <string name="revanced_settings_search_hint">بحث الإعدادات</string>
   <string name="revanced_settings_search_no_results_title">لم يتم العثور على نتائج لـ \".%s\"</string>
   <string name="revanced_settings_search_no_results_summary">جرّب كلمة مفتاحية أخرى</string>
   <string name="revanced_settings_search_remove_message">إزالة من سجل البحث؟</string>
@@ -97,9 +99,9 @@ Second \"item\" text"</string>
   <string name="revanced_restore_old_settings_menus_title">استعادة قوائم الإعدادات القديمة</string>
   <string name="revanced_restore_old_settings_menus_summary_on">يتم عرض قوائم الإعدادات القديمة</string>
   <string name="revanced_restore_old_settings_menus_summary_off">لا يتم عرض قوائم الإعدادات القديمة</string>
-  <string name="revanced_settings_search_history_title">إظهار سجل البحث في الإعدادات</string>
-  <string name="revanced_settings_search_history_summary_on">سجل البحث في الإعدادات معروض</string>
-  <string name="revanced_settings_search_history_summary_off">لم يتم عرض سجل البحث في الإعدادات</string>
+  <string name="revanced_settings_search_history_title">عرض سجل بحث الإعدادات</string>
+  <string name="revanced_settings_search_history_summary_on">يتم عرض سجل البحث في الإعدادات</string>
+  <string name="revanced_settings_search_history_summary_off">لا يتم عرض سجل البحث في الإعدادات</string>
   </patch>
   <patch id="misc.backgroundplayback.backgroundPlaybackPatch">
   <string name="revanced_shorts_disable_background_playback_title">تعطيل تشغيل فيديوهات Shorts في الخلفية</string>
@@ -115,6 +117,11 @@ Second \"item\" text"</string>
   <string name="revanced_debug_protobuffer_title">سجل بروتوكول التخزين المؤقت</string>
   <string name="revanced_debug_protobuffer_summary_on">تتضمن سجلات التصحيح التخزين المؤقت</string>
   <string name="revanced_debug_protobuffer_summary_off">لا تتضمن سجلات التصحيح التخزين المؤقت</string>
+  <string name="revanced_debug_protobuffer_user_dialog_message">"سيؤدي تمكين هذا الإعداد إلى تسجيل بيانات تخطيط إضافية، بما في ذلك النص المعروض على الشاشة لبعض مكونات واجهة المستخدم.
+
+يمكن أن يساعد هذا في تحديد المكونات عند إنشاء عوامل تصفية مخصصة.
+
+ومع ذلك، سيؤدي تمكين هذا أيضًا إلى تسجيل بعض بيانات المستخدم مثل عنوان IP الخاص بك."</string>
   <string name="revanced_debug_stacktrace_title">سجل تتبع المكدس</string>
   <string name="revanced_debug_stacktrace_summary_on">تتضمن سجلات التصحيح سجل تتبع المكدس</string>
   <string name="revanced_debug_stacktrace_summary_off">لا تتضمن سجلات التصحيح سجل تتبع المكدس</string>
@@ -124,6 +131,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_toast_on_error_user_dialog_message">"يؤدي إيقاف تشغيل ملاحظات الأخطاء إلى إخفاء كافة إشعارات أخطاء ReVanced.
 
 لن يتم إعلامك بأي أخطاء غير متوقعة."</string>
+  <string name="revanced_debug_export_logs_to_clipboard_title">تصدير سجلات تصحيح الأخطاء</string>
+  <string name="revanced_debug_export_logs_to_clipboard_summary">نسخ سجلات تصحيح أخطاء ReVanced إلى الحافظة</string>
+  <string name="revanced_debug_logs_disabled">تم تعطيل تسجيلات تصحيح الأخطاء</string>
+  <string name="revanced_debug_logs_none_found">لم يتم العثور على سجلات</string>
+  <string name="revanced_debug_logs_copied_to_clipboard">تم نسخ السجلات</string>
+  <string name="revanced_debug_logs_failed_to_export">فشل تصدير السجلات: $s</string>
+  <string name="revanced_debug_logs_clear_buffer_title">مسح سجلات تصحيح الأخطاء</string>
+  <string name="revanced_debug_logs_clear_buffer_summary">يمسح جميع سجلات تصحيح أخطاء ReVanced المخزنة</string>
+  <string name="revanced_debug_logs_clear_toast">تم مسح السجلات</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">إخفاء بطاقات الألبوم</string>
@@ -365,9 +381,6 @@ Second \"item\" text"</string>
 
 هذه الميزة متاحة فقط للأجهزة القديمة"</string>
   <string name="revanced_hide_fullscreen_ads_summary_off">يتم عرض إعلانات ملء الشاشة</string>
-  <string name="revanced_hide_buttoned_ads_title">إخفاء الإعلانات الزرية</string>
-  <string name="revanced_hide_buttoned_ads_summary_on">تم إخفاء الإعلانات الزرية</string>
-  <string name="revanced_hide_buttoned_ads_summary_off">يتم عرض الإعلانات الزرية</string>
   <string name="revanced_hide_paid_promotion_label_title">إخفاء تسمية الترقية المدفوعة</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">تم إخفاء تسمية الترقية المدفوعة</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">يتم عرض تسمية الترقية المدفوعة</string>
@@ -478,9 +491,10 @@ Second \"item\" text"</string>
   <string name="revanced_swipe_overlay_background_opacity_title">تعتيم خلفية واجهة التمرير السريع</string>
   <string name="revanced_swipe_overlay_background_opacity_summary">قيمة التعتيم بين 0-100</string>
   <string name="revanced_swipe_overlay_background_opacity_invalid_toast">يجب أن يكون تعتيم التمرير السريع بين 0-100</string>
-  <string name="revanced_swipe_overlay_progress_color_title">لون شريط تقدم واجهة التمرير</string>
-  <string name="revanced_swipe_overlay_progress_color_summary">لون شريط التقدم لعناصر التحكم في مستوى الصوت والسطوع</string>
-  <string name="revanced_swipe_overlay_progress_color_invalid_toast">لون شريط التقدم غير صالح</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_title">لون سطوع واجهة التمرير</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_summary">لون شريط التقدم لعناصر التحكم في السطوع</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_title">لون مستوى صوت واجهة التمرير</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_summary">لون شريط التقدم لعناصر التحكم في مستوى الصوت</string>
   <string name="revanced_swipe_text_overlay_size_title">حجم نص واجهة التمرير</string>
   <string name="revanced_swipe_text_overlay_size_summary">حجم النص لواجهة التمرير بين 1-30</string>
   <string name="revanced_swipe_text_overlay_size_invalid_toast">يجب أن يكون حجم النص بين 1-30</string>
@@ -1099,11 +1113,6 @@ Second \"item\" text"</string>
   <string name="revanced_sb_stats_saved_second_format">%s ثانية</string>
   <string name="revanced_sb_color_opacity_label">الشفافية:</string>
   <string name="revanced_sb_color_dot_label">اللون:</string>
-  <string name="revanced_sb_color_changed">تم تغيير اللون</string>
-  <string name="revanced_sb_color_reset">إعادة ضبط اللون</string>
-  <string name="revanced_sb_color_invalid">رمز اللون غير صالح</string>
-  <string name="revanced_sb_reset_color">إعادة تعيين اللون</string>
-  <string name="revanced_sb_reset">إعادة التعيين</string>
   <string name="revanced_sb_about_title">لمحة</string>
   <string name="revanced_sb_about_api_summary">يتم توفير البيانات بواسطة SponsorBlock API. انقر هنا لمعرفة المزيد ومشاهدة التنزيلات لمنصات أخرى</string>
   </patch>
@@ -1328,6 +1337,22 @@ Second \"item\" text"</string>
   <string name="microg_settings_title">إعدادات GmsCore</string>
   <string name="microg_settings_summary">إعدادات لـ GmsCore</string>
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  <string name="revanced_disable_haptic_feedback_title">الاهتزاز عند الضغط</string>
+  <string name="revanced_disable_haptic_feedback_summary">تغيير الاهتزاز عند الضغط</string>
+  <string name="revanced_disable_haptic_feedback_chapters_title">تعطيل الاهتزاز للفصول</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_on">تم تعطيل الاهتزاز للفصول</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_off">تم تفعيل الاهتزاز للفصول</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_title">تعطيل الاهتزاز عند التمرير الدقيق</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">تم تعطيل الاهتزاز الدقيق عند البحث</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">تم تفعيل الاهتزاز عند التمرير الدقيق</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_title">تعطيل الاهتزاز عند التراجع عن البحث</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">تم تعطيل الاهتزاز عند التراجع عن البحث</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">تم تمكين الاهتزاز عند التراجع عن البحث</string>
+  <string name="revanced_disable_haptic_feedback_zoom_title">تعطيل الاهتزاز عند التكبير</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_on">تم تعطيل الاهتزاز عند التكبير</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_off">تم تمكين الاهتزاز عند التكبير</string>
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   <string name="microg_offline_account_login_error">إذا قمت مؤخرًا بتغيير تفاصيل تسجيل الدخول إلى حسابك، فأزل تثبيت MicroG ثم أعد تثبيته.</string>
   </patch>
@@ -1346,11 +1371,6 @@ Second \"item\" text"</string>
   <string name="revanced_remove_tracking_query_parameter_summary_on">يتم إزالة معلمة استعلام التتبع من الروابط</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">لا يتم إزالة معلمة استعلام التتبع من الروابط</string>
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  <string name="revanced_disable_zoom_haptics_title">تعطيل الاهتزاز عند التكبير</string>
-  <string name="revanced_disable_zoom_haptics_summary_on">تم تعطيل الاهتزاز</string>
-  <string name="revanced_disable_zoom_haptics_summary_off">تم تمكين الاهتزاز</string>
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <string name="revanced_force_original_audio_title">فرض لغة الصوت الأصلية</string>
   <string name="revanced_force_original_audio_summary_on">استخدام لغة الصوت الأصلية</string>

patches/src/main/resources/addresources/values-as-rIN/strings.xml

@@ -201,6 +201,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.gms.gmsCoreSupportResourcePatch">
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   </patch>
   <patch id="misc.links.bypassURLRedirectsPatch">
@@ -209,8 +211,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   </patch>

patches/src/main/resources/addresources/values-az-rAZ/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Tənzimləmələr</string>
   <string name="revanced_settings_confirm_user_dialog_title">Davam etmək istəyirsiniz?</string>
   <string name="revanced_settings_reset">Sıfırla</string>
+  <string name="revanced_settings_reset_color">Rəngi sıfırla</string>
+  <string name="revanced_settings_color_invalid">Yanlış rəng</string>
   <string name="revanced_settings_restart_title">Yenilə və yenidən başlat</string>
   <string name="revanced_settings_restart">Yenidən başlat</string>
   <string name="revanced_settings_import">İdxal et</string>
@@ -42,7 +44,7 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVanced tənzimləmələr standarta təyin edildi</string>
   <string name="revanced_settings_import_success">%d tənzimləmə idxal edildi</string>
   <string name="revanced_settings_import_failure_parse">Uğursuz idxal prosesi: %s</string>
-  <string name="revanced_settings_search_hint">Axtarış tənzimləmələri</string>
+  <string name="revanced_settings_search_hint">Tənzimləmələri axtar</string>
   <string name="revanced_settings_search_no_results_title">‘%s’ üçün nəticə tapılmadı</string>
   <string name="revanced_settings_search_no_results_summary">Başqa açar sözü yoxla</string>
   <string name="revanced_settings_search_remove_message">Axtarış tarixçəsindən silinsin?</string>
@@ -115,6 +117,11 @@ Davam et düyməsinə toxun və optimallaşdırma dəyişikliklərin qəbul et."
   <string name="revanced_debug_protobuffer_title">Bufer protokol jurnalı</string>
   <string name="revanced_debug_protobuffer_summary_on">Sazlama jurnallarına protokol buferi daxildir</string>
   <string name="revanced_debug_protobuffer_summary_off">Sazlama jurnallarına protokol buferi daxil deyil</string>
+  <string name="revanced_debug_protobuffer_user_dialog_message">"Bu seçimi aktivləşdirmə bəzi UI quruluşları üçün ekran mətni də olmaqla əlavə tərtibat bazasını daxil edəcək.
+
+Bu, xüsusi filtrlər yaradarkən quruluşları müəyyən etməyə kömək edə bilər.
+
+Hər halda, bunu aktivləşdirmə IP ünvanınız kimi bəzi istifadəçi məlumatın da daxil edəcək."</string>
   <string name="revanced_debug_stacktrace_title">Yığın izləri jurnalı</string>
   <string name="revanced_debug_stacktrace_summary_on">Sazlama jurnalına yığın izləri daxildir</string>
   <string name="revanced_debug_stacktrace_summary_off">Sazlama jurnalına yığın izləri daxil deyil</string>
@@ -124,6 +131,15 @@ Davam et düyməsinə toxun və optimallaşdırma dəyişikliklərin qəbul et."
   <string name="revanced_debug_toast_on_error_user_dialog_message">"Xəta ani bildirişlərin qapatmaq, bütün ReVanced xəta bildirişlərin gizlədir.
 
 Gözlənilməz hallardan xəbərdar olmayacaqsınız."</string>
+  <string name="revanced_debug_export_logs_to_clipboard_title">Sazlama qeydlərini ixrac edin</string>
+  <string name="revanced_debug_export_logs_to_clipboard_summary">ReVanced sazlama qeydlərini buferə köçürür</string>
+  <string name="revanced_debug_logs_disabled">Sazlama qeydi qapalıdır</string>
+  <string name="revanced_debug_logs_none_found">Qeydlər tapılmadı</string>
+  <string name="revanced_debug_logs_copied_to_clipboard">Qeydlər köçürüldü</string>
+  <string name="revanced_debug_logs_failed_to_export">Qeydləri ixrac etmək alınmadı: $s</string>
+  <string name="revanced_debug_logs_clear_buffer_title">Sazlama qeydlərini təmizlə</string>
+  <string name="revanced_debug_logs_clear_buffer_summary">Saxlanılan bütün ReVanced sazlama qeydlərini təmizləyir</string>
+  <string name="revanced_debug_logs_clear_toast">Qeydlər silindi</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Albom kartlarını gizlət</string>
@@ -365,9 +381,6 @@ Məhdudiyyətlər
 
 Bu xüsusiyyət yalnız köhnə cihazlar üçün mövcuddur"</string>
   <string name="revanced_hide_fullscreen_ads_summary_off">Tam ekran reklamları göstərilir</string>
-  <string name="revanced_hide_buttoned_ads_title">Düyməli reklamları gizlət</string>
-  <string name="revanced_hide_buttoned_ads_summary_on">Düyməli reklamlar gizlədilir</string>
-  <string name="revanced_hide_buttoned_ads_summary_off">Düyməli reklamlar göstərilir</string>
   <string name="revanced_hide_paid_promotion_label_title">Ödənişli tanıtım etiketini gizlət</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">Ödənişli reklam etiketi gizlədilib</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">Ödənişli reklam etiketi göstərilir</string>
@@ -478,9 +491,10 @@ Ekranın sağ tərəfində düzünə sürüşdürərək səs səviyyəsini tənz
   <string name="revanced_swipe_overlay_background_opacity_title">Sürüşdürmə cildi arxa plan qeyri-şəffaflığı</string>
   <string name="revanced_swipe_overlay_background_opacity_summary">0-100 arası qeyri-şəffaflıq dəyəri</string>
   <string name="revanced_swipe_overlay_background_opacity_invalid_toast">Sürüşmə qeyri-şəffaflığı 0-100 arası olmalıdır</string>
-  <string name="revanced_swipe_overlay_progress_color_title">Sürüşdürmə örtüyü irəliləyiş cizgisi rəngi</string>
-  <string name="revanced_swipe_overlay_progress_color_summary">Səs səviyyəsinə və parlaqlığa nəzarət üçün irəliləyiş cizgisi rəngi</string>
-  <string name="revanced_swipe_overlay_progress_color_invalid_toast">Yanlış irəliləyiş cizgisi rəngi</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_title">Sürüşdürmə örtüyü parlaqlıq rəngi</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_summary">Parlaqlığa nəzarət üçün irəliləyiş zolağının rəngi</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_title">Sürüşdürmə örtüyü səs səviyyəsi rəngi</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_summary">Səs səviyyəsinə nəzarət üçün irəliləyiş zolağının rəngi</string>
   <string name="revanced_swipe_text_overlay_size_title">Sürüşdürmə örtüyü mətn ölçüsü</string>
   <string name="revanced_swipe_text_overlay_size_summary">Sürüşmə üçün mətn ölçüsü 1-30 arasındadır</string>
   <string name="revanced_swipe_text_overlay_size_invalid_toast">Mətn ölçüsü 1-30 arası olmalıdır</string>
@@ -1098,11 +1112,6 @@ Təqdim etməyə hazırdır?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s saniyə</string>
   <string name="revanced_sb_color_opacity_label">Qeyri-şəffaflıq:</string>
   <string name="revanced_sb_color_dot_label">Rəng:</string>
-  <string name="revanced_sb_color_changed">Rəng dəyişdirildi</string>
-  <string name="revanced_sb_color_reset">Rəngi sıfırla</string>
-  <string name="revanced_sb_color_invalid">Etibarsız rəng kodu</string>
-  <string name="revanced_sb_reset_color">Rəngi sıfırla</string>
-  <string name="revanced_sb_reset">Sıfırlayın</string>
   <string name="revanced_sb_about_title">Haqqında</string>
   <string name="revanced_sb_about_api_summary">Məlumat SponsorBlock API tərəfindən təqdim edilir. Daha ətraflı öyrənmək və digər platformalar üzrə yükləmələrə baxmaq üçün bura toxunun</string>
   </patch>
@@ -1327,6 +1336,22 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="microg_settings_title">GmsCore Tənzimləmələri</string>
   <string name="microg_settings_summary">GmsCore üçün Tənzimləmələr</string>
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  <string name="revanced_disable_haptic_feedback_title">Əks-əlaqə reaksiyası</string>
+  <string name="revanced_disable_haptic_feedback_summary">Əks-əlaqə reaksiyasını dəyişdir</string>
+  <string name="revanced_disable_haptic_feedback_chapters_title">Fəsillər reaksiyasın qapat</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_on">Fəsillər reaksiyası qapalıdır</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_off">Fəsillər reaksiyası aktivdir</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_title">Dəqiq axtarış reaksiyasın qapat</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">Dəqiq axtarış reaksiyası qapalıdır</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">Dəqiq axtarış reaksiyası aktivdir</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_title">Axtarış geriyə reaksiyasın qapat</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">Axtarış geri reaksiyası qapalıdır</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">Axtarış geri reaksiyası aktivdir</string>
+  <string name="revanced_disable_haptic_feedback_zoom_title">Yaxınlaşdırma reaksiyasın qapat</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_on">Yaxınlaşdırma reaksiyası qapalıdır</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_off">Yaxınlaşdırma reaksiyası aktivdir</string>
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   <string name="microg_offline_account_login_error">Bu yaxınlarda hesabınıza giriş məlumatlarınızı dəyişmisinizsə, MicroG-ni silin və təkrar quraşdırın.</string>
   </patch>
@@ -1345,11 +1370,6 @@ Bunu aktivləşdirmə daha yüksək video keyfiyyətləri əngəlin silə bilər
   <string name="revanced_remove_tracking_query_parameter_summary_on">İzləmə sorğusu faktoru bağlantılardan silinir</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">İzləmə sorğusu faktoru bağlantılardan silinmir</string>
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  <string name="revanced_disable_zoom_haptics_title">Yaxınlaşdırma reaksiyasın qapat</string>
-  <string name="revanced_disable_zoom_haptics_summary_on">Reaksiya qapalıdır</string>
-  <string name="revanced_disable_zoom_haptics_summary_off">Reaksiya aktivdir</string>
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <string name="revanced_force_original_audio_title">Orijinal səs dilini zorla</string>
   <string name="revanced_force_original_audio_summary_on">Orijinal səs dilini istifadə</string>

patches/src/main/resources/addresources/values-be-rBY/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Налады</string>
   <string name="revanced_settings_confirm_user_dialog_title">Вы хочаце працягнуць?</string>
   <string name="revanced_settings_reset">Скінуць</string>
+  <string name="revanced_settings_reset_color">Скінуць колер</string>
+  <string name="revanced_settings_color_invalid">Несапраўдны колер</string>
   <string name="revanced_settings_restart_title">Абнавіце і перазагрузіце</string>
   <string name="revanced_settings_restart">Перазапуск</string>
   <string name="revanced_settings_import">Імпарт</string>
@@ -115,6 +117,11 @@ Second \"item\" text"</string>
   <string name="revanced_debug_protobuffer_title">Буфер пратаколу часопіса</string>
   <string name="revanced_debug_protobuffer_summary_on">Журналы адладкі ўключаюць пратабуфер</string>
   <string name="revanced_debug_protobuffer_summary_off">Журналы адладкі не ўключаюць пратабуфер</string>
+  <string name="revanced_debug_protobuffer_user_dialog_message">"Уключэнне гэтага параметра будзе запісваць дадатковыя даныя макета, у тым ліку тэкст на экране для некаторых кампанентаў інтэрфейсу.
+
+Гэта можа дапамагчы ідэнтыфікаваць кампаненты пры стварэнні карыстацкіх фільтраў.
+
+Аднак уключэнне гэтага параметра таксама будзе запісваць некаторыя даныя карыстальніка, такія як ваш IP-адрас."</string>
   <string name="revanced_debug_stacktrace_title">Сляды стэка журнала</string>
   <string name="revanced_debug_stacktrace_summary_on">Журналы адладкі ўключаюць трасіроўку стэка</string>
   <string name="revanced_debug_stacktrace_summary_off">Журналы адладкі не ўключаюць трасіроўку стэка</string>
@@ -124,6 +131,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_toast_on_error_user_dialog_message">"Адключэнне паведамленняў пра памылкі схавае ўсе апавяшчэнні ReVanced пра памылкі.
 
 Вы не будзеце атрымліваць апавяшчэнні пра нечаканыя падзеі."</string>
+  <string name="revanced_debug_export_logs_to_clipboard_title">Экспартаваць адладачныя лагі</string>
+  <string name="revanced_debug_export_logs_to_clipboard_summary">Капіруе адладачныя лагі ReVanced у буфер абмену</string>
+  <string name="revanced_debug_logs_disabled">Адладачнае лагаванне адключана</string>
+  <string name="revanced_debug_logs_none_found">Лагі не знойдзены</string>
+  <string name="revanced_debug_logs_copied_to_clipboard">Лагі скапіяваны</string>
+  <string name="revanced_debug_logs_failed_to_export">Не атрымалася экспартаваць лагі: $s</string>
+  <string name="revanced_debug_logs_clear_buffer_title">Ачысціць адладачныя лагі</string>
+  <string name="revanced_debug_logs_clear_buffer_summary">Ачышчае ўсе захаваныя адладачныя лагі ReVanced</string>
+  <string name="revanced_debug_logs_clear_toast">Лагі ачышчаны</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Схаваць карты альбома</string>
@@ -365,9 +381,6 @@ Second \"item\" text"</string>
 
 Гэтая функцыя даступная толькі для старых прылад"</string>
   <string name="revanced_hide_fullscreen_ads_summary_off">Адлюстроўваецца поўнаэкранная рэклама</string>
-  <string name="revanced_hide_buttoned_ads_title">Схаваць рэкламу на кнопках</string>
-  <string name="revanced_hide_buttoned_ads_summary_on">Аб\"явы на кнопках схаваныя</string>
-  <string name="revanced_hide_buttoned_ads_summary_off">Паказваюцца аб\"явы на кнопках</string>
   <string name="revanced_hide_paid_promotion_label_title">Схаваць метку аплачанай акцыі</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">Пазнака платнай акцыі схавана</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">Адлюстроўваецца ярлык платнай акцыі</string>
@@ -478,9 +491,10 @@ Second \"item\" text"</string>
   <string name="revanced_swipe_overlay_background_opacity_title">Непразрыстасць фону накладкі пракруткі</string>
   <string name="revanced_swipe_overlay_background_opacity_summary">Значэнне непразрыстасці паміж 0-100</string>
   <string name="revanced_swipe_overlay_background_opacity_invalid_toast">Непразрыстасць пракруткі павінна быць паміж 0-100</string>
-  <string name="revanced_swipe_overlay_progress_color_title">Колер слупка прагрэсу накладкі правядзення</string>
-  <string name="revanced_swipe_overlay_progress_color_summary">Колер слупка прагрэсу для рэгулявання гучнасці і яркасці</string>
-  <string name="revanced_swipe_overlay_progress_color_invalid_toast">Несапраўдны колер слупка прагрэсу</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_title">Колер яркасці накладкі правядзення</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_summary">Колер шкалы прагрэсу для элементаў кіравання яркасцю</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_title">Колер гучнасці накладкі правядзення</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_summary">Колер шкалы прагрэсу для элементаў кіравання гучнасцю</string>
   <string name="revanced_swipe_text_overlay_size_title">Памер тэксту накладкі правядзення</string>
   <string name="revanced_swipe_text_overlay_size_summary">Памер тэксту для накладкі правядзення ад 1 да 30</string>
   <string name="revanced_swipe_text_overlay_size_invalid_toast">Памер тэксту павінен быць у межах ад 1 да 30</string>
@@ -1100,11 +1114,6 @@ Second \"item\" text"</string>
   <string name="revanced_sb_stats_saved_second_format">%s секунд</string>
   <string name="revanced_sb_color_opacity_label">Непразрыстасць:</string>
   <string name="revanced_sb_color_dot_label">колер:</string>
-  <string name="revanced_sb_color_changed">Колер змяніўся</string>
-  <string name="revanced_sb_color_reset">Скід колеру</string>
-  <string name="revanced_sb_color_invalid">Няправільны код колеру</string>
-  <string name="revanced_sb_reset_color">Скінуць колер</string>
-  <string name="revanced_sb_reset">Скінуць</string>
   <string name="revanced_sb_about_title">Пра праграму</string>
   <string name="revanced_sb_about_api_summary">Дадзеныя прадастаўляюцца API SponsorBlock. Націсніце тут, каб даведацца больш і паглядзець спампоўкі для іншых платформаў</string>
   </patch>
@@ -1329,6 +1338,22 @@ Second \"item\" text"</string>
   <string name="microg_settings_title">Налады GmsCore</string>
   <string name="microg_settings_summary">Налады для GmsCore</string>
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  <string name="revanced_disable_haptic_feedback_title">Тактыльная зваротная сувязь</string>
+  <string name="revanced_disable_haptic_feedback_summary">Змяніць тактыльную зваротную сувязь</string>
+  <string name="revanced_disable_haptic_feedback_chapters_title">Адключыць тактыльныя эфекты раздзелаў</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_on">Тактыльныя эфекты раздзелаў адключаны</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_off">Тактыльныя эфекты раздзелаў уключаны</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_title">Адключыць тактыльны эфект дакладнага пошуку</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">Дакладны тактыльны эфект пошуку адключаны</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">Тактыльны эфект дакладнага пошуку ўключаны</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_title">Адключыць тактыльны эфект адмены пошуку</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">Тактыльны эфект адмены пошуку адключаны</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">Тактыльны эфект адмены пошуку ўключаны</string>
+  <string name="revanced_disable_haptic_feedback_zoom_title">Адключыць тактыльны эфект маштабавання</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_on">Тактыльны эфект маштабавання адключаны</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_off">Тактыльны эфект маштабавання ўключаны</string>
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   <string name="microg_offline_account_login_error">Калі вы нядаўна змянілі даныя для ўваходу ў свой уліковы запіс, выдаліце і пераўсталюйце MicroG.</string>
   </patch>
@@ -1347,11 +1372,6 @@ Second \"item\" text"</string>
   <string name="revanced_remove_tracking_query_parameter_summary_on">Параметр запыту адсочвання выдалены са спасылак</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">Параметр адсочвання запыту не выдаляецца са спасылак</string>
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  <string name="revanced_disable_zoom_haptics_title">Адключыць тактыльны эфект маштабавання</string>
-  <string name="revanced_disable_zoom_haptics_summary_on">Тактыльныя функцыі адключаны</string>
-  <string name="revanced_disable_zoom_haptics_summary_off">Тактыльныя сігналы ўключаны</string>
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <string name="revanced_force_original_audio_title">Вымушаная арыгінальная мова аўдыё</string>
   <string name="revanced_force_original_audio_summary_on">Выкарыстоўваць арыгінальную мову аўдыя</string>

patches/src/main/resources/addresources/values-bg-rBG/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Настройки</string>
   <string name="revanced_settings_confirm_user_dialog_title">Искате ли да продължите?</string>
   <string name="revanced_settings_reset">Възстанови</string>
+  <string name="revanced_settings_reset_color">Нулиране на цвета</string>
+  <string name="revanced_settings_color_invalid">Невалиден цвят</string>
   <string name="revanced_settings_restart_title">Рестартирай и опресни</string>
   <string name="revanced_settings_restart">Рестартиране</string>
   <string name="revanced_settings_import">Импортиране</string>
@@ -88,7 +90,7 @@ Second \"item\" text"</string>
   <string name="revanced_settings_screen_01_ads_title">Реклами</string>
   <string name="revanced_settings_screen_02_alt_thumbnails_title">Алтернативни миниатюри</string>
   <string name="revanced_settings_screen_03_feed_title">Поток</string>
-  <string name="revanced_settings_screen_04_general_title">Общ</string>
+  <string name="revanced_settings_screen_04_general_title">Общи</string>
   <string name="revanced_settings_screen_05_player_title">Плеър</string>
   <string name="revanced_settings_screen_07_seekbar_title">Лента за прогрес на видеото</string>
   <string name="revanced_settings_screen_08_swipe_controls_title">Контроли с плъзгане</string>
@@ -115,6 +117,11 @@ Second \"item\" text"</string>
   <string name="revanced_debug_protobuffer_title">Буфер на протокола за дневника</string>
   <string name="revanced_debug_protobuffer_summary_on">Файлове с дневници за грешки включват буфера</string>
   <string name="revanced_debug_protobuffer_summary_off">Файлове с дневници за грешки не включват буфера</string>
+  <string name="revanced_debug_protobuffer_user_dialog_message">"Активирането на тази настройка ще регистрира допълнителни данни за оформлението, включително текст на екрана за някои компоненти на потребителския интерфейс.
+
+Това може да помогне за идентифициране на компоненти при създаване на персонализирани филтри.
+
+Активирането на тази настройка обаче ще регистрира и някои потребителски данни, като например вашия IP адрес."</string>
   <string name="revanced_debug_stacktrace_title">Следи от стека на дневника</string>
   <string name="revanced_debug_stacktrace_summary_on">Дневникът за отстраняване на грешки съдържа следи от стека</string>
   <string name="revanced_debug_stacktrace_summary_off">Дневникът за отстраняване на грешки не съдържа следи от стека</string>
@@ -124,6 +131,15 @@ Second \"item\" text"</string>
   <string name="revanced_debug_toast_on_error_user_dialog_message">"Изключването на изскачащи съобщения за грешки крие всички известия за грешки на ReVanced.
 
 Няма да бъдете уведомени за неочаквани събития."</string>
+  <string name="revanced_debug_export_logs_to_clipboard_title">Експортиране на логове за отстраняване на грешки</string>
+  <string name="revanced_debug_export_logs_to_clipboard_summary">Копира логовете за отстраняване на грешки на ReVanced в клипборда</string>
+  <string name="revanced_debug_logs_disabled">Отстраняването на грешки е деактивирано</string>
+  <string name="revanced_debug_logs_none_found">Не са намерени логове</string>
+  <string name="revanced_debug_logs_copied_to_clipboard">Логовете са копирани</string>
+  <string name="revanced_debug_logs_failed_to_export">Неуспешно експортиране на логове: $s</string>
+  <string name="revanced_debug_logs_clear_buffer_title">Изчистване на логовете за отстраняване на грешки</string>
+  <string name="revanced_debug_logs_clear_buffer_summary">Изчиства всички съхранени логове за отстраняване на грешки на ReVanced</string>
+  <string name="revanced_debug_logs_clear_toast">Логовете са изчистени</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">\"Карти на албумите\"</string>
@@ -365,9 +381,6 @@ Second \"item\" text"</string>
 
 Тази функция е налична само за по-стари устройства"</string>
   <string name="revanced_hide_fullscreen_ads_summary_off">Рекламите в режим на цял екран са показани</string>
-  <string name="revanced_hide_buttoned_ads_title">Скриване на рекламни бутони</string>
-  <string name="revanced_hide_buttoned_ads_summary_on">Бутонираните реклами са скрити</string>
-  <string name="revanced_hide_buttoned_ads_summary_off">Бутонираните реклами са показани</string>
   <string name="revanced_hide_paid_promotion_label_title">Скриване на платените промоции</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">Промоционалните етикети са скрити</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">Промоционалните етикети се показват</string>
@@ -478,9 +491,10 @@ Second \"item\" text"</string>
   <string name="revanced_swipe_overlay_background_opacity_title">Плъзгане на фона на наслагването непрозрачност</string>
   <string name="revanced_swipe_overlay_background_opacity_summary">Стойност на непрозрачността между 0-100</string>
   <string name="revanced_swipe_overlay_background_opacity_invalid_toast">Непрозрачността на плъзгането трябва да е между 0-100</string>
-  <string name="revanced_swipe_overlay_progress_color_title">Цвят на лентата за напредък при плъзгане</string>
-  <string name="revanced_swipe_overlay_progress_color_summary">Цветът на лентата за напредък за контролите за сила на звука и яркост</string>
-  <string name="revanced_swipe_overlay_progress_color_invalid_toast">Невалиден цвят на лентата за напредък</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_title">Цвят на наслагването за яркост при плъзгане</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_summary">Цветът на лентата за състояние при контролиране на яркостта</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_title">Цвят на наслагването за сила на звука при плъзгане</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_summary">Цветът на лентата за състояние при контролиране на силата на звука</string>
   <string name="revanced_swipe_text_overlay_size_title">Размер на текста на наслагването при плъзгане</string>
   <string name="revanced_swipe_text_overlay_size_summary">Размерът на текста за наслагването при плъзгане между 1-30</string>
   <string name="revanced_swipe_text_overlay_size_invalid_toast">Размерът на текста трябва да е между 1-30</string>
@@ -1099,11 +1113,6 @@ Second \"item\" text"</string>
   <string name="revanced_sb_stats_saved_second_format">%s секунди</string>
   <string name="revanced_sb_color_opacity_label">Непрозрачност:</string>
   <string name="revanced_sb_color_dot_label">Цвят:</string>
-  <string name="revanced_sb_color_changed">Цветът е променен</string>
-  <string name="revanced_sb_color_reset">Възстанови цвета</string>
-  <string name="revanced_sb_color_invalid">Невалидна стойност за цвета</string>
-  <string name="revanced_sb_reset_color">Възстановяване на цвят</string>
-  <string name="revanced_sb_reset">Възстанови</string>
   <string name="revanced_sb_about_title">За програмата</string>
   <string name="revanced_sb_about_api_summary">Данните са предоставени от SponsorBlock API. Докоснете тук за повече информация и изтеглияния</string>
   </patch>
@@ -1328,6 +1337,22 @@ Second \"item\" text"</string>
   <string name="microg_settings_title">GmsCore Настройки</string>
   <string name="microg_settings_summary">Настройки на GmsCore</string>
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  <string name="revanced_disable_haptic_feedback_title">Вибрационна обратна връзка</string>
+  <string name="revanced_disable_haptic_feedback_summary">Промяна на вибрационната обратна връзка</string>
+  <string name="revanced_disable_haptic_feedback_chapters_title">Деактивиране на вибрацията при главите</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_on">Вибрацията при главите е деактивирана</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_off">Вибрацията при главите е активирана</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_title">Деактивиране на вибрацията при прецизното търсене</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">Прецизната вибрация при търсене е деактивирана</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">Вибрацията при прецизното търсене е активирана</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_title">Деактивиране на вибрация при отмяна на търсене</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">Вибрацията при отмяна на търсене е деактивирана</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">Вибрацията при отмяна на търсене е активирана</string>
+  <string name="revanced_disable_haptic_feedback_zoom_title">Деактивиране на вибрация при мащабиране</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_on">Вибрацията при мащабиране е деактивирана</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_off">Вибрацията при мащабиране е активирана</string>
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   <string name="microg_offline_account_login_error">Ако наскоро сте променили данните си за вход в профила, деинсталирайте и инсталирайте отново MicroG.</string>
   </patch>
@@ -1346,11 +1371,6 @@ Second \"item\" text"</string>
   <string name="revanced_remove_tracking_query_parameter_summary_on">Параметърът на заявката за проследяване е премахнат от връзките</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">Параметърът на заявката за проследяване не е премахнат от връзките</string>
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  <string name="revanced_disable_zoom_haptics_title">Деактивиране на вибрация при мащабиране</string>
-  <string name="revanced_disable_zoom_haptics_summary_on">Вибрациите са деактивирани</string>
-  <string name="revanced_disable_zoom_haptics_summary_off">Вибрациите са активирани</string>
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <string name="revanced_force_original_audio_title">Принудително оригинално аудио език</string>
   <string name="revanced_force_original_audio_summary_on">Използване на оригиналния език на аудиото</string>

patches/src/main/resources/addresources/values-bn-rBD/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">সেটিংস</string>
   <string name="revanced_settings_confirm_user_dialog_title">আপনি কি এগিয়ে যেতে ইচ্ছুক?</string>
   <string name="revanced_settings_reset">আবার সেট করুন</string>
+  <string name="revanced_settings_reset_color">রঙ রিসেট করুন</string>
+  <string name="revanced_settings_color_invalid">অবৈধ রঙ</string>
   <string name="revanced_settings_restart_title">রিফ্রেশ করুন এবং আবার চালু করুন</string>
   <string name="revanced_settings_restart">আবার চালু করুন</string>
   <string name="revanced_settings_import">আমদানি করুন</string>
@@ -115,6 +117,7 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_debug_protobuffer_title">প্রটোকল বাফার লগ</string>
   <string name="revanced_debug_protobuffer_summary_on">ডিবাগ লগ প্রটোকল বাফার সংযুক্ত করবে</string>
   <string name="revanced_debug_protobuffer_summary_off">ডিবাগ লগ প্রটোকল বাফার সংযুক্ত করবে না</string>
+  <string name="revanced_debug_protobuffer_user_dialog_message">"এই সেটিংস সক্ষম করলে কিছু UI উপাদানের জন্য অন-স্ক্রীন পাঠ্য সহ অতিরিক্ত লেআউট ডেটা লগ করা হবে।\n\nএটি কাস্টম ফিল্টার তৈরি করার সময় উপাদান সনাক্ত করতে সাহায্য করতে পারে।\n\nতবে, এটি সক্রিয় করলে আপনার আইপি ঠিকানার মতো কিছু ব্যবহারকারীর ডেটাও লগ করা হবে।"</string>
   <string name="revanced_debug_stacktrace_title">স্টেক ট্রেস লগ</string>
   <string name="revanced_debug_stacktrace_summary_on">ডিবাগ লগ স্টেক ট্রেস সংযুক্ত করবে</string>
   <string name="revanced_debug_stacktrace_summary_off">ডিবাগ লগ স্টেক ট্রেস সংযুক্ত করবে না</string>
@@ -124,6 +127,15 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_debug_toast_on_error_user_dialog_message">"ত্রুটি \"toast\" বন্ধ করে ReVanced ত্রুটি বিজ্ঞপ্তিগুলি লুকানো হয়।
 
 আপনি কোনও অপ্রত্যাশিত ঘটনার বিষয়ে অবহিত হবেন না।"</string>
+  <string name="revanced_debug_export_logs_to_clipboard_title">ডিবাগ লগগুলি রফতানি করুন</string>
+  <string name="revanced_debug_export_logs_to_clipboard_summary">ক্লিপবোর্ডে ReVanced ডিবাগ লগগুলি অনুলিপি করে</string>
+  <string name="revanced_debug_logs_disabled">ডিবাগ লগিং নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="revanced_debug_logs_none_found">কোনো লগ পাওয়া যায়নি</string>
+  <string name="revanced_debug_logs_copied_to_clipboard">লগ অনুলিপি করা হয়েছে</string>
+  <string name="revanced_debug_logs_failed_to_export">লগ রপ্তানি করতে ব্যর্থ: $s</string>
+  <string name="revanced_debug_logs_clear_buffer_title">ডিবাগ লগগুলি সাফ করুন</string>
+  <string name="revanced_debug_logs_clear_buffer_summary">সমস্ত সঞ্চিত ReVanced ডিবাগ লগ সাফ করে</string>
+  <string name="revanced_debug_logs_clear_toast">লগ সাফ করা হয়েছে</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">অ্যালবাম কার্ড লুকান</string>
@@ -365,9 +377,6 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
 
 এই বৈশিষ্ট্যটি কেবল পুরনো ডিভাইসের জন্য উপলব্ধ"</string>
   <string name="revanced_hide_fullscreen_ads_summary_off">পূর্ণ স্ক্রীন বিজ্ঞাপন প্রদর্শিত হয়েছে</string>
-  <string name="revanced_hide_buttoned_ads_title">বোতামযুক্ত বিজ্ঞাপন লুকান</string>
-  <string name="revanced_hide_buttoned_ads_summary_on">বোতামযুক্ত বিজ্ঞাপন লুকিয়ে রয়েছে</string>
-  <string name="revanced_hide_buttoned_ads_summary_off">বোতামযুক্ত বিজ্ঞাপন প্রদর্শিত হয়েছে</string>
   <string name="revanced_hide_paid_promotion_label_title">অর্থের বিনিময়ে প্রচার অন্তর্ভুক্ত রয়েছে ব্যানার লুকান</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">অর্থের বিনিময়ে প্রচার অন্তর্ভুক্ত রয়েছে ব্যানার লুকিয়ে রয়েছে</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">অর্থের বিনিময়ে প্রচার অন্তর্ভুক্ত রয়েছে ব্যানার প্রদর্শিত হয়েছে</string>
@@ -478,9 +487,10 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_swipe_overlay_background_opacity_title">অস্বচ্ছতা</string>
   <string name="revanced_swipe_overlay_background_opacity_summary">0-100 এর মধ্যে অস্বচ্ছতার মান</string>
   <string name="revanced_swipe_overlay_background_opacity_invalid_toast">সোয়াইপের অস্বচ্ছতা অবশ্যই 0-100 এর মধ্যে হতে হবে</string>
-  <string name="revanced_swipe_overlay_progress_color_title">সোয়াইপ ওভারলে প্রগ্রেস বার এর রং</string>
-  <string name="revanced_swipe_overlay_progress_color_summary">ভলিউম এবং উজ্জ্বলতা নিয়ন্ত্রণের জন্য প্রগ্রেস বার এর রং</string>
-  <string name="revanced_swipe_overlay_progress_color_invalid_toast">অবৈধ প্রগ্রেস বার রং</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_title">সোয়াইপ ওভারলে উজ্জ্বলতা রঙ</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_summary">উজ্জ্বলতা নিয়ন্ত্রণের জন্য প্রগ্রেস বারের রঙ</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_title">সোয়াইপ ওভারলে ভলিউম রঙ</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_summary">ভলিউম নিয়ন্ত্রণের জন্য প্রগ্রেস বারের রঙ</string>
   <string name="revanced_swipe_text_overlay_size_title">সোয়াইপ ওভারলে টেক্সট সাইজ</string>
   <string name="revanced_swipe_text_overlay_size_summary">সোয়াইপ ওভারলে-এর জন্য টেক্সট সাইজ ১-৩০ এর মধ্যে</string>
   <string name="revanced_swipe_text_overlay_size_invalid_toast">টেক্সট সাইজ অবশ্যই ১-৩০ এর মধ্যে হতে হবে</string>
@@ -1099,11 +1109,6 @@ YouTube সেটিংসে অটো প্লে পরিবর্তন
   <string name="revanced_sb_stats_saved_second_format">%s সেকেন্ড</string>
   <string name="revanced_sb_color_opacity_label">স্বচ্ছতা:</string>
   <string name="revanced_sb_color_dot_label">রং:</string>
-  <string name="revanced_sb_color_changed">রং পরিবর্তন করা হয়েছে</string>
-  <string name="revanced_sb_color_reset">রং আবার সেট করুন</string>
-  <string name="revanced_sb_color_invalid">রংয়ের ভুল কোড</string>
-  <string name="revanced_sb_reset_color">রং আবার সেট করুন</string>
-  <string name="revanced_sb_reset">পুনরায় সেট করুন</string>
   <string name="revanced_sb_about_title">সম্পর্কিত</string>
   <string name="revanced_sb_about_api_summary">ডেটা SponsorBlock API দ্বারা সরবরাহ করা হয়। আরও জানতে এবং অন্যান্য প্ল্যাটফর্মের ডাউনলোড দেখতে এখানে ট্যাপ করুন</string>
   </patch>
@@ -1328,6 +1333,22 @@ DeArrow সম্পর্কে আরও জানতে এখানে ট
   <string name="microg_settings_title">GmsCore সেটিং</string>
   <string name="microg_settings_summary">GmsCore এর জন্য সেটিং</string>
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  <string name="revanced_disable_haptic_feedback_title">কম্পন প্রতিক্রিয়া</string>
+  <string name="revanced_disable_haptic_feedback_summary">কম্পন প্রতিক্রিয়া পরিবর্তন করুন</string>
+  <string name="revanced_disable_haptic_feedback_chapters_title">অধ্যায়গুলোর কম্পন নিষ্ক্রিয় করুন</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_on">অধ্যায়গুলোর কম্পন নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_off">অধ্যায়গুলোর কম্পন সক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_title">নির্দিষ্ট স্থানে খোঁজার কম্পন নিষ্ক্রিয় করুন</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">সূক্ষ্ম সিকিং কম্পন নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">নির্দিষ্ট স্থানে খোঁজার কম্পন সক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_title">সীক আনডু কম্পন নিষ্ক্রিয় করুন</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">সীক আনডু কম্পন নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">সীক আনডু কম্পন সক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_zoom_title">জুম করার কম্পন নিষ্ক্রিয় করুন</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_on">জুম করার কম্পন নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_off">জুম করার কম্পন সক্রিয় করা হয়েছে</string>
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   <string name="microg_offline_account_login_error">আপনি যদি সম্প্রতি আপনার অ্যাকাউন্ট লগইন বিশদ পরিবর্তন করে থাকেন, তবে MicroG আনইনস্টল করুন এবং পুনরায় ইনস্টল করুন।</string>
   </patch>
@@ -1346,11 +1367,6 @@ DeArrow সম্পর্কে আরও জানতে এখানে ট
   <string name="revanced_remove_tracking_query_parameter_summary_on">লিংক থেকে ট্র্যাকিং করার প্যারামিটার মুছে ফেলা হয়েছে</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">লিংক থেকে ট্র্যাকিং করার প্যারামিটার মুছে ফেলা হয়নি</string>
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  <string name="revanced_disable_zoom_haptics_title">জুম করার কম্পন নিষ্ক্রিয় করুন</string>
-  <string name="revanced_disable_zoom_haptics_summary_on">কম্পন নিষ্ক্রিয় করা হয়েছে</string>
-  <string name="revanced_disable_zoom_haptics_summary_off">কম্পন সক্রিয় করা হয়েছে</string>
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <string name="revanced_force_original_audio_title">মূল অডিও ভাষা বলপূর্বক চালু করুন</string>
   <string name="revanced_force_original_audio_summary_on">মূল অডিও ভাষা ব্যবহার করা হচ্ছে</string>

patches/src/main/resources/addresources/values-bs-rBA/strings.xml

@@ -199,6 +199,8 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.gms.gmsCoreSupportResourcePatch">
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   </patch>
   <patch id="misc.links.bypassURLRedirectsPatch">
@@ -207,8 +209,6 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.privacy.removeTrackingQueryParameterPatch">
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   </patch>

patches/src/main/resources/addresources/values-ca-rES/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Configuració</string>
   <string name="revanced_settings_confirm_user_dialog_title">Vols continuar?</string>
   <string name="revanced_settings_reset">Restablir</string>
+  <string name="revanced_settings_reset_color">Restablir el color</string>
+  <string name="revanced_settings_color_invalid">Color no vàlid</string>
   <string name="revanced_settings_restart_title">Actualitza i reinicia</string>
   <string name="revanced_settings_restart">Reinicia</string>
   <string name="revanced_settings_import">Importa</string>
@@ -115,6 +117,11 @@ Toca el botó Continua i permet els canvis d'optimització."</string>
   <string name="revanced_debug_protobuffer_title">Iniciar sesión en el buffer de protocolo</string>
   <string name="revanced_debug_protobuffer_summary_on">El registro de depuración incluye el búfer de protocolo</string>
   <string name="revanced_debug_protobuffer_summary_off">Els registres de depuració no inclouen l\'amortiment de proto</string>
+  <string name="revanced_debug_protobuffer_user_dialog_message">"Si activeu aquest paràmetre, es registraran dades de disseny addicionals, inclòs el text en pantalla per a alguns components de la IU.
+
+Això pot ajudar a identificar components quan creeu filtres personalitzats.
+
+Tot i això, si activeu aquesta opció, també es registraran algunes dades de l'usuari, com ara la vostra adreça IP."</string>
   <string name="revanced_debug_stacktrace_title">Registre dels rastrejos de la pila</string>
   <string name="revanced_debug_stacktrace_summary_on">Els registres de depuració inclouen el rastreig de la pila</string>
   <string name="revanced_debug_stacktrace_summary_off">Els registres de depuració no inclouen el rastreig de la pila</string>
@@ -124,6 +131,15 @@ Toca el botó Continua i permet els canvis d'optimització."</string>
   <string name="revanced_debug_toast_on_error_user_dialog_message">"Desactivar els missatges d'error d'avis oculta totes les notificacions d'error de ReVanced.
 
 No se t'informarà de cap esdeveniment inesperat."</string>
+  <string name="revanced_debug_export_logs_to_clipboard_title">Exporta els registres de depuració</string>
+  <string name="revanced_debug_export_logs_to_clipboard_summary">Copia els registres de depuració de ReVanced al porta-retalls</string>
+  <string name="revanced_debug_logs_disabled">El registre de depuració està desactivat</string>
+  <string name="revanced_debug_logs_none_found">No s\'ha trobat cap registre</string>
+  <string name="revanced_debug_logs_copied_to_clipboard">Registres copiats</string>
+  <string name="revanced_debug_logs_failed_to_export">No s\'han pogut exportar els registres: $s</string>
+  <string name="revanced_debug_logs_clear_buffer_title">Esborra els registres de depuració</string>
+  <string name="revanced_debug_logs_clear_buffer_summary">Esborra tots els registres de depuració de ReVanced emmagatzemats</string>
+  <string name="revanced_debug_logs_clear_toast">Registres esborrats</string>
   </patch>
   <patch id="layout.hide.general.hideLayoutComponentsPatch">
   <string name="revanced_hide_album_cards_title">Amagar les targetes d\'àlbums</string>
@@ -365,9 +381,6 @@ Limitacions
 
 Aquesta funció només està disponible per a dispositius antics"</string>
   <string name="revanced_hide_fullscreen_ads_summary_off">Els anuncis de pantalla completa es mostren</string>
-  <string name="revanced_hide_buttoned_ads_title">Amaga els anuncis amb botó</string>
-  <string name="revanced_hide_buttoned_ads_summary_on">Els anuncis amb botó estan amagats</string>
-  <string name="revanced_hide_buttoned_ads_summary_off">Els anuncis amb botó es mostren</string>
   <string name="revanced_hide_paid_promotion_label_title">Amaga l\'etiqueta de promoció de pagament</string>
   <string name="revanced_hide_paid_promotion_label_summary_on">L\'etiqueta de promoció de pagament està amagada</string>
   <string name="revanced_hide_paid_promotion_label_summary_off">Es mostra l\'etiqueta de promoció de pagament</string>
@@ -478,9 +491,10 @@ Ajusteu el volum lliscant verticalment a la part dreta de la pantalla"</string>
   <string name="revanced_swipe_overlay_background_opacity_title">Opacitat del fons de la superposició de lliscament</string>
   <string name="revanced_swipe_overlay_background_opacity_summary">Valor d\'opacitat entre 0 i 100</string>
   <string name="revanced_swipe_overlay_background_opacity_invalid_toast">L\'opacitat de lliscament ha d\'estar entre 0 i 100</string>
-  <string name="revanced_swipe_overlay_progress_color_title">Color de la barra de progrés de la superposició lliscant</string>
-  <string name="revanced_swipe_overlay_progress_color_summary">El color de la barra de progrés per als controls de volum i brillantor</string>
-  <string name="revanced_swipe_overlay_progress_color_invalid_toast">Color de barra de progrés no vàlid</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_title">Color de la lluminositat de la superposició de lliscament</string>
+  <string name="revanced_swipe_overlay_progress_brightness_color_summary">El color de la barra de progrés per als controls de brillantor</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_title">Color del volum de la superposició de lliscament</string>
+  <string name="revanced_swipe_overlay_progress_volume_color_summary">El color de la barra de progrés per als controls de volum</string>
   <string name="revanced_swipe_text_overlay_size_title">Mida del text de la superposició lliscant</string>
   <string name="revanced_swipe_text_overlay_size_summary">La mida del text per a la superposició lliscant entre 1 i 30</string>
   <string name="revanced_swipe_text_overlay_size_invalid_toast">La mida del text ha d\'estar entre 1 i 30</string>
@@ -1098,11 +1112,6 @@ Preparat per enviar?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s segons</string>
   <string name="revanced_sb_color_opacity_label">Opacitat:</string>
   <string name="revanced_sb_color_dot_label">Color:</string>
-  <string name="revanced_sb_color_changed">Color canviat</string>
-  <string name="revanced_sb_color_reset">Color restablert</string>
-  <string name="revanced_sb_color_invalid">Codi de color invàlid</string>
-  <string name="revanced_sb_reset_color">Restableix el color</string>
-  <string name="revanced_sb_reset">Restablir</string>
   <string name="revanced_sb_about_title">Quant a</string>
   <string name="revanced_sb_about_api_summary">Les dades són proporcionades per l\'API de SponsorBlock. Toca aquí per a saber-ne més i veure les descàrregues per a altres plataformes</string>
   </patch>
@@ -1327,6 +1336,22 @@ Si actives aquesta opció, es poden desbloquejar qualitats de vídeo més altes"
   <string name="microg_settings_title">Configuració de GmsCore</string>
   <string name="microg_settings_summary">Configuració de GmsCore</string>
   </patch>
+  <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+  <string name="revanced_disable_haptic_feedback_title">Hàptica</string>
+  <string name="revanced_disable_haptic_feedback_summary">Canvia la resposta hàptica</string>
+  <string name="revanced_disable_haptic_feedback_chapters_title">Desactiva els hàptics dels capítols</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_on">Els hàptics dels capítols estan desactivats</string>
+  <string name="revanced_disable_haptic_feedback_chapters_summary_off">Els hàptics dels capítols estan activats</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_title">Desactiva els hàptics de cerca precisa</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">Els hàptics de cerca precisa estan desactivats</string>
+  <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">Els hàptics de cerca precisa estan activats</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_title">Desactiva els hàptics de desfer la cerca</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">Els hàptics de desfer la cerca estan desactivats</string>
+  <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">Els hàptics de desfer la cerca estan activats</string>
+  <string name="revanced_disable_haptic_feedback_zoom_title">Desactiva els hàptics d\'enfocament</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_on">Els hàptics de zoom estan desactivats</string>
+  <string name="revanced_disable_haptic_feedback_zoom_summary_off">Els hàptics de zoom estan habilitats</string>
+  </patch>
   <patch id="misc.gms.accountCredentialsInvalidTextPatch">
   <string name="microg_offline_account_login_error">Si recentment heu canviat les dades d\'inici de sessió del vostre compte, desinstal·leu i torneu a instal·lar MicroG.</string>
   </patch>
@@ -1345,11 +1370,6 @@ Si actives aquesta opció, es poden desbloquejar qualitats de vídeo més altes"
   <string name="revanced_remove_tracking_query_parameter_summary_on">El paràmetre de consulta de seguiment s\'elimina dels enllaços</string>
   <string name="revanced_remove_tracking_query_parameter_summary_off">El paràmetre de consulta de seguiment no s\'elimina dels enllaços</string>
   </patch>
-  <patch id="misc.zoomhaptics.zoomHapticsPatch">
-  <string name="revanced_disable_zoom_haptics_title">Desactiva els hàptics d\'enfocament</string>
-  <string name="revanced_disable_zoom_haptics_summary_on">Els hàptics estan desactivats</string>
-  <string name="revanced_disable_zoom_haptics_summary_off">Els hàptics estan habilitats</string>
-  </patch>
   <patch id="video.audio.forceOriginalAudioPatch">
   <string name="revanced_force_original_audio_title">Forçar l\'idioma d\'àudio original</string>
   <string name="revanced_force_original_audio_summary_on">S\'utilitza l\'idioma d\'àudio original</string>