chore: Release v5.25.0-dev.11 [skip ci]

# [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)) ([83c148a](83c148addc))
* **YouTube:** Add `Disable haptic feedback` patch ([#5033](https://github.com/ReVanced/revanced-patches/issues/5033)) ([5c8ed05](5c8ed05727))

CHANGELOG.md

@@ -1,3 +1,50 @@
+# [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)
 
 

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,158 @@ 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.
+    private static final String REVANCED_LOG_TAG = "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);
+
+        StringBuilder logBuilder = new StringBuilder(className.length() + 2
+                + messageString.length());
+        logBuilder.append(className).append(": ").append(messageString);
+
+        String toastMessage = showToast ? logBuilder.toString() : null;
+
+        // Append exception message if present.
+        if (ex != null) {
+            var exceptionMessage = ex.getMessage();
+            if (exceptionMessage != null) {
+                logBuilder.append("\nException: ").append(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);
+            logBuilder.append(stackTrace, loggerBegins, stackTrace.length());
+        }
+
+        String logText = logBuilder.toString();
+        LogBufferManager.appendToLogBuffer(logText);
+
+        switch (logLevel) {
+            case DEBUG:
+                if (ex == null) Log.d(REVANCED_LOG_TAG, logText);
+                else Log.d(REVANCED_LOG_TAG, logText, ex);
+                break;
+            case INFO:
+                if (ex == null) Log.i(REVANCED_LOG_TAG, logText);
+                else Log.i(REVANCED_LOG_TAG, logText, ex);
+                break;
+            case ERROR:
+                if (ex == null) Log.e(REVANCED_LOG_TAG, logText);
+                else Log.e(REVANCED_LOG_TAG, logText, ex);
+                break;
+        }
+
+        if (toastMessage != null) {
+            Utils.showToastLong(toastMessage);
         }
     }
 
-    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 +192,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

@@ -23,6 +23,7 @@ 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;
@@ -362,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) {
@@ -382,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);
     }
@@ -547,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;
     }
 
@@ -578,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 = () -> {
@@ -604,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()) {
@@ -620,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()) {
@@ -634,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) {
@@ -777,8 +792,9 @@ public class Utils {
             preferences.add(new Pair<>(sortValue, preference));
         }
 
+        //noinspection ComparatorCombinators
         Collections.sort(preferences, (pair1, pair2)
-                -> pair1.first.compareToIgnoreCase(pair2.first));
+                -> pair1.first.compareTo(pair2.first));
 
         int index = 0;
         for (Pair<String, Preference> pair : preferences) {
@@ -852,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

@@ -60,8 +60,9 @@ public class SortedListPreference extends ListPreference {
             }
         }
 
+        //noinspection ComparatorCombinators
         Collections.sort(lastEntries, (pair1, pair2)
-                -> pair1.first.compareToIgnoreCase(pair2.first));
+                -> pair1.first.compareTo(pair2.first));
 
         CharSequence[] sortedEntries = new CharSequence[entrySize];
         CharSequence[] sortedEntryValues = new CharSequence[entrySize];

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/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/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

@@ -309,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);

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);
@@ -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,43 +295,42 @@ 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
@@ -277,4 +341,4 @@ public class SegmentCategoryListPreference extends ListPreference {
         // 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);
+                        }
                     });
                 }
             };

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.25.0-dev.7
+version = 5.25.0-dev.11

patches/api/patches.api

@@ -884,6 +884,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;
 }
@@ -1395,6 +1399,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

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/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/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/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/interaction/swipecontrols/SwipeControlsPatch.kt

@@ -48,7 +48,9 @@ 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_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/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/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>
@@ -1096,11 +1098,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>

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

@@ -1095,11 +1095,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>

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>
@@ -1097,11 +1099,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>

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>
@@ -1096,11 +1098,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>

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>
@@ -1096,11 +1098,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>

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>
@@ -1095,11 +1097,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>

patches/src/main/resources/addresources/values-cs-rCZ/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Nastavení</string>
   <string name="revanced_settings_confirm_user_dialog_title">Přejete si pokračovat?</string>
   <string name="revanced_settings_reset">Výchozí</string>
+  <string name="revanced_settings_reset_color">Obnovit barvu</string>
+  <string name="revanced_settings_color_invalid">Neplatná barva</string>
   <string name="revanced_settings_restart_title">Obnovit a restartovat</string>
   <string name="revanced_settings_restart">Restartovat</string>
   <string name="revanced_settings_import">Importovat</string>
@@ -1095,11 +1097,6 @@ Jste připraveni k odeslání?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekund</string>
   <string name="revanced_sb_color_opacity_label">Průhlednost:</string>
   <string name="revanced_sb_color_dot_label">Barva:</string>
-  <string name="revanced_sb_color_changed">Barva změněna</string>
-  <string name="revanced_sb_color_reset">Barva resetována</string>
-  <string name="revanced_sb_color_invalid">Neplatný kód barvy</string>
-  <string name="revanced_sb_reset_color">Resetovat barvu</string>
-  <string name="revanced_sb_reset">Výchozí</string>
   <string name="revanced_sb_about_title">O aplikaci</string>
   <string name="revanced_sb_about_api_summary">Data poskytuje rozhraní API SponsorBlock. Klepněte zde, abyste se dozvěděli více a zobrazili si soubory ke stažení pro další platformy</string>
   </patch>

patches/src/main/resources/addresources/values-da-rDK/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Indstillinger</string>
   <string name="revanced_settings_confirm_user_dialog_title">Ønsker du at fortsætte?</string>
   <string name="revanced_settings_reset">Nulstil</string>
+  <string name="revanced_settings_reset_color">Nulstil farve</string>
+  <string name="revanced_settings_color_invalid">Ugyldig farve</string>
   <string name="revanced_settings_restart_title">Opdater og genstart</string>
   <string name="revanced_settings_restart">Genstart</string>
   <string name="revanced_settings_import">Importer</string>
@@ -1045,11 +1047,6 @@ Er du klar til at indsende?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekunder</string>
   <string name="revanced_sb_color_opacity_label">Opacitet:</string>
   <string name="revanced_sb_color_dot_label">Farve:</string>
-  <string name="revanced_sb_color_changed">Farve ændret</string>
-  <string name="revanced_sb_color_reset">Nulstil farve</string>
-  <string name="revanced_sb_color_invalid">Ugyldig farvekode</string>
-  <string name="revanced_sb_reset_color">Nulstil farve</string>
-  <string name="revanced_sb_reset">Nulstil</string>
   <string name="revanced_sb_about_title">Om</string>
   <string name="revanced_sb_about_api_summary">Data leveres af SponsorBlock API. Tryk her for at få flere oplysninger og se downloads til andre platforme</string>
   </patch>

patches/src/main/resources/addresources/values-de-rDE/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Einstellungen</string>
   <string name="revanced_settings_confirm_user_dialog_title">Möchtest du fortfahren?</string>
   <string name="revanced_settings_reset">Zurücksetzen</string>
