chore: Release v5.28.0-dev.6 [skip ci]

# [5.28.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.28.0-dev.5...v5.28.0-dev.6) (2025-06-17)

### Bug Fixes

* **Threads - Hide ads:** Constrain patch to the last working app target ([#5189](https://github.com/ReVanced/revanced-patches/issues/5189)) ([e138501](e138501657))

CHANGELOG.md

@@ -1,3 +1,38 @@
+# [5.28.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.28.0-dev.5...v5.28.0-dev.6) (2025-06-17)
+
+
+### Bug Fixes
+
+* **Threads - Hide ads:** Constrain patch to the last working app target ([#5189](https://github.com/ReVanced/revanced-patches/issues/5189)) ([3558c44](https://github.com/ReVanced/revanced-patches/commit/3558c44a05c13f19fefdbbf14b364181a79f17c0))
+
+# [5.28.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.28.0-dev.4...v5.28.0-dev.5) (2025-06-17)
+
+
+### Bug Fixes
+
+* **Pandora - Disable ads:** Support latest app target ([#5185](https://github.com/ReVanced/revanced-patches/issues/5185)) ([ca83047](https://github.com/ReVanced/revanced-patches/commit/ca83047f5c4acbb267d5b98db80ad111999086e0))
+
+# [5.28.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.28.0-dev.3...v5.28.0-dev.4) (2025-06-13)
+
+
+### Features
+
+* Use modern style settings dialogs ([#5109](https://github.com/ReVanced/revanced-patches/issues/5109)) ([312b6dc](https://github.com/ReVanced/revanced-patches/commit/312b6dc04e01c2758cd304ca8606306027aa2f01))
+
+# [5.28.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.28.0-dev.2...v5.28.0-dev.3) (2025-06-11)
+
+
+### Bug Fixes
+
+* **Spotify:** Fix `Hide Create button` and `Sanitize sharing links` for older but supported app targets ([#5159](https://github.com/ReVanced/revanced-patches/issues/5159)) ([e7dd061](https://github.com/ReVanced/revanced-patches/commit/e7dd061c513af90861c0ab0d7adc6ee43be57ce2))
+
+# [5.28.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.28.0-dev.1...v5.28.0-dev.2) (2025-06-11)
+
+
+### Bug Fixes
+
+* **Google Photos:** Resolve startup crash if MicroG GmsCore does not already have granted permissions ([a93d74d](https://github.com/ReVanced/revanced-patches/commit/a93d74d26e7ef87a3745df2b9fe82722d65a0e59))
+
 # [5.28.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.27.0...v5.28.0-dev.1) (2025-06-11)
 
 

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

@@ -5,7 +5,7 @@ import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.SearchManager;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -15,6 +15,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
+import android.util.Pair;
+import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
@@ -26,6 +28,7 @@ import java.util.Locale;
 
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.Utils;
 
 @SuppressWarnings("unused")
 public class GmsCoreSupport {
@@ -78,13 +81,27 @@ public class GmsCoreSupport {
         // Use a delay to allow the activity to finish initializing.
         // Otherwise, if device is in dark mode the dialog is shown with wrong color scheme.
         Utils.runOnMainThreadDelayed(() -> {
+            // Create the custom dialog.
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    context,
+                    str("gms_core_dialog_title"), // Title.
+                    str(dialogMessageRef),        // Message.
+                    null,                         // No EditText.
+                    str(positiveButtonTextRef),   // OK button text.
+                    () -> onPositiveClickListener.onClick(null, 0), // Convert DialogInterface.OnClickListener to Runnable.
+                    null,                         // No Cancel button action.
+                    null,                         // No Neutral button text.
+                    null,                         // No Neutral button action.
+                    true                          // Dismiss dialog when onNeutralClick.
+            );
+
+            Dialog dialog = dialogPair.first;
+
             // Do not set cancelable to false, to allow using back button to skip the action,
             // just in case the battery change can never be satisfied.
-            var dialog = new AlertDialog.Builder(context)
-                    .setTitle(str("gms_core_dialog_title"))
-                    .setMessage(str(dialogMessageRef))
-                    .setPositiveButton(str(positiveButtonTextRef), onPositiveClickListener)
-                    .create();
+            dialog.setCancelable(true);
+
+            // Show the dialog
             Utils.showDialog(context, dialog);
         }, 100);
     }

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

@@ -19,7 +19,8 @@ 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.
+ * All methods are thread safe, and are safe to call even
+ * if {@link Utils#getContext()} is not available.
  */
 public class Logger {
 
@@ -138,6 +139,20 @@ public class Logger {
         }
     }
 
+    private static boolean shouldLogDebug() {
+        // If the app is still starting up and the context is not yet set,
+        // then allow debug logging regardless what the debug setting actually is.
+        return Utils.context == null || DEBUG.get();
+    }
+
+    private static boolean shouldShowErrorToast() {
+        return Utils.context != null && DEBUG_TOAST_ON_ERROR.get();
+    }
+
+    private static boolean includeStackTrace() {
+        return Utils.context != null && DEBUG_STACKTRACE.get();
+    }
+
     /**
      * Logs debug messages under the outer class name of the code calling this method.
      * <p>
@@ -157,8 +172,8 @@ public class Logger {
      * building strings is paid only if {@link BaseSettings#DEBUG} is enabled.
      */
     public static void printDebug(LogMessage message, @Nullable Exception ex) {
-        if (DEBUG.get()) {
-            logInternal(LogLevel.DEBUG, message, ex, DEBUG_STACKTRACE.get(), false);
+        if (shouldLogDebug()) {
+            logInternal(LogLevel.DEBUG, message, ex, includeStackTrace(), false);
         }
     }
 
@@ -173,7 +188,7 @@ public class Logger {
      * Logs information messages using the outer class name of the code calling this method.
      */
     public static void printInfo(LogMessage message, @Nullable Exception ex) {
-        logInternal(LogLevel.INFO, message, ex, DEBUG_STACKTRACE.get(), false);
+        logInternal(LogLevel.INFO, message, ex, includeStackTrace(), false);
     }
 
     /**
@@ -194,22 +209,6 @@ public class Logger {
      * @param ex               exception (optional)
      */
     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(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(LogMessage message, @Nullable Exception ex) {
-        logInternal(LogLevel.ERROR, message, ex, false, false);
+        logInternal(LogLevel.ERROR, message, ex, includeStackTrace(), shouldShowErrorToast());
     }
 }

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

@@ -3,15 +3,21 @@ package app.revanced.extension.shared.checks;
 import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.DialogFragmentOnStartAction;
+import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
+import android.app.Dialog;
 import android.content.Intent;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.text.Html;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 
@@ -86,38 +92,59 @@ abstract class Check {
         );
 
         Utils.runOnMainThreadDelayed(() -> {
-            AlertDialog alert = new AlertDialog.Builder(activity)
-                    .setCancelable(false)
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setTitle(str("revanced_check_environment_failed_title"))
-                    .setMessage(message)
-                    .setPositiveButton(
-                            " ",
-                            (dialog, which) -> {
-                                final var intent = new Intent(Intent.ACTION_VIEW, GOOD_SOURCE);
-                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                activity.startActivity(intent);
+            // Create the custom dialog.
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    activity,
+                    str("revanced_check_environment_failed_title"), // Title.
+                    message, // Message.
+                    null,    // No EditText.
+                    str("revanced_check_environment_dialog_open_official_source_button"), // OK button text.
+                    () -> {
+                        // Action for the OK (website) button.
+                        final var intent = new Intent(Intent.ACTION_VIEW, GOOD_SOURCE);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        activity.startActivity(intent);
 
-                                // Shutdown to prevent the user from navigating back to this app,
-                                // which is no longer showing a warning dialog.
-                                activity.finishAffinity();
-                                System.exit(0);
-                            }
-                    ).setNegativeButton(
-                            " ",
-                            (dialog, which) -> {
-                                // Cleanup data if the user incorrectly imported a huge negative number.
-                                final int current = Math.max(0, BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get());
-                                BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(current + 1);
+                        // Shutdown to prevent the user from navigating back to this app,
+                        // which is no longer showing a warning dialog.
+                        activity.finishAffinity();
+                        System.exit(0);
+                    },
+                    null, // No cancel button.
+                    str("revanced_check_environment_dialog_ignore_button"), // Neutral button text.
+                    () -> {
+                        // Neutral button action.
+                        // Cleanup data if the user incorrectly imported a huge negative number.
+                        final int current = Math.max(0, BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.get());
+                        BaseSettings.CHECK_ENVIRONMENT_WARNINGS_ISSUED.save(current + 1);
+                    },
+                    true // Dismiss dialog when onNeutralClick.
+            );
 
-                                dialog.dismiss();
-                            }
-                    ).create();
+            // Get the dialog and main layout.
+            Dialog dialog = dialogPair.first;
+            LinearLayout mainLayout = dialogPair.second;
 
-            Utils.showDialog(activity, alert, false, new DialogFragmentOnStartAction() {
+            // Add icon to the dialog.
+            ImageView iconView = new ImageView(activity);
+            iconView.setImageResource(Utils.getResourceIdentifier("revanced_ic_dialog_alert", "drawable"));
+            iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
+            final int dip8 = dipToPixels(8);
+            iconView.setPadding(0, dip8, 0, dip8);
+            LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT
+            );
+            iconParams.gravity = Gravity.CENTER;
+            mainLayout.addView(iconView, 0); // Add icon at the top.
+
+            dialog.setCancelable(false);
+
+            // Show the dialog.
+            Utils.showDialog(activity, dialog, false, new DialogFragmentOnStartAction() {
                 boolean hasRun;
                 @Override
-                public void onStart(AlertDialog dialog) {
+                public void onStart(Dialog dialog) {
                     // Only run this once, otherwise if the user changes to a different app
                     // then changes back, this handler will run again and disable the buttons.
                     if (hasRun) {
@@ -125,19 +152,43 @@ abstract class Check {
                     }
                     hasRun = true;
 
-                    var openWebsiteButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+                    // Get the button container to access buttons.
+                    LinearLayout buttonContainer = (LinearLayout) mainLayout.getChildAt(mainLayout.getChildCount() - 1);
+
+                    Button openWebsiteButton;
+                    Button ignoreButton;
+
+                    // Check if buttons are in a single-row layout (buttonContainer has one child: rowContainer).
+                    if (buttonContainer.getChildCount() == 1 && buttonContainer.getChildAt(0) instanceof LinearLayout) {
+                        LinearLayout rowContainer = (LinearLayout) buttonContainer.getChildAt(0);
+                        // Neutral button is the first child (index 0).
+                        ignoreButton = (Button) rowContainer.getChildAt(0);
+                        // OK button is the last child.
+                        openWebsiteButton = (Button) rowContainer.getChildAt(rowContainer.getChildCount() - 1);
+                    } else {
+                        // Multi-row layout: buttons are in separate containers, ordered OK, Cancel, Neutral.
+                        LinearLayout okContainer =
+                                (LinearLayout) buttonContainer.getChildAt(0); // OK is first.
+                        openWebsiteButton = (Button) okContainer.getChildAt(0);
+                        LinearLayout neutralContainer =
+                                (LinearLayout)buttonContainer.getChildAt(buttonContainer.getChildCount() - 1); // Neutral is last.
+                        ignoreButton = (Button) neutralContainer.getChildAt(0);
+                    }
+
+                    // Initially set buttons to INVISIBLE and disabled.
+                    openWebsiteButton.setVisibility(View.INVISIBLE);
                     openWebsiteButton.setEnabled(false);
+                    ignoreButton.setVisibility(View.INVISIBLE);
+                    ignoreButton.setEnabled(false);
 
-                    var dismissButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-                    dismissButton.setEnabled(false);
-
-                    getCountdownRunnable(dismissButton, openWebsiteButton).run();
+                    // Start the countdown for showing and enabling buttons.
+                    getCountdownRunnable(ignoreButton, openWebsiteButton).run();
                 }
             });
         }, 1000); // Use a delay, so this dialog is shown on top of any other startup dialogs.
     }
 
-    private static Runnable getCountdownRunnable(Button dismissButton, Button openWebsiteButton) {
+    private static Runnable getCountdownRunnable(Button ignoreButton, Button openWebsiteButton) {
         return new Runnable() {
             private int secondsRemaining = SECONDS_BEFORE_SHOWING_IGNORE_BUTTON;
 
@@ -146,17 +197,15 @@ abstract class Check {
                 Utils.verifyOnMainThread();
 
                 if (secondsRemaining > 0) {
-                    if (secondsRemaining - SECONDS_BEFORE_SHOWING_WEBSITE_BUTTON == 0) {
-                        openWebsiteButton.setText(str("revanced_check_environment_dialog_open_official_source_button"));
+                    if (secondsRemaining - SECONDS_BEFORE_SHOWING_WEBSITE_BUTTON <= 0) {
+                        openWebsiteButton.setVisibility(View.VISIBLE);
                         openWebsiteButton.setEnabled(true);
                     }
-
                     secondsRemaining--;
-
                     Utils.runOnMainThreadDelayed(this, 1000);
                 } else {
-                    dismissButton.setText(str("revanced_check_environment_dialog_ignore_button"));
-                    dismissButton.setEnabled(true);
+                    ignoreButton.setVisibility(View.VISIBLE);
+                    ignoreButton.setEnabled(true);
                 }
             }
         };

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

@@ -52,7 +52,7 @@ public class Route {
 
     private int countMatches(CharSequence seq, char c) {
         int count = 0;
-        for (int i = 0; i < seq.length(); i++) {
+        for (int i = 0, length = seq.length(); i < length; i++) {
             if (seq.charAt(i) == c)
                 count++;
         }

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

@@ -3,12 +3,20 @@ package app.revanced.extension.shared.settings.preference;
 import static app.revanced.extension.shared.StringRef.str;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.*;
-
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.util.Pair;
+import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -44,7 +52,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * Set by subclasses if Strings cannot be added as a resource.
      */
     @Nullable
-    protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle;
+    protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle, restartDialogMessage;
 
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
@@ -76,7 +84,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
             updatingPreference = true;
             // Apply 'Setting <- Preference', unless during importing when it needs to be 'Setting -> Preference'.
-            // Updating here can can cause a recursive call back into this same method.
+            // Updating here can cause a recursive call back into this same method.
             updatePreference(pref, setting, true, settingImportInProgress);
             // Update any other preference availability that may now be different.
             updateUIAvailability();
@@ -116,11 +124,14 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
         showingUserDialogMessage = true;
 
-        new AlertDialog.Builder(context)
-                .setTitle(confirmDialogTitle)
-                .setMessage(Objects.requireNonNull(setting.userDialogMessage).toString())
-                .setPositiveButton(android.R.string.ok, (dialog, id) -> {
-                    // User confirmed, save to the Setting.
+        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                context,
+                confirmDialogTitle, // Title.
+                Objects.requireNonNull(setting.userDialogMessage).toString(), // No message.
+                null, // No EditText.
+                null, // OK button text.
+                () -> {
+                    // OK button action. User confirmed, save to the Setting.
                     updatePreference(pref, setting, true, false);
 
                     // Update availability of other preferences that may be changed.
@@ -129,23 +140,27 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                     if (setting.rebootApp) {
                         showRestartDialog(context);
                     }
-                })
-                .setNegativeButton(android.R.string.cancel, (dialog, id) -> {
-                    // Restore whatever the setting was before the change.
+                },
+                () -> {
+                    // Cancel button action. Restore whatever the setting was before the change.
                     updatePreference(pref, setting, true, true);
-                })
-                .setOnDismissListener(dialog -> {
-                    showingUserDialogMessage = false;
-                })
-                .setCancelable(false)
-                .show();
+                },
+                null, // No Neutral button.
+                null, // No Neutral button action.
+                true  // Dismiss dialog when onNeutralClick.
+        );
+
+        dialogPair.first.setOnDismissListener(d -> showingUserDialogMessage = false);
+
+        // Show the dialog.
+        dialogPair.first.show();
     }
 
     /**
      * Updates all Preferences values and their availability using the current values in {@link Setting}.
      */
     protected void updateUIToSettingValues() {
-        updatePreferenceScreen(getPreferenceScreen(), true,true);
+        updatePreferenceScreen(getPreferenceScreen(), true, true);
     }
 
     /**
@@ -280,17 +295,27 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (restartDialogTitle == null) {
             restartDialogTitle = str("revanced_settings_restart_title");
         }
+        if (restartDialogMessage == null) {
+            restartDialogMessage = str("revanced_settings_restart_dialog_message");
+        }
         if (restartDialogButtonText == null) {
             restartDialogButtonText = str("revanced_settings_restart");
         }
 
-        new AlertDialog.Builder(context)
-                .setMessage(restartDialogTitle)
-                .setPositiveButton(restartDialogButtonText, (dialog, id)
-                        -> Utils.restartApp(context))
-                .setNegativeButton(android.R.string.cancel, null)
-                .setCancelable(false)
-                .show();
+        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(context,
+                restartDialogTitle,              // Title.
+                restartDialogMessage,            // Message.
+                null,                            // No EditText.
+                restartDialogButtonText,         // OK button text.
+                () -> Utils.restartApp(context), // OK button action.
+                () -> {},                        // Cancel button action (dismiss only).
+                null,                            // No Neutral button text.
+                null,                            // No Neutral button action.
+                true                             // Dismiss dialog when onNeutralClick.
+        );
+
+        // Show the dialog.
+        dialogPair.first.show();
     }
 
     @SuppressLint("ResourceType")

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

@@ -2,8 +2,9 @@ package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.getResourceIdentifier;
+import static app.revanced.extension.shared.Utils.dipToPixels;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -18,6 +19,7 @@ import android.text.TextWatcher;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.util.AttributeSet;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -182,7 +184,7 @@ public class ColorPickerPreference extends EditTextPreference {
      * @throws IllegalArgumentException If the color string is invalid.
      */
     @Override
-    public final void setText(String colorString)  {
+    public final void setText(String colorString) {
         try {
             Logger.printDebug(() -> "setText: " + colorString);
             super.setText(colorString);
@@ -216,86 +218,6 @@ public class ColorPickerPreference extends EditTextPreference {
         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.
      */
@@ -360,65 +282,142 @@ public class ColorPickerPreference extends EditTextPreference {
     }
 
     /**
-     * Prepares the dialog builder with a custom view and reset button.
-     *
-     * @param builder The AlertDialog.Builder to configure.
+     * Creates a Dialog with a color preview and EditText for hex color input.
      */
-    @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);
+        Context context = getContext();
 
-        AlertDialog dialog = (AlertDialog) getDialog();
-        dialog.setCanceledOnTouchOutside(false);
+        // Inflate color picker view.
+        View colorPicker = LayoutInflater.from(context).inflate(
+                getResourceIdentifier("revanced_color_picker", "layout"), null);
+        dialogColorPickerView = colorPicker.findViewById(
+                getResourceIdentifier("revanced_color_picker_view", "id"));
+        dialogColorPickerView.setColor(currentColor);
 
-        // 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);
+        // Horizontal layout for preview and EditText.
+        LinearLayout inputLayout = new LinearLayout(context);
+        inputLayout.setOrientation(LinearLayout.HORIZONTAL);
+        inputLayout.setPadding(0, 0, 0, dipToPixels(10));
+
+        dialogColorPreview = new TextView(context);
+        LinearLayout.LayoutParams previewParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        );
+        previewParams.setMargins(dipToPixels(15), 0, dipToPixels(10), 0); // text dot has its own indents so 15, instead 16.
+        dialogColorPreview.setLayoutParams(previewParams);
+        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);
+
+        // Create main container for color picker and input layout.
+        LinearLayout container = new LinearLayout(context);
+        container.setOrientation(LinearLayout.VERTICAL);
+        container.addView(colorPicker);
+        container.addView(inputLayout);
+
+        // Create custom dialog.
+        final int originalColor = currentColor & 0x00FFFFFF;
+        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                context,
+                getTitle() != null ? getTitle().toString() : str("revanced_settings_color_picker_title"), // Title.
+                null, // No message.
+                null, // No EditText.
+                null, // OK button text.
+                () -> {
+                    // OK button action.
+                    try {
+                        String colorString = editText.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(() -> "OK button failure", ex);
+                    }
+                },
+                () -> {
+                    // Cancel button action.
+                    try {
+                        // Restore the original color.
+                        setText(getColorString(originalColor));
+                    } catch (Exception ex) {
+                        Logger.printException(() -> "Cancel button failure", ex);
+                    }
+                },
+                str("revanced_settings_reset_color"), // Neutral button text.
+                () -> {
+                    // Neutral button action.
+                    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(() -> "Reset button failure", ex);
+                    }
+                },
+                false // Do not dismiss dialog when onNeutralClick.
+        );
+
+        // Add the custom container to the dialog's main layout.
+        LinearLayout dialogMainLayout = dialogPair.second;
+        dialogMainLayout.addView(container, 1);
+
+        // 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();
         });
+
+        // Configure and show the dialog.
+        Dialog dialog = dialogPair.first;
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.show();
     }
 
     @Override

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

@@ -29,8 +29,8 @@ import app.revanced.extension.shared.Utils;
  * <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)
+ *     <li><b>Hue Bar:</b> A horizontal bar at the bottom that allows the user to select the hue component of the color.
+ *     <li><b>Saturation-Value Selector:</b> A rectangular area above the hue bar that allows the user to select the saturation and value (brightness)
  *     components of the color based on the selected hue.
  * </ul>
  *
@@ -63,12 +63,12 @@ public class ColorPickerView extends View {
 
     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_BAR_HEIGHT = 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,
+     * 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;
@@ -144,17 +144,17 @@ public class ColorPickerView extends View {
         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);
+        final int minHeight = (int) (minWidth * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS);
 
         int width = resolveSize(minWidth, widthMeasureSpec);
         int height = resolveSize(minHeight, heightMeasureSpec);
 
-        // Ensure minimum dimensions for usability
+        // 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);
+        // Adjust height to maintain desired aspect ratio if possible.
+        final int desiredHeight = (int) (width * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS);
         if (MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY) {
             height = desiredHeight;
         }
@@ -171,22 +171,22 @@ public class ColorPickerView extends View {
     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
+        // Calculate bounds with hue bar at the bottom.
         final float effectiveWidth = width - (2 * VIEW_PADDING);
-        final float selectorWidth = effectiveWidth - HUE_BAR_WIDTH - MARGIN_BETWEEN_AREAS;
+        final float effectiveHeight = height - (2 * VIEW_PADDING) - HUE_BAR_HEIGHT - MARGIN_BETWEEN_AREAS;
 
-        // Adjust rectangles to account for padding and density-independent dimensions
+        // Adjust rectangles to account for padding and density-independent dimensions.
         saturationValueRect.set(
                 VIEW_PADDING,
                 VIEW_PADDING,
-                VIEW_PADDING + selectorWidth,
-                height - VIEW_PADDING
+                VIEW_PADDING + effectiveWidth,
+                VIEW_PADDING + effectiveHeight
         );
 
         hueRect.set(
-                width - VIEW_PADDING - HUE_BAR_WIDTH,
                 VIEW_PADDING,
-                width - VIEW_PADDING,
+                height - VIEW_PADDING - HUE_BAR_HEIGHT,
+                VIEW_PADDING + effectiveWidth,
                 height - VIEW_PADDING
         );
 
@@ -201,7 +201,7 @@ public class ColorPickerView extends View {
     private void updateHueShader() {
         LinearGradient hueShader = new LinearGradient(
                 hueRect.left, hueRect.top,
-                hueRect.left, hueRect.bottom,
+                hueRect.right, hueRect.top,
                 HUE_COLORS,
                 null,
                 Shader.TileMode.CLAMP
@@ -263,8 +263,8 @@ public class ColorPickerView extends View {
         // 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 hueSelectorX = hueRect.left + (hue / 360f) * hueRect.width();
+        final float hueSelectorY = hueRect.centerY();
 
         final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
         final float satSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
@@ -316,17 +316,17 @@ public class ColorPickerView extends View {
 
             // Define touch expansion for the hue bar.
             RectF expandedHueRect = new RectF(
-                    hueRect.left - TOUCH_EXPANSION,
-                    hueRect.top,
-                    hueRect.right + TOUCH_EXPANSION,
-                    hueRect.bottom
+                    hueRect.left,
+                    hueRect.top - TOUCH_EXPANSION,
+                    hueRect.right,
+                    hueRect.bottom + TOUCH_EXPANSION
             );
 
             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 hueSelectorX = hueRect.left + (hue / 360f) * hueRect.width();
+                    final float hueSelectorY = hueRect.centerY();
 
                     final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
                     final float valSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
@@ -348,14 +348,14 @@ public class ColorPickerView extends View {
                     // Check if the touch started on a handle or within the expanded hue bar area.
                     if (hueHitRect.contains(x, y)) {
                         isDraggingHue = true;
-                        updateHueFromTouch(y);
+                        updateHueFromTouch(x);
                     } 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);
+                        updateHueFromTouch(x);
                     } else if (saturationValueRect.contains(x, y)) {
                         isDraggingSaturation = true;
                         updateSaturationValueFromTouch(x, y);
@@ -365,7 +365,7 @@ public class ColorPickerView extends View {
                 case MotionEvent.ACTION_MOVE:
                     // Continue updating values even if touch moves outside the view.
                     if (isDraggingHue) {
-                        updateHueFromTouch(y);
+                        updateHueFromTouch(x);
                     } else if (isDraggingSaturation) {
                         updateSaturationValueFromTouch(x, y);
                     }
@@ -387,12 +387,12 @@ public class ColorPickerView extends View {
     /**
      * Updates the hue value based on touch position, clamping to valid range.
      *
-     * @param y The y-coordinate of the touch position.
+     * @param x The x-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;
+    private void updateHueFromTouch(float x) {
+        // Clamp x to the hue rectangle bounds.
+        final float clampedX = Utils.clamp(x, hueRect.left, hueRect.right);
+        final float updatedHue = ((clampedX - hueRect.left) / hueRect.width()) * 360f;
         if (hue == updatedHue) {
             return;
         }

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

@@ -0,0 +1,197 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import app.revanced.extension.shared.Utils;
+
+/**
+ * A custom ListPreference that uses a styled custom dialog with a custom checkmark indicator.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class CustomDialogListPreference extends ListPreference {
+
+    /**
+     * Custom ArrayAdapter to handle checkmark visibility.
+     */
+    private static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
+        private static class SubViewDataContainer {
+            ImageView checkIcon;
+            View placeholder;
+            TextView itemText;
+        }
+
+        final int layoutResourceId;
+        final CharSequence[] entryValues;
+        String selectedValue;
+
+        public ListPreferenceArrayAdapter(Context context, int resource, CharSequence[] entries,
+                                          CharSequence[] entryValues, String selectedValue) {
+            super(context, resource, entries);
+            this.layoutResourceId = resource;
+            this.entryValues = entryValues;
+            this.selectedValue = selectedValue;
+        }
+
+        @NonNull
+        @Override
+        public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+            View view = convertView;
+            SubViewDataContainer holder;
+
+            if (view == null) {
+                LayoutInflater inflater = LayoutInflater.from(getContext());
+                view = inflater.inflate(layoutResourceId, parent, false);
+                holder = new SubViewDataContainer();
+                holder.checkIcon = view.findViewById(Utils.getResourceIdentifier(
+                        "revanced_check_icon", "id"));
+                holder.placeholder = view.findViewById(Utils.getResourceIdentifier(
+                        "revanced_check_icon_placeholder", "id"));
+                holder.itemText = view.findViewById(Utils.getResourceIdentifier(
+                        "revanced_item_text", "id"));
+                view.setTag(holder);
+            } else {
+                holder = (SubViewDataContainer) view.getTag();
+            }
+
+            // Set text.
+            holder.itemText.setText(getItem(position));
+            holder.itemText.setTextColor(Utils.getAppForegroundColor());
+
+            // Show or hide checkmark and placeholder.
+            String currentValue = entryValues[position].toString();
+            boolean isSelected = currentValue.equals(selectedValue);
+            holder.checkIcon.setVisibility(isSelected ? View.VISIBLE : View.GONE);
+            holder.checkIcon.setColorFilter(Utils.getAppForegroundColor());
+            holder.placeholder.setVisibility(isSelected ? View.GONE : View.VISIBLE);
+
+            return view;
+        }
+
+        public void setSelectedValue(String value) {
+            this.selectedValue = value;
+        }
+    }
+
+    public CustomDialogListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public CustomDialogListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public CustomDialogListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomDialogListPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        // Create ListView.
+        ListView listView = new ListView(getContext());
+        listView.setId(android.R.id.list);
+        listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+
+        // Create custom adapter for the ListView.
+        ListPreferenceArrayAdapter adapter = new ListPreferenceArrayAdapter(
+                getContext(),
+                Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
+                getEntries(),
+                getEntryValues(),
+                getValue()
+        );
+        listView.setAdapter(adapter);
+
+        // Set checked item.
+        String currentValue = getValue();
+        if (currentValue != null) {
+            CharSequence[] entryValues = getEntryValues();
+            for (int i = 0, length = entryValues.length; i < length; i++) {
+                if (currentValue.equals(entryValues[i].toString())) {
+                    listView.setItemChecked(i, true);
+                    listView.setSelection(i);
+                    break;
+                }
+            }
+        }
+
+        // Create the custom dialog without OK button.
+        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                getContext(),
+                getTitle() != null ? getTitle().toString() : "",
+                null,
+                null,
+                null, // No OK button text.
+                null, // No OK button action.
+                () -> {}, // Cancel button action (just dismiss).
+                null,
+                null,
+                true
+        );
+
+        Dialog dialog = dialogPair.first;
+        LinearLayout mainLayout = dialogPair.second;
+
+        // Measure content height before adding ListView to layout.
+        // Otherwise, the ListView will push the buttons off the screen.
+        int totalHeight = 0;
+        int widthSpec = View.MeasureSpec.makeMeasureSpec(
+                getContext().getResources().getDisplayMetrics().widthPixels,
+                View.MeasureSpec.AT_MOST
+        );
+        int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+
+        for (int i = 0; i < adapter.getCount(); i++) {
+            View listItem = adapter.getView(i, null, listView);
+            listItem.measure(widthSpec, heightSpec);
+            totalHeight += listItem.getMeasuredHeight();
+        }
+
+        // Cap the height at maxHeight.
+        int maxHeight = (int) (getContext().getResources().getDisplayMetrics().heightPixels * 0.6);
+        int finalHeight = Math.min(totalHeight, maxHeight);
+
+        // Add ListView to the main layout with calculated height.
+        LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                finalHeight // Use calculated height directly.
+        );
+        final int marginHorizontal = dipToPixels(8);
+        listViewParams.setMargins(0, marginHorizontal, 0, marginHorizontal);
+        mainLayout.addView(listView, mainLayout.getChildCount() - 1, listViewParams);
+
+        // Handle item click to select value and dismiss dialog.
+        listView.setOnItemClickListener((parent, view, position, id) -> {
+            String selectedValue = getEntryValues()[position].toString();
+            if (callChangeListener(selectedValue)) {
+                setValue(selectedValue);
+                adapter.setSelectedValue(selectedValue);
+                adapter.notifyDataSetChanged();
+            }
+            dialog.dismiss();
+        });
+
+        // Show the dialog.
+        dialog.show();
+    }
+}

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

@@ -1,19 +1,30 @@
 package app.revanced.extension.shared.settings.preference;
 
-import android.app.AlertDialog;
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.app.Dialog;
 import android.content.Context;
 import android.os.Build;
+import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Pair;
 import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.EditText;
-import app.revanced.extension.shared.settings.Setting;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.graphics.Color;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-
-import static app.revanced.extension.shared.StringRef.str;
+import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener {
@@ -54,7 +65,8 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
     @Override
     public boolean onPreferenceClick(Preference preference) {
         try {
-            // Must set text before preparing dialog, otherwise text is non selectable if this preference is later reopened.
+            // Must set text before showing dialog,
+            // otherwise text is non-selectable if this preference is later reopened.
             existingSettings = Setting.exportToJson(getContext());
             getEditText().setText(existingSettings);
         } catch (Exception ex) {
@@ -64,18 +76,32 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
     }
 
     @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+    protected void showDialog(Bundle state) {
         try {
-            Utils.setEditTextDialogTheme(builder);
+            Context context = getContext();
+            EditText editText = getEditText();
 
-            // Show the user the settings in JSON format.
-            builder.setNeutralButton(str("revanced_settings_import_copy"), (dialog, which) -> {
-                Utils.setClipboard(getEditText().getText());
-            }).setPositiveButton(str("revanced_settings_import"), (dialog, which) -> {
-                importSettings(builder.getContext(), getEditText().getText().toString());
-            });
+            // Create a custom dialog with the EditText.
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    context,
+                    str("revanced_pref_import_export_title"), // Title.
+                    null,     // No message (EditText replaces it).
+                    editText, // Pass the EditText.
+                    str("revanced_settings_import"), // OK button text.
+                    () -> importSettings(context, editText.getText().toString()), // OK button action.
+                    () -> {}, // Cancel button action (dismiss only).
+                    str("revanced_settings_import_copy"), // Neutral button (Copy) text.
+                    () -> {
+                        // Neutral button (Copy) action. Show the user the settings in JSON format.
+                        Utils.setClipboard(editText.getText());
+                    },
+                    true // Dismiss dialog when onNeutralClick.
+            );
+
+            // Show the dialog.
+            dialogPair.first.show();
         } catch (Exception ex) {
-            Logger.printException(() -> "onPrepareDialogBuilder failure", ex);
+            Logger.printException(() -> "showDialog failure", ex);
         }
     }
 
@@ -88,7 +114,7 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
 
             final boolean rebootNeeded = Setting.importFromJSON(context, replacementSettings);
             if (rebootNeeded) {
-                AbstractPreferenceFragment.showRestartDialog(getContext());
+                AbstractPreferenceFragment.showRestartDialog(context);
             }
         } catch (Exception ex) {
             Logger.printException(() -> "importSettings failure", ex);
@@ -96,5 +122,4 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
             AbstractPreferenceFragment.settingImportInProgress = false;
         }
     }
-
-}
+}

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

@@ -1,6 +1,7 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 import android.annotation.SuppressLint;
@@ -8,7 +9,8 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -18,6 +20,7 @@ import android.util.AttributeSet;
 import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -48,28 +51,6 @@ public class ReVancedAboutPreference extends Preference {
         return text.replace("-", "‑"); // #8209 = non breaking hyphen.
     }
 
-    private static String getColorHexString(int color) {
-        return String.format("#%06X", (0x00FFFFFF & color));
-    }
-
-    protected boolean isDarkModeEnabled() {
-        return Utils.isDarkModeEnabled();
-    }
-
-    /**
-     * Subclasses can override this and provide a themed color.
-     */
-    protected int getLightColor() {
-        return Color.WHITE;
-    }
-
-    /**
-     * Subclasses can override this and provide a themed color.
-     */
-    protected int getDarkColor() {
-        return Color.BLACK;
-    }
-
     /**
      * Apps that do not support bundling resources must override this.
      *
@@ -86,9 +67,8 @@ public class ReVancedAboutPreference extends Preference {
         builder.append("<html>");
         builder.append("<body style=\"text-align: center; padding: 10px;\">");
 
-        final boolean isDarkMode = isDarkModeEnabled();
-        String backgroundColorHex = getColorHexString(isDarkMode ? getDarkColor() : getLightColor());
-        String foregroundColorHex = getColorHexString(isDarkMode ? getLightColor() : getDarkColor());
+        String foregroundColorHex = Utils.getColorHexString(Utils.getAppForegroundColor());
+        String backgroundColorHex = Utils.getColorHexString(Utils.getDialogBackgroundColor());
         // Apply light/dark mode colors.
         builder.append(String.format(
                 "<style> body { background-color: %s; color: %s; } a { color: %s; } </style>",
@@ -220,14 +200,36 @@ class WebViewDialog extends Dialog {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
 
+        // Create main layout.
+        LinearLayout mainLayout = new LinearLayout(getContext());
+        mainLayout.setOrientation(LinearLayout.VERTICAL);
+
+        final int padding = dipToPixels(10);
+        mainLayout.setPadding(padding, padding, padding, padding);
+        // Set rounded rectangle background.
+        ShapeDrawable mainBackground = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(28), null, null));
+        mainBackground.getPaint().setColor(Utils.getDialogBackgroundColor());
+        mainLayout.setBackground(mainBackground);
+
+        // Create WebView.
         WebView webView = new WebView(getContext());
         webView.getSettings().setJavaScriptEnabled(true);
         webView.setWebViewClient(new OpenLinksExternallyWebClient());
         webView.loadDataWithBaseURL(null, htmlContent, "text/html", "utf-8", null);
 
-        setContentView(webView);
+        // Add WebView to layout.
+        mainLayout.addView(webView);
+
+        setContentView(mainLayout);
+
+        // Set dialog window attributes
+        Window window = getWindow();
+        if (window != null) {
+            Utils.setDialogWindowParameters(getContext(), window);
+        }
     }
 
     private class OpenLinksExternallyWebClient extends WebViewClient {
@@ -315,7 +317,7 @@ class AboutLinksRoutes {
             // Do not show an exception toast if the server is down
             final int responseCode = connection.getResponseCode();
             if (responseCode != 200) {
-                Logger.printDebug(() -> "Failed to get social links.  Response code: " + responseCode);
+                Logger.printDebug(() -> "Failed to get social links. Response code: " + responseCode);
                 return NO_CONNECTION_STATIC_LINKS;
             }
 

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

@@ -1,14 +1,28 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.shapes.RectShape;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.Paint.Style;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
+import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Pair;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
@@ -44,41 +58,61 @@ public class ResettableEditTextPreference extends EditTextPreference {
         this.setting = setting;
     }
 
-    @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-        super.onPrepareDialogBuilder(builder);
-        Utils.setEditTextDialogTheme(builder);
-
-        if (setting == null) {
-            String key = getKey();
-            if (key != null) {
-                setting = Setting.getSettingFromPath(key);
-            }
-        }
-
-        if (setting != null) {
-            builder.setNeutralButton(str("revanced_settings_reset"), null);
-        }
-    }
-
     @Override
     protected void showDialog(Bundle state) {
-        super.showDialog(state);
+        try {
+            Context context = getContext();
+            EditText editText = getEditText();
 
-        // Override the button click listener to prevent dismissing the dialog.
-        Button button = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_NEUTRAL);
-        if (button == null) {
-            return;
-        }
-        button.setOnClickListener(v -> {
-            try {
-                String defaultStringValue = Objects.requireNonNull(setting).defaultValue.toString();
-                EditText editText = getEditText();
-                editText.setText(defaultStringValue);
-                editText.setSelection(defaultStringValue.length()); // move cursor to end of text
-            } catch (Exception ex) {
-                Logger.printException(() -> "reset failure", ex);
+            // Resolve setting if not already set.
+            if (setting == null) {
+                String key = getKey();
+                if (key != null) {
+                    setting = Setting.getSettingFromPath(key);
+                }
             }
-        });
+
+            // Set initial EditText value to the current persisted value or empty string.
+            String initialValue = getText() != null ? getText() : "";
+            editText.setText(initialValue);
+            editText.setSelection(initialValue.length()); // Move cursor to end.
+
+            // Create custom dialog.
+            String neutralButtonText = (setting != null) ? str("revanced_settings_reset") : null;
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    context,
+                    getTitle() != null ? getTitle().toString() : "", // Title.
+                    null,     // Message is replaced by EditText.
+                    editText, // Pass the EditText.
+                    null,     // OK button text.
+                    () -> {
+                        // OK button action. Persist the EditText value when OK is clicked.
+                        String newValue = editText.getText().toString();
+                        if (callChangeListener(newValue)) {
+                            setText(newValue);
+                        }
+                    },
+                    () -> {}, // Cancel button action (dismiss only).
+                    neutralButtonText, // Neutral button text (Reset).
+                    () -> {
+                        // Neutral button action.
+                        if (setting != null) {
+                            try {
+                                String defaultStringValue = Objects.requireNonNull(setting).defaultValue.toString();
+                                editText.setText(defaultStringValue);
+                                editText.setSelection(defaultStringValue.length()); // Move cursor to end of text.
+                            } catch (Exception ex) {
+                                Logger.printException(() -> "reset failure", ex);
+                            }
+                        }
+                    },
+                    false // Do not dismiss dialog when onNeutralClick.
+            );
+
+            // Show the dialog.
+            dialogPair.first.show();
+        } catch (Exception ex) {
+            Logger.printException(() -> "showDialog failure", ex);
+        }
     }
 }

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

@@ -1,7 +1,6 @@
 package app.revanced.extension.shared.settings.preference;
 
 import android.content.Context;
-import android.preference.ListPreference;
 import android.util.AttributeSet;
 import android.util.Pair;
 
@@ -24,12 +23,14 @@ import app.revanced.extension.shared.Utils;
  * it needs to subclass this preference and override {@link #getFirstEntriesToPreserve}.
  */
 @SuppressWarnings({"unused", "deprecation"})
-public class SortedListPreference extends ListPreference {
+public class SortedListPreference extends CustomDialogListPreference {
 
     /**
      * Sorts the current list entries.
      *
-     * @param firstEntriesToPreserve The number of entries to preserve in their original position.
+     * @param firstEntriesToPreserve The number of entries to preserve in their original position,
+     *                               or a negative value to not sort and leave entries
+     *                               as they current are.
      */
     public void sortEntryAndValues(int firstEntriesToPreserve) {
         CharSequence[] entries = getEntries();
@@ -44,6 +45,10 @@ public class SortedListPreference extends ListPreference {
             throw new IllegalStateException();
         }
 
+        if (firstEntriesToPreserve < 0) {
+            return; // Nothing to do.
+        }
+
         List<Pair<CharSequence, CharSequence>> firstEntries = new ArrayList<>(firstEntriesToPreserve);
 
         // Android does not have a triple class like Kotlin, So instead use a nested pair.
@@ -85,10 +90,6 @@ public class SortedListPreference extends ListPreference {
         super.setEntryValues(sortedEntryValues);
     }
 
-    protected int getFirstEntriesToPreserve() {
-        return 1;
-    }
-
     public SortedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
 
@@ -112,4 +113,12 @@ public class SortedListPreference extends ListPreference {
 
         sortEntryAndValues(getFirstEntriesToPreserve());
     }
+
+    /**
+     * @return The number of first entries to leave exactly where they are, and do not sort them.
+     *         A negative value indicates do not sort any entries.
+     */
+    protected int getFirstEntriesToPreserve() {
+        return 1;
+    }
 }

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

@@ -37,20 +37,24 @@ public final class HideCreateButtonPatch {
             return null;
         }
 
-        String stringifiedNavigationBarItem = navigationBarItem.toString();
+        try {
+            String stringifiedNavigationBarItem = navigationBarItem.toString();
 
-        for (ComponentFilter componentFilter : CREATE_BUTTON_COMPONENT_FILTERS) {
-            if (componentFilter.filterUnavailable()) {
-                Logger.printInfo(() -> "returnNullIfIsCreateButton: Filter " +
-                        componentFilter.getFilterRepresentation() + " not available, skipping");
-                continue;
-            }
+            for (ComponentFilter componentFilter : CREATE_BUTTON_COMPONENT_FILTERS) {
+                if (componentFilter.filterUnavailable()) {
+                    Logger.printInfo(() -> "returnNullIfIsCreateButton: Filter " +
+                            componentFilter.getFilterRepresentation() + " not available, skipping");
+                    continue;
+                }
 
-            if (stringifiedNavigationBarItem.contains(componentFilter.getFilterValue())) {
-                Logger.printInfo(() -> "Hiding Create button because the navigation bar item " + navigationBarItem +
-                        " matched the filter " + componentFilter.getFilterRepresentation());
-                return null;
+                if (stringifiedNavigationBarItem.contains(componentFilter.getFilterValue())) {
+                    Logger.printInfo(() -> "Hiding Create button because the navigation bar item " +
+                            navigationBarItem + " matched the filter " + componentFilter.getFilterRepresentation());
+                    return null;
+                }
             }
+        } catch (Exception ex) {
+            Logger.printException(() -> "returnNullIfIsCreateButton failure", ex);
         }
 
         return navigationBarItem;

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

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

extensions/youtube/src/main/java/app/revanced/extension/youtube/ThemeHelper.java

@@ -1,179 +0,0 @@
-package app.revanced.extension.youtube;
-
-import static app.revanced.extension.shared.Utils.clamp;
-
-import android.app.Activity;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.os.Build;
-import android.text.style.ReplacementSpan;
-import android.text.TextPaint;
-import android.view.Window;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
-
-public class ThemeHelper {
-    @Nullable
-    private static Integer darkThemeColor, lightThemeColor;
-    private static int themeValue;
-
-    /**
-     * Injection point.
-     */
-    @SuppressWarnings("unused")
-    public static void setTheme(Enum<?> value) {
-        final int newOrdinalValue = value.ordinal();
-        if (themeValue != newOrdinalValue) {
-            themeValue = newOrdinalValue;
-            Logger.printDebug(() -> "Theme value: " + newOrdinalValue);
-        }
-    }
-
-    public static boolean isDarkTheme() {
-        return themeValue == 1;
-    }
-
-    public static void setActivityTheme(Activity activity) {
-        final var theme = isDarkTheme()
-                ? "Theme.YouTube.Settings.Dark"
-                : "Theme.YouTube.Settings";
-        activity.setTheme(Utils.getResourceIdentifier(theme, "style"));
-    }
-
-    /**
-     * Injection point.
-     */
-    @SuppressWarnings("SameReturnValue")
-    private static String darkThemeResourceName() {
-        // Value is changed by Theme patch, if included.
-        return "@color/yt_black3";
-    }
-
-    private static int getThemeColor(String resourceName, int defaultColor) {
-        try {
-            return Utils.getColorFromString(resourceName);
-        } catch (Exception ex) {
-            // User entered an invalid custom theme color.
-            // Normally this should never be reached, and no localized strings are needed.
-            Utils.showToastLong("Invalid custom theme color: " + resourceName);
-            return defaultColor;
-        }
-    }
-
-    /**
-     * @return The dark theme color as specified by the Theme patch (if included),
-     *         or the dark mode background color unpatched YT uses.
-     */
-    public static int getDarkThemeColor() {
-        if (darkThemeColor == null) {
-            darkThemeColor = getThemeColor(darkThemeResourceName(), Color.BLACK);
-        }
-        return darkThemeColor;
-    }
-
-    /**
-     * Injection point.
-     */
-    @SuppressWarnings("SameReturnValue")
-    private static String lightThemeResourceName() {
-        // Value is changed by Theme patch, if included.
-        return "@color/yt_white1";
-    }
-
-    /**
-     * @return The light theme color as specified by the Theme patch (if included),
-     *         or the non dark mode background color unpatched YT uses.
-     */
-    public static int getLightThemeColor() {
-        if (lightThemeColor == null) {
-            lightThemeColor = getThemeColor(lightThemeResourceName(), Color.WHITE);
-        }
-        return lightThemeColor;
-    }
-
-    public static int getBackgroundColor() {
-        return isDarkTheme() ? getDarkThemeColor() : getLightThemeColor();
-    }
-
-    public static int getForegroundColor() {
-        return isDarkTheme() ? getLightThemeColor() : getDarkThemeColor();
-    }
-
-    public static int getDialogBackgroundColor() {
-        final String colorName = isDarkTheme()
-                ? "yt_black1"
-                : "yt_white1";
-
-        return Utils.getColorFromString(colorName);
-    }
-
-    public static int getToolbarBackgroundColor() {
-        final String colorName = isDarkTheme()
-                ? "yt_black3"
-                : "yt_white1";
-
-        return Utils.getColorFromString(colorName);
-    }
-
-    /**
-     * Sets the system navigation bar color for the activity.
-     * Applies the background color obtained from {@link #getBackgroundColor()} to the navigation bar.
-     * For Android 10 (API 29) and above, enforces navigation bar contrast to ensure visibility.
-     */
-    public static void setNavigationBarColor(@Nullable Window window) {
-        if (window == null) {
-            Logger.printDebug(() -> "Cannot set navigation bar color, window is null");
-            return;
-        }
-
-        window.setNavigationBarColor(getBackgroundColor());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            window.setNavigationBarContrastEnforced(true);
-        }
-    }
-
-    /**
-     * Adjusts the brightness of a color by lightening or darkening it based on the given factor.
-     * <p>
-     * If the factor is greater than 1, the color is lightened by interpolating toward white (#FFFFFF).
-     * If the factor is less than or equal to 1, the color is darkened by scaling its RGB components toward black (#000000).
-     * The alpha channel remains unchanged.
-     *
-     * @param color  The input color to adjust, in ARGB format.
-     * @param factor The adjustment factor. Use values > 1.0f to lighten (e.g., 1.11f for slight lightening)
-     *               or values <= 1.0f to darken (e.g., 0.95f for slight darkening).
-     * @return The adjusted color in ARGB format.
-     */
-    public static int adjustColorBrightness(int color, float factor) {
-        final int alpha = Color.alpha(color);
-        int red = Color.red(color);
-        int green = Color.green(color);
-        int blue = Color.blue(color);
-
-        if (factor > 1.0f) {
-            // Lighten: Interpolate toward white (255)
-            final float t = 1.0f - (1.0f / factor); // Interpolation parameter
-            red = Math.round(red + (255 - red) * t);
-            green = Math.round(green + (255 - green) * t);
-            blue = Math.round(blue + (255 - blue) * t);
-        } else {
-            // Darken or no change: Scale toward black
-            red = (int) (red * factor);
-            green = (int) (green * factor);
-            blue = (int) (blue * factor);
-        }
-
-        // Ensure values are within [0, 255]
-        red = clamp(red, 0, 255);
-        green = clamp(green, 0, 255);
-        blue = clamp(blue, 0, 255);
-
-        return Color.argb(alpha, red, green, blue);
-    }
-}

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

@@ -3,7 +3,10 @@ package app.revanced.extension.youtube.patches;
 import static app.revanced.extension.shared.StringRef.str;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.text.Html;
+import android.util.Pair;
+import android.widget.LinearLayout;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -63,18 +66,28 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
                 }
 
                 Utils.runOnMainThread(() -> {
-                    var alert = new android.app.AlertDialog.Builder(context)
-                            .setTitle(str("revanced_check_watch_history_domain_name_dialog_title"))
-                            .setMessage(Html.fromHtml(str("revanced_check_watch_history_domain_name_dialog_message")))
-                            .setIconAttribute(android.R.attr.alertDialogIcon)
-                            .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                                dialog.dismiss();
-                            }).setNegativeButton(str("revanced_check_watch_history_domain_name_dialog_ignore"), (dialog, which) -> {
-                                Settings.CHECK_WATCH_HISTORY_DOMAIN_NAME.save(false);
-                                dialog.dismiss();
-                            }).create();
+                    try {
+                        // Create the custom dialog.
+                        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                                context,
+                                str("revanced_check_watch_history_domain_name_dialog_title"), // Title.
+                                Html.fromHtml(str("revanced_check_watch_history_domain_name_dialog_message")), // Message (HTML).
+                                null, // No EditText.
+                                null, // OK button text.
+                                () -> {}, // OK button action (just dismiss).
+                                () -> {}, // Cancel button action (just dismiss).
+                                str("revanced_check_watch_history_domain_name_dialog_ignore"), // Neutral button text.
+                                () -> Settings.CHECK_WATCH_HISTORY_DOMAIN_NAME.save(false),    // Neutral button action (Ignore).
+                                true // Dismiss dialog on Neutral button click.
+                        );
 
-                    Utils.showDialog(context, alert, false, null);
+                        // Show the dialog.
+                        Dialog dialog = dialogPair.first;
+
+                        Utils.showDialog(context, dialog, false, null);
+                    } catch (Exception ex) {
+                        Logger.printException(() -> "checkDnsResolver dialog creation failure", ex);
+                    }
                 });
             } catch (Exception ex) {
                 Logger.printException(() -> "checkDnsResolver failure", ex);

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

@@ -2,13 +2,16 @@ package app.revanced.extension.youtube.patches.announcements;
 
 import static android.text.Html.FROM_HTML_MODE_COMPACT;
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENTS;
 import static app.revanced.extension.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT_IDS;
 
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.text.Html;
-import android.text.method.LinkMovementMethod;
+import android.util.Pair;
+import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.json.JSONArray;
@@ -120,25 +123,38 @@ public final class AnnouncementsPatch {
                 final Level finalLevel = level;
 
                 Utils.runOnMainThread(() -> {
-                    // Show the announcement.
-                    var alert = new AlertDialog.Builder(context)
-                            .setTitle(finalTitle)
-                            .setMessage(finalMessage)
-                            .setIcon(finalLevel.icon)
-                            .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                                Settings.ANNOUNCEMENT_LAST_ID.save(finalId);
-                                dialog.dismiss();
-                            }).setNegativeButton(str("revanced_announcements_dialog_dismiss"), (dialog, which) -> {
-                                dialog.dismiss();
-                            })
-                            .setCancelable(false)
-                            .create();
+                    // Create the custom dialog and show the announcement.
+                    Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                            context,
+                            finalTitle,                           // Title.
+                            finalMessage,                         // Message.
+                            null,                                 // No EditText.
+                            null,                                 // OK button text.
+                            () -> Settings.ANNOUNCEMENT_LAST_ID.save(finalId), // OK button action.
+                            () -> {},                             // Cancel button action (dismiss only).
+                            str("revanced_announcements_dialog_dismiss"), // Neutral button text.
+                            () -> {},                             // Neutral button action (dismiss only).
+                            true                                  // Dismiss dialog when onNeutralClick.
+                    );
 
-                    Utils.showDialog(context, alert, false, (AlertDialog dialog) -> {
-                        // Make links clickable.
-                        ((TextView) dialog.findViewById(android.R.id.message))
-                                .setMovementMethod(LinkMovementMethod.getInstance());
-                    });
+                    Dialog dialog = dialogPair.first;
+                    LinearLayout mainLayout = dialogPair.second;
+
+                    // Set the icon for the title TextView
+                    for (int i = 0, childCould = mainLayout.getChildCount(); i < childCould; i++) {
+                        View child = mainLayout.getChildAt(i);
+                        if (child instanceof TextView childTextView && finalTitle.equals(childTextView.getText().toString())) {
+                            childTextView.setCompoundDrawablesWithIntrinsicBounds(
+                                    finalLevel.icon, 0, 0, 0);
+                            childTextView.setCompoundDrawablePadding(dipToPixels(8));
+                        }
+                    }
+
+                    // Set dialog as non-cancelable.
+                    dialog.setCancelable(false);
+
+                    // Show the dialog.
+                    Utils.showDialog(context, dialog);
                 });
             } catch (Exception e) {
                 final var message = "Failed to get announcement";

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

@@ -6,7 +6,7 @@ import app.revanced.extension.youtube.patches.playback.quality.AdvancedVideoQual
 import app.revanced.extension.youtube.settings.Settings;
 
 /**
- * Abuse LithoFilter for {@link AdvancedVideoQualityMenuPatch}.
+ * LithoFilter for {@link AdvancedVideoQualityMenuPatch}.
  */
 public final class AdvancedVideoQualityMenuFilter extends Filter {
     // Must be volatile or synchronized, as litho filtering runs off main thread

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/quality/AdvancedVideoQualityMenuPatch.java

@@ -13,8 +13,6 @@ import app.revanced.extension.youtube.settings.Settings;
 
 /**
  * This patch contains the logic to always open the advanced video quality menu.
- * Two methods are required, because the quality menu is a RecyclerView in the new YouTube version
- * and a ListView in the old one.
  */
 @SuppressWarnings("unused")
 public final class AdvancedVideoQualityMenuPatch {
@@ -76,7 +74,7 @@ public final class AdvancedVideoQualityMenuPatch {
     /**
      * Injection point.
      *
-     * Used if spoofing to an old app version, and also used for the Shorts video quality flyout.
+     * Shorts video quality flyout.
      */
     public static void showAdvancedVideoQualityMenu(ListView listView) {
         if (!Settings.ADVANCED_VIDEO_QUALITY_MENU.get()) return;
@@ -90,14 +88,12 @@ public final class AdvancedVideoQualityMenuPatch {
                     final var indexOfAdvancedQualityMenuItem = 4;
                     if (listView.indexOfChild(child) != indexOfAdvancedQualityMenuItem) return;
 
-                    Logger.printDebug(() -> "Found advanced menu item in old type of quality menu");
-
                     listView.setSoundEffectsEnabled(false);
                     final var qualityItemMenuPosition = 4;
                     listView.performItemClick(null, qualityItemMenuPosition, 0);
 
                 } catch (Exception ex) {
-                    Logger.printException(() -> "showOldVideoQualityMenu failure", ex);
+                    Logger.printException(() -> "showAdvancedVideoQualityMenu failure", ex);
                 }
             }
 

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java

@@ -19,13 +19,15 @@ import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
 import android.icu.text.NumberFormat;
 import android.support.v7.widget.RecyclerView;
-import android.view.animation.Animation;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.GridLayout;
@@ -39,7 +41,6 @@ import java.util.function.Function;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.patches.VideoInformation;
 import app.revanced.extension.youtube.patches.components.PlaybackSpeedMenuFilterPatch;
 import app.revanced.extension.youtube.settings.Settings;
@@ -240,6 +241,9 @@ public class CustomPlaybackSpeedPatch {
         // Store the dialog reference.
         currentDialog = new WeakReference<>(dialog);
 
+        // Enable dismissing the dialog when tapping outside.
+        dialog.setCanceledOnTouchOutside(true);
+
         // Create main vertical LinearLayout for dialog content.
         LinearLayout mainLayout = new LinearLayout(context);
         mainLayout.setOrientation(LinearLayout.VERTICAL);
@@ -259,15 +263,15 @@ public class CustomPlaybackSpeedPatch {
 
         // Set rounded rectangle background for the main layout.
         RoundRectShape roundRectShape = new RoundRectShape(
-                createCornerRadii(12), null, null);
+                Utils.createCornerRadii(12), null, null);
         ShapeDrawable background = new ShapeDrawable(roundRectShape);
-        background.getPaint().setColor(ThemeHelper.getDialogBackgroundColor());
+        background.getPaint().setColor(Utils.getDialogBackgroundColor());
         mainLayout.setBackground(background);
 
         // Add handle bar at the top.
         View handleBar = new View(context);
         ShapeDrawable handleBackground = new ShapeDrawable(new RoundRectShape(
-                createCornerRadii(4), null, null));
+                Utils.createCornerRadii(4), null, null));
         handleBackground.getPaint().setColor(getAdjustedBackgroundColor(true));
         handleBar.setBackground(handleBackground);
         LinearLayout.LayoutParams handleParams = new LinearLayout.LayoutParams(
@@ -285,7 +289,7 @@ public class CustomPlaybackSpeedPatch {
         float currentSpeed = VideoInformation.getPlaybackSpeed();
         // Initially show with only 0 minimum digits, so 1.0 shows as 1x
         currentSpeedText.setText(formatSpeedStringX(currentSpeed, 0));
-        currentSpeedText.setTextColor(ThemeHelper.getForegroundColor());
+        currentSpeedText.setTextColor(Utils.getAppForegroundColor());
         currentSpeedText.setTextSize(16);
         currentSpeedText.setTypeface(Typeface.DEFAULT_BOLD);
         currentSpeedText.setGravity(Gravity.CENTER);
@@ -305,7 +309,8 @@ public class CustomPlaybackSpeedPatch {
         // Create minus button.
         Button minusButton = new Button(context, null, 0); // Disable default theme style.
         minusButton.setText(""); // No text on button.
-        ShapeDrawable minusBackground = new ShapeDrawable(new RoundRectShape(createCornerRadii(20), null, null));
+        ShapeDrawable minusBackground = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(20), null, null));
         minusBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
         minusButton.setBackground(minusBackground);
         OutlineSymbolDrawable minusDrawable = new OutlineSymbolDrawable(false); // Minus symbol.
@@ -319,9 +324,9 @@ public class CustomPlaybackSpeedPatch {
         speedSlider.setMax(speedToProgressValue(customPlaybackSpeedsMax));
         speedSlider.setProgress(speedToProgressValue(currentSpeed));
         speedSlider.getProgressDrawable().setColorFilter(
-                ThemeHelper.getForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme progress bar.
+                Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme progress bar.
         speedSlider.getThumb().setColorFilter(
-                ThemeHelper.getForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme slider thumb.
+                Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN); // Theme slider thumb.
         LinearLayout.LayoutParams sliderParams = new LinearLayout.LayoutParams(
                 0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
         sliderParams.setMargins(dip5, 0, dip5, 0); // 5dp to -/+ buttons.
@@ -331,7 +336,7 @@ public class CustomPlaybackSpeedPatch {
         Button plusButton = new Button(context, null, 0); // Disable default theme style.
         plusButton.setText(""); // No text on button.
         ShapeDrawable plusBackground = new ShapeDrawable(new RoundRectShape(
-                createCornerRadii(20), null, null));
+                Utils.createCornerRadii(20), null, null));
         plusBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
         plusButton.setBackground(plusBackground);
         OutlineSymbolDrawable plusDrawable = new OutlineSymbolDrawable(true); // Plus symbol.
@@ -418,13 +423,13 @@ public class CustomPlaybackSpeedPatch {
             // Create speed button.
             Button speedButton = new Button(context, null, 0);
             speedButton.setText(speedFormatter.format(speed)); // Do not use 'x' speed format.
-            speedButton.setTextColor(ThemeHelper.getForegroundColor());
+            speedButton.setTextColor(Utils.getAppForegroundColor());
             speedButton.setTextSize(12);
             speedButton.setAllCaps(false);
             speedButton.setGravity(Gravity.CENTER);
 
             ShapeDrawable buttonBackground = new ShapeDrawable(new RoundRectShape(
-                    createCornerRadii(20), null, null));
+                    Utils.createCornerRadii(20), null, null));
             buttonBackground.getPaint().setColor(getAdjustedBackgroundColor(false));
             speedButton.setBackground(buttonBackground);
             speedButton.setPadding(dip5, dip5, dip5, dip5);
@@ -442,7 +447,7 @@ public class CustomPlaybackSpeedPatch {
                 TextView normalLabel = new TextView(context);
                 // Use same 'Normal' string as stock YouTube.
                 normalLabel.setText(str("normal_playback_rate_label"));
-                normalLabel.setTextColor(ThemeHelper.getForegroundColor());
+                normalLabel.setTextColor(Utils.getAppForegroundColor());
                 normalLabel.setTextSize(10);
                 normalLabel.setGravity(Gravity.CENTER);
 
@@ -489,6 +494,77 @@ public class CustomPlaybackSpeedPatch {
             window.setBackgroundDrawable(null); // Remove default dialog background.
         }
 
+        // Apply slide-in animation when showing the dialog.
+        final int fadeDurationFast = Utils.getResourceInteger("fade_duration_fast");
+        Animation slideInABottomAnimation = Utils.getResourceAnimation("slide_in_bottom");
+        slideInABottomAnimation.setDuration(fadeDurationFast);
+        mainLayout.startAnimation(slideInABottomAnimation);
+
+        // Set touch listener on mainLayout to enable drag-to-dismiss.
+        //noinspection ClickableViewAccessibility
+        mainLayout.setOnTouchListener(new View.OnTouchListener() {
+            /** Threshold for dismissing the dialog. */
+            final float dismissThreshold = dipToPixels(100); // Distance to drag to dismiss.
+            /** Store initial Y position of touch. */
+            float touchY;
+            /** Track current translation. */
+            float translationY;
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        // Capture initial Y position of touch.
+                        touchY = event.getRawY();
+                        translationY = mainLayout.getTranslationY();
+                        return true;
+                    case MotionEvent.ACTION_MOVE:
+                        // Calculate drag distance and apply translation downwards only.
+                        final float deltaY = event.getRawY() - touchY;
+                        // Only allow downward drag (positive deltaY).
+                        if (deltaY >= 0) {
+                            mainLayout.setTranslationY(translationY + deltaY);
+                        }
+                        return true;
+                    case MotionEvent.ACTION_UP:
+                    case MotionEvent.ACTION_CANCEL:
+                        // Check if dialog should be dismissed based on drag distance.
+                        if (mainLayout.getTranslationY() > dismissThreshold) {
+                            // Animate dialog off-screen and dismiss.
+                            //noinspection ExtractMethodRecommender
+                            final float remainingDistance = context.getResources().getDisplayMetrics().heightPixels
+                                    - mainLayout.getTop();
+                            TranslateAnimation slideOut = new TranslateAnimation(
+                                    0, 0, mainLayout.getTranslationY(), remainingDistance);
+                            slideOut.setDuration(fadeDurationFast);
+                            slideOut.setAnimationListener(new Animation.AnimationListener() {
+                                @Override
+                                public void onAnimationStart(Animation animation) {}
+
+                                @Override
+                                public void onAnimationEnd(Animation animation) {
+                                    dialog.dismiss();
+                                }
+
+                                @Override
+                                public void onAnimationRepeat(Animation animation) {}
+                            });
+                            mainLayout.startAnimation(slideOut);
+                        } else {
+                            // Animate back to original position if not dragged far enough.
+                            TranslateAnimation slideBack = new TranslateAnimation(
+                                    0, 0, mainLayout.getTranslationY(), 0);
+                            slideBack.setDuration(fadeDurationFast);
+                            mainLayout.startAnimation(slideBack);
+                            mainLayout.setTranslationY(0);
+                        }
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+        });
+
         // Create observer for PlayerType changes.
         Function1<PlayerType, Unit> playerTypeObserver = new Function1<>() {
             @Override
@@ -515,27 +591,9 @@ public class CustomPlaybackSpeedPatch {
             Logger.printDebug(() -> "PlayerType observer removed on dialog dismiss");
         });
 
-        // Apply slide-in animation when showing the dialog.
-        final int fadeDurationFast = Utils.getResourceInteger("fade_duration_fast");
-        Animation slideInABottomAnimation = Utils.getResourceAnimation("slide_in_bottom");
-        slideInABottomAnimation.setDuration(fadeDurationFast);
-        mainLayout.startAnimation(slideInABottomAnimation);
-
         dialog.show(); // Display the dialog.
     }
 
-    /**
-     * Creates an array of corner radii for a rounded rectangle shape.
-     *
-     * @param dp The radius in density-independent pixels (dp) to apply to all corners.
-     * @return An array of eight float values representing the corner radii
-     * (top-left, top-right, bottom-right, bottom-left).
-     */
-    private static float[] createCornerRadii(float dp) {
-        final float radius = dipToPixels(dp);
-        return new float[]{radius, radius, radius, radius, radius, radius, radius, radius};
-    }
-
     /**
      * @param speed The playback speed value to format.
      * @return A string representation of the speed with 'x' (e.g. "1.25x" or "1.00x").
@@ -573,12 +631,12 @@ public class CustomPlaybackSpeedPatch {
      *         for light themes to ensure visual contrast.
      */
     public static int getAdjustedBackgroundColor(boolean isHandleBar) {
-        final int baseColor = ThemeHelper.getDialogBackgroundColor();
+        final int baseColor = Utils.getDialogBackgroundColor();
         float darkThemeFactor = isHandleBar ? 1.25f : 1.115f; // 1.25f for handleBar, 1.115f for others in dark theme.
         float lightThemeFactor = isHandleBar ? 0.9f : 0.95f; // 0.9f for handleBar, 0.95f for others in light theme.
-        return ThemeHelper.isDarkTheme()
-                ? ThemeHelper.adjustColorBrightness(baseColor, darkThemeFactor)  // Lighten for dark theme.
-                : ThemeHelper.adjustColorBrightness(baseColor, lightThemeFactor); // Darken for light theme.
+        return Utils.isDarkModeEnabled()
+                ? Utils.adjustColorBrightness(baseColor, darkThemeFactor)  // Lighten for dark theme.
+                : Utils.adjustColorBrightness(baseColor, lightThemeFactor); // Darken for light theme.
     }
 }
 
@@ -592,7 +650,7 @@ class OutlineSymbolDrawable extends Drawable {
     OutlineSymbolDrawable(boolean isPlus) {
         this.isPlus = isPlus;
         paint = new Paint(Paint.ANTI_ALIAS_FLAG); // Enable anti-aliasing for smooth rendering.
-        paint.setColor(ThemeHelper.getForegroundColor());
+        paint.setColor(Utils.getAppForegroundColor());
         paint.setStyle(Paint.Style.STROKE); // Use stroke style for outline.
         paint.setStrokeWidth(dipToPixels(1)); // 1dp stroke width.
     }

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

@@ -6,7 +6,6 @@ import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -75,7 +74,7 @@ public class ThemePatch {
      * @return The new or original color value
      */
     public static int getValue(int originalValue) {
-        if (ThemeHelper.isDarkTheme()) {
+        if (Utils.isDarkModeEnabled()) {
             if (anyEquals(originalValue, DARK_VALUES)) return BLACK_COLOR;
         } else {
             if (anyEquals(originalValue, WHITE_VALUES)) return WHITE_COLOR;

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

@@ -30,11 +30,15 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.RYDVoteData;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
@@ -177,7 +181,7 @@ public class ReturnYouTubeDislike {
      * Ideally, this would be the actual color YT uses at runtime.
      */
     private static int getSeparatorColor() {
-        return ThemeHelper.isDarkTheme()
+        return Utils.isDarkModeEnabled()
                 ? 0x33FFFFFF
                 : 0xFFD9D9D9;
     }

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

@@ -14,7 +14,6 @@ import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
-import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.patches.VersionCheckPatch;
 import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
@@ -27,6 +26,8 @@ import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFrag
 @SuppressWarnings("unused")
 public class LicenseActivityHook {
 
+    private static int currentThemeValueOrdinal = -1; // Must initially be a non-valid enum ordinal value.
+
     private static ViewGroup.LayoutParams toolbarLayoutParams;
 
     public static void setToolbarLayoutParams(Toolbar toolbar) {
@@ -78,8 +79,8 @@ public class LicenseActivityHook {
      */
     public static void initialize(Activity licenseActivity) {
         try {
-            ThemeHelper.setActivityTheme(licenseActivity);
-            ThemeHelper.setNavigationBarColor(licenseActivity.getWindow());
+            setActivityTheme(licenseActivity);
+            ReVancedPreferenceFragment.setNavigationBarColor(licenseActivity.getWindow());
             licenseActivity.setContentView(getResourceIdentifier(
                     "revanced_settings_with_toolbar", "layout"));
 
@@ -114,7 +115,7 @@ public class LicenseActivityHook {
         toolBarParent.removeView(dummyToolbar);
 
         Toolbar toolbar = new Toolbar(toolBarParent.getContext());
-        toolbar.setBackgroundColor(ThemeHelper.getToolbarBackgroundColor());
+        toolbar.setBackgroundColor(getToolbarBackgroundColor());
         toolbar.setNavigationIcon(ReVancedPreferenceFragment.getBackButtonDrawable());
         toolbar.setTitle(getResourceIdentifier("revanced_settings_title", "string"));
 
@@ -124,7 +125,7 @@ public class LicenseActivityHook {
         TextView toolbarTextView = Utils.getChildView(toolbar, false,
                 view -> view instanceof TextView);
         if (toolbarTextView != null) {
-            toolbarTextView.setTextColor(ThemeHelper.getForegroundColor());
+            toolbarTextView.setTextColor(Utils.getAppForegroundColor());
         }
         setToolbarLayoutParams(toolbar);
 
@@ -135,4 +136,34 @@ public class LicenseActivityHook {
 
         toolBarParent.addView(toolbar, 0);
     }
+
+    public static void setActivityTheme(Activity activity) {
+        final var theme = Utils.isDarkModeEnabled()
+                ? "Theme.YouTube.Settings.Dark"
+                : "Theme.YouTube.Settings";
+        activity.setTheme(getResourceIdentifier(theme, "style"));
+    }
+
+    public static int getToolbarBackgroundColor() {
+        final String colorName = Utils.isDarkModeEnabled()
+                ? "yt_black3"
+                : "yt_white1";
+
+        return Utils.getColorFromString(colorName);
+    }
+
+    /**
+     * Injection point.
+     *
+     * Updates dark/light mode since YT settings can force light/dark mode
+     * which can differ from the global device settings.
+     */
+    @SuppressWarnings("unused")
+    public static void updateLightDarkModeStatus(Enum<?> value) {
+        final int themeOrdinal = value.ordinal();
+        if (currentThemeValueOrdinal != themeOrdinal) {
+            currentThemeValueOrdinal = themeOrdinal;
+            Utils.setIsDarkModeEnabled(themeOrdinal == 1);
+        }
+    }
 }

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

@@ -4,9 +4,10 @@ import static app.revanced.extension.shared.StringRef.str;
 import static app.revanced.extension.shared.Utils.getResourceIdentifier;
 
 import android.app.Activity;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
+import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -31,7 +32,6 @@ import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.StringSetting;
-import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.settings.preference.ReVancedPreferenceFragment;
 
 /**
@@ -58,10 +58,10 @@ public class SearchViewController {
         GradientDrawable background = new GradientDrawable();
         background.setShape(GradientDrawable.RECTANGLE);
         background.setCornerRadius(28 * context.getResources().getDisplayMetrics().density); // 28dp corner radius.
-        int baseColor = ThemeHelper.getBackgroundColor();
-        int adjustedColor = ThemeHelper.isDarkTheme()
-                ? ThemeHelper.adjustColorBrightness(baseColor, 1.11f)  // Lighten for dark theme.
-                : ThemeHelper.adjustColorBrightness(baseColor, 0.95f); // Darken for light theme.
+        int baseColor = Utils.getAppBackgroundColor();
+        int adjustedColor = Utils.isDarkModeEnabled()
+                ? Utils.adjustColorBrightness(baseColor, 1.11f)  // Lighten for dark theme.
+                : Utils.adjustColorBrightness(baseColor, 0.95f); // Darken for light theme.
         background.setColor(adjustedColor);
         return background;
     }
@@ -171,10 +171,6 @@ public class SearchViewController {
         final int actionSearchId = getResourceIdentifier("action_search", "id");
         toolbar.inflateMenu(getResourceIdentifier("revanced_search_menu", "menu"));
         MenuItem searchItem = toolbar.getMenu().findItem(actionSearchId);
-        searchItem.setIcon(getResourceIdentifier(ThemeHelper.isDarkTheme()
-                                ? "yt_outline_search_white_24"
-                                : "yt_outline_search_black_24",
-                        "drawable")).setTooltipText(null);
 
         // Set menu item click listener.
         toolbar.setOnMenuItemClickListener(item -> {
@@ -316,12 +312,7 @@ public class SearchViewController {
     private void closeSearch() {
         isSearchActive = false;
         toolbar.getMenu().findItem(getResourceIdentifier(
-                        "action_search", "id"))
-                .setIcon(getResourceIdentifier(ThemeHelper.isDarkTheme()
-                                ? "yt_outline_search_white_24"
-                                : "yt_outline_search_black_24",
-                        "drawable")
-                ).setVisible(true);
+                "action_search", "id")).setVisible(true);
         toolbar.setTitle(originalTitle);
         searchContainer.setVisibility(View.GONE);
         searchView.setQuery("", false);
@@ -365,13 +356,22 @@ public class SearchViewController {
 
             // Set long click listener for deletion confirmation.
             convertView.setOnLongClickListener(v -> {
-                new AlertDialog.Builder(activity)
-                        .setTitle(query)
-                        .setMessage(str("revanced_settings_search_remove_message"))
-                        .setPositiveButton(android.R.string.ok,
-                                (dialog, which) -> removeSearchQuery(query))
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .show();
+                Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                        activity,
+                        query,                                // Title.
+                        str("revanced_settings_search_remove_message"), // Message.
+                        null,                                 // No EditText.
+                        null,                                 // OK button text.
+                        () -> removeSearchQuery(query),       // OK button action.
+                        () -> {},                             // Cancel button action (dismiss only).
+                        null,                                 // No Neutral button text.
+                        () -> {},                             // Neutral button action (dismiss only).
+                        true                                  // Dismiss dialog when onNeutralClick.
+                );
+
+                Dialog dialog = dialogPair.first;
+                dialog.setCancelable(true); // Allow dismissal via back button.
+                dialog.show(); // Show the dialog.
                 return true;
             });
 

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

@@ -3,17 +3,18 @@ package app.revanced.extension.youtube.settings.preference;
 import static app.revanced.extension.shared.StringRef.sf;
 
 import android.content.Context;
-import android.preference.ListPreference;
 import android.util.AttributeSet;
 
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
 import app.revanced.extension.youtube.patches.playback.speed.CustomPlaybackSpeedPatch;
 import app.revanced.extension.youtube.settings.Settings;
 
 /**
+ * A custom ListPreference that uses a styled custom dialog with a custom checkmark indicator.
  * Custom video speeds used by {@link CustomPlaybackSpeedPatch}.
  */
 @SuppressWarnings({"unused", "deprecation"})
-public final class CustomVideoSpeedListPreference extends ListPreference {
+public final class CustomVideoSpeedListPreference extends CustomDialogListPreference {
 
     /**
      * Initialize a settings preference list with the available playback speeds.
@@ -59,4 +60,5 @@ public final class CustomVideoSpeedListPreference extends ListPreference {
     public CustomVideoSpeedListPreference(Context context) {
         super(context);
     }
+
 }

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

@@ -18,6 +18,7 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.BackgroundColorSpan;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowInsets;
 import android.widget.TextView;
 import android.widget.Toolbar;
@@ -40,7 +41,6 @@ import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.preference.AbstractPreferenceFragment;
 import app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory;
-import app.revanced.extension.youtube.ThemeHelper;
 import app.revanced.extension.youtube.settings.LicenseActivityHook;
 import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockPreferenceGroup;
 
@@ -71,11 +71,27 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
 
     @SuppressLint("UseCompatLoadingForDrawables")
     public static Drawable getBackButtonDrawable() {
-        final int backButtonResource = getResourceIdentifier(ThemeHelper.isDarkTheme()
-                        ? "yt_outline_arrow_left_white_24"
-                        : "yt_outline_arrow_left_black_24",
-                "drawable");
-        return Utils.getContext().getResources().getDrawable(backButtonResource);
+        final int backButtonResource = getResourceIdentifier("revanced_settings_toolbar_arrow_left", "drawable");
+        Drawable drawable = Utils.getContext().getResources().getDrawable(backButtonResource);
+        drawable.setTint(Utils.getAppForegroundColor());
+        return drawable;
+    }
+
+    /**
+     * Sets the system navigation bar color for the activity.
+     * Applies the background color obtained from {@link Utils#getAppBackgroundColor()} to the navigation bar.
+     * For Android 10 (API 29) and above, enforces navigation bar contrast to ensure visibility.
+     */
+    public static void setNavigationBarColor(@Nullable Window window) {
+        if (window == null) {
+            Logger.printDebug(() -> "Cannot set navigation bar color, window is null");
+            return;
+        }
+
+        window.setNavigationBarColor(Utils.getAppBackgroundColor());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.setNavigationBarContrastEnforced(true);
+        }
     }
 
     /**
@@ -201,9 +217,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
             // Set icon for the placeholder preference.
             noResultsPreference.setLayoutResource(getResourceIdentifier(
                     "revanced_preference_with_icon_no_search_result", "layout"));
-            noResultsPreference.setIcon(getResourceIdentifier(
-                    ThemeHelper.isDarkTheme() ? "yt_outline_search_white_24" : "yt_outline_search_black_24",
-                    "drawable"));
+            noResultsPreference.setIcon(getResourceIdentifier("revanced_settings_search_icon", "drawable"));
             preferenceScreen.addPreference(noResultsPreference);
         }
     }
@@ -226,7 +240,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     .getParent();
 
                             // Fix the system navigation bar color for submenus.
-                            ThemeHelper.setNavigationBarColor(preferenceScreenDialog.getWindow());
+                            setNavigationBarColor(preferenceScreenDialog.getWindow());
 
                             // Fix edge-to-edge screen with Android 15 and YT 19.45+
                             // https://developer.android.com/develop/ui/views/layout/edge-to-edge#system-bars-insets
@@ -250,7 +264,7 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                             TextView toolbarTextView = Utils.getChildView(toolbar,
                                     true, TextView.class::isInstance);
                             if (toolbarTextView != null) {
-                                toolbarTextView.setTextColor(ThemeHelper.getForegroundColor());
+                                toolbarTextView.setTextColor(Utils.getAppForegroundColor());
                             }
 
                             LicenseActivityHook.setToolbarLayoutParams(toolbar);
@@ -304,10 +318,10 @@ class AbstractPreferenceSearchData<T extends Preference> {
             return text;
         }
 
-        final int baseColor = ThemeHelper.getBackgroundColor();
-        final int adjustedColor = ThemeHelper.isDarkTheme()
-                ? ThemeHelper.adjustColorBrightness(baseColor, 1.20f)  // Lighten for dark theme.
-                : ThemeHelper.adjustColorBrightness(baseColor, 0.95f); // Darken for light theme.
+        final int baseColor = Utils.getAppBackgroundColor();
+        final int adjustedColor = Utils.isDarkModeEnabled()
+                ? Utils.adjustColorBrightness(baseColor, 1.20f)  // Lighten for dark theme.
+                : Utils.adjustColorBrightness(baseColor, 0.95f); // Darken for light theme.
         BackgroundColorSpan highlightSpan = new BackgroundColorSpan(adjustedColor);
 
         SpannableStringBuilder spannable = new SpannableStringBuilder(text);

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

@@ -1,32 +0,0 @@
-package app.revanced.extension.youtube.settings.preference;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
-import app.revanced.extension.youtube.ThemeHelper;
-
-@SuppressWarnings("unused")
-public class ReVancedYouTubeAboutPreference extends ReVancedAboutPreference {
-
-    public int getLightColor() {
-        return ThemeHelper.getLightThemeColor();
-    }
-
-    public int getDarkColor() {
-        return ThemeHelper.getDarkThemeColor();
-    }
-
-    public ReVancedYouTubeAboutPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-    public ReVancedYouTubeAboutPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-    public ReVancedYouTubeAboutPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-    public ReVancedYouTubeAboutPreference(Context context) {
-        super(context);
-    }
-}

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

@@ -2,9 +2,11 @@ package app.revanced.extension.youtube.sponsorblock;
 
 import static app.revanced.extension.shared.StringRef.str;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.util.Pair;
 import android.util.Patterns;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -56,7 +58,7 @@ public class SponsorBlockSettings {
                 }
             }
 
-            for (int i = 0; i < categorySelectionsArray.length(); i++) {
+            for (int i = 0, length = categorySelectionsArray.length(); i < length; i++) {
                 JSONObject categorySelectionObject = categorySelectionsArray.getJSONObject(i);
 
                 String categoryKey = categorySelectionObject.getString("name");
@@ -181,13 +183,25 @@ public class SponsorBlockSettings {
         // If user has a SponsorBlock user id then show a warning.
         if (dialogContext != null && SponsorBlockSettings.userHasSBPrivateId()
                 && !Settings.SB_HIDE_EXPORT_WARNING.get()) {
-            new AlertDialog.Builder(dialogContext)
-                    .setMessage(str("revanced_sb_settings_revanced_export_user_id_warning"))
-                    .setNeutralButton(str("revanced_sb_settings_revanced_export_user_id_warning_dismiss"),
-                            (dialog, which) -> Settings.SB_HIDE_EXPORT_WARNING.save(true))
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setCancelable(false)
-                    .show();
+            // Create the custom dialog.
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    dialogContext,
+                    null, // No title.
+                    str("revanced_sb_settings_revanced_export_user_id_warning"), // Message.
+                    null, // No EditText.
+                    null, // OK button text.
+                    () -> {}, // OK button action (dismiss only).
+                    null, // No cancel button action.
+                    str("revanced_sb_settings_revanced_export_user_id_warning_dismiss"), // Neutral button text.
+                    () -> Settings.SB_HIDE_EXPORT_WARNING.save(true), // Neutral button action.
+                    true // Dismiss dialog when onNeutralClick.
+            );
+
+            // Set dialog as non-cancelable.
+            dialogPair.first.setCancelable(false);
+
+            // Show the dialog.
+            dialogPair.first.show();
         }
     }
 

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

@@ -2,12 +2,12 @@ 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.Utils.dipToPixels;
 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.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
@@ -15,12 +15,14 @@ import android.preference.ListPreference;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
+import android.util.Pair;
 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.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
@@ -52,6 +54,7 @@ public class SegmentCategoryListPreference extends ListPreference {
     private EditText dialogColorEditText;
     private EditText dialogOpacityEditText;
     private ColorPickerView dialogColorPickerView;
+    private Dialog dialog;
 
     public SegmentCategoryListPreference(Context context, SegmentCategory category) {
         super(context);
@@ -75,30 +78,47 @@ public class SegmentCategoryListPreference extends ListPreference {
     }
 
     @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+    protected void showDialog(Bundle state) {
         try {
-            Utils.setEditTextDialogTheme(builder);
-
+            Context context = getContext();
             categoryColor = category.getColorNoOpacity();
             categoryOpacity = category.getOpacity();
+            selectedDialogEntryIndex = findIndexOfValue(getValue());
 
-            Context context = builder.getContext();
-            LinearLayout mainLayout = new LinearLayout(context);
-            mainLayout.setOrientation(LinearLayout.VERTICAL);
-            mainLayout.setPadding(70, 0, 70, 0);
+            // Create the main layout for the dialog content.
+            LinearLayout contentLayout = new LinearLayout(context);
+            contentLayout.setOrientation(LinearLayout.VERTICAL);
+            final int dip10 = dipToPixels(10);
+            contentLayout.setPadding(0, 0, 0, dip10);
+
+            // Add behavior selection radio buttons.
+            RadioGroup radioGroup = new RadioGroup(context);
+            radioGroup.setOrientation(RadioGroup.VERTICAL);
+            CharSequence[] entries = getEntries();
+            for (int i = 0; i < entries.length; i++) {
+                RadioButton radioButton = new RadioButton(context);
+                radioButton.setText(entries[i]);
+                radioButton.setId(i);
+                radioButton.setChecked(i == selectedDialogEntryIndex);
+                radioGroup.addView(radioButton);
+            }
+            radioGroup.setOnCheckedChangeListener((group, checkedId) -> selectedDialogEntryIndex = checkedId);
+            radioGroup.setPadding(dip10, 0, 0, 0);
+            contentLayout.addView(radioGroup);
 
             // 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"));
+                    getResourceIdentifier("revanced_color_picker_view", "id"));
             dialogColorPickerView.setColor(categoryColor);
-            mainLayout.addView(colorPickerContainer);
+            contentLayout.addView(colorPickerContainer);
 
             // Grid layout for color and opacity inputs.
             GridLayout gridLayout = new GridLayout(context);
             gridLayout.setColumnCount(3);
             gridLayout.setRowCount(2);
+            gridLayout.setPadding(dipToPixels(16), 0, 0, 0);
 
             GridLayout.LayoutParams gridParams = new GridLayout.LayoutParams();
             gridParams.rowSpec = GridLayout.spec(0); // First row.
@@ -111,7 +131,7 @@ public class SegmentCategoryListPreference extends ListPreference {
             gridParams = new GridLayout.LayoutParams();
             gridParams.rowSpec = GridLayout.spec(0); // First row.
             gridParams.columnSpec = GridLayout.spec(1); // Second column.
-            gridParams.setMargins(0, 0, 10, 0);
+            gridParams.setMargins(0, 0, dip10, 0);
             dialogColorDotView = new TextView(context);
             dialogColorDotView.setLayoutParams(gridParams);
             gridLayout.addView(dialogColorDotView);
@@ -162,8 +182,7 @@ public class SegmentCategoryListPreference extends ListPreference {
                     }
                 }
             });
-            dialogColorEditText.setLayoutParams(gridParams);
-            gridLayout.addView(dialogColorEditText);
+            gridLayout.addView(dialogColorEditText, gridParams);
 
             gridParams = new GridLayout.LayoutParams();
             gridParams.rowSpec = GridLayout.spec(1); // Second row.
@@ -226,11 +245,10 @@ public class SegmentCategoryListPreference extends ListPreference {
                     }
                 }
             });
-            dialogOpacityEditText.setLayoutParams(gridParams);
-            gridLayout.addView(dialogOpacityEditText);
+            gridLayout.addView(dialogOpacityEditText, gridParams);
             updateOpacityText();
 
-            mainLayout.addView(gridLayout);
+            contentLayout.addView(gridLayout);
 
             // Set up color picker listener.
             // Do last to prevent listener callbacks while setting up view.
@@ -247,69 +265,74 @@ public class SegmentCategoryListPreference extends ListPreference {
                 dialogColorEditText.setSelection(hexColor.length());
             });
 
-            builder.setView(mainLayout);
-            builder.setTitle(category.title.toString());
+            // Create the custom dialog.
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    context,
+                    category.title.toString(), // Title.
+                    null, // No message (replaced by contentLayout).
+                    null, // No EditText.
+                    null, // OK button text.
+                    () -> {
+                        // OK button action.
+                        if (selectedDialogEntryIndex >= 0 && getEntryValues() != null) {
+                            String value = getEntryValues()[selectedDialogEntryIndex].toString();
+                            if (callChangeListener(value)) {
+                                setValue(value);
+                                category.setBehaviour(Objects.requireNonNull(CategoryBehaviour.byReVancedKeyValue(value)));
+                                SegmentCategory.updateEnabledCategories();
+                            }
 
-            builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                onClick(dialog, DialogInterface.BUTTON_POSITIVE);
-            });
-            builder.setNeutralButton(str("revanced_settings_reset_color"), null);
-            builder.setNegativeButton(android.R.string.cancel, null);
+                            try {
+                                category.setColor(dialogColorEditText.getText().toString());
+                                category.setOpacity(categoryOpacity);
+                            } catch (IllegalArgumentException ex) {
+                                Utils.showToastShort(str("revanced_settings_color_invalid"));
+                            }
 
-            selectedDialogEntryIndex = findIndexOfValue(getValue());
-            builder.setSingleChoiceItems(getEntries(), selectedDialogEntryIndex,
-                    (dialog, which) -> selectedDialogEntryIndex = which);
+                            updateUI();
+                        }
+                    },
+                    () -> {}, // Cancel button action (dismiss only).
+                    str("revanced_settings_reset_color"), // Neutral button text.
+                    () -> {
+                        // Neutral button action (Reset).
+                        try {
+                            // Setting view color causes callback to update the UI.
+                            dialogColorPickerView.setColor(category.getColorNoOpacityDefault());
+
+                            categoryOpacity = category.getOpacityDefault();
+                            updateOpacityText();
+                        } catch (Exception ex) {
+                            Logger.printException(() -> "resetButton onClick failure", ex);
+                        }
+                    },
+                    false // Do not dismiss dialog on Neutral button click.
+            );
+
+            dialog = dialogPair.first;
+            LinearLayout dialogMainLayout = dialogPair.second;
+
+            // Add the custom content to the dialog's main layout.
+            dialogMainLayout.addView(contentLayout, 1); // Add after title, before buttons.
+
+            // Show the dialog.
+            dialog.show();
         } catch (Exception ex) {
-            Logger.printException(() -> "onPrepareDialogBuilder failure", ex);
+            Logger.printException(() -> "showDialog failure", ex);
         }
     }
 
-    @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 {
-            if (positiveResult && selectedDialogEntryIndex >= 0 && getEntryValues() != null) {
-                String value = getEntryValues()[selectedDialogEntryIndex].toString();
-                if (callChangeListener(value)) {
-                    setValue(value);
-                    category.setBehaviour(Objects.requireNonNull(CategoryBehaviour.byReVancedKeyValue(value)));
-                    SegmentCategory.updateEnabledCategories();
-                }
+        // Nullify dialog references.
+        dialogColorDotView = null;
+        dialogColorEditText = null;
+        dialogOpacityEditText = null;
+        dialogColorPickerView = null;
 
-                try {
-                    category.setColor(dialogColorEditText.getText().toString());
-                    category.setOpacity(categoryOpacity);
-                } catch (IllegalArgumentException ex) {
-                    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;
+        if (dialog != null) {
+            dialog.dismiss();
+            dialog = null;
         }
     }
 

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

@@ -3,19 +3,25 @@ package app.revanced.extension.youtube.sponsorblock.ui;
 import static app.revanced.extension.shared.StringRef.str;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.preference.*;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.SwitchPreference;
 import android.text.Html;
 import android.text.InputType;
 import android.util.AttributeSet;
+import android.util.Pair;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -279,14 +285,26 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
             addNewSegment.setOnPreferenceChangeListener((preference1, o) -> {
                 Boolean newValue = (Boolean) o;
                 if (newValue && !Settings.SB_SEEN_GUIDELINES.get()) {
-                    new AlertDialog.Builder(preference1.getContext())
-                            .setTitle(str("revanced_sb_guidelines_popup_title"))
-                            .setMessage(str("revanced_sb_guidelines_popup_content"))
-                            .setNegativeButton(str("revanced_sb_guidelines_popup_already_read"), null)
-                            .setPositiveButton(str("revanced_sb_guidelines_popup_open"), (dialogInterface, i) -> openGuidelines())
-                            .setOnDismissListener(dialog -> Settings.SB_SEEN_GUIDELINES.save(true))
-                            .setCancelable(false)
-                            .show();
+                    Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                            preference1.getContext(),
+                            str("revanced_sb_guidelines_popup_title"),   // Title.
+                            str("revanced_sb_guidelines_popup_content"), // Message.
+                            null,                                        // No EditText.
+                            str("revanced_sb_guidelines_popup_open"),    // OK button text.
+                            () -> openGuidelines(),                      // OK button action.
+                            null,                                        // Cancel button action.
+                            str("revanced_sb_guidelines_popup_already_read"), // Neutral button text.
+                            () -> {},                                    // Neutral button action (dismiss only).
+                            true                                         // Dismiss dialog when onNeutralClick.
+                    );
+
+                    // Set dialog as non-cancelable.
+                    dialogPair.first.setCancelable(false);
+
+                    dialogPair.first.setOnDismissListener(dialog -> Settings.SB_SEEN_GUIDELINES.save(true));
+
+                    // Show the dialog.
+                    dialogPair.first.show();
                 }
                 Settings.SB_CREATE_NEW_SEGMENT.save(newValue);
                 updateUI();
@@ -372,16 +390,52 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
             generalCategory.addPreference(minSegmentDuration);
 
             privateUserId = new EditTextPreference(context) {
-                protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-                    Utils.setEditTextDialogTheme(builder);
+                @Override
+                protected void showDialog(Bundle state) {
+                    try {
+                        Context context = getContext();
+                        EditText editText = getEditText();
 
-                    builder.setNeutralButton(str("revanced_sb_settings_copy"), (dialog, which) -> {
-                        try {
-                            Utils.setClipboard(getEditText().getText());
-                        } catch (Exception ex) {
-                            Logger.printException(() -> "Copy settings failure", ex);
-                        }
-                    });
+                        // Set initial EditText value to the current persisted value or empty string.
+                        String initialValue = getText() != null ? getText() : "";
+                        editText.setText(initialValue);
+                        editText.setSelection(initialValue.length()); // Move cursor to end.
+
+                        // Create custom dialog.
+                        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                                context,
+                                getTitle() != null ? getTitle().toString() : "", // Title.
+                                null,     // Message is replaced by EditText.
+                                editText, // Pass the EditText.
+                                null,     // OK button text.
+                                () -> {
+                                    // OK button action. Persist the EditText value when OK is clicked.
+                                    String newValue = editText.getText().toString();
+                                    if (callChangeListener(newValue)) {
+                                        setText(newValue);
+                                    }
+                                },
+                                () -> {}, // Cancel button action (dismiss only).
+                                str("revanced_sb_settings_copy"), // Neutral button text (Copy).
+                                () -> {
+                                    // Neutral button action (Copy).
+                                    try {
+                                        Utils.setClipboard(getEditText().getText());
+                                    } catch (Exception ex) {
+                                        Logger.printException(() -> "Copy settings failure", ex);
+                                    }
+                                },
+                                true // Dismiss dialog when onNeutralClick.
+                        );
+
+                        // Set dialog as cancelable.
+                        dialogPair.first.setCancelable(true);
+
+                        // Show the dialog.
+                        dialogPair.first.show();
+                    } catch (Exception ex) {
+                        Logger.printException(() -> "showDialog failure", ex);
+                    }
                 }
             };
             privateUserId.setTitle(str("revanced_sb_general_uuid"));
@@ -407,51 +461,90 @@ public class SponsorBlockPreferenceGroup extends PreferenceGroup {
                 editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
                 editText.setText(Settings.SB_API_URL.get());
 
-                DialogInterface.OnClickListener urlChangeListener = (dialog, buttonPressed) -> {
-                    if (buttonPressed == DialogInterface.BUTTON_NEUTRAL) {
-                        Settings.SB_API_URL.resetToDefault();
-                        Utils.showToastLong(str("revanced_sb_api_url_reset"));
-                    } else if (buttonPressed == DialogInterface.BUTTON_POSITIVE) {
-                        String serverAddress = editText.getText().toString();
-                        if (!SponsorBlockSettings.isValidSBServerAddress(serverAddress)) {
-                            Utils.showToastLong(str("revanced_sb_api_url_invalid"));
-                        } else if (!serverAddress.equals(Settings.SB_API_URL.get())) {
-                            Settings.SB_API_URL.save(serverAddress);
-                            Utils.showToastLong(str("revanced_sb_api_url_changed"));
-                        }
-                    }
-                };
-                new AlertDialog.Builder(context)
-                        .setTitle(apiUrl.getTitle())
-                        .setView(editText)
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .setNeutralButton(str("revanced_settings_reset"), urlChangeListener)
-                        .setPositiveButton(android.R.string.ok, urlChangeListener)
-                        .show();
+                // Create a custom dialog.
+                Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                        context,
+                        str("revanced_sb_general_api_url"), // Title.
+                        null,     // No message, EditText replaces it.
+                        editText, // Pass the EditText.
+                        null,     // OK button text.
+                        () -> {
+                            // OK button action.
+                            String serverAddress = editText.getText().toString();
+                            if (!SponsorBlockSettings.isValidSBServerAddress(serverAddress)) {
+                                Utils.showToastLong(str("revanced_sb_api_url_invalid"));
+                            } else if (!serverAddress.equals(Settings.SB_API_URL.get())) {
+                                Settings.SB_API_URL.save(serverAddress);
+                                Utils.showToastLong(str("revanced_sb_api_url_changed"));
+                            }
+                        },
+                        () -> {}, // Cancel button action (dismiss dialog).
+                        str("revanced_settings_reset"), // Neutral (Reset) button text.
+                        () -> {
+                            // Neutral button action.
+                            Settings.SB_API_URL.resetToDefault();
+                            Utils.showToastLong(str("revanced_sb_api_url_reset"));
+                        },
+                        true // Dismiss dialog when onNeutralClick.
+                );
+
+                // Show the dialog.
+                dialogPair.first.show();
                 return true;
             });
             generalCategory.addPreference(apiUrl);
 
             importExport = new EditTextPreference(context) {
-                protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-                    Utils.setEditTextDialogTheme(builder);
+                @Override
+                protected void showDialog(Bundle state) {
+                    try {
+                        Context context = getContext();
+                        EditText editText = getEditText();
 
-                    builder.setNeutralButton(str("revanced_sb_settings_copy"), (dialog, which) -> {
-                        try {
-                            Utils.setClipboard(getEditText().getText());
-                        } catch (Exception ex) {
-                            Logger.printException(() -> "Copy settings failure", ex);
-                        }
-                    });
+                        // Create a custom dialog.
+                        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                                context,
+                                str("revanced_sb_settings_ie"), // Title.
+                                null,     // No message, EditText replaces it.
+                                editText, // Pass the EditText.
+                                str("revanced_settings_import"), // OK button text.
+                                () -> {
+                                    // OK button action. Trigger OnPreferenceChangeListener.
+                                    String newValue = editText.getText().toString();
+                                    if (getOnPreferenceChangeListener() != null) {
+                                        getOnPreferenceChangeListener().onPreferenceChange(this, newValue);
+                                    }
+                                },
+                                () -> {}, // Cancel button action (dismiss only).
+                                str("revanced_sb_settings_copy"), // Neutral button text (Copy).
+                                () -> {
+                                    // Neutral button action (Copy).
+                                    try {
+                                        Utils.setClipboard(editText.getText());
+                                    } catch (Exception ex) {
+                                        Logger.printException(() -> "Copy settings failure", ex);
+                                    }
+                                },
+                                true // Dismiss dialog when onNeutralClick.
+                        );
+
+                        // Show the dialog.
+                        dialogPair.first.show();
+                    } catch (Exception ex) {
+                        Logger.printException(() -> "showDialog failure", ex);
+                    }
                 }
             };
             importExport.setTitle(str("revanced_sb_settings_ie"));
-            // Summary is set in updateUI()
-            importExport.getEditText().setInputType(InputType.TYPE_CLASS_TEXT
+            // Summary is set in updateUI().
+            EditText editText = importExport.getEditText();
+            editText.setInputType(InputType.TYPE_CLASS_TEXT
                     | InputType.TYPE_TEXT_FLAG_MULTI_LINE
                     | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-            importExport.getEditText().setAutofillHints((String) null);
-            importExport.getEditText().setTextSize(TypedValue.COMPLEX_UNIT_PT, 8);
+            editText.setAutofillHints((String) null);
+            editText.setTextSize(TypedValue.COMPLEX_UNIT_PT, 8);
+
+            // Set preference listeners.
             importExport.setOnPreferenceClickListener(preference1 -> {
                 importExport.getEditText().setText(SponsorBlockSettings.exportDesktopSettings());
                 return true;

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

@@ -3,7 +3,7 @@ package app.revanced.extension.youtube.sponsorblock.ui;
 import static android.text.Html.fromHtml;
 import static app.revanced.extension.shared.StringRef.str;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -11,6 +11,8 @@ import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
+import android.util.Pair;
+import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 
@@ -194,14 +196,26 @@ public class SponsorBlockStatsPreferenceCategory extends PreferenceCategory {
         updateStatsSelfSaved.run();
 
         preference.setOnPreferenceClickListener(preference1 -> {
-            new AlertDialog.Builder(preference1.getContext())
-                    .setTitle(str("revanced_sb_stats_self_saved_reset_title"))
-                    .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
+            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+                    preference.getContext(),
+                    str("revanced_sb_stats_self_saved_reset_title"), // Title.
+                    null, // No message.
+                    null, // No EditText.
+                    null, // OK button text.
+                    () -> {
+                        // OK button action.
                         Settings.SB_LOCAL_TIME_SAVED_NUMBER_SEGMENTS.resetToDefault();
                         Settings.SB_LOCAL_TIME_SAVED_MILLISECONDS.resetToDefault();
                         updateStatsSelfSaved.run();
-                    })
-                    .setNegativeButton(android.R.string.no, null).show();
+                    },
+                    () -> {}, // Cancel button action (dismiss only).
+                    null, // No neutral button.
+                    null, // No neutral button action.
+                    true  // Dismiss dialog when onNeutralClick.
+            );
+
+            // Show the dialog.
+            dialogPair.first.show();
             return true;
         });
 

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.28.0-dev.1
+version = 5.28.0-dev.6

patches/api/patches.api

@@ -694,6 +694,7 @@ public final class app/revanced/patches/shared/misc/pairip/license/DisableLicens
 }
 
 public final class app/revanced/patches/shared/misc/settings/SettingsPatchKt {
+	public static final fun overrideThemeColors (Ljava/lang/String;Ljava/lang/String;)V
 	public static final fun settingsPatch (Ljava/util/List;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
 	public static final fun settingsPatch (Lkotlin/Pair;Ljava/util/Set;)Lapp/revanced/patcher/patch/ResourcePatch;
 	public static synthetic fun settingsPatch$default (Ljava/util/List;Ljava/util/Set;ILjava/lang/Object;)Lapp/revanced/patcher/patch/ResourcePatch;
@@ -957,6 +958,10 @@ public final class app/revanced/patches/swissid/integritycheck/RemoveGooglePlayI
 	public static final fun getRemoveGooglePlayIntegrityCheckPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/threads/HideAdsPatchKt {
+	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/ticktick/misc/themeunlock/UnlockThemePatchKt {
 	public static final fun getUnlockProPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1678,6 +1683,7 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;F)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;J)V
+	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;S)V
 	public static final fun returnEarly (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Z)V
 	public static synthetic fun returnEarly$default (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ZILjava/lang/Object;)V
@@ -1687,6 +1693,7 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;F)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;J)V
+	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;S)V
 	public static final fun returnLate (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Z)V
 	public static final fun transformMethods (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lkotlin/jvm/functions/Function1;)V

patches/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/SpoofSignaturePatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.idaustria.detection.signature
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val spoofSignaturePatch = bytecodePatch(
@@ -24,12 +24,6 @@ val spoofSignaturePatch = bytecodePatch(
                 "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
                 "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
 
-        spoofSignatureFingerprint.method.addInstructions(
-            0,
-            """
-                const-string v0, "$expectedSignature"
-                return-object v0 
-            """,
-        )
+        spoofSignatureFingerprint.method.returnEarly(expectedSignature)
     }
 }

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

@@ -1,9 +1,16 @@
 package app.revanced.patches.instagram.ads
 
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.meta.ads.adInjectorFingerprint
+import app.revanced.util.returnEarly
 
-@Deprecated("Patch was moved to different package: app.revanced.patches.meta.ads.hideAdsPatch")
 @Suppress("unused")
-val hideAdsPatch = bytecodePatch {
-    dependsOn(app.revanced.patches.meta.ads.hideAdsPatch)
+val hideAdsPatch = bytecodePatch(
+    name = "Hide ads",
+) {
+    compatibleWith("com.instagram.android")
+
+    execute {
+        adInjectorFingerprint.method.returnEarly(false)
+    }
 }

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

@@ -3,18 +3,9 @@ package app.revanced.patches.meta.ads
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.util.returnEarly
 
+@Deprecated("Instead use the Instagram or Threads specific hide ads patch")
 @Suppress("unused")
-val hideAdsPatch = bytecodePatch(
-    name = "Hide ads",
-) {
-    /**
-     * Patch is identical for both Instagram and Threads app.
-     */
-    compatibleWith(
-        "com.instagram.android",
-        "com.instagram.barcelona",
-    )
-
+val hideAdsPatch = bytecodePatch {
     execute {
         adInjectorFingerprint.method.returnEarly(false)
     }

patches/src/main/kotlin/app/revanced/patches/nunl/firebase/SpoofCertificatePatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.nunl.firebase
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val spoofCertificatePatch = bytecodePatch(
@@ -12,13 +12,7 @@ val spoofCertificatePatch = bytecodePatch(
 
     execute {
         getFingerprintHashForPackageFingerprints.forEach { fingerprint ->
-            fingerprint.method.addInstructions(
-                0,
-                """
-                    const-string v0, "eae41fc018df2731a9b6ae1ac327da44a288667b"
-                    return-object v0
-                """,
-            )
+            fingerprint.method.returnEarly("eae41fc018df2731a9b6ae1ac327da44a288667b")
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/pandora/ads/DisableAudioAdsPatch.kt

@@ -1,12 +1,7 @@
 package app.revanced.patches.pandora.ads
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.pandora.shared.constructUserDataFingerprint
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val disableAudioAdsPatch = bytecodePatch(
@@ -15,16 +10,7 @@ val disableAudioAdsPatch = bytecodePatch(
     compatibleWith("com.pandora.android")
 
     execute {
-        constructUserDataFingerprint.method.apply {
-            // First match is "hasAudioAds".
-            val hasAudioAdsStringIndex = constructUserDataFingerprint.stringMatches!!.first().index
-            val moveResultIndex = indexOfFirstInstructionOrThrow(hasAudioAdsStringIndex, Opcode.MOVE_RESULT)
-            val hasAudioAdsRegister = getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-
-            addInstruction(
-                moveResultIndex + 1,
-                "const/4 v$hasAudioAdsRegister, 0"
-            )
-        }
+        getIsAdSupportedFingerprint.method.returnEarly(false)
+        requestAudioAdFingerprint.method.returnEarly()
     }
 }

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

@@ -0,0 +1,15 @@
+package app.revanced.patches.pandora.ads
+
+import app.revanced.patcher.fingerprint
+
+internal val getIsAdSupportedFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "getIsAdSupported" && classDef.endsWith("UserData;")
+    }
+}
+
+internal val requestAudioAdFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "requestAudioAdFromAdSDK" && classDef.endsWith("ContentServiceOpsImpl;")
+    }
+}

patches/src/main/kotlin/app/revanced/patches/pandora/misc/EnableUnlimitedSkipsPatch.kt

@@ -1,12 +1,7 @@
 package app.revanced.patches.pandora.misc
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.pandora.shared.constructUserDataFingerprint
-import app.revanced.util.indexOfFirstInstructionOrThrow
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val enableUnlimitedSkipsPatch = bytecodePatch(
@@ -15,17 +10,6 @@ val enableUnlimitedSkipsPatch = bytecodePatch(
     compatibleWith("com.pandora.android")
 
     execute {
-        constructUserDataFingerprint.method.apply {
-            // Last match is "skipLimitBehavior".
-            val skipLimitBehaviorStringIndex = constructUserDataFingerprint.stringMatches!!.last().index
-            val moveResultObjectIndex =
-                indexOfFirstInstructionOrThrow(skipLimitBehaviorStringIndex, Opcode.MOVE_RESULT_OBJECT)
-            val skipLimitBehaviorRegister = getInstruction<OneRegisterInstruction>(moveResultObjectIndex).registerA
-
-            addInstruction(
-                moveResultObjectIndex + 1,
-                "const-string v$skipLimitBehaviorRegister, \"unlimited\""
-            )
-        }
+        skipLimitBehaviorFingerprint.method.returnEarly("unlimited")
     }
 }

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

@@ -0,0 +1,9 @@
+package app.revanced.patches.pandora.misc
+
+import app.revanced.patcher.fingerprint
+
+internal val skipLimitBehaviorFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "getSkipLimitBehavior" && classDef.endsWith("UserData;")
+    }
+}

patches/src/main/kotlin/app/revanced/patches/pandora/shared/Fingerprints.kt

@@ -1,7 +0,0 @@
-package app.revanced.patches.pandora.shared
-
-import app.revanced.patcher.fingerprint
-
-internal val constructUserDataFingerprint = fingerprint {
-    strings("hasAudioAds", "skipLimitBehavior")
-}

patches/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.photomath.detection.deviceid
 
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.photomath.detection.signature.signatureDetectionPatch
+import app.revanced.util.returnEarly
 import kotlin.random.Random
 
 @Suppress("unused")
@@ -15,12 +15,6 @@ val getDeviceIdPatch = bytecodePatch(
     compatibleWith("com.microblink.photomath")
 
     execute {
-        getDeviceIdFingerprint.method.replaceInstructions(
-            0,
-            """
-                const-string v0, "${Random.nextLong().toString(16)}"
-                return-object v0
-            """,
-        )
+        getDeviceIdFingerprint.method.returnEarly(Random.nextLong().toString(16))
     }
 }

patches/src/main/kotlin/app/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch.kt

@@ -3,6 +3,7 @@ package app.revanced.patches.piccomafr.misc
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.stringOption
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val spoofAndroidDeviceIdPatch = bytecodePatch(
@@ -39,12 +40,6 @@ val spoofAndroidDeviceIdPatch = bytecodePatch(
     ) { it!!.matches("[A-Fa-f0-9]{16}".toRegex()) }
 
     execute {
-        getAndroidIdFingerprint.method.addInstructions(
-            0,
-            """
-                const-string v0, "$androidDeviceId"
-                return-object v0
-            """,
-        )
+        getAndroidIdFingerprint.method.returnEarly(androidDeviceId!!)
     }
 }

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch.kt

@@ -1,9 +1,9 @@
 package app.revanced.patches.reddit.customclients.boostforreddit.api
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "http://rubenmayayo.com") { clientIdOption ->
@@ -14,13 +14,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "http://rubenmayayo.com")
     execute {
         // region Patch client id.
 
-        getClientIdFingerprint.method.addInstructions(
-            0,
-            """
-                 const-string v0, "$clientId"
-                 return-object v0
-            """,
-        )
+        getClientIdFingerprint.method.returnEarly(clientId!!)
 
         // endregion
 

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/SpoofClientPatch.kt

@@ -1,9 +1,8 @@
 package app.revanced.patches.reddit.customclients.joeyforreddit.api
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.disablePiracyDetectionPatch
 import app.revanced.patches.reddit.customclients.spoofClientPatch
+import app.revanced.util.returnEarly
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "https://127.0.0.1:65023/authorize_callback") { clientIdOption ->
     dependsOn(disablePiracyDetectionPatch)
@@ -19,13 +18,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "https://127.0.0.1:65023/a
     execute {
         // region Patch client id.
 
-        getClientIdFingerprint.method.addInstructions(
-            0,
-            """
-                 const-string v0, "$clientId"
-                 return-object v0
-            """,
-        )
+        getClientIdFingerprint.method.returnEarly(clientId!!)
 
         // endregion
 
@@ -35,13 +28,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "https://127.0.0.1:65023/a
         val randomName = (0..100000).random()
         val userAgent = "$randomName:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
 
-        authUtilityUserAgentFingerprint.method.replaceInstructions(
-            0,
-            """
-                const-string v0, "$userAgent"
-                return-object v0
-            """,
-        )
+        authUtilityUserAgentFingerprint.method.returnEarly(userAgent)
 
         // endregion
     }

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatch.kt

@@ -2,12 +2,12 @@ package app.revanced.patches.reddit.customclients.redditisfun.api
 
 import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.Match
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.StringReference
 
@@ -54,13 +54,7 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "redditisfun://auth") { cl
         val randomName = (0..100000).random()
         val userAgent = "$randomName:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
 
-        getUserAgentFingerprint.method.addInstructions(
-            0,
-            """
-                const-string v0, "$userAgent"
-                return-object v0
-            """,
-        )
+        getUserAgentFingerprint.method.returnEarly(userAgent)
 
         // endregion
 

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/SpoofClientPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.reddit.customclients.slide.api
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patches.reddit.customclients.spoofClientPatch
+import app.revanced.util.returnEarly
 
 val spoofClientPatch = spoofClientPatch(redirectUri = "http://www.ccrama.me") { clientIdOption ->
     compatibleWith("me.ccrama.redditslide")
@@ -9,12 +9,6 @@ val spoofClientPatch = spoofClientPatch(redirectUri = "http://www.ccrama.me") {
     val clientId by clientIdOption
 
     execute {
-        getClientIdFingerprint.method.addInstructions(
-            0,
-            """
-                 const-string v0, "$clientId"
-                 return-object v0
-            """,
-        )
+        getClientIdFingerprint.method.returnEarly(clientId!!)
     }
 }

patches/src/main/kotlin/app/revanced/patches/reddit/customclients/sync/syncforreddit/api/SpoofClientPatch.kt

@@ -1,14 +1,14 @@
 package app.revanced.patches.reddit.customclients.sync.syncforreddit.api
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patches.reddit.customclients.spoofClientPatch
 import app.revanced.patches.reddit.customclients.sync.detection.piracy.disablePiracyDetectionPatch
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.StringReference
-import java.util.*
+import java.util.Base64
 
 val spoofClientPatch = spoofClientPatch(
     redirectUri = "http://redditsync/auth",
@@ -28,13 +28,8 @@ val spoofClientPatch = spoofClientPatch(
 
         getBearerTokenFingerprint.match(getAuthorizationStringFingerprint.originalClassDef).method.apply {
             val auth = Base64.getEncoder().encodeToString("$clientId:".toByteArray(Charsets.UTF_8))
-            addInstructions(
-                0,
-                """
-                     const-string v0, "Basic $auth"
-                     return-object v0
-                """,
-            )
+            returnEarly("Basic $auth")
+
             val occurrenceIndex =
                 getAuthorizationStringFingerprint.stringMatches!!.first().index
 
@@ -63,23 +58,19 @@ val spoofClientPatch = spoofClientPatch(
         val randomName = (0..100000).random()
         val userAgent = "$randomName:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
 
-        getUserAgentFingerprint.method.replaceInstruction(
-            0,
-            """
-                const-string v0, "$userAgent"
-                return-object v0
-            """,
-        )
+        getUserAgentFingerprint.method.returnEarly(userAgent)
 
         // endregion
 
         // region Patch Imgur API URL.
 
-        val apiUrlIndex = imgurImageAPIFingerprint.stringMatches!!.first().index
-        imgurImageAPIFingerprint.method.replaceInstruction(
-            apiUrlIndex,
-            "const-string v1, \"https://api.imgur.com/3/image\"",
-        )
+        imgurImageAPIFingerprint.let {
+            val apiUrlIndex = it.stringMatches!!.first().index
+            it.method.replaceInstruction(
+                apiUrlIndex,
+                "const-string v1, \"https://api.imgur.com/3/image\"",
+            )
+        }
 
         // endregion
     }

patches/src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt

@@ -84,7 +84,7 @@ fun checkEnvironmentPatch(
 
         fun invokeCheck() = mainActivityOnCreateFingerprint.method.addInstruction(
             0,
-            "invoke-static/range { p0 .. p0 },$EXTENSION_CLASS_DESCRIPTOR->check(Landroid/app/Activity;)V",
+            "invoke-static/range { p0 .. p0 }, $EXTENSION_CLASS_DESCRIPTOR->check(Landroid/app/Activity;)V",
         )
 
         setPatchInfo()

patches/src/main/kotlin/app/revanced/patches/shared/misc/extension/SharedExtensionPatch.kt

@@ -3,11 +3,11 @@ package app.revanced.patches.shared.misc.extension
 import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.FingerprintBuilder
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.iface.Method
 import java.net.URLDecoder
 import java.util.jar.JarFile
@@ -80,14 +80,7 @@ fun sharedExtensionPatch(
             }
 
             val manifestValue = getPatchesManifestEntry("Version")
-
-            addInstructions(
-                0,
-                """
-                    const-string v0, "$manifestValue"
-                    return-object v0
-                """,
-            )
+            returnEarly(manifestValue)
         }
     }
 }

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.shared.misc.settings
+
+import app.revanced.patcher.fingerprint
+import app.revanced.patches.shared.misc.extension.EXTENSION_CLASS_DESCRIPTOR
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val themeLightColorResourceNameFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    returns("Ljava/lang/String;")
+    parameters()
+    custom { method, classDef ->
+        method.name == "getThemeLightColorResourceName" && classDef.type == EXTENSION_CLASS_DESCRIPTOR
+    }
+}
+
+internal val themeDarkColorResourceNameFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
+    returns("Ljava/lang/String;")
+    parameters()
+    custom { method, classDef ->
+        method.name == "getThemeDarkColorResourceName" && classDef.type == EXTENSION_CLASS_DESCRIPTOR
+    }
+}

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

@@ -1,6 +1,7 @@
 package app.revanced.patches.shared.misc.settings
 
 import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.all.misc.resources.addResource
 import app.revanced.patches.all.misc.resources.addResources
@@ -13,6 +14,7 @@ import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 import app.revanced.util.getNode
 import app.revanced.util.insertFirst
+import app.revanced.util.returnEarly
 import org.w3c.dom.Node
 
 // TODO: Delete this on next major version bump.
@@ -22,6 +24,30 @@ fun settingsPatch (
     preferences: Set<BasePreference>,
 ) = settingsPatch(listOf(rootPreference), preferences)
 
+private var themeForegroundColor : String? = null
+private var themeBackgroundColor : String? = null
+
+/**
+ * Sets the default theme colors used in various ReVanced specific settings menus.
+ * By default these colors are white and black, but instead can be set to the
+ * same color the target app uses for it's own settings.
+ */
+fun overrideThemeColors(foregroundColor: String, backgroundColor: String) {
+    themeForegroundColor = foregroundColor
+    themeBackgroundColor = backgroundColor
+}
+
+private val settingsColorPatch = bytecodePatch {
+    finalize {
+        if (themeForegroundColor != null) {
+            themeLightColorResourceNameFingerprint.method.returnEarly(themeForegroundColor!!)
+        }
+        if (themeBackgroundColor != null) {
+            themeDarkColorResourceNameFingerprint.method.returnEarly(themeBackgroundColor!!)
+        }
+    }
+}
+
 /**
  * A resource patch that adds settings to a settings fragment.
  *
@@ -33,12 +59,28 @@ fun settingsPatch (
     rootPreferences: List<Pair<BasePreference, String>>? = null,
     preferences: Set<BasePreference>,
 ) = resourcePatch {
-    dependsOn(addResourcesPatch)
+    dependsOn(addResourcesPatch, settingsColorPatch)
 
     execute {
         copyResources(
             "settings",
             ResourceGroup("xml", "revanced_prefs.xml", "revanced_prefs_icons.xml"),
+            ResourceGroup("drawable",
+                // CustomListPreference resources.
+                "revanced_ic_dialog_alert.xml",
+                "revanced_settings_arrow_time.xml",
+                "revanced_settings_circle_background.xml",
+                "revanced_settings_cursor.xml",
+                "revanced_settings_custom_checkmark.xml",
+                "revanced_settings_search_icon.xml",
+                "revanced_settings_toolbar_arrow_left.xml",
+            ),
+            ResourceGroup("layout",
+                "revanced_custom_list_item_checked.xml",
+                // Color picker.
+                "revanced_color_dot_widget.xml",
+                "revanced_color_picker.xml",
+            )
         )
 
         addResources("shared", "misc.settings.settingsResourcePatch")

patches/src/main/kotlin/app/revanced/patches/shared/misc/settings/preference/ListPreference.kt

@@ -12,7 +12,7 @@ import org.w3c.dom.Document
  * @param summaryKey The preference summary key.
  * @param icon The preference icon resource name.
  * @param layout Layout declaration.
- * @param tag The preference tag.
+ * @param tag The preference class type.
  * @param entriesKey The entries array key.
  * @param entryValuesKey The entry values array key.
  */
@@ -20,10 +20,12 @@ import org.w3c.dom.Document
 class ListPreference(
     key: String? = null,
     titleKey: String = "${key}_title",
-    summaryKey: String? = "${key}_summary",
+    /** Summary key is ignored and will be removed soon */
+    //@Deprecated
+    summaryKey: String? = null,
     icon: String? = null,
     layout: String? = null,
-    tag: String = "ListPreference",
+    tag: String = "app.revanced.extension.shared.settings.preference.CustomDialogListPreference",
     val entriesKey: String? = "${key}_entries",
     val entryValuesKey: String? = "${key}_entry_values"
 ) : BasePreference(key, titleKey, summaryKey, icon, layout, tag) {

patches/src/main/kotlin/app/revanced/patches/spotify/layout/hide/createbutton/HideCreateButtonPatch.kt

@@ -72,7 +72,7 @@ val hideCreateButtonPatch = bytecodePatch(
 
         if (oldNavigationBarAddItemMethod != null) {
             // In case an older version of the app is being patched, hook the old method which adds navigation bar items.
-            // Return null early if the navigation bar item title resource id is the old Create button title resource id.
+            // Return early if the navigation bar item title resource id is the old Create button title resource id.
             oldNavigationBarAddItemFingerprint.methodOrNull?.apply {
                 val getNavigationBarItemTitleStringIndex = indexOfFirstInstructionOrThrow {
                     val reference = getReference<MethodReference>()
@@ -89,6 +89,16 @@ val hideCreateButtonPatch = bytecodePatch(
                 val isOldCreateButtonDescriptor =
                     "$EXTENSION_CLASS_DESCRIPTOR->isOldCreateButton(I)Z"
 
+                val returnEarlyInstruction = if (returnType == "V") {
+                    // In older implementations the method return value is void.
+                    "return-void"
+                } else {
+                    // In newer implementations
+                    // return null because the method return value is a BottomNavigationItemView.
+                    "const/4 v0, 0\n" +
+                    "return-object v0"
+                }
+
                 addInstructionsWithLabels(
                     0,
                     """
@@ -98,9 +108,7 @@ val hideCreateButtonPatch = bytecodePatch(
                         # If this navigation bar item is not the Create button, jump to the normal method logic.
                         if-eqz v0, :normal-method-logic
 
-                        # Return null early because this method return value is a BottomNavigationItemView.
-                        const/4 v0, 0
-                        return-object v0
+                        $returnEarlyInstruction
                     """,
                     ExternalLabel("normal-method-logic", firstInstruction)
                 )

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

@@ -3,6 +3,7 @@ package app.revanced.patches.spotify.misc.privacy
 import app.revanced.patcher.fingerprint
 import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 internal val shareCopyUrlFingerprint = fingerprint {
     returns("Ljava/lang/Object;")
@@ -23,9 +24,15 @@ internal val shareCopyUrlLegacyFingerprint = fingerprint {
 }
 
 internal val formatAndroidShareSheetUrlFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
     returns("Ljava/lang/String;")
     parameters("L", "Ljava/lang/String;")
+    opcodes(
+        Opcode.GOTO,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.RETURN_OBJECT
+    )
     literal {
         '\n'.code.toLong()
     }

patches/src/main/kotlin/app/revanced/patches/spotify/misc/privacy/SanitizeSharingLinksPatch.kt

@@ -8,6 +8,7 @@ import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
 import app.revanced.patches.spotify.shared.IS_SPOTIFY_LEGACY_APP_TARGET
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
@@ -56,7 +57,15 @@ val sanitizeSharingLinksPatch = bytecodePatch(
             shareUrlParameter = "p2"
         } else {
             shareSheetFingerprint = formatAndroidShareSheetUrlFingerprint
-            shareUrlParameter = "p1"
+            val methodAccessFlags = formatAndroidShareSheetUrlFingerprint.originalMethod.accessFlags
+            shareUrlParameter = if (AccessFlags.STATIC.isSet(methodAccessFlags)) {
+                // In newer implementations the method is static, so p0 is not `this`.
+                "p1"
+            } else {
+                // In older implementations the method is not static, making it so p0 is `this`.
+                // For that reason, add one to the parameter register.
+                "p2"
+            }
         }
 
         shareSheetFingerprint.method.addInstructions(

patches/src/main/kotlin/app/revanced/patches/threads/HideAdsPatch.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.threads
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.meta.ads.adInjectorFingerprint
+import app.revanced.util.returnEarly
+
+@Suppress("unused")
+val hideAdsPatch = bytecodePatch(
+    name = "Hide ads",
+) {
+    compatibleWith("com.instagram.barcelona"("382.0.0.51.85"))
+
+    execute {
+        adInjectorFingerprint.method.returnEarly(false)
+    }
+}

patches/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt

@@ -25,7 +25,7 @@ val embeddedAdsPatch = bytecodePatch(
         addResources("twitch", "ad.embedded.embeddedAdsPatch")
 
         PreferenceScreen.ADS.SURESTREAM.addPreferences(
-            ListPreference("revanced_block_embedded_ads", summaryKey = null),
+            ListPreference("revanced_block_embedded_ads"),
         )
 
         // Inject OkHttp3 application interceptor

patches/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/ShowDeletedMessagesPatch.kt

@@ -34,10 +34,7 @@ val showDeletedMessagesPatch = bytecodePatch(
         addResources("twitch", "chat.antidelete.showDeletedMessagesPatch")
 
         PreferenceScreen.CHAT.GENERAL.addPreferences(
-            ListPreference(
-                key = "revanced_show_deleted_messages",
-                summaryKey = null,
-            ),
+            ListPreference("revanced_show_deleted_messages")
         )
 
         // Spoiler mode: Force set hasModAccess member to true in constructor

patches/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/FirebaseGetCertPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.warnwetter.misc.firebasegetcert
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 val firebaseGetCertPatch = bytecodePatch(
     description = "Spoofs the X-Android-Cert header.",
@@ -10,13 +10,7 @@ val firebaseGetCertPatch = bytecodePatch(
 
     execute {
         listOf(getRegistrationCertFingerprint, getMessagingCertFingerprint).forEach { match ->
-            match.method.addInstructions(
-                0,
-                """
-                    const-string v0, "0799DDF0414D3B3475E88743C91C0676793ED450"
-                    return-object v0
-                """,
-            )
+            match.method.returnEarly("0799DDF0414D3B3475E88743C91C0676793ED450")
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt

@@ -11,10 +11,14 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPref
 import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.shared.misc.settings.preference.TextPreference
-import app.revanced.patches.youtube.misc.playercontrols.*
+import app.revanced.patches.youtube.misc.playercontrols.addBottomControl
+import app.revanced.patches.youtube.misc.playercontrols.initializeBottomControl
+import app.revanced.patches.youtube.misc.playercontrols.injectVisibilityCheckCall
+import app.revanced.patches.youtube.misc.playercontrols.playerControlsPatch
+import app.revanced.patches.youtube.misc.playercontrols.playerControlsResourcePatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
-import app.revanced.patches.youtube.shared.mainActivityFingerprint
+import app.revanced.patches.youtube.shared.mainActivityOnCreateFingerprint
 import app.revanced.patches.youtube.video.information.videoInformationPatch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
@@ -83,12 +87,10 @@ val downloadsPatch = bytecodePatch(
         injectVisibilityCheckCall(BUTTON_DESCRIPTOR)
 
         // Main activity is used to launch downloader intent.
-        mainActivityFingerprint.method.apply {
-            addInstruction(
-                implementation!!.instructions.lastIndex,
-                "invoke-static { p0 }, $EXTENSION_CLASS_DESCRIPTOR->activityCreated(Landroid/app/Activity;)V",
-            )
-        }
+        mainActivityOnCreateFingerprint.method.addInstruction(
+            1,
+            "invoke-static/range { p0 .. p0 }, $EXTENSION_CLASS_DESCRIPTOR->activityCreated(Landroid/app/Activity;)V"
+        )
 
         offlineVideoEndpointFingerprint.method.apply {
             addInstructionsWithLabels(

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

@@ -14,7 +14,7 @@ import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_43_or_greater
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
-import app.revanced.patches.youtube.shared.mainActivityFingerprint
+import app.revanced.patches.youtube.shared.mainActivityConstructorFingerprint
 import app.revanced.util.*
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
@@ -43,10 +43,7 @@ private val swipeControlsResourcePatch = resourcePatch {
             SwitchPreference("revanced_swipe_haptic_feedback"),
             SwitchPreference("revanced_swipe_save_and_restore_brightness"),
             SwitchPreference("revanced_swipe_lowest_value_enable_auto_brightness"),
-            ListPreference(
-                "revanced_swipe_overlay_style",
-                summaryKey = null,
-            ),
+            ListPreference("revanced_swipe_overlay_style"),
             TextPreference("revanced_swipe_overlay_background_opacity", inputType = InputType.NUMBER),
             TextPreference("revanced_swipe_overlay_progress_brightness_color",
                 tag = "app.revanced.extension.shared.settings.preference.ColorPickerPreference",
@@ -103,7 +100,7 @@ val swipeControlsPatch = bytecodePatch(
 
     execute {
         val wrapperClass = swipeControlsHostActivityFingerprint.classDef
-        val targetClass = mainActivityFingerprint.classDef
+        val targetClass = mainActivityConstructorFingerprint.classDef
 
         // Inject the wrapper class from the extension into the class hierarchy of MainActivity.
         wrapperClass.setSuperClass(targetClass.superclass)

patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt

@@ -47,10 +47,7 @@ val changeFormFactorPatch = bytecodePatch(
         addResources("youtube", "layout.formfactor.changeFormFactorPatch")
 
         PreferenceScreen.GENERAL_LAYOUT.addPreferences(
-            ListPreference(
-                "revanced_change_form_factor",
-                summaryKey = null,
-            )
+            ListPreference("revanced_change_form_factor")
         )
 
         hookNavigationButtonCreated(EXTENSION_CLASS_DESCRIPTOR)

patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt

@@ -184,23 +184,18 @@ val miniplayerPatch = bytecodePatch(
 
         preferences +=
             if (is_20_03_or_greater) {
-                ListPreference(
-                    "revanced_miniplayer_type",
-                    summaryKey = null,
-                )
+                ListPreference("revanced_miniplayer_type")
             } else if (is_19_43_or_greater) {
                 ListPreference(
-                    "revanced_miniplayer_type",
-                    summaryKey = null,
+                    key = "revanced_miniplayer_type",
                     entriesKey = "revanced_miniplayer_type_legacy_19_43_entries",
-                    entryValuesKey = "revanced_miniplayer_type_legacy_19_43_entry_values",
+                    entryValuesKey = "revanced_miniplayer_type_legacy_19_43_entry_values"
                 )
             } else {
                 ListPreference(
-                    "revanced_miniplayer_type",
-                    summaryKey = null,
+                    key = "revanced_miniplayer_type",
                     entriesKey = "revanced_miniplayer_type_legacy_19_16_entries",
-                    entryValuesKey = "revanced_miniplayer_type_legacy_19_16_entry_values",
+                    entryValuesKey = "revanced_miniplayer_type_legacy_19_16_entry_values"
                 )
             }
 

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

@@ -49,10 +49,7 @@ internal val exitFullscreenPatch = bytecodePatch(
         addResources("youtube", "layout.player.fullscreen.exitFullscreenPatch")
 
         PreferenceScreen.PLAYER.addPreferences(
-            ListPreference(
-                "revanced_exit_fullscreen",
-                summaryKey = null,
-            )
+            ListPreference("revanced_exit_fullscreen")
         )
 
         autoRepeatFingerprint.match(autoRepeatParentFingerprint.originalClassDef).method.apply {

patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt

@@ -70,8 +70,7 @@ val shortsAutoplayPatch = bytecodePatch(
         // Main activity is used to check if app is in pip mode.
         mainActivityOnCreateFingerprint.method.addInstruction(
             1,
-            "invoke-static/range { p0 .. p0 }, $EXTENSION_CLASS_DESCRIPTOR->" +
-                "setMainActivity(Landroid/app/Activity;)V",
+            "invoke-static/range { p0 .. p0 }, $EXTENSION_CLASS_DESCRIPTOR->setMainActivity(Landroid/app/Activity;)V",
         )
 
         val reelEnumClass = reelEnumConstructorFingerprint.originalClassDef.type

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

@@ -79,14 +79,10 @@ val openShortsInRegularPlayerPatch = bytecodePatch(
 
         PreferenceScreen.SHORTS.addPreferences(
             if (is_19_46_or_greater) {
-                ListPreference(
-                    key = "revanced_shorts_player_type",
-                    summaryKey = null,
-                )
+                ListPreference("revanced_shorts_player_type")
             } else {
                 ListPreference(
                     key = "revanced_shorts_player_type",
-                    summaryKey = null,
                     entriesKey = "revanced_shorts_player_type_legacy_entries",
                     entryValuesKey = "revanced_shorts_player_type_legacy_entry_values"
                 )

patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt

@@ -83,7 +83,7 @@ val spoofAppVersionPatch = bytecodePatch(
                     if (is_19_43_or_greater) {
                         ListPreference(
                             key = "revanced_spoof_app_version_target",
-                            summaryKey = null,
+                            summaryKey = null
                         )
                     } else {
                         ListPreference(

patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt

@@ -53,7 +53,6 @@ val changeStartPagePatch = bytecodePatch(
                 preferences = setOf(
                     ListPreference(
                         key = "revanced_change_start_page",
-                        summaryKey = null,
                         tag = "app.revanced.extension.shared.settings.preference.SortedListPreference"
                     ),
                     SwitchPreference("revanced_change_start_page_always")

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

@@ -24,26 +24,6 @@ internal val lithoThemeFingerprint = fingerprint {
     }
 }
 
-internal val themeHelperDarkColorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
-    returns("Ljava/lang/String;")
-    parameters()
-    custom { method, _ ->
-        method.name == "darkThemeResourceName" &&
-            method.definingClass == "Lapp/revanced/extension/youtube/ThemeHelper;"
-    }
-}
-
-internal val themeHelperLightColorFingerprint = fingerprint {
-    accessFlags(AccessFlags.PRIVATE, AccessFlags.STATIC)
-    returns("Ljava/lang/String;")
-    parameters()
-    custom { method, _ ->
-        method.name == "lightThemeResourceName" &&
-            method.definingClass == "Lapp/revanced/extension/youtube/ThemeHelper;"
-    }
-}
-
 internal const val GRADIENT_LOADING_SCREEN_AB_CONSTANT = 45412406L
 
 internal val useGradientLoadingScreenFingerprint = fingerprint {

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

@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.layout.theme
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
@@ -8,6 +7,7 @@ import app.revanced.patcher.patch.stringOption
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
+import app.revanced.patches.shared.misc.settings.overrideThemeColors
 import app.revanced.patches.shared.misc.settings.preference.BasePreference
 import app.revanced.patches.shared.misc.settings.preference.InputType
 import app.revanced.patches.shared.misc.settings.preference.ListPreference
@@ -22,16 +22,17 @@ import app.revanced.patches.youtube.misc.playservice.is_19_47_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.childElementsSequence
 import app.revanced.util.forEachChildElement
 import app.revanced.util.insertLiteralOverride
 import org.w3c.dom.Element
 
-private const val EXTENSION_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/patches/theme/ThemePatch;"
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/theme/ThemePatch;"
 
 val themePatch = bytecodePatch(
     name = "Theme",
-    description = "Adds options for theming and applies a custom background theme (dark background theme defaults to amoled black).",
+    description = "Adds options for theming and applies a custom background theme " +
+            "(dark background theme defaults to amoled black).",
 ) {
     val amoledBlackColor = "@android:color/black"
     val whiteColor = "@android:color/white"
@@ -109,27 +110,23 @@ val themePatch = bytecodePatch(
                     )
                 )
 
+                overrideThemeColors(lightThemeBackgroundColor!!, darkThemeBackgroundColor!!)
+
                 // Edit theme colors via resources.
                 document("res/values/colors.xml").use { document ->
-
                     val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
 
-                    val children = resourcesNode.childNodes
-                    for (i in 0 until children.length) {
-                        val node = children.item(i) as? Element ?: continue
+                    resourcesNode.childElementsSequence().forEach { node ->
+                        when (node.getAttribute("name")) {
+                            "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98",
+                            "yt_black2", "yt_black3", "yt_black4", "yt_status_bar_background_dark",
+                            "material_grey_850",
+                                -> node.textContent = darkThemeBackgroundColor
 
-                        node.textContent =
-                            when (node.getAttribute("name")) {
-                                "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
-                                "yt_black4", "yt_status_bar_background_dark", "material_grey_850",
-                                -> darkThemeBackgroundColor ?: continue
-
-                                "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
-                                "yt_white2", "yt_white3", "yt_white4",
-                                -> lightThemeBackgroundColor ?: continue
-
-                                else -> continue
-                            }
+                            "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98",
+                            "yt_white2", "yt_white3", "yt_white4",
+                                -> node.textContent = lightThemeBackgroundColor
+                        }
                     }
                 }
 
@@ -151,67 +148,56 @@ val themePatch = bytecodePatch(
                     }
                 }
 
-                val splashBackgroundColor = "revanced_splash_background_color"
-
                 // Add a dynamic background color to the colors.xml file.
-                lightThemeBackgroundColor?.let {
-                    addColorResource("res/values/colors.xml", splashBackgroundColor, it)
-                }
-
-                darkThemeBackgroundColor?.let {
-                    addColorResource("res/values-night/colors.xml", splashBackgroundColor, it)
-                }
+                val splashBackgroundColorKey = "revanced_splash_background_color"
+                addColorResource("res/values/colors.xml", splashBackgroundColorKey, lightThemeBackgroundColor!!)
+                addColorResource("res/values-night/colors.xml", splashBackgroundColorKey, darkThemeBackgroundColor!!)
 
                 // Edit splash screen files and change the background color,
-                // if the background colors are set.
-                if (darkThemeBackgroundColor != null && lightThemeBackgroundColor != null) {
-                    val splashScreenResourceFiles = listOf(
-                        "res/drawable/quantum_launchscreen_youtube.xml",
-                        "res/drawable-sw600dp/quantum_launchscreen_youtube.xml",
-                    )
-
-                    splashScreenResourceFiles.forEach editSplashScreen@{ resourceFile ->
-                        document(resourceFile).use { document ->
-                            document.getElementsByTagName("layer-list").item(0).forEachChildElement { node ->
-                                if (node.hasAttribute("android:drawable")) {
-                                    node.setAttribute("android:drawable", "@color/$splashBackgroundColor")
-                                    return@editSplashScreen
-                                }
+                arrayOf(
+                    "res/drawable/quantum_launchscreen_youtube.xml",
+                    "res/drawable-sw600dp/quantum_launchscreen_youtube.xml",
+                ).forEach editSplashScreen@{ resourceFileName ->
+                    document(resourceFileName).use { document ->
+                        document.getElementsByTagName("layer-list").item(0).forEachChildElement { node ->
+                            if (node.hasAttribute("android:drawable")) {
+                                node.setAttribute("android:drawable", "@color/$splashBackgroundColorKey")
+                                return@editSplashScreen
                             }
-
-                            throw PatchException("Failed to modify launch screen")
-                        }
-                    }
-
-                    // Fix the splash screen dark mode background color.
-                    // In 19.32+ the dark mode splash screen is white and fades to black.
-                    // Maybe it's a bug in YT, or maybe it intentionally. Who knows.
-                    document("res/values-night-v27/styles.xml").use { document ->
-                        // Create a night mode specific override for the splash screen background.
-                        val style = document.createElement("style")
-                        style.setAttribute("name", "Theme.YouTube.Home")
-                        style.setAttribute("parent", "@style/Base.V27.Theme.YouTube.Home")
-
-                        // Fix status and navigation bar showing white on some Android devices,
-                        // such as SDK 28 Android 10 medium tablet.
-                        val colorSplashBackgroundColor = "@color/$splashBackgroundColor"
-                        arrayOf(
-                            "android:navigationBarColor" to colorSplashBackgroundColor,
-                            "android:windowBackground" to colorSplashBackgroundColor,
-                            "android:colorBackground" to colorSplashBackgroundColor,
-                            "colorPrimaryDark" to colorSplashBackgroundColor,
-                            "android:windowLightStatusBar" to "false",
-                        ).forEach { (name, value) ->
-                            val styleItem = document.createElement("item")
-                            styleItem.setAttribute("name", name)
-                            styleItem.textContent = value
-                            style.appendChild(styleItem)
                         }
 
-                        val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
-                        resourcesNode.appendChild(style)
+                        throw PatchException("Failed to modify launch screen")
                     }
                 }
+
+                // Fix the splash screen dark mode background color.
+                // In 19.32+ the dark mode splash screen is white and fades to black.
+                // Maybe it's a bug in YT, or maybe it intentionally. Who knows.
+                document("res/values-night-v27/styles.xml").use { document ->
+                    // Create a night mode specific override for the splash screen background.
+                    val style = document.createElement("style")
+                    style.setAttribute("name", "Theme.YouTube.Home")
+                    style.setAttribute("parent", "@style/Base.V27.Theme.YouTube.Home")
+
+                    // Fix status and navigation bar showing white on some Android devices,
+                    // such as SDK 28 Android 10 medium tablet.
+                    val colorSplashBackgroundColor = "@color/$splashBackgroundColorKey"
+                    arrayOf(
+                        "android:navigationBarColor" to colorSplashBackgroundColor,
+                        "android:windowBackground" to colorSplashBackgroundColor,
+                        "android:colorBackground" to colorSplashBackgroundColor,
+                        "colorPrimaryDark" to colorSplashBackgroundColor,
+                        "android:windowLightStatusBar" to "false",
+                    ).forEach { (name, value) ->
+                        val styleItem = document.createElement("item")
+                        styleItem.setAttribute("name", name)
+                        styleItem.textContent = value
+                        style.appendChild(styleItem)
+                    }
+
+                    val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
+                    resourcesNode.appendChild(style)
+                }
             }
         }
     )
@@ -237,10 +223,7 @@ val themePatch = bytecodePatch(
 
         if (is_19_47_or_greater) {
             PreferenceScreen.GENERAL_LAYOUT.addPreferences(
-                ListPreference(
-                    key = "splash_screen_animation_style",
-                    summaryKey = null
-                )
+                ListPreference("splash_screen_animation_style")
             )
         }
 
@@ -257,21 +240,6 @@ val themePatch = bytecodePatch(
             )
         }
 
-        arrayOf(
-            themeHelperLightColorFingerprint to lightThemeBackgroundColor,
-            themeHelperDarkColorFingerprint to darkThemeBackgroundColor,
-        ).forEach { (fingerprint, color) ->
-            fingerprint.method.apply {
-                addInstructions(
-                    0,
-                    """
-                        const-string v0, "$color"
-                        return-object v0
-                    """,
-                )
-            }
-        }
-
         lithoColorOverrideHook(EXTENSION_CLASS_DESCRIPTOR, "getValue")
     }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt

@@ -50,34 +50,29 @@ val alternativeThumbnailsPatch = bytecodePatch(
         val values = "revanced_alt_thumbnail_options_entry_values"
         PreferenceScreen.ALTERNATIVE_THUMBNAILS.addPreferences(
             ListPreference(
-                "revanced_alt_thumbnail_home",
-                summaryKey = null,
+                key = "revanced_alt_thumbnail_home",
                 entriesKey = entries,
-                entryValuesKey = values,
+                entryValuesKey = values
             ),
             ListPreference(
-                "revanced_alt_thumbnail_subscription",
-                summaryKey = null,
+                key = "revanced_alt_thumbnail_subscription",
                 entriesKey = entries,
-                entryValuesKey = values,
+                entryValuesKey = values
             ),
             ListPreference(
-                "revanced_alt_thumbnail_library",
-                summaryKey = null,
+                key = "revanced_alt_thumbnail_library",
                 entriesKey = entries,
-                entryValuesKey = values,
+                entryValuesKey = values
             ),
             ListPreference(
-                "revanced_alt_thumbnail_player",
-                summaryKey = null,
+                key = "revanced_alt_thumbnail_player",
                 entriesKey = entries,
-                entryValuesKey = values,
+                entryValuesKey = values
             ),
             ListPreference(
-                "revanced_alt_thumbnail_search",
-                summaryKey = null,
+                key = "revanced_alt_thumbnail_search",
                 entriesKey = entries,
-                entryValuesKey = values,
+                entryValuesKey = values
             ),
             NonInteractivePreference(
                 "revanced_alt_thumbnail_dearrow_about",
@@ -89,7 +84,7 @@ val alternativeThumbnailsPatch = bytecodePatch(
             TextPreference("revanced_alt_thumbnail_dearrow_api_url"),
             NonInteractivePreference("revanced_alt_thumbnail_stills_about"),
             SwitchPreference("revanced_alt_thumbnail_stills_fast"),
-            ListPreference("revanced_alt_thumbnail_stills_time", summaryKey = null),
+            ListPreference("revanced_alt_thumbnail_stills_time"),
         )
 
         addImageUrlHook(EXTENSION_CLASS_DESCRIPTOR)

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

@@ -4,15 +4,6 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.AccessFlags
 import app.revanced.patcher.fingerprint
 
-internal val onBackPressedFingerprint = fingerprint {
-    returns("V")
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    opcodes(Opcode.RETURN_VOID)
-    custom { method, classDef ->
-        method.name == "onBackPressed" && classDef.endsWith("MainActivity;")
-    }
-}
-
 internal val scrollPositionFingerprint = fingerprint {
     accessFlags(AccessFlags.PROTECTED, AccessFlags.FINAL)
     returns("V")

patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt

@@ -2,6 +2,7 @@ package app.revanced.patches.youtube.misc.fix.backtoexitgesture
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.youtube.shared.mainActivityOnBackPressedFingerprint
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
@@ -10,7 +11,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/FixBackToExitGesturePatch;"
 
 internal val fixBackToExitGesturePatch = bytecodePatch(
-    description = "Fixes the swipe back to exit gesture.",
+    description = "Fixes the swipe back to exit gesture."
 ) {
 
     execute {
@@ -36,12 +37,12 @@ internal val fixBackToExitGesturePatch = bytecodePatch(
                         "invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->onScrollingViews()V"
                     )
                 }
-
         }
 
-        onBackPressedFingerprint.let {
-            it.method.addInstruction(
-                it.patternMatch!!.endIndex,
+        mainActivityOnBackPressedFingerprint.method.apply {
+            val index = indexOfFirstInstructionOrThrow(Opcode.RETURN_VOID)
+            addInstruction(
+                index,
                 "invoke-static { p0 }, $EXTENSION_CLASS_DESCRIPTOR->onBackPressed(Landroid/app/Activity;)V"
             )
         }

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

@@ -42,15 +42,6 @@ internal val initializeButtonsFingerprint = fingerprint {
     literal { imageOnlyTabResourceId }
 }
 
-internal val mainActivityOnBackPressedFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters()
-    custom { method, classDef ->
-        method.name == "onBackPressed" && classDef.endsWith("MainActivity;")
-    }
-}
-
 /**
  * Extension method, used for callback into to other patches.
  * Specifically, [navigationButtonsPatch].

patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt

@@ -15,6 +15,7 @@ import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_35_or_greater
+import app.revanced.patches.youtube.shared.mainActivityOnBackPressedFingerprint
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow

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

@@ -3,7 +3,6 @@ package app.revanced.patches.youtube.misc.settings
 import app.revanced.patcher.fingerprint
 import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
 
 internal val licenseActivityOnCreateFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
@@ -18,13 +17,9 @@ internal val setThemeFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("L")
     parameters()
-    opcodes(Opcode.RETURN_OBJECT)
     literal { appearanceStringId }
 }
 
-/**
- * Added in YouTube v19.04.38.
- */
 internal const val CAIRO_CONFIG_LITERAL_VALUE = 45532100L
 
 internal val cairoFragmentConfigFingerprint = fingerprint {

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

@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.misc.settings
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
@@ -13,15 +11,32 @@ import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.mapping.get
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
-import app.revanced.patches.shared.misc.settings.preference.*
+import app.revanced.patches.shared.misc.settings.overrideThemeColors
+import app.revanced.patches.shared.misc.settings.preference.BasePreference
+import app.revanced.patches.shared.misc.settings.preference.BasePreferenceScreen
+import app.revanced.patches.shared.misc.settings.preference.InputType
+import app.revanced.patches.shared.misc.settings.preference.IntentPreference
+import app.revanced.patches.shared.misc.settings.preference.ListPreference
+import app.revanced.patches.shared.misc.settings.preference.NonInteractivePreference
+import app.revanced.patches.shared.misc.settings.preference.PreferenceCategory
+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
+import app.revanced.patches.shared.misc.settings.preference.TextPreference
 import app.revanced.patches.shared.misc.settings.settingsPatch
 import app.revanced.patches.youtube.misc.check.checkEnvironmentPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.fix.playbackspeed.fixPlaybackSpeedWhilePlayingPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
-import app.revanced.util.*
+import app.revanced.util.ResourceGroup
+import app.revanced.util.addInstructionsAtControlFlowLabel
+import app.revanced.util.copyResources
+import app.revanced.util.copyXmlNode
+import app.revanced.util.findElementByAttributeValueOrThrow
+import app.revanced.util.findInstructionIndicesReversedOrThrow
+import app.revanced.util.inputStreamFromBundledResource
+import app.revanced.util.insertLiteralOverride
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
@@ -30,7 +45,9 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 import com.android.tools.smali.dexlib2.util.MethodUtil
 
-// Used by a fingerprint() from SettingsPatch.
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/settings/LicenseActivityHook;"
+
 internal var appearanceStringId = -1L
     private set
 
@@ -69,13 +86,13 @@ private val settingsResourcePatch = resourcePatch {
     )
 
     execute {
-        // Used for a fingerprint from SettingsPatch.
         appearanceStringId = resourceMappings["string", "app_theme_appearance_dark"]
 
+        // Use same colors as stock YouTube.
+        overrideThemeColors("@color/yt_white1", "@color/yt_black3")
+
         arrayOf(
             ResourceGroup("drawable",
-                "revanced_settings_circle_background.xml",
-                "revanced_settings_cursor.xml",
                 "revanced_settings_icon.xml",
                 "revanced_settings_screen_00_about.xml",
                 "revanced_settings_screen_01_ads.xml",
@@ -92,11 +109,10 @@ 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"),
+                "revanced_settings_with_toolbar.xml"
+            ),
             ResourceGroup("menu", "revanced_search_menu.xml")
         ).forEach { resourceGroup ->
             copyResources("settings", resourceGroup)
@@ -170,12 +186,6 @@ val settingsPatch = bytecodePatch(
         checkEnvironmentPatch,
     )
 
-    val extensionPackage = "app/revanced/extension/youtube"
-    val activityHookClassDescriptor = "L$extensionPackage/settings/LicenseActivityHook;"
-
-    val themeHelperDescriptor = "L$extensionPackage/ThemeHelper;"
-    val setThemeMethodName = "setTheme"
-
     execute {
         addResources("youtube", "misc.settings.settingsPatch")
 
@@ -185,7 +195,7 @@ val settingsPatch = bytecodePatch(
             icon = "@drawable/revanced_settings_screen_00_about",
             layout = "@layout/preference_with_icon",
             summaryKey = null,
-            tag = "app.revanced.extension.youtube.settings.preference.ReVancedYouTubeAboutPreference",
+            tag = "app.revanced.extension.shared.settings.preference.ReVancedAboutPreference",
             selectable = true,
         )
 
@@ -210,31 +220,10 @@ val settingsPatch = bytecodePatch(
             ),
             ListPreference(
                 key = "revanced_language",
-                summaryKey = null,
                 tag = "app.revanced.extension.shared.settings.preference.SortedListPreference"
             )
         )
 
-        setThemeFingerprint.method.let { setThemeMethod ->
-            setThemeMethod.implementation!!.instructions.mapIndexedNotNull { i, instruction ->
-                if (instruction.opcode == Opcode.RETURN_OBJECT) i else null
-            }.asReversed().forEach { returnIndex ->
-                // The following strategy is to replace the return instruction with the setTheme instruction,
-                // then add a return instruction after the setTheme instruction.
-                // This is done because the return instruction is a target of another instruction.
-
-                setThemeMethod.apply {
-                    // This register is returned by the setTheme method.
-                    val register = getInstruction<OneRegisterInstruction>(returnIndex).registerA
-                    replaceInstruction(
-                        returnIndex,
-                        "invoke-static { v$register }, " +
-                            "$themeHelperDescriptor->$setThemeMethodName(Ljava/lang/Enum;)V",
-                    )
-                    addInstruction(returnIndex + 1, "return-object v$register")
-                }
-            }
-        }
 
         // Modify the license activity and remove all existing layout code.
         // Must modify an existing activity and cannot add a new activity to the manifest,
@@ -243,9 +232,9 @@ val settingsPatch = bytecodePatch(
         licenseActivityOnCreateFingerprint.method.addInstructions(
             1,
             """
-                invoke-static { p0 }, $activityHookClassDescriptor->initialize(Landroid/app/Activity;)V
+                invoke-static { p0 }, $EXTENSION_CLASS_DESCRIPTOR->initialize(Landroid/app/Activity;)V
                 return-void
-            """,
+            """
         )
 
         // Remove other methods as they will break as the onCreate method is modified above.
@@ -267,7 +256,7 @@ val settingsPatch = bytecodePatch(
             ).toMutable().apply {
                 addInstructions(
                     """
-                        invoke-static { p1 }, $activityHookClassDescriptor->getAttachBaseContext(Landroid/content/Context;)Landroid/content/Context;
+                        invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->getAttachBaseContext(Landroid/content/Context;)Landroid/content/Context;
                         move-result-object p1
                         invoke-super { p0, p1 }, $superclass->attachBaseContext(Landroid/content/Context;)V
                         return-void
@@ -278,10 +267,23 @@ val settingsPatch = bytecodePatch(
             methods.add(attachBaseContext)
         }
 
+        // Update shared dark mode status based on YT theme.
+        // This is needed because YT allows forcing light/dark mode
+        // which then differs from the system dark mode status.
+        setThemeFingerprint.method.apply {
+            findInstructionIndicesReversedOrThrow(Opcode.RETURN_OBJECT).forEach { index ->
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+                addInstructionsAtControlFlowLabel(
+                    index,
+                    "invoke-static { v$register }, ${EXTENSION_CLASS_DESCRIPTOR}->updateLightDarkModeStatus(Ljava/lang/Enum;)V",
+                )
+            }
+        }
+
         // Add setting to force cairo settings fragment on/off.
         cairoFragmentConfigFingerprint.method.insertLiteralOverride(
             CAIRO_CONFIG_LITERAL_VALUE,
-            "$activityHookClassDescriptor->useCairoSettingsFragment(Z)Z"
+            "$EXTENSION_CLASS_DESCRIPTOR->useCairoSettingsFragment(Z)Z"
         )
     }
 

patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt

@@ -48,10 +48,7 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
             sorting = PreferenceScreenPreference.Sorting.UNSORTED,
             preferences = setOf(
                 SwitchPreference("revanced_spoof_video_streams"),
-                ListPreference(
-                    "revanced_spoof_video_streams_client_type",
-                    summaryKey = null,
-                ),
+                ListPreference("revanced_spoof_video_streams_client_type"),
                 NonInteractivePreference(
                     // Requires a key and title but the actual text is chosen at runtime.
                     key = "revanced_spoof_video_streams_about_android",
@@ -59,7 +56,6 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
                 ),
                 ListPreference(
                     key = "revanced_spoof_video_streams_language",
-                    summaryKey = null,
                     // Language strings are declared in Setting patch.
                     entriesKey = "revanced_language_entries",
                     entryValuesKey = "revanced_language_entry_values",

patches/src/main/kotlin/app/revanced/patches/youtube/shared/Fingerprints.kt

@@ -44,11 +44,20 @@ internal val layoutConstructorFingerprint = fingerprint {
     strings("1.0x")
 }
 
-internal val mainActivityFingerprint = fingerprint {
+internal val mainActivityConstructorFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     parameters()
     custom { _, classDef ->
-        classDef.endsWith("MainActivity;")
+        classDef.endsWith("/MainActivity;")
+    }
+}
+
+internal val mainActivityOnBackPressedFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters()
+    custom { method, classDef ->
+        method.name == "onBackPressed" && classDef.endsWith("/MainActivity;")
     }
 }
 
@@ -56,7 +65,7 @@ internal val mainActivityOnCreateFingerprint = fingerprint {
     returns("V")
     parameters("Landroid/os/Bundle;")
     custom { method, classDef ->
-        method.name == "onCreate" && classDef.endsWith("MainActivity;")
+        method.name == "onCreate" && classDef.endsWith("/MainActivity;")
     }
 }
 

patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt

@@ -37,29 +37,25 @@ val rememberVideoQualityPatch = bytecodePatch {
         settingsMenuVideoQualityGroup.addAll(listOf(
             ListPreference(
                 key = "revanced_video_quality_default_mobile",
-                summaryKey = null,
                 entriesKey = "revanced_video_quality_default_entries",
-                entryValuesKey = "revanced_video_quality_default_entry_values",
+                entryValuesKey = "revanced_video_quality_default_entry_values"
             ),
             ListPreference(
                 key = "revanced_video_quality_default_wifi",
-                summaryKey = null,
                 entriesKey = "revanced_video_quality_default_entries",
-                entryValuesKey = "revanced_video_quality_default_entry_values",
+                entryValuesKey = "revanced_video_quality_default_entry_values"
             ),
             SwitchPreference("revanced_remember_video_quality_last_selected"),
 
             ListPreference(
                 key = "revanced_shorts_quality_default_mobile",
-                summaryKey = null,
                 entriesKey = "revanced_shorts_quality_default_entries",
                 entryValuesKey = "revanced_shorts_quality_default_entry_values",
             ),
             ListPreference(
                 key = "revanced_shorts_quality_default_wifi",
-                summaryKey = null,
                 entriesKey = "revanced_shorts_quality_default_entries",
-                entryValuesKey = "revanced_shorts_quality_default_entry_values",
+                entryValuesKey = "revanced_shorts_quality_default_entry_values"
             ),
             SwitchPreference("revanced_remember_shorts_quality_last_selected")
         ))

patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/remember/RememberPlaybackSpeedPatch.kt

@@ -34,7 +34,6 @@ internal val rememberPlaybackSpeedPatch = bytecodePatch {
             listOf(
                 ListPreference(
                     key = "revanced_playback_speed_default",
-                    summaryKey = null,
                     // Entries and values are set by the extension code based on the actual speeds available.
                     entriesKey = null,
                     entryValuesKey = null,

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

@@ -742,16 +742,22 @@ private const val RETURN_TYPE_MISMATCH = "Mismatch between override type and Met
  *
  * For methods that return an object or any array type, calling this method with `false`
  * will force the method to return a `null` value.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Boolean = false) {
     val returnType = returnType.first()
-    check(returnType == 'Z' || (!value && (returnType in setOf('V', 'L', '[')))) { RETURN_TYPE_MISMATCH }
+    check(returnType == 'Z' || (!value && (returnType == 'V' || returnType == 'L' || returnType != '['))) {
+        RETURN_TYPE_MISMATCH
+    }
     overrideReturnValue(value.toHexString(), false)
 }
 
 /**
  * Overrides the first instruction of a method with a constant `Byte` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Byte) {
     check(returnType.first() == 'B') { RETURN_TYPE_MISMATCH }
@@ -761,6 +767,8 @@ fun MutableMethod.returnEarly(value: Byte) {
 /**
  * Overrides the first instruction of a method with a constant `Short` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Short) {
     check(returnType.first() == 'S') { RETURN_TYPE_MISMATCH }
@@ -770,6 +778,8 @@ fun MutableMethod.returnEarly(value: Short) {
 /**
  * Overrides the first instruction of a method with a constant `Char` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Char) {
     check(returnType.first() == 'C') { RETURN_TYPE_MISMATCH }
@@ -779,6 +789,8 @@ fun MutableMethod.returnEarly(value: Char) {
 /**
  * Overrides the first instruction of a method with a constant `Int` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Int) {
     check(returnType.first() == 'I') { RETURN_TYPE_MISMATCH }
@@ -788,6 +800,8 @@ fun MutableMethod.returnEarly(value: Int) {
 /**
  * Overrides the first instruction of a method with a constant `Long` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Long) {
     check(returnType.first() == 'J') { RETURN_TYPE_MISMATCH }
@@ -797,6 +811,8 @@ fun MutableMethod.returnEarly(value: Long) {
 /**
  * Overrides the first instruction of a method with a constant `Float` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Float) {
     check(returnType.first() == 'F') { RETURN_TYPE_MISMATCH }
@@ -806,12 +822,30 @@ fun MutableMethod.returnEarly(value: Float) {
 /**
  * Overrides the first instruction of a method with a constant `Double` return value.
  * None of the method code will ever execute.
+ *
+ * @see returnLate
  */
 fun MutableMethod.returnEarly(value: Double) {
     check(returnType.first() == 'J') { RETURN_TYPE_MISMATCH }
     overrideReturnValue(value.toString(), false)
 }
 
+/**
+ * Overrides the first instruction of a method with a constant String return value.
+ * None of the method code will ever execute.
+ *
+ * Target method must have return type
+ * Ljava/lang/String; or Ljava/lang/CharSequence;
+ *
+ * @see returnLate
+ */
+fun MutableMethod.returnEarly(value: String) {
+    check(returnType == "Ljava/lang/String;" || returnType == "Ljava/lang/CharSequence;") {
+        RETURN_TYPE_MISMATCH
+    }
+    overrideReturnValue(value, false)
+}
+
 /**
  * Overrides all return statements with a constant `Boolean` value.
  * All method code is executed the same as unpatched.
@@ -826,7 +860,9 @@ fun MutableMethod.returnLate(value: Boolean) {
     if (returnType == 'V') {
         error("Cannot return late for Method of void type")
     }
-    check(returnType == 'Z' || (!value && returnType in setOf('L', '['))) { RETURN_TYPE_MISMATCH }
+    check(returnType == 'Z' || (!value && (returnType == 'L' || returnType == '['))) {
+        RETURN_TYPE_MISMATCH
+    }
 
     overrideReturnValue(value.toHexString(), true)
 }
@@ -908,8 +944,29 @@ fun MutableMethod.returnLate(value: Double) {
     overrideReturnValue(value.toString(), true)
 }
 
+/**
+ * Overrides all return statements with a constant String value.
+ * All method code is executed the same as unpatched.
+ *
+ * Target method must have return type
+ * Ljava/lang/String; or Ljava/lang/CharSequence;
+ *
+ * @see returnEarly
+ */
+fun MutableMethod.returnLate(value: String) {
+    check(returnType == "Ljava/lang/String;" || returnType == "Ljava/lang/CharSequence;") {
+        RETURN_TYPE_MISMATCH
+    }
+    overrideReturnValue(value, true)
+}
+
 private fun MutableMethod.overrideReturnValue(value: String, returnLate: Boolean) {
-    val instructions = when (returnType.first()) {
+    val instructions = if (returnType == "Ljava/lang/String;" || returnType == "Ljava/lang/CharSequence;" ) {
+        """
+            const-string v0, "$value"
+            return-object v0
+        """
+    } else when (returnType.first()) {
         // If return type is an object, always return null.
         'L', '[' -> {
             """

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">الإعدادات</string>
-  <string name="revanced_settings_confirm_user_dialog_title">هل ترغب في المتابعة؟</string>
+  <string name="revanced_settings_confirm_user_dialog_title">هل أنت متأكد أنك تريد المتابعة؟</string>
   <string name="revanced_settings_reset">إعادة التعيين</string>
   <string name="revanced_settings_reset_color">Reset color</string>
   <string name="revanced_settings_color_invalid">لون غير صالح</string>
-  <string name="revanced_settings_restart_title">تحديث وإعادة التشغيل</string>
+  <string name="revanced_settings_restart_title">إعادة التشغيل مطلوبة</string>
+  <string name="revanced_settings_restart_dialog_message">أعد تشغيل التطبيق لكي يسري هذا التغيير.</string>
   <string name="revanced_settings_restart">إعادة التشغيل</string>
   <string name="revanced_settings_import">استيراد</string>
   <string name="revanced_settings_import_copy">نسخ</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Tənzimləmələr</string>
-  <string name="revanced_settings_confirm_user_dialog_title">Davam etmək istəyirsiniz?</string>
+  <string name="revanced_settings_confirm_user_dialog_title">Davam etmək istədiyinizə əminsiniz?</string>
   <string name="revanced_settings_reset">Sıfırla</string>
   <string name="revanced_settings_reset_color">Rəngi sıfırla</string>
   <string name="revanced_settings_color_invalid">Yanlış rəng</string>
-  <string name="revanced_settings_restart_title">Yenilə və yenidən başlat</string>
+  <string name="revanced_settings_restart_title">Yenidən başlatma tələb olunur</string>
+  <string name="revanced_settings_restart_dialog_message">Bu dəyişikliyin təsir etməsi üçün tətbiqi yenidən başladın.</string>
   <string name="revanced_settings_restart">Yenidən başlat</string>
   <string name="revanced_settings_import">İdxal et</string>
   <string name="revanced_settings_import_copy">Köçür</string>
@@ -681,6 +682,9 @@ Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iO
   <string name="revanced_hide_autoplay_button_title">Avtomatik oynatma düyməsini gizlət</string>
   <string name="revanced_hide_autoplay_button_summary_on">Avtomatik oynatma düyməsi gizlidir</string>
   <string name="revanced_hide_autoplay_button_summary_off">Avtomatik oynatma düyməsi göstərilir</string>
+  <string name="revanced_hide_player_control_buttons_background_title">Oynadıcı idarəetmə düymələri fonunu gizlət</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_on">Oynadıcı idarəetmə düymələri fonu gizlidir</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_off">Oynadıcı idarəetmə düymələri fonu görünür</string>
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   <string name="revanced_hide_endscreen_cards_title">Son ekran kartlarını gizlət</string>
@@ -765,6 +769,9 @@ Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iO
   <string name="revanced_hide_shorts_green_screen_button_title">Yaşıl ekran düyməsini gizlət</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_on">\"Yaşıl ekran\" düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_off">\"Yaşıl ekran\" düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_new_posts_button_title">Yeni elanları gizlət düyməsi</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_off">Yeni elanlar düyməsi göstərilir</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_on">Yeni elanlar düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_hashtag_button_title">Mövzu etiketi düyməsini gizlət</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_on">Mövzu etiketi düyməsi gizlidir</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_off">Mövzu etiketi düyməsi göstərilir</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Налады</string>
-  <string name="revanced_settings_confirm_user_dialog_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_title">Неабходны перазапуск</string>
+  <string name="revanced_settings_restart_dialog_message">Перазапусціце праграму, каб змены ўступілі ў сілу.</string>
   <string name="revanced_settings_restart">Перазапуск</string>
   <string name="revanced_settings_import">Імпарт</string>
   <string name="revanced_settings_import_copy">Копія</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Настройки</string>
-  <string name="revanced_settings_confirm_user_dialog_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_title">Необходимо е рестартиране</string>
+  <string name="revanced_settings_restart_dialog_message">Рестартирайте приложението, за да влязат в сила тези промени.</string>
   <string name="revanced_settings_restart">Рестартиране</string>
   <string name="revanced_settings_import">Импортиране</string>
   <string name="revanced_settings_import_copy">Копирай</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">সেটিংস</string>
-  <string name="revanced_settings_confirm_user_dialog_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_title">পুনরায় আরম্ভ করা আবশ্যক</string>
+  <string name="revanced_settings_restart_dialog_message">এই পরিবর্তন কার্যকর করার জন্য অ্যাপটি পুনরায় চালু করুন।</string>
   <string name="revanced_settings_restart">আবার চালু করুন</string>
   <string name="revanced_settings_import">আমদানি করুন</string>
   <string name="revanced_settings_import_copy">অনুলিপি করুন</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Configuració</string>
-  <string name="revanced_settings_confirm_user_dialog_title">Vols continuar?</string>
+  <string name="revanced_settings_confirm_user_dialog_title">Segur que 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_title">Cal reiniciar</string>
+  <string name="revanced_settings_restart_dialog_message">Reinicia l\'aplicació perquè aquest canvi tingui efecte.</string>
   <string name="revanced_settings_restart">Reinicia</string>
   <string name="revanced_settings_import">Importa</string>
   <string name="revanced_settings_import_copy">Copia</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <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_confirm_user_dialog_title">Opravdu chcete 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_title">Je vyžadován restart</string>
+  <string name="revanced_settings_restart_dialog_message">Aby se tato změna projevila, restartujte aplikaci.</string>
   <string name="revanced_settings_restart">Restartovat</string>
   <string name="revanced_settings_import">Importovat</string>
   <string name="revanced_settings_import_copy">Kopírovat</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <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_confirm_user_dialog_title">Er du sikker på, at du vil 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_title">Genstart kræves</string>
+  <string name="revanced_settings_restart_dialog_message">Genstart appen for at denne ændring træder i kraft.</string>
   <string name="revanced_settings_restart">Genstart</string>
   <string name="revanced_settings_import">Importer</string>
   <string name="revanced_settings_import_copy">Kopier</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <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_confirm_user_dialog_title">Bist du sicher, dass du fortfahren möchtest?</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_title">Neustart erforderlich</string>
+  <string name="revanced_settings_restart_dialog_message">Starte die App neu, damit diese Änderung wirksam wird.</string>
   <string name="revanced_settings_restart">Neustart</string>
   <string name="revanced_settings_import">Importieren</string>
   <string name="revanced_settings_import_copy">Kopieren</string>

patches/src/main/resources/addresources/values-el-rGR/strings.xml

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Ρυθμίσεις</string>
-  <string name="revanced_settings_confirm_user_dialog_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_title">Απαιτείται επανεκκίνηση</string>
+  <string name="revanced_settings_restart_dialog_message">Επανεκκινήστε την εφαρμογή για να τεθεί σε ισχύ αυτή η αλλαγή.</string>
   <string name="revanced_settings_restart">Επανεκκίνηση</string>
   <string name="revanced_settings_import">Εισαγωγή</string>
   <string name="revanced_settings_import_copy">Αντιγραφή</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Ajustes</string>
-  <string name="revanced_settings_confirm_user_dialog_title">¿Desea continuar?</string>
+  <string name="revanced_settings_confirm_user_dialog_title">¿Está seguro de que quiere 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_title">Reinicio necesario</string>
+  <string name="revanced_settings_restart_dialog_message">Reinicie la aplicación para que este cambio surta efecto.</string>
   <string name="revanced_settings_restart">Reiniciar</string>
   <string name="revanced_settings_import">Importar</string>
   <string name="revanced_settings_import_copy">Copiar</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <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_confirm_user_dialog_title">Kas sa oled kindel, et soovid 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_title">Vajalik taaskäivitamine</string>
+  <string name="revanced_settings_restart_dialog_message">Selle muudatuse jõustumiseks on vaja rakendus taaskäivitada.</string>
   <string name="revanced_settings_restart">Taaskäivita</string>
   <string name="revanced_settings_import">Impordi</string>
   <string name="revanced_settings_import_copy">Kopeeri</string>

patches/src/main/resources/addresources/values-fa-rIR/strings.xml

@@ -33,9 +33,7 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <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_restart_title">تازه‌سازی و راه‌اندازی مجدد</string>
   <string name="revanced_settings_restart">راه‌اندازی مجدد</string>
   <string name="revanced_settings_import">واردکردن</string>
   <string name="revanced_settings_import_copy">رونوشت‌</string>

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

@@ -33,11 +33,12 @@ Second \"item\" text"</string>
   </patch>
   <patch id="misc.settings.settingsResourcePatch">
   <string name="revanced_settings_submenu_title">Asetukset</string>
-  <string name="revanced_settings_confirm_user_dialog_title">Haluatko jatkaa?</string>
+  <string name="revanced_settings_confirm_user_dialog_title">Haluatko varmasti jatkaa?</string>
   <string name="revanced_settings_reset">Nollaa</string>
   <string name="revanced_settings_reset_color">Nollaa väri</string>
   <string name="revanced_settings_color_invalid">Virheellinen väri</string>
-  <string name="revanced_settings_restart_title">Päivitä ja käynnistä uudelleen</string>
+  <string name="revanced_settings_restart_title">Uudelleenkäynnistys vaaditaan</string>
+  <string name="revanced_settings_restart_dialog_message">Käynnistä sovellus uudelleen, jotta muutos tulee voimaan.</string>
   <string name="revanced_settings_restart">Käynnistä uudelleen</string>
   <string name="revanced_settings_import">Tuo</string>
   <string name="revanced_settings_import_copy">Kopioi</string>
@@ -681,6 +682,9 @@ Jos haluat nähdä sen, aseta \"Naamioi videovirrat\" iOS TV:ksi"</string>
   <string name="revanced_hide_autoplay_button_title">Piilota Automaattinen toisto -painike</string>
   <string name="revanced_hide_autoplay_button_summary_on">Automaattinen toisto -painike on piilotettu</string>
   <string name="revanced_hide_autoplay_button_summary_off">Automaattinen toisto -painike näytetään</string>
+  <string name="revanced_hide_player_control_buttons_background_title">Piilota soittimen ohjauspainikkeiden tausta</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_on">Soittimen ohjauspainikkeiden tausta on piilotettu</string>
+  <string name="revanced_hide_player_control_buttons_background_summary_off">Soittimen ohjauspainikkeiden tausta näytetään</string>
   </patch>
   <patch id="layout.hide.endscreencards.hideEndscreenCardsResourcePatch">
   <string name="revanced_hide_endscreen_cards_title">Piilota loppunäytön kortit</string>
@@ -765,6 +769,9 @@ Jos haluat nähdä sen, aseta \"Naamioi videovirrat\" iOS TV:ksi"</string>
   <string name="revanced_hide_shorts_green_screen_button_title">Piilota Vihertausta-painike</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_on">Vihertausta-painike on piilotettu</string>
   <string name="revanced_hide_shorts_green_screen_button_summary_off">Vihertausta-painike näytetään</string>
+  <string name="revanced_hide_shorts_new_posts_button_title">Piilota Uudet postaukset -painike</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_off">Uudet postaukset -painike näytetään</string>
+  <string name="revanced_hide_shorts_new_posts_button_summary_on">Uudet postaukset -painike on piilotettu</string>
   <string name="revanced_hide_shorts_hashtag_button_title">Piilota Hashtag-painike</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_on">Hashtag-painike on piilotettu</string>
   <string name="revanced_hide_shorts_hashtag_button_summary_off">Hashtag-painike näytetään</string>