+  <string name="revanced_settings_reset_color">Farbe zurücksetzen</string>
+  <string name="revanced_settings_color_invalid">Ungültige Farbe</string>
   <string name="revanced_settings_restart_title">Aktualisieren und neu starten</string>
   <string name="revanced_settings_restart">Neustart</string>
   <string name="revanced_settings_import">Importieren</string>
@@ -1089,11 +1091,6 @@ Bereit zum Einreichen?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s Sekunden</string>
   <string name="revanced_sb_color_opacity_label">Deckkraft:</string>
   <string name="revanced_sb_color_dot_label">Farbe:</string>
-  <string name="revanced_sb_color_changed">Farbe geändert</string>
-  <string name="revanced_sb_color_reset">Farbe zurücksetzen</string>
-  <string name="revanced_sb_color_invalid">Ungültiger Farbcode</string>
-  <string name="revanced_sb_reset_color">Farbe zurücksetzen</string>
-  <string name="revanced_sb_reset">Zurücksetzen</string>
   <string name="revanced_sb_about_title">Über</string>
   <string name="revanced_sb_about_api_summary">Daten werden von der SponsorBlock API bereitgestellt. Tippe hier, um mehr zu erfahren und Downloads für andere Plattformen zu sehen</string>
   </patch>

patches/src/main/resources/addresources/values-el-rGR/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>
@@ -1097,11 +1099,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>

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

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Ajustes</string>
   <string name="revanced_settings_confirm_user_dialog_title">¿Desea continuar?</string>
   <string name="revanced_settings_reset">Restablecer</string>
+  <string name="revanced_settings_reset_color">Restablecer color</string>
+  <string name="revanced_settings_color_invalid">Color no válido</string>
   <string name="revanced_settings_restart_title">Actualizar y reiniciar</string>
   <string name="revanced_settings_restart">Reiniciar</string>
   <string name="revanced_settings_import">Importar</string>
@@ -1084,11 +1086,6 @@ Ya existe"</string>
   <string name="revanced_sb_stats_saved_second_format">%s segundos</string>
   <string name="revanced_sb_color_opacity_label">Opacidad:</string>
   <string name="revanced_sb_color_dot_label">Color:</string>
-  <string name="revanced_sb_color_changed">Color cambiado</string>
-  <string name="revanced_sb_color_reset">Restablecer color</string>
-  <string name="revanced_sb_color_invalid">Código de color inválido</string>
-  <string name="revanced_sb_reset_color">Reiniciar color</string>
-  <string name="revanced_sb_reset">Restablecer</string>
   <string name="revanced_sb_about_title">Acerca de</string>
   <string name="revanced_sb_about_api_summary">Los datos son proporcionados por la API de SponsorBlock. Pulsa aquí para aprender más y ver las descargas para otras plataformas</string>
   </patch>

patches/src/main/resources/addresources/values-et-rEE/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Seaded</string>
   <string name="revanced_settings_confirm_user_dialog_title">Kas soovite jätkata?</string>
   <string name="revanced_settings_reset">Lähtesta</string>
+  <string name="revanced_settings_reset_color">Lähtesta värv</string>
+  <string name="revanced_settings_color_invalid">Vigane värv</string>
   <string name="revanced_settings_restart_title">Värskenda ja taaskäivita</string>
   <string name="revanced_settings_restart">Taaskäivita</string>
   <string name="revanced_settings_import">Impordi</string>
@@ -1096,11 +1098,6 @@ Kas olete esitamiseks valmis?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekundit</string>
   <string name="revanced_sb_color_opacity_label">Läbipaistmatus:</string>
   <string name="revanced_sb_color_dot_label">Värv:</string>
-  <string name="revanced_sb_color_changed">Värv muudetud</string>
-  <string name="revanced_sb_color_reset">Värv lähtestatud</string>
-  <string name="revanced_sb_color_invalid">Vigane värvikood</string>
-  <string name="revanced_sb_reset_color">Lähtesta värv</string>
-  <string name="revanced_sb_reset">Lähtesta</string>
   <string name="revanced_sb_about_title">Teave</string>
   <string name="revanced_sb_about_api_summary">Andmed on pärit SponsorBlock API-st. Puudutage siia, et saada lisateavet ja vaadata allalaadimisi teistele platvormidele</string>
   </patch>

patches/src/main/resources/addresources/values-fi-rFI/strings.xml

@@ -35,6 +35,7 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Asetukset</string>
   <string name="revanced_settings_confirm_user_dialog_title">Haluatko jatkaa?</string>
   <string name="revanced_settings_reset">Nollaa</string>
+  <string name="revanced_settings_reset_color">Nollaa väri</string>
   <string name="revanced_settings_restart_title">Päivitä ja käynnistä uudelleen</string>
   <string name="revanced_settings_restart">Käynnistä uudelleen</string>
   <string name="revanced_settings_import">Tuo</string>
@@ -1088,11 +1089,6 @@ Oletko valmis lähettämään?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekuntia</string>
   <string name="revanced_sb_color_opacity_label">Läpikuultamattomuus:</string>
   <string name="revanced_sb_color_dot_label">Väri:</string>
-  <string name="revanced_sb_color_changed">Väri vaihdettu</string>
-  <string name="revanced_sb_color_reset">Väri nollattu</string>
-  <string name="revanced_sb_color_invalid">Virheellinen värikoodi</string>
-  <string name="revanced_sb_reset_color">Nollaa väri</string>
-  <string name="revanced_sb_reset">Nollaa</string>
   <string name="revanced_sb_about_title">Tietoja</string>
   <string name="revanced_sb_about_api_summary">Tiedot tarjoaa SponsorBlock API. Napauta tätä saadaksesi lisätietoja ja nähdäksesi lataukset muille alustoille</string>
   </patch>

patches/src/main/resources/addresources/values-fil-rPH/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Mga Setting</string>
   <string name="revanced_settings_confirm_user_dialog_title">Gusto mo bang magpatuloy?</string>
   <string name="revanced_settings_reset">I-reset</string>
+  <string name="revanced_settings_reset_color">I-reset ang kulay</string>
+  <string name="revanced_settings_color_invalid">Hindi wasto ang kulay</string>
   <string name="revanced_settings_restart_title">I-refresh at i-restart</string>
   <string name="revanced_settings_restart">I-restart</string>
   <string name="revanced_settings_import">Angkat</string>
@@ -1094,11 +1096,6 @@ Isumite na ba?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s segundo</string>
   <string name="revanced_sb_color_opacity_label">Opacity:</string>
   <string name="revanced_sb_color_dot_label">Kulay:</string>
-  <string name="revanced_sb_color_changed">Nagbago ang kulay</string>
-  <string name="revanced_sb_color_reset">Pag-reset ng kulay</string>
-  <string name="revanced_sb_color_invalid">Di-wastong code ng kulay</string>
-  <string name="revanced_sb_reset_color">I-reset ang kulay</string>
-  <string name="revanced_sb_reset">I-reset</string>
   <string name="revanced_sb_about_title">Tungkol</string>
   <string name="revanced_sb_about_api_summary">Ang data ay ibinibigay ng SponsorBlock API. Mag-tap dito para matuto pa at makakita ng mga download para sa iba pang platform</string>
   </patch>

patches/src/main/resources/addresources/values-fr-rFR/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Paramètres</string>
   <string name="revanced_settings_confirm_user_dialog_title">Voulez-vous continuer ?</string>
   <string name="revanced_settings_reset">Réinitialiser</string>
+  <string name="revanced_settings_reset_color">Réinitialiser la couleur</string>
+  <string name="revanced_settings_color_invalid">Couleur invalide</string>
   <string name="revanced_settings_restart_title">Actualiser et redémarrer</string>
   <string name="revanced_settings_restart">Redémarrer</string>
   <string name="revanced_settings_import">Importer</string>
@@ -1095,11 +1097,6 @@ Prêt à soumettre ?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s secondes</string>
   <string name="revanced_sb_color_opacity_label">Opacité :</string>
   <string name="revanced_sb_color_dot_label">Couleur :</string>
-  <string name="revanced_sb_color_changed">Couleur modifiée</string>
-  <string name="revanced_sb_color_reset">Couleur réinitialisée</string>
-  <string name="revanced_sb_color_invalid">Code couleur invalide</string>
-  <string name="revanced_sb_reset_color">Réinitialiser la couleur</string>
-  <string name="revanced_sb_reset">Réinitialiser</string>
   <string name="revanced_sb_about_title">À propos</string>
   <string name="revanced_sb_about_api_summary">Les données sont fournies par l\'API SponsorBlock. Appuyez ici pour en savoir plus et pour voir les téléchargements pour les autres plateformes.</string>
   </patch>

patches/src/main/resources/addresources/values-ga-rIE/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Socruithe</string>
   <string name="revanced_settings_confirm_user_dialog_title">Ar mhaith leat dul ar aghaidh?</string>
   <string name="revanced_settings_reset">Athshocraigh</string>
+  <string name="revanced_settings_reset_color">Dath a athshocrú</string>
+  <string name="revanced_settings_color_invalid">Dath neamhbhailí</string>
   <string name="revanced_settings_restart_title">Athnuachan agus atosaigh</string>
   <string name="revanced_settings_restart">Athosaigh</string>
   <string name="revanced_settings_import">Iompórtáil</string>
@@ -1096,11 +1098,6 @@ Maithe chun cur isteach?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s soicindí</string>
   <string name="revanced_sb_color_opacity_label">Teimhneacht:</string>
   <string name="revanced_sb_color_dot_label">Dath:</string>
-  <string name="revanced_sb_color_changed">Athraigh dath</string>
-  <string name="revanced_sb_color_reset">Athshocrú dath</string>
-  <string name="revanced_sb_color_invalid">Cód dath neamhbhailí</string>
-  <string name="revanced_sb_reset_color">Athshocraigh dath</string>
-  <string name="revanced_sb_reset">Athshocraigh</string>
   <string name="revanced_sb_about_title">Maidir</string>
   <string name="revanced_sb_about_api_summary">Soláthraíonn an API SponsorBlock sonraí. Tapáil anseo chun níos mó a fhoghlaim agus íoslódálacha a fheiceáil d\'ardáin eile</string>
   </patch>

patches/src/main/resources/addresources/values-hu-rHU/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Beállítások</string>
   <string name="revanced_settings_confirm_user_dialog_title">Szeretné folytatni?</string>
   <string name="revanced_settings_reset">Visszaállítás</string>
+  <string name="revanced_settings_reset_color">Szín alaphelyzetbe állítása</string>
+  <string name="revanced_settings_color_invalid">Érvénytelen szín</string>
   <string name="revanced_settings_restart_title">Frissítés és újraindítás</string>
   <string name="revanced_settings_restart">Újraindítás</string>
   <string name="revanced_settings_import">Importálás</string>
@@ -1095,11 +1097,6 @@ Készen állsz a beküldésre?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s másodperc</string>
   <string name="revanced_sb_color_opacity_label">Áttetszőség:</string>
   <string name="revanced_sb_color_dot_label">Szín:</string>
-  <string name="revanced_sb_color_changed">A szín megváltoztatva</string>
-  <string name="revanced_sb_color_reset">Szín alaphelyzetbe</string>
-  <string name="revanced_sb_color_invalid">Érvénytelen színkód</string>
-  <string name="revanced_sb_reset_color">Színek visszaállítása</string>
-  <string name="revanced_sb_reset">Visszaállítás</string>
   <string name="revanced_sb_about_title">Rólunk</string>
   <string name="revanced_sb_about_api_summary">Az adatokat a SponsorBlock API biztosítja. Koppintson ide, ha többet szeretne megtudni és megtekintené a letöltéseket más platformokra</string>
   </patch>

patches/src/main/resources/addresources/values-hy-rAM/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>
@@ -1096,11 +1098,6 @@ Seekbar thumbnails-ները կօգտագործեն նույն որակը, ինչ
   <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>

patches/src/main/resources/addresources/values-in-rID/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Pengaturan</string>
   <string name="revanced_settings_confirm_user_dialog_title">Apakah Anda ingin melanjutkan?</string>
   <string name="revanced_settings_reset">Setel ulang</string>
+  <string name="revanced_settings_reset_color">Setel ulang warna</string>
+  <string name="revanced_settings_color_invalid">Warna tidak sah</string>
   <string name="revanced_settings_restart_title">Segarkan dan mulai ulang</string>
   <string name="revanced_settings_restart">Mulai ulang</string>
   <string name="revanced_settings_import">Impor</string>
@@ -1095,11 +1097,6 @@ Siap mengirim?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s detik</string>
   <string name="revanced_sb_color_opacity_label">Opasitas:</string>
   <string name="revanced_sb_color_dot_label">Warna:</string>
-  <string name="revanced_sb_color_changed">Warna berubah</string>
-  <string name="revanced_sb_color_reset">Reset warna</string>
-  <string name="revanced_sb_color_invalid">Kode warna tidak sah</string>
-  <string name="revanced_sb_reset_color">Atur ulang warna</string>
-  <string name="revanced_sb_reset">Setel ulang</string>
   <string name="revanced_sb_about_title">Tentang</string>
   <string name="revanced_sb_about_api_summary">Data disediakan oleh API SponsorBlock. Tekan di sini untuk mempelajari lebih lanjut dan melihat hasil pengunduhan untuk platform lain</string>
   </patch>

patches/src/main/resources/addresources/values-it-rIT/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Impostazioni</string>
   <string name="revanced_settings_confirm_user_dialog_title">Sei sicuro di voler continuare?</string>
   <string name="revanced_settings_reset">Reimposta</string>
+  <string name="revanced_settings_reset_color">Reimposta colore</string>
+  <string name="revanced_settings_color_invalid">Colore non valido</string>
   <string name="revanced_settings_restart_title">Aggiorna e riavvia</string>
   <string name="revanced_settings_restart">Riavvia</string>
   <string name="revanced_settings_import">Importa</string>
@@ -1095,11 +1097,6 @@ Pronto per l'invio?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s secondi</string>
   <string name="revanced_sb_color_opacity_label">Opacità:</string>
   <string name="revanced_sb_color_dot_label">Colore:</string>
-  <string name="revanced_sb_color_changed">Colore modificato</string>
-  <string name="revanced_sb_color_reset">Ripristino colore</string>
-  <string name="revanced_sb_color_invalid">Codice colore non valido</string>
-  <string name="revanced_sb_reset_color">Ripristina colore</string>
-  <string name="revanced_sb_reset">Reimposta</string>
   <string name="revanced_sb_about_title">Informazioni</string>
   <string name="revanced_sb_about_api_summary">I dati sono forniti dall\'API di SponsorBlock. Tocca qui per saperne di più e vedere i download per altre piattaforme</string>
   </patch>

patches/src/main/resources/addresources/values-iw-rIL/strings.xml

@@ -35,6 +35,7 @@ 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_restart_title">רענן והפעל מחדש</string>
   <string name="revanced_settings_restart">הפעלה מחדש</string>
   <string name="revanced_settings_import">ייבוא</string>
@@ -1060,11 +1061,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>

patches/src/main/resources/addresources/values-ja-rJP/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>
@@ -1096,11 +1098,6 @@ MicroG GmsCore に対する電池の最適化を無効にしても、バッテ
   <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">SponsorBlock について</string>
   <string name="revanced_sb_about_api_summary">SponsorBlock APIによって提供されるデータです。詳細はこちらをタップしてください。</string>
   </patch>

patches/src/main/resources/addresources/values-ko-rKR/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>
@@ -485,13 +487,13 @@ MicroG 앱 배터리 최적화를 비활성화(제한 없음)하더라도, 배
   <string name="revanced_swipe_volume_sensitivity_title">볼륨 스와이프 민감도</string>
   <string name="revanced_swipe_volume_sensitivity_summary">스와이프할 때마다 볼륨이 얼마나 변경되는지를 지정할 수 있습니다</string>
   <string name="revanced_swipe_overlay_style_title">스와이프 오버레이 스타일</string>
-  <string name="revanced_swipe_overlay_style_entry_1">가로 오버레이</string>
-  <string name="revanced_swipe_overlay_style_entry_2">가로 오버레이 (최소화 - 상단)</string>
-  <string name="revanced_swipe_overlay_style_entry_3">가로 오버레이 (최소화 - 중앙)</string>
-  <string name="revanced_swipe_overlay_style_entry_4">원형 오버레이</string>
-  <string name="revanced_swipe_overlay_style_entry_5">원형 오버레이 (최소화)</string>
-  <string name="revanced_swipe_overlay_style_entry_6">세로 오버레이</string>
-  <string name="revanced_swipe_overlay_style_entry_7">세로 오버레이 (최소화)</string>
+  <string name="revanced_swipe_overlay_style_entry_1">가로</string>
+  <string name="revanced_swipe_overlay_style_entry_2">가로 (최소화 - 상단)</string>
+  <string name="revanced_swipe_overlay_style_entry_3">가로 (최소화 - 중앙)</string>
+  <string name="revanced_swipe_overlay_style_entry_4">원형</string>
+  <string name="revanced_swipe_overlay_style_entry_5">원형 (최소화)</string>
+  <string name="revanced_swipe_overlay_style_entry_6">세로</string>
+  <string name="revanced_swipe_overlay_style_entry_7">세로 (최소화)</string>
   <string name="revanced_swipe_change_video_title">스와이프 제스처로 동영상 전환 활성화하기</string>
   <string name="revanced_swipe_change_video_summary_on">전체 화면 중앙에서 위로/아래로 스와이프하여 다음/이전 동영상으로 전환합니다</string>
   <string name="revanced_swipe_change_video_summary_off">전체 화면 중앙에서 위로/아래로 스와이프하여 다음/이전 동영상으로 전환하지 않습니다</string>
@@ -1096,11 +1098,6 @@ MicroG 앱 배터리 최적화를 비활성화(제한 없음)하더라도, 배
   <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>

patches/src/main/resources/addresources/values-lt-rLT/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Nustatymai</string>
   <string name="revanced_settings_confirm_user_dialog_title">Ar norite tęsti?</string>
   <string name="revanced_settings_reset">Atstatyti</string>
+  <string name="revanced_settings_reset_color">Atkurti spalvą</string>
+  <string name="revanced_settings_color_invalid">Neteisinga spalva</string>
   <string name="revanced_settings_restart_title">Atnaujinti ir paleisti iš naujo</string>
   <string name="revanced_settings_restart">Paleisti iš naujo</string>
   <string name="revanced_settings_import">Importuoti</string>
@@ -1095,11 +1097,6 @@ Ar paruošta pateikti?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekundės</string>
   <string name="revanced_sb_color_opacity_label">Neskaidrumas:</string>
   <string name="revanced_sb_color_dot_label">Spalva:</string>
-  <string name="revanced_sb_color_changed">Spalva pakeista</string>
-  <string name="revanced_sb_color_reset">Spalva atstatyta</string>
-  <string name="revanced_sb_color_invalid">Netinkamas spalvos kodas</string>
-  <string name="revanced_sb_reset_color">Atstatyti spalvą</string>
-  <string name="revanced_sb_reset">Atstatyti</string>
   <string name="revanced_sb_about_title">Apie</string>
   <string name="revanced_sb_about_api_summary">Duomenys pateikiami per \"SponsorBlock\" API. Bakstelėkite čia, kad sužinotumėte daugiau ir pamatytumėte atsisiuntimus kitoms platformoms</string>
   </patch>

patches/src/main/resources/addresources/values-lv-rLV/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Iestatījumi</string>
   <string name="revanced_settings_confirm_user_dialog_title">Vai vēlaties turpināt?</string>
   <string name="revanced_settings_reset">Atiestatīt</string>
+  <string name="revanced_settings_reset_color">Atiestatīt krāsu</string>
+  <string name="revanced_settings_color_invalid">Nederīga krāsa</string>
   <string name="revanced_settings_restart_title">Atjaunināt un restartēt</string>
   <string name="revanced_settings_restart">Restartēt</string>
   <string name="revanced_settings_import">Importēt</string>
@@ -1095,11 +1097,6 @@ Vai esat gatavs iesniegt?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekundes</string>
   <string name="revanced_sb_color_opacity_label">Necaurredzamība:</string>
   <string name="revanced_sb_color_dot_label">Krāsa:</string>
-  <string name="revanced_sb_color_changed">Krāsa mainīta</string>
-  <string name="revanced_sb_color_reset">Krāsa atiestatīta</string>
-  <string name="revanced_sb_color_invalid">Nederīgs krāsas kods</string>
-  <string name="revanced_sb_reset_color">Atiestatīt krāsu</string>
-  <string name="revanced_sb_reset">Atiestatīt</string>
   <string name="revanced_sb_about_title">Par</string>
   <string name="revanced_sb_about_api_summary">Dati tiek sniegti no SponsorBlock API. Pieskarieties šeit, lai uzzinātu vairāk un skatītu lejupielādes citām platformām</string>
   </patch>

patches/src/main/resources/addresources/values-nl-rNL/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Instellingen</string>
   <string name="revanced_settings_confirm_user_dialog_title">Wilt u doorgaan?</string>
   <string name="revanced_settings_reset">Terugzetten</string>
+  <string name="revanced_settings_reset_color">Kleur opnieuw instellen</string>
+  <string name="revanced_settings_color_invalid">Ongeldige kleur</string>
   <string name="revanced_settings_restart_title">Vernieuwen en opnieuw starten</string>
   <string name="revanced_settings_restart">Opnieuw starten</string>
   <string name="revanced_settings_import">Importeren</string>
@@ -1096,11 +1098,6 @@ Klaar om in te dienen?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s seconden</string>
   <string name="revanced_sb_color_opacity_label">Ondoorzichtigheid:</string>
   <string name="revanced_sb_color_dot_label">Kleur:</string>
-  <string name="revanced_sb_color_changed">Kleur gewijzigd</string>
-  <string name="revanced_sb_color_reset">Kleur gereset</string>
-  <string name="revanced_sb_color_invalid">Ongeldige kleurcode</string>
-  <string name="revanced_sb_reset_color">Kleur resetten</string>
-  <string name="revanced_sb_reset">Herstellen naar standaard</string>
   <string name="revanced_sb_about_title">Over</string>
   <string name="revanced_sb_about_api_summary">Gegevens worden geleverd door de SponsorBlock API. Tik hier om meer te weten te komen en downloads te bekijken voor andere platforms</string>
   </patch>

patches/src/main/resources/addresources/values-pl-rPL/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Ustawienia</string>
   <string name="revanced_settings_confirm_user_dialog_title">Czy chcesz kontynuować?</string>
   <string name="revanced_settings_reset">Zresetuj</string>
+  <string name="revanced_settings_reset_color">Zresetuj kolor</string>
+  <string name="revanced_settings_color_invalid">Nieprawidłowy kolor</string>
   <string name="revanced_settings_restart_title">Odśwież i uruchom ponownie</string>
   <string name="revanced_settings_restart">Uruchom ponownie</string>
   <string name="revanced_settings_import">Zaimportuj</string>
@@ -1096,11 +1098,6 @@ Gotowy do przesłania?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekund</string>
   <string name="revanced_sb_color_opacity_label">Krycie:</string>
   <string name="revanced_sb_color_dot_label">Kolor:</string>
-  <string name="revanced_sb_color_changed">Zmieniono kolor</string>
-  <string name="revanced_sb_color_reset">Zresetowano kolor</string>
-  <string name="revanced_sb_color_invalid">Nieprawidłowy kod koloru</string>
-  <string name="revanced_sb_reset_color">Resetuj kolor</string>
-  <string name="revanced_sb_reset">Resetuj</string>
   <string name="revanced_sb_about_title">O aplikacji</string>
   <string name="revanced_sb_about_api_summary">Dane są dostarczane przez API SponsorBlock. Dotknij tutaj, aby dowiedzieć się więcej i pobrać na inne platformy</string>
   </patch>

patches/src/main/resources/addresources/values-pt-rBR/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Configurações</string>
   <string name="revanced_settings_confirm_user_dialog_title">Você deseja prosseguir?</string>
   <string name="revanced_settings_reset">Resetar</string>
+  <string name="revanced_settings_reset_color">Redefinir cor</string>
+  <string name="revanced_settings_color_invalid">Cor inválida</string>
   <string name="revanced_settings_restart_title">Atualizar e reiniciar</string>
   <string name="revanced_settings_restart">Reiniciar</string>
   <string name="revanced_settings_import">Importar</string>
@@ -759,8 +761,8 @@ Para exibir o menu da faixa de áudio, altere \"Spoof video streams\" para iOS T
   <string name="revanced_hide_shorts_like_button_summary_on">Botão gostei está oculto</string>
   <string name="revanced_hide_shorts_like_button_summary_off">Botão gostei não está oculto</string>
   <string name="revanced_hide_shorts_dislike_button_title">Ocultar botão Não curtir</string>
-  <string name="revanced_hide_shorts_dislike_button_summary_on">Botão não gostei é mostrado</string>
-  <string name="revanced_hide_shorts_dislike_button_summary_off">Botão não gostei está oculto</string>
+  <string name="revanced_hide_shorts_dislike_button_summary_on">Botão não gostei está oculto</string>
+  <string name="revanced_hide_shorts_dislike_button_summary_off">Botão não gostei é mostrado</string>
   <string name="revanced_hide_shorts_comments_button_title">Ocultar botão Comentários</string>
   <string name="revanced_hide_shorts_comments_button_summary_on">Botão comentários está oculto</string>
   <string name="revanced_hide_shorts_comments_button_summary_off">Botão comentários não está oculto</string>
@@ -1093,11 +1095,6 @@ Pronto para enviar?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s segundos</string>
   <string name="revanced_sb_color_opacity_label">Opacidade:</string>
   <string name="revanced_sb_color_dot_label">Cor:</string>
-  <string name="revanced_sb_color_changed">Cor alterada</string>
-  <string name="revanced_sb_color_reset">Redefinir cor</string>
-  <string name="revanced_sb_color_invalid">Código de cor inválido</string>
-  <string name="revanced_sb_reset_color">Redefinir cor</string>
-  <string name="revanced_sb_reset">Resetar</string>
   <string name="revanced_sb_about_title">Sobre</string>
   <string name="revanced_sb_about_api_summary">Os dados são fornecidos pela API do SponsorBlock. Toque aqui para aprender mais e ver como baixar para outras plataformas</string>
   </patch>

patches/src/main/resources/addresources/values-pt-rPT/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Configurações</string>
   <string name="revanced_settings_confirm_user_dialog_title">Desejas continuar?</string>
   <string name="revanced_settings_reset">Repor</string>
+  <string name="revanced_settings_reset_color">Redefinir cor</string>
+  <string name="revanced_settings_color_invalid">Cor inválida</string>
   <string name="revanced_settings_restart_title">Atualizar e reiniciar</string>
   <string name="revanced_settings_restart">Reiniciar</string>
   <string name="revanced_settings_import">Importar</string>
@@ -1096,11 +1098,6 @@ Pronto para enviar?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s segundos</string>
   <string name="revanced_sb_color_opacity_label">Opacidade:</string>
   <string name="revanced_sb_color_dot_label">Cor:</string>
-  <string name="revanced_sb_color_changed">Cor alterada</string>
-  <string name="revanced_sb_color_reset">Redefinir cor</string>
-  <string name="revanced_sb_color_invalid">Código de cor inválido</string>
-  <string name="revanced_sb_reset_color">Redefinir cor</string>
-  <string name="revanced_sb_reset">Repor</string>
   <string name="revanced_sb_about_title">Sobre</string>
   <string name="revanced_sb_about_api_summary">Os dados são fornecidos pela API do SponsorBlock. Toque aqui para aprender mais e ver downloads para outras plataformas</string>
   </patch>

patches/src/main/resources/addresources/values-ro-rRO/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Setări</string>
   <string name="revanced_settings_confirm_user_dialog_title">Doriți să continuați?</string>
   <string name="revanced_settings_reset">Resetare</string>
+  <string name="revanced_settings_reset_color">Resetează culoarea</string>
+  <string name="revanced_settings_color_invalid">Culoare nevalidă</string>
   <string name="revanced_settings_restart_title">Reîmprospătare și repornire</string>
   <string name="revanced_settings_restart">Repornire</string>
   <string name="revanced_settings_import">Importare</string>
@@ -1095,11 +1097,6 @@ Ești gata să trimiți?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s secunde</string>
   <string name="revanced_sb_color_opacity_label">Opacitate:</string>
   <string name="revanced_sb_color_dot_label">Culoare:</string>
-  <string name="revanced_sb_color_changed">Culoare schimbată</string>
-  <string name="revanced_sb_color_reset">Resetare culoare</string>
-  <string name="revanced_sb_color_invalid">Cod culoare nevalid</string>
-  <string name="revanced_sb_reset_color">Resetare culoare</string>
-  <string name="revanced_sb_reset">Resetează</string>
   <string name="revanced_sb_about_title">Despre</string>
   <string name="revanced_sb_about_api_summary">Datele sunt furnizate de API-ul SponsorBlock. Apasă aici pentru a afla mai multe și a vedea descărcările pentru alte platforme</string>
   </patch>

patches/src/main/resources/addresources/values-ru-rRU/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>
@@ -1096,11 +1098,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>

patches/src/main/resources/addresources/values-sk-rSK/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Nastavenia</string>
   <string name="revanced_settings_confirm_user_dialog_title">Chcete pokračovať?</string>
   <string name="revanced_settings_reset">Resetovať</string>
+  <string name="revanced_settings_reset_color">Obnovi	 farbu</string>
+  <string name="revanced_settings_color_invalid">Neplatn	 farba</string>
   <string name="revanced_settings_restart_title">Obnovte a reštartujte</string>
   <string name="revanced_settings_restart">Reštart</string>
   <string name="revanced_settings_import">Importovať</string>
@@ -1086,11 +1088,6 @@ Pripravené na odoslanie?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekúnd</string>
   <string name="revanced_sb_color_opacity_label">Priehľadnosť:</string>
   <string name="revanced_sb_color_dot_label">Farba:</string>
-  <string name="revanced_sb_color_changed">Farba bola zmenená</string>
-  <string name="revanced_sb_color_reset">Farba bola resetovaná</string>
-  <string name="revanced_sb_color_invalid">Neplatný kód farby</string>
-  <string name="revanced_sb_reset_color">Obnoviť farbu</string>
-  <string name="revanced_sb_reset">Resetovať</string>
   <string name="revanced_sb_about_title">Informácie</string>
   <string name="revanced_sb_about_api_summary">Údaje poskytuje SponsorBlock API. Klepnutím sem sa dozviete viac a zobrazíte súbory na stiahnutie pre iné platformy</string>
   </patch>

patches/src/main/resources/addresources/values-sl-rSI/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Nastavitve</string>
   <string name="revanced_settings_confirm_user_dialog_title">Ali želite nadaljevati?</string>
   <string name="revanced_settings_reset">Ponastavi</string>
+  <string name="revanced_settings_reset_color">Ponastavi barvo</string>
+  <string name="revanced_settings_color_invalid">Neveljavna barva</string>
   <string name="revanced_settings_restart_title">Osveži in ponovno zaženi</string>
   <string name="revanced_settings_restart">Ponovno zaženi</string>
   <string name="revanced_settings_import">Uvozi</string>
@@ -1095,11 +1097,6 @@ Ali ste pripravljeni na oddajo?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekund</string>
   <string name="revanced_sb_color_opacity_label">Prosojnost:</string>
   <string name="revanced_sb_color_dot_label">Barva:</string>
-  <string name="revanced_sb_color_changed">Barva spremenjena</string>
-  <string name="revanced_sb_color_reset">Barva ponastavljena</string>
-  <string name="revanced_sb_color_invalid">Neveljavna koda barve</string>
-  <string name="revanced_sb_reset_color">Ponastavi barvo</string>
-  <string name="revanced_sb_reset">Ponastavi</string>
   <string name="revanced_sb_about_title">O programu</string>
   <string name="revanced_sb_about_api_summary">Podatki so zagotovljeni s strani SponsorBlock API. Tapnite tukaj, da izveste več in si ogledate prenose za druge platforme</string>
   </patch>

patches/src/main/resources/addresources/values-sq-rAL/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Cilësimet</string>
   <string name="revanced_settings_confirm_user_dialog_title">Dëshironi të vazhdoni?</string>
   <string name="revanced_settings_reset">Rivendos</string>
+  <string name="revanced_settings_reset_color">Rikthe ngjyrën</string>
+  <string name="revanced_settings_color_invalid">Ngjyrë e pavlefshme</string>
   <string name="revanced_settings_restart_title">Rifresko dhe rifillo</string>
   <string name="revanced_settings_restart">Rifillo</string>
   <string name="revanced_settings_import">Importo</string>
@@ -1094,11 +1096,6 @@ Gati per te dhene?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekonda</string>
   <string name="revanced_sb_color_opacity_label">Opaciteti:</string>
   <string name="revanced_sb_color_dot_label">Ngjyra:</string>
-  <string name="revanced_sb_color_changed">Ngjyra është ndryshuar</string>
-  <string name="revanced_sb_color_reset">Ngjyra u rikthye</string>
-  <string name="revanced_sb_color_invalid">Kod ngjyre i pavlefshëm</string>
-  <string name="revanced_sb_reset_color">Rikthe ngjyrën</string>
-  <string name="revanced_sb_reset">Rikthe</string>
   <string name="revanced_sb_about_title">Rreth</string>
   <string name="revanced_sb_about_api_summary">Të dhënat janë siguruar nga API e SponsorBlock. Prekni këtu për të mësuar më shumë dhe për të parë shkarkimet për platformat e tjera</string>
   </patch>

patches/src/main/resources/addresources/values-sr-rCS/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Podešavanja</string>
   <string name="revanced_settings_confirm_user_dialog_title">Želite li da nastavite?</string>
   <string name="revanced_settings_reset">Resetuj</string>
+  <string name="revanced_settings_reset_color">Poništi boju</string>
+  <string name="revanced_settings_color_invalid">Nevažeća boja</string>
   <string name="revanced_settings_restart_title">Osvežite i restartujte</string>
   <string name="revanced_settings_restart">Restartuj</string>
   <string name="revanced_settings_import">Uvoz</string>
@@ -1095,11 +1097,6 @@ Spreman za podnošenje?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekundi</string>
   <string name="revanced_sb_color_opacity_label">Neprozirnost:</string>
   <string name="revanced_sb_color_dot_label">Boja:</string>
-  <string name="revanced_sb_color_changed">Boja promenjena</string>
-  <string name="revanced_sb_color_reset">Boja resetovana</string>
-  <string name="revanced_sb_color_invalid">Nevažeći kôd boje</string>
-  <string name="revanced_sb_reset_color">Resetuj boju</string>
-  <string name="revanced_sb_reset">Resetuj</string>
   <string name="revanced_sb_about_title">O programu</string>
   <string name="revanced_sb_about_api_summary">Podatke obezbeđuje SponsorBlock API. Dodirnite ovde da saznate više i vidite preuzimanja za druge platforme</string>
   </patch>

patches/src/main/resources/addresources/values-sr-rSP/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>
@@ -1095,11 +1097,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>

patches/src/main/resources/addresources/values-sv-rSE/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Inställningar</string>
   <string name="revanced_settings_confirm_user_dialog_title">Vill du fortsätta?</string>
   <string name="revanced_settings_reset">Återställ</string>
+  <string name="revanced_settings_reset_color">Återställ färg</string>
+  <string name="revanced_settings_color_invalid">Ogiltig färg</string>
   <string name="revanced_settings_restart_title">Uppdatera och starta om</string>
   <string name="revanced_settings_restart">Starta om</string>
   <string name="revanced_settings_import">Importera</string>
@@ -1095,11 +1097,6 @@ Redo att skicka in?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s sekunder</string>
   <string name="revanced_sb_color_opacity_label">Opacitet:</string>
   <string name="revanced_sb_color_dot_label">Färg:</string>
-  <string name="revanced_sb_color_changed">Färg ändrad</string>
-  <string name="revanced_sb_color_reset">Färg återställning</string>
-  <string name="revanced_sb_color_invalid">Ogiltig färgkod</string>
-  <string name="revanced_sb_reset_color">Återställ färg</string>
-  <string name="revanced_sb_reset">Återställ</string>
   <string name="revanced_sb_about_title">Om</string>
   <string name="revanced_sb_about_api_summary">Data tillhandahålls av SponsorBlock API. Tryck här för att läsa mer och se nedladdningar för andra plattformar</string>
   </patch>

patches/src/main/resources/addresources/values-th-rTH/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>
@@ -1094,11 +1096,6 @@ User id ของคุณเหมือนกับรหัสผ่าน
   <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>

patches/src/main/resources/addresources/values-tr-rTR/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Ayarlar</string>
   <string name="revanced_settings_confirm_user_dialog_title">Devam etmek istiyor musunuz?</string>
   <string name="revanced_settings_reset">Sıfırla</string>
+  <string name="revanced_settings_reset_color">Rengi sıfırla</string>
+  <string name="revanced_settings_color_invalid">Geçersiz renk</string>
   <string name="revanced_settings_restart_title">Yenile ve yeniden başlat</string>
   <string name="revanced_settings_restart">Yeniden başlat</string>
   <string name="revanced_settings_import">İçe aktar</string>
@@ -1096,11 +1098,6 @@ Göndermeye hazır mısınız?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s saniye</string>
   <string name="revanced_sb_color_opacity_label">Opaklık:</string>
   <string name="revanced_sb_color_dot_label">Renk:</string>
-  <string name="revanced_sb_color_changed">Renk değiştirildi</string>
-  <string name="revanced_sb_color_reset">Renk sıfırlandı</string>
-  <string name="revanced_sb_color_invalid">Geçersiz renk kodu</string>
-  <string name="revanced_sb_reset_color">Rengi sıfırla</string>
-  <string name="revanced_sb_reset">Sıfırla</string>
   <string name="revanced_sb_about_title">Hakkında</string>
   <string name="revanced_sb_about_api_summary">Veri, SponsorBlock API\'sinden sağlanır. Daha fazla bilgi ve diğer platformlar için indirmeleri görmek için dokunun</string>
   </patch>

patches/src/main/resources/addresources/values-uk-rUA/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>
@@ -1096,11 +1098,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>

patches/src/main/resources/addresources/values-vi-rVN/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
   <string name="revanced_settings_submenu_title">Thiết lập</string>
   <string name="revanced_settings_confirm_user_dialog_title">Bạn có muốn tiếp tục không?</string>
   <string name="revanced_settings_reset">Đặt lại</string>
+  <string name="revanced_settings_reset_color">Đặt lại màu</string>
+  <string name="revanced_settings_color_invalid">Màu không hợp lệ</string>
   <string name="revanced_settings_restart_title">Làm mới và khởi động lại</string>
   <string name="revanced_settings_restart">Khởi động lại</string>
   <string name="revanced_settings_import">Nhập</string>
@@ -1095,11 +1097,6 @@ Bạn đã sẵn sàng gửi?"</string>
   <string name="revanced_sb_stats_saved_second_format">%s giây</string>
   <string name="revanced_sb_color_opacity_label">Độ mờ:</string>
   <string name="revanced_sb_color_dot_label">Màu:</string>
-  <string name="revanced_sb_color_changed">Màu sắc đã được thay đổi</string>
-  <string name="revanced_sb_color_reset">Đặt lại màu sắc</string>
-  <string name="revanced_sb_color_invalid">Mã màu không hợp lệ</string>
-  <string name="revanced_sb_reset_color">Đặt lại màu</string>
-  <string name="revanced_sb_reset">Đặt lại</string>
   <string name="revanced_sb_about_title">Giới thiệu</string>
   <string name="revanced_sb_about_api_summary">Dữ liệu được cung cấp bởi API SponsorBlock. Nhấn vào đây để tìm hiểu thêm và xem các bản tải cho các nền tảng khác</string>
   </patch>

patches/src/main/resources/addresources/values-zh-rCN/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>
@@ -1100,11 +1102,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>

patches/src/main/resources/addresources/values-zh-rTW/strings.xml

@@ -1072,11 +1072,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>

patches/src/main/resources/addresources/values/strings.xml

@@ -35,6 +35,8 @@ Second \"item\" text"</string>
             <string name="revanced_settings_title" translatable="false">ReVanced</string>
             <string name="revanced_settings_confirm_user_dialog_title">Do you wish to proceed?</string>
             <string name="revanced_settings_reset">Reset</string>
+            <string name="revanced_settings_reset_color">Reset color</string>
+            <string name="revanced_settings_color_invalid">Invalid color</string>
             <string name="revanced_settings_restart_title">Refresh and restart</string>
             <string name="revanced_settings_restart">Restart</string>
             <string name="revanced_settings_import">Import</string>
@@ -173,6 +175,11 @@ Tap the continue button and allow optimization changes."</string>
             <string name="revanced_debug_protobuffer_title">Log protocol buffer</string>
             <string name="revanced_debug_protobuffer_summary_on">Debug logs include proto buffer</string>
             <string name="revanced_debug_protobuffer_summary_off">Debug logs do not include proto buffer</string>
+            <string name="revanced_debug_protobuffer_user_dialog_message">"Enabling this setting will log additional layout data, including on-screen text for some UI components.
+
+This can help identify components when creating custom filters.
+
+However, enabling this will also log some user data such as your IP address."</string>
             <string name="revanced_debug_stacktrace_title">Log stack traces</string>
             <string name="revanced_debug_stacktrace_summary_on">Debug logs include stack trace</string>
             <string name="revanced_debug_stacktrace_summary_off">Debug logs do not include stack trace</string>
@@ -182,6 +189,15 @@ Tap the continue button and allow optimization changes."</string>
             <string name="revanced_debug_toast_on_error_user_dialog_message">"Turning off error toasts hides all ReVanced error notifications.
 
 You will not be notified of any unexpected events."</string>
+            <string name="revanced_debug_export_logs_to_clipboard_title">Export debug logs</string>
+            <string name="revanced_debug_export_logs_to_clipboard_summary">Copies ReVanced debug logs to the clipboard</string>
+            <string name="revanced_debug_logs_disabled">Debug logging is disabled</string>
+            <string name="revanced_debug_logs_none_found">No logs found</string>
+            <string name="revanced_debug_logs_copied_to_clipboard">Logs copied</string>
+            <string name="revanced_debug_logs_failed_to_export">Failed to export logs: $s</string>
+            <string name="revanced_debug_logs_clear_buffer_title">Clear debug logs</string>
+            <string name="revanced_debug_logs_clear_buffer_summary">Clears all stored ReVanced debug logs</string>
+            <string name="revanced_debug_logs_clear_toast">Logs cleared</string>
         </patch>
         <patch id="layout.hide.general.hideLayoutComponentsPatch">
             <string name="revanced_hide_album_cards_title">Hide album cards</string>
@@ -1161,11 +1177,6 @@ Ready to submit?"</string>
             <string name="revanced_sb_stats_saved_second_format">%s seconds</string>
             <string name="revanced_sb_color_opacity_label">Opacity:</string>
             <string name="revanced_sb_color_dot_label">Color:</string>
-            <string name="revanced_sb_color_changed">Color changed</string>
-            <string name="revanced_sb_color_reset">Color reset</string>
-            <string name="revanced_sb_color_invalid">Invalid color code</string>
-            <string name="revanced_sb_reset_color">Reset color</string>
-            <string name="revanced_sb_reset">Reset</string>
             <string name="revanced_sb_about_title">About</string>
             <string name="revanced_sb_about_api_title" translatable="false">sponsor.ajay.app</string>
             <string name="revanced_sb_about_api_summary">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
@@ -1393,6 +1404,22 @@ Enabling this can unlock higher video qualities"</string>
             <string name="microg_settings_title">GmsCore Settings</string>
             <string name="microg_settings_summary">Settings for GmsCore</string>
         </patch>
+        <patch id="misc.hapticfeedback.disableHapticFeedbackPatch">
+            <string name="revanced_disable_haptic_feedback_title">Haptic feedback</string>
+            <string name="revanced_disable_haptic_feedback_summary">Change haptic feedback</string>
+            <string name="revanced_disable_haptic_feedback_chapters_title">Disable chapters haptics</string>
+            <string name="revanced_disable_haptic_feedback_chapters_summary_on">Chapters haptics is disabled</string>
+            <string name="revanced_disable_haptic_feedback_chapters_summary_off">Chapters haptics is enabled</string>
+            <string name="revanced_disable_haptic_feedback_precise_seeking_title">Disable precise seeking haptics</string>
+            <string name="revanced_disable_haptic_feedback_precise_seeking_summary_on">Precise seeking haptics is disabled</string>
+            <string name="revanced_disable_haptic_feedback_precise_seeking_summary_off">Precise seeking haptics is enabled</string>
+            <string name="revanced_disable_haptic_feedback_seek_undo_title">Disable seek undo haptics</string>
+            <string name="revanced_disable_haptic_feedback_seek_undo_summary_on">Seek undo haptics is disabled</string>
+            <string name="revanced_disable_haptic_feedback_seek_undo_summary_off">Seek undo haptics is enabled</string>
+            <string name="revanced_disable_haptic_feedback_zoom_title">Disable zoom haptics</string>
+            <string name="revanced_disable_haptic_feedback_zoom_summary_on">Zoom haptics is disabled</string>
+            <string name="revanced_disable_haptic_feedback_zoom_summary_off">Zoom haptics is enabled</string>
+        </patch>
         <patch id="misc.gms.accountCredentialsInvalidTextPatch">
             <string name="microg_offline_account_login_error">If you recently changed your account login details, then uninstall and reinstall MicroG.</string>
         </patch>
@@ -1411,11 +1438,6 @@ Enabling this can unlock higher video qualities"</string>
             <string name="revanced_remove_tracking_query_parameter_summary_on">Tracking query parameter is removed from links</string>
             <string name="revanced_remove_tracking_query_parameter_summary_off">Tracking query parameter is not removed from links</string>
         </patch>
-        <patch id="misc.zoomhaptics.zoomHapticsPatch">
-            <string name="revanced_disable_zoom_haptics_title">Disable zoom haptics</string>
-            <string name="revanced_disable_zoom_haptics_summary_on">Haptics are disabled</string>
-            <string name="revanced_disable_zoom_haptics_summary_off">Haptics are enabled</string>
-        </patch>
         <patch id="video.audio.forceOriginalAudioPatch">
             <string name="revanced_force_original_audio_title">Force original audio language</string>
             <string name="revanced_force_original_audio_summary_on">Using original audio language</string>

patches/src/main/resources/settings/drawable/revanced_settings_circle_background.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="#FF0000" />
+    <size
+            android:width="20dp"
+            android:height="20dp" />
+</shape>

patches/src/main/resources/settings/layout/revanced_color_dot_widget.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="center"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+    <View
+            android:id="@+id/revanced_color_dot_widget"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:background="@drawable/revanced_settings_circle_background"
+            android:elevation="2dp"
+            android:translationZ="2dp"
+            android:outlineProvider="background" />
+</FrameLayout>

patches/src/main/resources/settings/layout/revanced_color_picker.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <app.revanced.extension.shared.settings.preference.ColorPickerView
+            android:id="@+id/color_picker_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp" />
+</LinearLayout>