chore: Release v5.33.0-dev.8 [skip ci]

# [5.33.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.33.0-dev.7...v5.33.0-dev.8) (2025-08-03)

### Bug Fixes

* **NFC Tools:** Remove broken patch that is no longer supported ([#5584](https://github.com/ReVanced/revanced-patches/issues/5584)) ([2e177a8](2e177a8839))

.github/workflows/build_pull_request.yml

@@ -13,17 +13,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
-          java-version: "17"
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
 
       - name: Build
         env:

.github/workflows/pull_strings.yml

@@ -17,7 +17,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: dev
-          fetch-depth: 0
           clean: true
 
       - name: Pull strings

.github/workflows/push_strings.yml

@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Preprocess strings
         env:

.github/workflows/release.yml

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

.releaserc

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

build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    alias(libs.plugins.android.library) apply false
+}

extensions/boostforreddit/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

extensions/cricbuzz/build.gradle.kts

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

extensions/cricbuzz/src/main/AndroidManifest.xml

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

extensions/cricbuzz/src/main/java/app/revanced/extension/cricbuzz/HideAdsPatch.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.cricbuzz.ads;
+
+import com.cricbuzz.android.data.rest.model.BottomBar;
+import java.util.List;
+import java.util.Iterator;
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class HideAdsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void filterCb11(List<BottomBar> list) {
+        try {
+            Iterator<BottomBar> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                BottomBar bar = iterator.next();
+                if (bar.getName().equals("Cricbuzz11")) {
+                    Logger.printInfo(() -> "Removing Cricbuzz11 bar: " + bar);
+                    iterator.remove();
+                }
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "filterCb11 failure", ex);
+        }
+    }
+}

extensions/cricbuzz/stub/build.gradle.kts

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

extensions/cricbuzz/stub/src/main/AndroidManifest.xml

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

extensions/cricbuzz/stub/src/main/java/com/cricbuzz/android/data/rest/model/BottomBar.java

@@ -0,0 +1,5 @@
+package com.cricbuzz.android.data.rest.model;
+
+public final class BottomBar {
+    public final String getName() { throw new UnsupportedOperationException(); }
+}

extensions/messenger/build.gradle.kts

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

extensions/messenger/src/main/AndroidManifest.xml

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

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

@@ -0,0 +1,25 @@
+package app.revanced.extension.messenger.metaai;
+
+import java.util.*;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class RemoveMetaAIPatch {
+    private static final Set<Long> loggedIDs = Collections.synchronizedSet(new HashSet<>());
+
+    public static boolean overrideBooleanFlag(long id, boolean value) {
+        try {
+            if (Long.toString(id).startsWith("REPLACED_BY_PATCH")) {
+                if (loggedIDs.add(id))
+                    Logger.printInfo(() -> "Overriding " + id + " from " + value + " to false");
+
+                return false;
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "overrideBooleanFlag failure", ex);
+        }
+
+        return value;
+    }
+}

extensions/nunl/src/main/java/app/revanced/extension/nunl/ads/HideAdsPatch.java

@@ -82,7 +82,7 @@ public class HideAdsPatch {
 
                 // Filter HeaderBlock with known ads until next HeaderBlock.
                 if (currentBlock instanceof HeaderBlock headerBlock) {
-                    StyledText headerText = headerBlock.component20();
+                    StyledText headerText = headerBlock.getTitle();
                     if (headerText != null) {
                         skipFullHeader = false;
                         for (String blockedHeaderBlock : blockedHeaderBlocks) {

extensions/nunl/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

extensions/nunl/stub/src/main/java/nl/nu/performance/api/client/objects/HeaderBlock.java

@@ -3,8 +3,7 @@ package nl.nu.performance.api.client.objects;
 import nl.nu.performance.api.client.interfaces.Block;
 
 public class HeaderBlock extends Block {
-    // returns title
-    public final StyledText component20() {
+    public final StyledText getTitle() {
         throw new UnsupportedOperationException("Stub");
     }
 }

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

@@ -0,0 +1,207 @@
+package app.revanced.extension.primevideo.videoplayer;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.RectF;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import java.util.Arrays;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+import com.amazon.video.sdk.player.Player;
+
+public class PlaybackSpeedPatch {
+    private static Player player;
+    private static final float[] SPEED_VALUES = {0.5f, 0.7f, 0.8f, 0.9f, 0.95f, 1.0f, 1.05f, 1.1f, 1.2f, 1.3f, 1.5f, 2.0f};
+    private static final String SPEED_BUTTON_TAG = "speed_overlay";
+
+    public static void setPlayer(Player playerInstance) {
+        player = playerInstance;
+        if (player != null) {
+            // Reset playback rate when switching between episodes to ensure correct display.
+            player.setPlaybackRate(1.0f);
+        }
+    }
+
+    public static void initializeSpeedOverlay(View userControlsView) {
+        try {
+            LinearLayout buttonContainer = Utils.getChildViewByResourceName(userControlsView, "ButtonContainerPlayerTop");
+
+            // If the speed overlay exists we should return early.
+            if (Utils.getChildView(buttonContainer, false, child ->
+                    child instanceof ImageView && SPEED_BUTTON_TAG.equals(child.getTag())) != null) {
+                return;
+            }
+
+            ImageView speedButton = createSpeedButton(userControlsView.getContext());
+            speedButton.setOnClickListener(v -> changePlaybackSpeed(speedButton));
+            buttonContainer.addView(speedButton, 0);
+
+        } catch (IllegalArgumentException e) {
+            Logger.printException(() -> "initializeSpeedOverlay, no button container found", e);
+        } catch (Exception e) {
+            Logger.printException(() -> "initializeSpeedOverlay failure", e);
+        }
+    }
+
+    private static ImageView createSpeedButton(Context context) {
+        ImageView speedButton = new ImageView(context);
+        speedButton.setContentDescription("Playback Speed");
+        speedButton.setTag(SPEED_BUTTON_TAG);
+        speedButton.setClickable(true);
+        speedButton.setFocusable(true);
+        speedButton.setScaleType(ImageView.ScaleType.CENTER);
+
+        SpeedIconDrawable speedIcon = new SpeedIconDrawable();
+        speedButton.setImageDrawable(speedIcon);
+
+        int buttonSize = Utils.dipToPixels(48);
+        speedButton.setMinimumWidth(buttonSize);
+        speedButton.setMinimumHeight(buttonSize);
+
+        return speedButton;
+    }
+
+    private static String[] getSpeedOptions() {
+        String[] options = new String[SPEED_VALUES.length];
+        for (int i = 0; i < SPEED_VALUES.length; i++) {
+            options[i] = SPEED_VALUES[i] + "x";
+        }
+        return options;
+    }
+
+    private static void changePlaybackSpeed(ImageView imageView) {
+        if (player == null) {
+            Logger.printException(() -> "Player not available");
+            return;
+        }
+
+        try {
+            player.pause();
+            AlertDialog dialog = createSpeedPlaybackDialog(imageView);
+            dialog.setOnDismissListener(dialogInterface -> player.play());
+            dialog.show();
+
+        } catch (Exception e) {
+            Logger.printException(() -> "changePlaybackSpeed", e);
+        }
+    }
+
+    private static AlertDialog createSpeedPlaybackDialog(ImageView imageView) {
+        Context context = imageView.getContext();
+        int currentSelection = getCurrentSpeedSelection();
+
+        return new AlertDialog.Builder(context)
+                .setTitle("Select Playback Speed")
+                .setSingleChoiceItems(getSpeedOptions(), currentSelection,
+                        PlaybackSpeedPatch::handleSpeedSelection)
+                .create();
+    }
+
+    private static int getCurrentSpeedSelection() {
+        try {
+            float currentRate = player.getPlaybackRate();
+            int index = Arrays.binarySearch(SPEED_VALUES, currentRate);
+            return Math.max(index, 0); // Use slowest speed if not found.
+        } catch (Exception e) {
+            Logger.printException(() -> "getCurrentSpeedSelection error getting current playback speed", e);
+            return 0;
+        }
+    }
+
+    private static void handleSpeedSelection(android.content.DialogInterface dialog, int selectedIndex) {
+        try {
+            float selectedSpeed = SPEED_VALUES[selectedIndex];
+            player.setPlaybackRate(selectedSpeed);
+            player.play();
+        } catch (Exception e) {
+            Logger.printException(() -> "handleSpeedSelection error setting playback speed", e);
+        } finally {
+            dialog.dismiss();
+        }
+    }
+}
+
+class SpeedIconDrawable extends Drawable {
+    private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    @Override
+    public void draw(Canvas canvas) {
+        int w = getBounds().width();
+        int h = getBounds().height();
+        float centerX = w / 2f;
+        // Position gauge in lower portion.
+        float centerY = h * 0.7f;
+        float radius = Math.min(w, h) / 2f * 0.8f;
+
+        paint.setColor(Color.WHITE);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(radius * 0.1f);
+
+        // Draw semicircle.
+        RectF oval = new RectF(centerX - radius, centerY - radius, centerX + radius, centerY + radius);
+        canvas.drawArc(oval, 180, 180, false, paint);
+
+        // Draw three tick marks.
+        paint.setStrokeWidth(radius * 0.06f);
+        for (int i = 0; i < 3; i++) {
+            float angle = 180 + (i * 45); // 180°, 225°, 270°.
+            float angleRad = (float) Math.toRadians(angle);
+
+            float startX = centerX + (radius * 0.8f) * (float) Math.cos(angleRad);
+            float startY = centerY + (radius * 0.8f) * (float) Math.sin(angleRad);
+            float endX = centerX + radius * (float) Math.cos(angleRad);
+            float endY = centerY + radius * (float) Math.sin(angleRad);
+
+            canvas.drawLine(startX, startY, endX, endY, paint);
+        }
+
+        // Draw needle.
+        paint.setStrokeWidth(radius * 0.08f);
+        float needleAngle = 200; // Slightly right of center.
+        float needleAngleRad = (float) Math.toRadians(needleAngle);
+
+        float needleEndX = centerX + (radius * 0.6f) * (float) Math.cos(needleAngleRad);
+        float needleEndY = centerY + (radius * 0.6f) * (float) Math.sin(needleAngleRad);
+
+        canvas.drawLine(centerX, centerY, needleEndX, needleEndY, paint);
+
+        // Center dot.
+        paint.setStyle(Paint.Style.FILL);
+        canvas.drawCircle(centerX, centerY, radius * 0.06f, paint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        paint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        paint.setColorFilter(colorFilter);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return Utils.dipToPixels(32);
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return Utils.dipToPixels(32);
+    }
+}

extensions/primevideo/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

extensions/primevideo/stub/src/main/java/com/amazon/avod/media/playback/VideoPlayer.java

@@ -4,4 +4,10 @@ public interface VideoPlayer {
     long getCurrentPosition();
 
     void seekTo(long positionMs);
+    
+    void pause();
+    
+    void play();
+    
+    boolean isPlaying();
 }

extensions/primevideo/stub/src/main/java/com/amazon/video/sdk/player/Player.java

@@ -0,0 +1,11 @@
+package com.amazon.video.sdk.player;
+
+public interface Player {
+    float getPlaybackRate();
+    
+    void setPlaybackRate(float rate);
+
+    void play();
+    
+    void pause();
+} 

extensions/reddit/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

extensions/shared/library/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.android.library) 
 }
 
 android {

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

@@ -1,10 +1,11 @@
 package app.revanced.extension.shared;
 
 import static app.revanced.extension.shared.StringRef.str;
+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;
@@ -14,11 +15,18 @@ 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.RequiresApi;
+import androidx.annotation.Nullable;
 
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
+
+import app.revanced.extension.shared.requests.Requester;
+import app.revanced.extension.shared.requests.Route;
 
 @SuppressWarnings("unused")
 public class GmsCoreSupport {
@@ -29,10 +37,24 @@ public class GmsCoreSupport {
             = getGmsCoreVendorGroupId() + ".android.gms";
     private static final Uri GMS_CORE_PROVIDER
             = Uri.parse("content://" + getGmsCoreVendorGroupId() + ".android.gsf.gservices/prefix");
-    private static final String DONT_KILL_MY_APP_LINK
-            = "https://dontkillmyapp.com";
+    private static final String DONT_KILL_MY_APP_URL
+            = "https://dontkillmyapp.com/";
+    private static final Route DONT_KILL_MY_APP_MANUFACTURER_API
+            = new Route(GET, "/api/v2/{manufacturer}.json");
+    private static final String DONT_KILL_MY_APP_NAME_PARAMETER
+            = "?app=MicroG";
+    private static final String BUILD_MANUFACTURER
+            = Build.MANUFACTURER.toLowerCase(Locale.ROOT).replace(" ", "-");
+
+    /**
+     * If a manufacturer specific page exists on DontKillMyApp.
+     */
+    @Nullable
+    private static volatile Boolean DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
 
     private static void open(String queryOrLink) {
+        Logger.printInfo(() -> "Opening link: " + queryOrLink);
+
         Intent intent;
         try {
             // Check if queryOrLink is a valid URL.
@@ -57,13 +79,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);
     }
@@ -71,7 +107,6 @@ public class GmsCoreSupport {
     /**
      * Injection point.
      */
-    @RequiresApi(api = Build.VERSION_CODES.N)
     public static void checkGmsCore(Activity context) {
         try {
             // Verify the user has not included GmsCore for a root installation.
@@ -86,7 +121,7 @@ public class GmsCoreSupport {
 
                 // Do not exit. If the app exits before launch completes (and without
                 // opening another activity), then on some devices such as Pixel phone Android 10
-                // no toast will be shown and the app will continually be relaunched
+                // no toast will be shown and the app will continually relaunch
                 // with the appearance of a hung app.
             }
 
@@ -119,15 +154,20 @@ public class GmsCoreSupport {
             }
 
             // Check if GmsCore is currently running in the background.
-            try (var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER)) {
+            var client = context.getContentResolver().acquireContentProviderClient(GMS_CORE_PROVIDER);
+            //noinspection TryFinallyCanBeTryWithResources
+            try {
                 if (client == null) {
                     Logger.printInfo(() -> "GmsCore is not running in the background");
+                    checkIfDontKillMyAppSupportsManufacturer();
 
                     showBatteryOptimizationDialog(context,
                             "gms_core_dialog_not_whitelisted_not_allowed_in_background_message",
                             "gms_core_dialog_open_website_text",
-                            (dialog, id) -> open(DONT_KILL_MY_APP_LINK));
+                            (dialog, id) -> openDontKillMyApp());
                 }
+            } finally {
+                if (client != null) client.close();
             }
         } catch (Exception ex) {
             Logger.printException(() -> "checkGmsCore failure", ex);
@@ -141,10 +181,57 @@ public class GmsCoreSupport {
         activity.startActivityForResult(intent, 0);
     }
 
+    private static void checkIfDontKillMyAppSupportsManufacturer() {
+        Utils.runOnBackgroundThread(() -> {
+            try {
+                final long start = System.currentTimeMillis();
+                HttpURLConnection connection = Requester.getConnectionFromRoute(
+                        DONT_KILL_MY_APP_URL, DONT_KILL_MY_APP_MANUFACTURER_API, BUILD_MANUFACTURER);
+                connection.setConnectTimeout(5000);
+                connection.setReadTimeout(5000);
+
+                final boolean supported = connection.getResponseCode() == 200;
+                Logger.printInfo(() -> "Manufacturer is " + (supported ? "" : "NOT ")
+                        + "listed on DontKillMyApp: " + BUILD_MANUFACTURER
+                        + " fetch took: " + (System.currentTimeMillis() - start) + "ms");
+                DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = supported;
+            } catch (Exception ex) {
+                Logger.printInfo(() -> "Could not check if manufacturer is listed on DontKillMyApp: "
+                        + BUILD_MANUFACTURER, ex);
+                DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED = null;
+            }
+        });
+    }
+
+    private static void openDontKillMyApp() {
+        final Boolean manufacturerSupported = DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
+
+        String manufacturerPageToOpen;
+        if (manufacturerSupported == null) {
+            // Fetch has not completed yet. Only happens on extremely slow internet connections
+            // and the user spends less than 1 second reading what's on screen.
+            // Instead of waiting for the fetch (which may timeout),
+            // open the website without a vendor.
+            manufacturerPageToOpen = "";
+        } else if (manufacturerSupported) {
+            manufacturerPageToOpen = BUILD_MANUFACTURER;
+        } else {
+            // No manufacturer specific page exists. Open the general page.
+            manufacturerPageToOpen = "general";
+        }
+
+        open(DONT_KILL_MY_APP_URL + manufacturerPageToOpen + DONT_KILL_MY_APP_NAME_PARAMETER);
+    }
+
     /**
      * @return If GmsCore is not whitelisted from battery optimizations.
      */
     private static boolean batteryOptimizationsEnabled(Context context) {
+        //noinspection ObsoleteSdkInt
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            // Android 5.0 does not have battery optimization settings.
+            return false;
+        }
         var powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         return !powerManager.isIgnoringBatteryOptimizations(GMS_CORE_PACKAGE_NAME);
     }

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

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

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,58 @@ 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);
+            iconView.setPadding(0, 0, 0, 0);
+            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 +151,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 +196,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/AppLanguage.java

@@ -89,9 +89,11 @@ public enum AppLanguage {
     ZU;
 
     private final String language;
+    private final Locale locale;
 
     AppLanguage() {
         language = name().toLowerCase(Locale.US);
+        locale = Locale.forLanguageTag(language);
     }
 
     /**
@@ -112,6 +114,6 @@ public enum AppLanguage {
             return Locale.getDefault();
         }
 
-        return Locale.forLanguageTag(language);
+        return locale;
     }
 }

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

@@ -71,15 +71,20 @@ public class EnumSetting<T extends Enum<?>> extends Setting<T> {
         json.put(importExportKey, value.name().toLowerCase(Locale.ENGLISH));
     }
 
-    @NonNull
-    private T getEnumFromString(String enumName) {
+    /**
+     * @param enumName Enum name.  Casing does not matter.
+     * @return Enum of this type with the same declared name.
+     * @throws IllegalArgumentException if the name is not a valid enum of this type.
+     */
+    protected T getEnumFromString(String enumName) {
         //noinspection ConstantConditions
         for (Enum<?> value : defaultValue.getClass().getEnumConstants()) {
             if (value.name().equalsIgnoreCase(enumName)) {
-                // noinspection unchecked
+                //noinspection unchecked
                 return (T) value;
             }
         }
+
         throw new IllegalArgumentException("Unknown enum value: " + enumName);
     }
 
@@ -103,7 +108,9 @@ public class EnumSetting<T extends Enum<?>> extends Setting<T> {
      * Availability based on if this setting is currently set to any of the provided types.
      */
     @SafeVarargs
-    public final Setting.Availability availability(@NonNull T... types) {
+    public final Setting.Availability availability(T... types) {
+        Objects.requireNonNull(types);
+
         return () -> {
             T currentEnumType = get();
             for (T enumType : types) {

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

@@ -28,16 +28,14 @@ public abstract class Setting<T> {
     /**
      * Availability based on a single parent setting being enabled.
      */
-    @NonNull
-    public static Availability parent(@NonNull BooleanSetting parent) {
+    public static Availability parent(BooleanSetting parent) {
         return parent::get;
     }
 
     /**
      * Availability based on all parents being enabled.
      */
-    @NonNull
-    public static Availability parentsAll(@NonNull BooleanSetting... parents) {
+    public static Availability parentsAll(BooleanSetting... parents) {
         return () -> {
             for (BooleanSetting parent : parents) {
                 if (!parent.get()) return false;
@@ -49,8 +47,7 @@ public abstract class Setting<T> {
     /**
      * Availability based on any parent being enabled.
      */
-    @NonNull
-    public static Availability parentsAny(@NonNull BooleanSetting... parents) {
+    public static Availability parentsAny(BooleanSetting... parents) {
         return () -> {
             for (BooleanSetting parent : parents) {
                 if (parent.get()) return true;
@@ -79,7 +76,7 @@ public abstract class Setting<T> {
     /**
      * Adds a callback for {@link #importFromJSON(Context, String)} and {@link #exportToJson(Context)}.
      */
-    public static void addImportExportCallback(@NonNull ImportExportCallback callback) {
+    public static void addImportExportCallback(ImportExportCallback callback) {
         importExportCallbacks.add(Objects.requireNonNull(callback));
     }
 
@@ -100,14 +97,13 @@ public abstract class Setting<T> {
     public static final SharedPrefCategory preferences = new SharedPrefCategory("revanced_prefs");
 
     @Nullable
-    public static Setting<?> getSettingFromPath(@NonNull String str) {
+    public static Setting<?> getSettingFromPath(String str) {
         return PATH_TO_SETTINGS.get(str);
     }
 
     /**
      * @return All settings that have been created.
      */
-    @NonNull
     public static List<Setting<?>> allLoadedSettings() {
         return Collections.unmodifiableList(SETTINGS);
     }
@@ -115,7 +111,6 @@ public abstract class Setting<T> {
     /**
      * @return All settings that have been created, sorted by keys.
      */
-    @NonNull
     private static List<Setting<?>> allLoadedSettingsSorted() {
         Collections.sort(SETTINGS, (Setting<?> o1, Setting<?> o2) -> o1.key.compareTo(o2.key));
         return allLoadedSettings();
@@ -124,13 +119,11 @@ public abstract class Setting<T> {
     /**
      * The key used to store the value in the shared preferences.
      */
-    @NonNull
     public final String key;
 
     /**
      * The default value of the setting.
      */
-    @NonNull
     public final T defaultValue;
 
     /**
@@ -161,7 +154,6 @@ public abstract class Setting<T> {
     /**
      * The value of the setting.
      */
-    @NonNull
     protected volatile T value;
 
     public Setting(String key, T defaultValue) {
@@ -199,8 +191,8 @@ public abstract class Setting<T> {
      * @param userDialogMessage       Confirmation message to display, if the user tries to change the setting from the default value.
      * @param availability            Condition that must be true, for this setting to be available to configure.
      */
-    public Setting(@NonNull String key,
-                   @NonNull T defaultValue,
+    public Setting(String key,
+                   T defaultValue,
                    boolean rebootApp,
                    boolean includeWithImportExport,
                    @Nullable String userDialogMessage,
@@ -227,7 +219,7 @@ public abstract class Setting<T> {
     /**
      * Migrate a setting value if the path is renamed but otherwise the old and new settings are identical.
      */
-    public static <T> void migrateOldSettingToNew(@NonNull Setting<T> oldSetting, @NonNull Setting<T> newSetting) {
+    public static <T> void migrateOldSettingToNew(Setting<T> oldSetting, Setting<T> newSetting) {
         if (oldSetting == newSetting) throw new IllegalArgumentException();
 
         if (!oldSetting.isSetToDefault()) {
@@ -243,7 +235,7 @@ public abstract class Setting<T> {
      * This method will be deleted in the future.
      */
     @SuppressWarnings("rawtypes")
-    public static void migrateFromOldPreferences(@NonNull SharedPrefCategory oldPrefs, @NonNull Setting setting, String settingKey) {
+    public static void migrateFromOldPreferences(SharedPrefCategory oldPrefs, Setting setting, String settingKey) {
         if (!oldPrefs.preferences.contains(settingKey)) {
             return; // Nothing to do.
         }
@@ -285,7 +277,7 @@ public abstract class Setting<T> {
      * This intentionally is a static method to deter
      * accidental usage when {@link #save(Object)} was intended.
      */
-    public static void privateSetValueFromString(@NonNull Setting<?> setting, @NonNull String newValue) {
+    public static void privateSetValueFromString(Setting<?> setting, String newValue) {
         setting.setValueFromString(newValue);
 
         // Clear the preference value since default is used, to allow changing
@@ -299,7 +291,7 @@ public abstract class Setting<T> {
     /**
      * Sets the value of {@link #value}, but do not save to {@link #preferences}.
      */
-    protected abstract void setValueFromString(@NonNull String newValue);
+    protected abstract void setValueFromString(String newValue);
 
     /**
      * Load and set the value of {@link #value}.
@@ -309,7 +301,7 @@ public abstract class Setting<T> {
     /**
      * Persistently saves the value.
      */
-    public final void save(@NonNull T newValue) {
+    public final void save(T newValue) {
         if (value.equals(newValue)) {
             return;
         }
@@ -406,7 +398,6 @@ public abstract class Setting<T> {
         json.put(importExportKey, value);
     }
 
-    @NonNull
     public static String exportToJson(@Nullable Context alertDialogContext) {
         try {
             JSONObject json = new JSONObject();
@@ -445,7 +436,7 @@ public abstract class Setting<T> {
     /**
      * @return if any settings that require a reboot were changed.
      */
-    public static boolean importFromJSON(@NonNull Context alertDialogContext, @NonNull String settingsJsonString) {
+    public static boolean importFromJSON(Context alertDialogContext, String settingsJsonString) {
         try {
             if (!settingsJsonString.matches("[\\s\\S]*\\{")) {
                 settingsJsonString = '{' + settingsJsonString + '}'; // Restore outer JSON braces

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

@@ -0,0 +1,449 @@
+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.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextWatcher;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.RelativeSizeSpan;
+import android.util.AttributeSet;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.*;
+
+import androidx.annotation.ColorInt;
+
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.StringSetting;
+
+/**
+ * A custom preference for selecting a color via a hexadecimal code or a color picker dialog.
+ * Extends {@link EditTextPreference} to display a colored dot in the widget area,
+ * reflecting the currently selected color. The dot is dimmed when the preference is disabled.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class ColorPickerPreference extends EditTextPreference {
+
+    /**
+     * Character to show the color appearance.
+     */
+    public static final String COLOR_DOT_STRING = "⬤";
+
+    /**
+     * Length of a valid color string of format #RRGGBB.
+     */
+    public static final int COLOR_STRING_LENGTH = 7;
+
+    /**
+     * Matches everything that is not a hex number/letter.
+     */
+    private static final Pattern PATTERN_NOT_HEX = Pattern.compile("[^0-9A-Fa-f]");
+
+    /**
+     * Alpha for dimming when the preference is disabled.
+     */
+    private static final float DISABLED_ALPHA = 0.5f; // 50%
+
+    /**
+     * View displaying a colored dot in the widget area.
+     */
+    private View widgetColorDot;
+
+    /**
+     * Current color in RGB format (without alpha).
+     */
+    @ColorInt
+    private int currentColor;
+
+    /**
+     * Associated setting for storing the color value.
+     */
+    private StringSetting colorSetting;
+
+    /**
+     * Dialog TextWatcher for the EditText to monitor color input changes.
+     */
+    private TextWatcher colorTextWatcher;
+
+    /**
+     * Dialog TextView displaying a colored dot for the selected color preview in the dialog.
+     */
+    private TextView dialogColorPreview;
+
+    /**
+     * Dialog color picker view.
+     */
+    private ColorPickerView dialogColorPickerView;
+
+    /**
+     * Removes non valid hex characters, converts to all uppercase,
+     * and adds # character to the start if not present.
+     */
+    public static String cleanupColorCodeString(String colorString) {
+        // Remove non-hex chars, convert to uppercase, and ensure correct length
+        String result = "#" + PATTERN_NOT_HEX.matcher(colorString)
+                .replaceAll("").toUpperCase(Locale.ROOT);
+
+        if (result.length() < COLOR_STRING_LENGTH) {
+            return result;
+        }
+
+        return result.substring(0, COLOR_STRING_LENGTH);
+    }
+
+    /**
+     * @param color RGB color, without an alpha channel.
+     * @return #RRGGBB hex color string
+     */
+    public static String getColorString(@ColorInt int color) {
+        String colorString = String.format("#%06X", color);
+        if ((color & 0xFF000000) != 0) {
+            // Likely a bug somewhere.
+            Logger.printException(() -> "getColorString: color has alpha channel: " + colorString);
+        }
+        return colorString;
+    }
+
+    /**
+     * Creates a Spanned object for a colored dot using SpannableString.
+     *
+     * @param color The RGB color (without alpha).
+     * @return A Spanned object with the colored dot.
+     */
+    public static Spanned getColorDot(@ColorInt int color) {
+        SpannableString spannable = new SpannableString(COLOR_DOT_STRING);
+        spannable.setSpan(new ForegroundColorSpan(color | 0xFF000000), 0, COLOR_DOT_STRING.length(),
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        spannable.setSpan(new RelativeSizeSpan(1.5f), 0, 1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return spannable;
+    }
+
+    public ColorPickerPreference(Context context) {
+        super(context);
+        init();
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    /**
+     * Initializes the preference by setting up the EditText, loading the color, and set the widget layout.
+     */
+    private void init() {
+        colorSetting = (StringSetting) Setting.getSettingFromPath(getKey());
+        if (colorSetting == null) {
+            Logger.printException(() -> "Could not find color setting for: " + getKey());
+        }
+
+        EditText editText = getEditText();
+        editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
+                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            editText.setAutofillHints((String) null);
+        }
+
+        // Set the widget layout to a custom layout containing the colored dot.
+        setWidgetLayoutResource(getResourceIdentifier("revanced_color_dot_widget", "layout"));
+    }
+
+    /**
+     * Sets the selected color and updates the UI and settings.
+     *
+     * @param colorString The color in hexadecimal format (e.g., "#RRGGBB").
+     * @throws IllegalArgumentException If the color string is invalid.
+     */
+    @Override
+    public final void setText(String colorString) {
+        try {
+            Logger.printDebug(() -> "setText: " + colorString);
+            super.setText(colorString);
+
+            currentColor = Color.parseColor(colorString) & 0x00FFFFFF;
+            if (colorSetting != null) {
+                colorSetting.save(getColorString(currentColor));
+            }
+            updateColorPreview();
+            updateWidgetColorDot();
+        } catch (IllegalArgumentException ex) {
+            // This code is reached if the user pastes settings json with an invalid color
+            // since this preference is updated with the new setting text.
+            Logger.printDebug(() -> "Parse color error: " + colorString, ex);
+            Utils.showToastShort(str("revanced_settings_color_invalid"));
+            setText(colorSetting.resetToDefault());
+        } catch (Exception ex) {
+            Logger.printException(() -> "setText failure: " + colorString, ex);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        widgetColorDot = view.findViewById(getResourceIdentifier(
+                "revanced_color_dot_widget", "id"));
+        widgetColorDot.setBackgroundResource(getResourceIdentifier(
+                "revanced_settings_circle_background", "drawable"));
+        widgetColorDot.getBackground().setTint(currentColor | 0xFF000000);
+        widgetColorDot.setAlpha(isEnabled() ? 1.0f : DISABLED_ALPHA);
+    }
+
+    /**
+     * Updates the color preview TextView with a colored dot.
+     */
+    private void updateColorPreview() {
+        if (dialogColorPreview != null) {
+            dialogColorPreview.setText(getColorDot(currentColor));
+        }
+    }
+
+    private void updateWidgetColorDot() {
+        if (widgetColorDot != null) {
+            widgetColorDot.getBackground().setTint(currentColor | 0xFF000000);
+            widgetColorDot.setAlpha(isEnabled() ? 1.0f : DISABLED_ALPHA);
+        }
+    }
+
+    /**
+     * Creates a TextWatcher to monitor changes in the EditText for color input.
+     *
+     * @return A TextWatcher that updates the color preview on valid input.
+     */
+    private TextWatcher createColorTextWatcher(ColorPickerView colorPickerView) {
+        return new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable edit) {
+                try {
+                    String colorString = edit.toString();
+
+                    String sanitizedColorString = cleanupColorCodeString(colorString);
+                    if (!sanitizedColorString.equals(colorString)) {
+                        edit.replace(0, colorString.length(), sanitizedColorString);
+                        return;
+                    }
+
+                    if (sanitizedColorString.length() != COLOR_STRING_LENGTH) {
+                        // User is still typing out the color.
+                        return;
+                    }
+
+                    final int newColor = Color.parseColor(colorString);
+                    if (currentColor != newColor) {
+                        Logger.printDebug(() -> "afterTextChanged: " + sanitizedColorString);
+                        currentColor = newColor;
+                        updateColorPreview();
+                        updateWidgetColorDot();
+                        colorPickerView.setColor(newColor);
+                    }
+                } catch (Exception ex) {
+                    // Should never be reached since input is validated before using.
+                    Logger.printException(() -> "afterTextChanged failure", ex);
+                }
+            }
+        };
+    }
+
+    /**
+     * Creates a Dialog with a color preview and EditText for hex color input.
+     */
+    @Override
+    protected void showDialog(Bundle state) {
+        Context context = getContext();
+
+        // 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);
+
+        // Horizontal layout for preview and EditText.
+        LinearLayout inputLayout = new LinearLayout(context);
+        inputLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        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 content container for color picker and input layout.
+        LinearLayout contentContainer = new LinearLayout(context);
+        contentContainer.setOrientation(LinearLayout.VERTICAL);
+        contentContainer.addView(colorPicker);
+        contentContainer.addView(inputLayout);
+
+        // Create ScrollView to wrap the content container.
+        ScrollView contentScrollView = new ScrollView(context);
+        contentScrollView.setVerticalScrollBarEnabled(false); // Disable vertical scrollbar.
+        contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER); // Disable overscroll effect.
+        LinearLayout.LayoutParams scrollViewParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                0,
+                1.0f
+        );
+        contentScrollView.setLayoutParams(scrollViewParams);
+        contentScrollView.addView(contentContainer);
+
+        // 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 ScrollView to the dialog's main layout.
+        LinearLayout dialogMainLayout = dialogPair.second;
+        dialogMainLayout.addView(contentScrollView, dialogMainLayout.getChildCount() - 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
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        if (colorTextWatcher != null) {
+            getEditText().removeTextChangedListener(colorTextWatcher);
+            colorTextWatcher = null;
+        }
+
+        dialogColorPreview = null;
+        dialogColorPickerView = null;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        updateWidgetColorDot();
+    }
+}

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

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

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

@@ -0,0 +1,171 @@
+package app.revanced.extension.shared.settings.preference;
+
+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.*;
+
+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.
+     */
+    public 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) {
+        Context context = getContext();
+
+        // Create ListView.
+        ListView listView = new ListView(context);
+        listView.setId(android.R.id.list);
+        listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+
+        // Create custom adapter for the ListView.
+        ListPreferenceArrayAdapter adapter = new ListPreferenceArrayAdapter(
+                context,
+                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(
+                context,
+                getTitle() != null ? getTitle().toString() : "",
+                null,
+                null,
+                null, // No OK button text.
+                null, // No OK button action.
+                () -> {}, // Cancel button action (just dismiss).
+                null,
+                null,
+                true
+        );
+
+        // Add the ListView to the main layout.
+        LinearLayout mainLayout = dialogPair.second;
+        LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                0,
+                1.0f
+        );
+        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();
+            }
+            dialogPair.first.dismiss();
+        });
+
+        // Show the dialog.
+        dialogPair.first.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().toString());
-            }).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/LogBufferManager.java

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

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

@@ -21,6 +21,10 @@ public class NoTitlePreferenceCategory extends PreferenceCategory {
         super(context, attrs, defStyleAttr);
     }
 
+    public NoTitlePreferenceCategory(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
     public NoTitlePreferenceCategory(Context context) {
         super(context);
     }

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,17 +9,19 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Color;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.Preference;
 import android.util.AttributeSet;
+import android.view.View;
 import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -49,28 +52,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(getContext());
-    }
-
-    /**
-     * 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.
      *
@@ -87,9 +68,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>",
@@ -221,14 +201,38 @@ 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.setVerticalScrollBarEnabled(false); // Disable the vertical scrollbar.
+        webView.setOverScrollMode(View.OVER_SCROLL_NEVER);
         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(window);
+        }
     }
 
     private class OpenLinksExternallyWebClient extends WebViewClient {
@@ -316,7 +320,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

@@ -2,13 +2,14 @@ package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.util.AttributeSet;
-import android.widget.Button;
+import android.util.Pair;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 
@@ -44,41 +45,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

@@ -0,0 +1,124 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Pair;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import app.revanced.extension.shared.Utils;
+
+/**
+ * PreferenceList that sorts itself.
+ * By default the first entry is preserved in its original position,
+ * and all other entries are sorted alphabetically.
+ *
+ * Ideally the 'keep first entries to preserve' is an xml parameter,
+ * but currently that's not so simple since Extensions code cannot use
+ * generated code from the Patches repo (which is required for custom xml parameters).
+ *
+ * If any class wants to use a different getFirstEntriesToPreserve value,
+ * it needs to subclass this preference and override {@link #getFirstEntriesToPreserve}.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class SortedListPreference extends CustomDialogListPreference {
+
+    /**
+     * Sorts the current list entries.
+     *
+     * @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();
+        CharSequence[] entryValues = getEntryValues();
+        if (entries == null || entryValues == null) {
+            return;
+        }
+
+        final int entrySize = entries.length;
+        if (entrySize != entryValues.length) {
+            // Xml array declaration has a missing/extra entry.
+            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.
+        // Cannot easily use a SortedMap, because if two entries incorrectly have
+        // identical names then the duplicates entries are not preserved.
+        List<Pair<String, Pair<CharSequence, CharSequence>>> lastEntries = new ArrayList<>();
+
+        for (int i = 0; i < entrySize; i++) {
+            Pair<CharSequence, CharSequence> pair = new Pair<>(entries[i], entryValues[i]);
+            if (i < firstEntriesToPreserve) {
+                firstEntries.add(pair);
+            } else {
+                lastEntries.add(new Pair<>(Utils.removePunctuationToLowercase(pair.first), pair));
+            }
+        }
+
+        //noinspection ComparatorCombinators
+        Collections.sort(lastEntries, (pair1, pair2)
+                -> pair1.first.compareTo(pair2.first));
+
+        CharSequence[] sortedEntries = new CharSequence[entrySize];
+        CharSequence[] sortedEntryValues = new CharSequence[entrySize];
+
+        int i = 0;
+        for (Pair<CharSequence, CharSequence> pair : firstEntries) {
+            sortedEntries[i] = pair.first;
+            sortedEntryValues[i] = pair.second;
+            i++;
+        }
+
+        for (Pair<String, Pair<CharSequence, CharSequence>> outer : lastEntries) {
+            Pair<CharSequence, CharSequence> inner = outer.second;
+            sortedEntries[i] = inner.first;
+            sortedEntryValues[i] = inner.second;
+            i++;
+        }
+
+        super.setEntries(sortedEntries);
+        super.setEntryValues(sortedEntryValues);
+    }
+
+    public SortedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+
+    public SortedListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+
+    public SortedListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        sortEntryAndValues(getFirstEntriesToPreserve());
+    }
+
+    public SortedListPreference(Context context) {
+        super(context);
+
+        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/shared/library/src/main/java/app/revanced/extension/shared/spoof/requests/PlayerRoutes.java

@@ -71,9 +71,7 @@ final class PlayerRoutes {
         return innerTubeBody.toString();
     }
 
-    /**
-     * @noinspection SameParameterValue
-     */
+    @SuppressWarnings("SameParameterValue")
     static HttpURLConnection getPlayerResponseConnectionFromRoute(Route.CompiledRoute route, ClientType clientType) throws IOException {
         var connection = Requester.getConnectionFromCompiledRoute(YT_API_URL, route);
 

extensions/spotify/build.gradle.kts

@@ -1,16 +1,39 @@
+plugins {
+    alias(libs.plugins.protobuf)
+}
+
 dependencies {
     compileOnly(project(":extensions:shared:library"))
     compileOnly(project(":extensions:spotify:stub"))
     compileOnly(libs.annotation)
+
+    implementation(libs.nanohttpd)
+    implementation(libs.protobuf.javalite)
 }
 
 android {
     defaultConfig {
-        minSdk = 24
+        minSdk = 21
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = libs.protobuf.protoc.get().toString()
+    }
+
+    generateProtoTasks {
+        all().forEach { task ->
+            task.builtins {
+                create("java") {
+                    option("lite")
+                }
+            }
+        }
     }
 }

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

@@ -0,0 +1,86 @@
+package app.revanced.extension.spotify.layout.hide.createbutton;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.shared.ComponentFilters.ComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.ResourceIdComponentFilter;
+import app.revanced.extension.spotify.shared.ComponentFilters.StringComponentFilter;
+
+import java.util.List;
+
+@SuppressWarnings("unused")
+public final class HideCreateButtonPatch {
+
+    /**
+     * A list of component filters that match whether a navigation bar item is the Create button.
+     * The main approach used is matching the resource id for the Create button title.
+     */
+    private static final List<ComponentFilter> CREATE_BUTTON_COMPONENT_FILTERS = List.of(
+            new ResourceIdComponentFilter("navigationbar_musicappitems_create_title", "string"),
+            // Temporary fallback and fix for APKs merged with AntiSplit-M not having resources properly encoded,
+            // and thus getting the resource identifier for the Create button title always return 0.
+            // FIXME: Remove this once the above issue is no longer relevant.
+            new StringComponentFilter("spotify:create-menu")
+    );
+
+    /**
+     * A component filter for the old id of the resource which contained the Create button title.
+     * Used in older versions of the app.
+     */
+    private static final ResourceIdComponentFilter OLD_CREATE_BUTTON_COMPONENT_FILTER =
+            new ResourceIdComponentFilter("bottom_navigation_bar_create_tab_title", "string");
+
+    /**
+     * Injection point. This method is called on every navigation bar item to check whether it is the Create button.
+     * If the navigation bar item is the Create button, it returns null to erase it.
+     * The method fingerprint used to patch ensures we can safely return null here.
+     */
+    public static Object returnNullIfIsCreateButton(Object navigationBarItem) {
+        if (navigationBarItem == null) {
+            return null;
+        }
+
+        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;
+                }
+
+                if (stringifiedNavigationBarItem.contains(componentFilter.getFilterValue())) {
+                    Logger.printInfo(() -> "Hiding Create button because the navigation bar item " +
+                            navigationBarItem + " matched the filter " + componentFilter.getFilterRepresentation());
+                    return null;
+                }
+            }
+        } catch (Throwable ex) {
+            // Catch Throwable as calling toString can cause crashes with wrongfully generated code that throws
+            // NoSuchMethod errors.
+            Logger.printException(() -> "returnNullIfIsCreateButton failure", ex);
+        }
+
+        return navigationBarItem;
+    }
+
+    /**
+     * Injection point. Called in older versions of the app. Returns whether the old navigation bar item is the old
+     * Create button.
+     */
+    public static boolean isOldCreateButton(int oldNavigationBarItemTitleResId) {
+        if (OLD_CREATE_BUTTON_COMPONENT_FILTER.filterUnavailable()) {
+            Logger.printInfo(() -> "Skipping hiding old Create button because the resource id for " +
+                    OLD_CREATE_BUTTON_COMPONENT_FILTER.resourceName + " is not available");
+            return false;
+        }
+
+        if (oldNavigationBarItemTitleResId == OLD_CREATE_BUTTON_COMPONENT_FILTER.getResourceId()) {
+            Logger.printInfo(() -> "Hiding old Create button because the navigation bar item title resource id" +
+                    " matched " + OLD_CREATE_BUTTON_COMPONENT_FILTER.getFilterRepresentation());
+            return true;
+        }
+
+        return false;
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/layout/theme/CustomThemePatch.java

@@ -8,15 +8,54 @@ import app.revanced.extension.shared.Utils;
 @SuppressWarnings("unused")
 public final class CustomThemePatch {
 
+    private static final int BACKGROUND_COLOR = getColorFromString("@color/gray_7");
+    private static final int BACKGROUND_COLOR_SECONDARY = getColorFromString("@color/gray_15");
+    private static final int ACCENT_COLOR = getColorFromString("@color/spotify_green_157");
+    private static final int ACCENT_PRESSED_COLOR =
+            getColorFromString("@color/dark_brightaccent_background_press");
+
     /**
-     * Injection point.
+     * Returns an int representation of the color resource or hex code.
      */
-    public static long getThemeColor(String colorString) {
+    private static int getColorFromString(String colorString) {
         try {
             return Utils.getColorFromString(colorString);
         } catch (Exception ex) {
-            Logger.printException(() -> "Invalid custom color: " + colorString, ex);
+            Logger.printException(() -> "Invalid color string: " + colorString, ex);
             return Color.BLACK;
         }
     }
+
+    /**
+     * Injection point. Returns an int representation of the replaced color from the original color.
+     */
+    public static int replaceColor(int originalColor) {
+        switch (originalColor) {
+            // Playlist background color.
+            case 0xFF121212:
+                return BACKGROUND_COLOR;
+
+            // Share menu background color.
+            case 0xFF1F1F1F:
+            // Home category pills background color.
+            case 0xFF333333:
+            // Settings header background color.
+            case 0xFF282828:
+             // Spotify Connect device list background color.
+            case 0xFF2A2A2A:
+                return BACKGROUND_COLOR_SECONDARY;
+
+            // Some Lottie animations have a color that's slightly off due to rounding errors.
+            case 0xFF1ED760: case 0xFF1ED75F:
+            // Intermediate color used in some animations, same rounding issue.
+            case 0xFF1DB954: case 0xFF1CB854:
+                return ACCENT_COLOR;
+
+            case 0xFF1ABC54:
+                return ACCENT_PRESSED_COLOR;
+
+            default:
+                return originalColor;
+        }
+    }
 }

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenService.java

@@ -0,0 +1,115 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.misc.fix.clienttoken.data.v0.ClienttokenHttp.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import static app.revanced.extension.spotify.misc.fix.Constants.*;
+
+class ClientTokenService {
+    private static final String IOS_CLIENT_ID = "58bd3c95768941ea9eb4350aaa033eb3";
+    private static final String IOS_USER_AGENT;
+
+    static {
+        String clientVersion = getClientVersion();
+        int commitHashIndex = clientVersion.lastIndexOf(".");
+        String version = clientVersion.substring(
+                clientVersion.indexOf("-") + 1,
+                clientVersion.lastIndexOf(".", commitHashIndex - 1)
+        );
+
+        IOS_USER_AGENT = "Spotify/" + version + " iOS/" + getSystemVersion() + " (" + getHardwareMachine() + ")";
+    }
+
+    private static final ConnectivitySdkData.Builder IOS_CONNECTIVITY_SDK_DATA =
+            ConnectivitySdkData.newBuilder()
+                    .setPlatformSpecificData(PlatformSpecificData.newBuilder()
+                            .setIos(NativeIOSData.newBuilder()
+                                    .setHwMachine(getHardwareMachine())
+                                    .setSystemVersion(getSystemVersion())
+                            )
+                    );
+
+    private static final ClientDataRequest.Builder IOS_CLIENT_DATA_REQUEST =
+            ClientDataRequest.newBuilder()
+                    .setClientVersion(getClientVersion())
+                    .setClientId(IOS_CLIENT_ID);
+
+    private static final ClientTokenRequest.Builder IOS_CLIENT_TOKEN_REQUEST =
+            ClientTokenRequest.newBuilder()
+                    .setRequestType(ClientTokenRequestType.REQUEST_CLIENT_DATA_REQUEST);
+
+
+    @NonNull
+    static ClientTokenRequest newIOSClientTokenRequest(String deviceId) {
+        Logger.printInfo(() -> "Creating new iOS client token request with device ID: " + deviceId);
+
+        return IOS_CLIENT_TOKEN_REQUEST
+                .setClientData(IOS_CLIENT_DATA_REQUEST
+                        .setConnectivitySdkData(IOS_CONNECTIVITY_SDK_DATA
+                                .setDeviceId(deviceId)
+                        )
+                )
+                .build();
+    }
+
+    @Nullable
+    static ClientTokenResponse getClientTokenResponse(@NonNull ClientTokenRequest request) {
+        if (request.getRequestType() == ClientTokenRequestType.REQUEST_CLIENT_DATA_REQUEST) {
+            Logger.printInfo(() -> "Requesting iOS client token");
+            String deviceId = request.getClientData().getConnectivitySdkData().getDeviceId();
+            request = newIOSClientTokenRequest(deviceId);
+        }
+
+        ClientTokenResponse response;
+        try {
+            response = requestClientToken(request);
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to handle request", ex);
+            return null;
+        }
+
+        return response;
+    }
+
+    @NonNull
+    private static ClientTokenResponse requestClientToken(@NonNull ClientTokenRequest request) throws IOException {
+        HttpURLConnection urlConnection = (HttpURLConnection) new URL(CLIENT_TOKEN_API_URL).openConnection();
+        urlConnection.setRequestMethod("POST");
+        urlConnection.setDoOutput(true);
+        urlConnection.setRequestProperty("Content-Type", "application/x-protobuf");
+        urlConnection.setRequestProperty("Accept", "application/x-protobuf");
+        urlConnection.setRequestProperty("User-Agent", IOS_USER_AGENT);
+
+        byte[] requestArray = request.toByteArray();
+        urlConnection.setFixedLengthStreamingMode(requestArray.length);
+        urlConnection.getOutputStream().write(requestArray);
+
+        try (InputStream inputStream = urlConnection.getInputStream()) {
+            return ClientTokenResponse.parseFrom(inputStream);
+        }
+    }
+
+    @Nullable
+    static ClientTokenResponse serveClientTokenRequest(@NonNull InputStream inputStream) {
+        ClientTokenRequest request;
+        try {
+            request = ClientTokenRequest.parseFrom(inputStream);
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to parse request from input stream", ex);
+            return null;
+        }
+        Logger.printInfo(() -> "Request of type: " + request.getRequestType());
+
+        ClientTokenResponse response = getClientTokenResponse(request);
+        if (response != null) Logger.printInfo(() -> "Response of type: " + response.getResponseType());
+
+        return response;
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/Constants.java

@@ -0,0 +1,26 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+
+class Constants {
+    static final String CLIENT_TOKEN_API_PATH = "/v1/clienttoken";
+    static final String CLIENT_TOKEN_API_URL = "https://clienttoken.spotify.com" + CLIENT_TOKEN_API_PATH;
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getClientVersion() {
+        return "";
+    }
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getSystemVersion() {
+        return "";
+    }
+
+    // Modified by a patch. Do not touch.
+    @NonNull
+    static String getHardwareMachine() {
+        return "";
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java

@@ -0,0 +1,94 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import androidx.annotation.NonNull;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.spotify.misc.fix.clienttoken.data.v0.ClienttokenHttp.ClientTokenResponse;
+import com.google.protobuf.MessageLite;
+import fi.iki.elonen.NanoHTTPD;
+
+import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+import static app.revanced.extension.spotify.misc.fix.ClientTokenService.serveClientTokenRequest;
+import static app.revanced.extension.spotify.misc.fix.Constants.CLIENT_TOKEN_API_PATH;
+import static fi.iki.elonen.NanoHTTPD.Response.Status.INTERNAL_ERROR;
+
+class RequestListener extends NanoHTTPD {
+    RequestListener(int port) {
+        super(port);
+
+        try {
+            start();
+        } catch (IOException ex) {
+            Logger.printException(() -> "Failed to start request listener on port " + port, ex);
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @NonNull
+    @Override
+    public Response serve(@NonNull IHTTPSession session) {
+        String uri = session.getUri();
+        if (!uri.equals(CLIENT_TOKEN_API_PATH)) return INTERNAL_ERROR_RESPONSE;
+
+        Logger.printInfo(() -> "Serving request for URI: " + uri);
+
+        ClientTokenResponse response = serveClientTokenRequest(getInputStream(session));
+        if (response != null) return newResponse(Response.Status.OK, response);
+
+        Logger.printException(() -> "Failed to serve client token request");
+        return INTERNAL_ERROR_RESPONSE;
+    }
+
+    @NonNull
+    private static InputStream newLimitedInputStream(InputStream inputStream, long contentLength) {
+        return new FilterInputStream(inputStream) {
+            private long remaining = contentLength;
+
+            @Override
+            public int read() throws IOException {
+                if (remaining <= 0) return -1;
+                int result = super.read();
+                if (result != -1) remaining--;
+                return result;
+            }
+
+            @Override
+            public int read(byte[] b, int off, int len) throws IOException {
+                if (remaining <= 0) return -1;
+                len = (int) Math.min(len, remaining);
+                int result = super.read(b, off, len);
+                if (result != -1) remaining -= result;
+                return result;
+            }
+        };
+    }
+
+    @NonNull
+    private static InputStream getInputStream(@NonNull IHTTPSession session) {
+        long requestContentLength = Long.parseLong(Objects.requireNonNull(session.getHeaders().get("content-length")));
+        return newLimitedInputStream(session.getInputStream(), requestContentLength);
+    }
+
+    private static final Response INTERNAL_ERROR_RESPONSE = newResponse(INTERNAL_ERROR);
+
+    @SuppressWarnings("SameParameterValue")
+    @NonNull
+    private static Response newResponse(Response.Status status) {
+        return newResponse(status, null);
+    }
+
+    @NonNull
+    private static Response newResponse(Response.IStatus status, MessageLite messageLite) {
+        if (messageLite == null) {
+            return newFixedLengthResponse(status, "application/x-protobuf", null);
+        }
+
+        byte[] messageBytes = messageLite.toByteArray();
+        InputStream stream = new ByteArrayInputStream(messageBytes);
+        return newFixedLengthResponse(status, "application/x-protobuf", stream, messageBytes.length);
+    }
+}

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/SpoofClientPatch.java

@@ -0,0 +1,25 @@
+package app.revanced.extension.spotify.misc.fix;
+
+import app.revanced.extension.shared.Logger;
+
+@SuppressWarnings("unused")
+public class SpoofClientPatch {
+    private static RequestListener listener;
+
+    /**
+     * Injection point. Launch requests listener server.
+     */
+    public synchronized static void launchListener(int port) {
+        if (listener != null) {
+            Logger.printInfo(() -> "Listener already running on port " + port);
+            return;
+        }
+
+        try {
+            Logger.printInfo(() -> "Launching listener on port " + port);
+            listener = new RequestListener(port);
+        } catch (Exception ex) {
+            Logger.printException(() -> "launchListener failure", ex);
+        }
+    }
+}

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

@@ -33,10 +33,11 @@ public final class SanitizeSharingLinksPatch {
                 }
             }
 
-            return builder.build().toString();
+            String sanitizedUrl = builder.build().toString();
+            Logger.printInfo(() -> "Sanitized url " + url + " to " + sanitizedUrl);
+            return sanitizedUrl;
         } catch (Exception ex) {
-            Logger.printException(() -> "sanitizeUrl failure", ex);
-
+            Logger.printException(() -> "sanitizeUrl failure with " + url, ex);
             return url;
         }
     }

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

@@ -0,0 +1,85 @@
+package app.revanced.extension.spotify.shared;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+public final class ComponentFilters {
+
+    public interface ComponentFilter {
+        @NonNull
+        String getFilterValue();
+        String getFilterRepresentation();
+        default boolean filterUnavailable() {
+            return false;
+        }
+    }
+
+    public static final class ResourceIdComponentFilter implements ComponentFilter {
+
+        public final String resourceName;
+        public final String resourceType;
+        // Android resources are always positive, so -1 is a valid sentinel value to indicate it has not been loaded.
+        // 0 is returned when a resource has not been found.
+        private int resourceId = -1;
+        @Nullable
+        private String stringfiedResourceId;
+
+        public ResourceIdComponentFilter(String resourceName, String resourceType) {
+            this.resourceName = resourceName;
+            this.resourceType = resourceType;
+        }
+
+        public int getResourceId() {
+            if (resourceId == -1) {
+                resourceId = Utils.getResourceIdentifier(resourceName, resourceType);
+            }
+            return resourceId;
+        }
+
+        @NonNull
+        @Override
+        public String getFilterValue() {
+            if (stringfiedResourceId == null) {
+                stringfiedResourceId = Integer.toString(getResourceId());
+            }
+            return stringfiedResourceId;
+        }
+
+        @Override
+        public String getFilterRepresentation() {
+            boolean resourceFound = getResourceId() != 0;
+            return (resourceFound ? getFilterValue() + " (" : "") + resourceName + (resourceFound ? ")" : "");
+        }
+
+        @Override
+        public boolean filterUnavailable() {
+            boolean resourceNotFound = getResourceId() == 0;
+            if (resourceNotFound) {
+                Logger.printInfo(() -> "Resource id for " + resourceName + " was not found");
+            }
+            return resourceNotFound;
+        }
+    }
+
+    public static final class StringComponentFilter implements ComponentFilter {
+
+        public final String string;
+
+        public StringComponentFilter(String string) {
+            this.string = string;
+        }
+
+        @NonNull
+        @Override
+        public String getFilterValue() {
+            return string;
+        }
+
+        @Override
+        public String getFilterRepresentation() {
+            return string;
+        }
+    }
+}

extensions/spotify/src/main/proto/app/revanced/extension/spotify/misc/fix/clienttoken_http.proto

@@ -0,0 +1,73 @@
+syntax = "proto3";
+
+package spotify.clienttoken.data.v0;
+
+option optimize_for = LITE_RUNTIME;
+option java_package = "app.revanced.extension.spotify.misc.fix.clienttoken.data.v0";
+
+message ClientTokenRequest {
+    ClientTokenRequestType request_type = 1;
+
+    oneof request {
+        ClientDataRequest client_data = 2;
+    }
+}
+
+enum ClientTokenRequestType {
+    REQUEST_UNKNOWN = 0;
+    REQUEST_CLIENT_DATA_REQUEST = 1;
+    REQUEST_CHALLENGE_ANSWERS_REQUEST = 2;
+}
+
+message ClientDataRequest {
+    string client_version = 1;
+    string client_id = 2;
+
+    oneof data {
+        ConnectivitySdkData connectivity_sdk_data = 3;
+    }
+}
+
+message ConnectivitySdkData {
+    PlatformSpecificData platform_specific_data = 1;
+    string device_id = 2;
+}
+
+message PlatformSpecificData {
+    oneof data {
+        NativeIOSData ios = 2;
+    }
+}
+
+message NativeIOSData {
+    int32 user_interface_idiom = 1;
+    bool target_iphone_simulator = 2;
+    string hw_machine = 3;
+    string system_version = 4;
+    string simulator_model_identifier = 5;
+}
+
+message ClientTokenResponse {
+    ClientTokenResponseType response_type = 1;
+
+    oneof response {
+        GrantedTokenResponse granted_token = 2;
+    }
+}
+
+enum ClientTokenResponseType {
+    RESPONSE_UNKNOWN = 0;
+    RESPONSE_GRANTED_TOKEN_RESPONSE = 1;
+    RESPONSE_CHALLENGES_RESPONSE = 2;
+}
+
+message GrantedTokenResponse {
+    string token = 1;
+    int32 expires_after_seconds = 2;
+    int32 refresh_after_seconds = 3;
+    repeated TokenDomain domains = 4;
+}
+
+message TokenDomain {
+    string domain = 1;
+}

extensions/spotify/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {
@@ -7,11 +7,11 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 26
+        minSdk = 21
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }

extensions/spotify/stub/src/main/java/app/revanced/ContextMenuItemPlaceholder.java

@@ -0,0 +1,5 @@
+package app.revanced;
+
+public interface ContextMenuItemPlaceholder {
+    Object getViewModel();
+}

extensions/spotify/stub/src/main/java/com/spotify/browsita/v1/resolved/Section.java

@@ -0,0 +1,6 @@
+package com.spotify.browsita.v1.resolved;
+
+public final class Section {
+    public static final int BRAND_ADS_FIELD_NUMBER = 6;
+    public int sectionTypeCase_;
+}

extensions/spotify/stub/src/main/java/com/spotify/useraccount/v1/AccountAttribute.java

@@ -1,8 +0,0 @@
-package com.spotify.useraccount.v1;
-
-/**
- * Used for target 8.6.98.900. Class is still present in newer app targets.
- */
-public class AccountAttribute {
-    public Object value_;
-}

extensions/syncforreddit/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

extensions/tiktok/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

extensions/tumblr/stub/build.gradle.kts

@@ -1,7 +1,7 @@
 android.namespace = "app.revanced.extension"
 
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

extensions/twitch/stub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(libs.plugins.android.library.get().pluginId)
+    alias(libs.plugins.android.library)
 }
 
 android {

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

@@ -1,124 +0,0 @@
-package app.revanced.extension.youtube;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Build;
-import android.view.Window;
-
-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 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);
-        }
-    }
-}

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

@@ -686,7 +686,7 @@ public final class AlternativeThumbnailsPatch {
                     ? "" : fullUrl.substring(imageExtensionEndIndex);
         }
 
-        /** @noinspection SameParameterValue */
+        @SuppressWarnings("SameParameterValue")
         String createStillsUrl(@NonNull ThumbnailQuality qualityToUse, boolean includeViewTracking) {
             // Images could be upgraded to webp if they are not already, but this fails quite often,
             // especially for new videos uploaded in the last hour.

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

@@ -0,0 +1,101 @@
+package app.revanced.extension.youtube.patches;
+
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public class ChangeHeaderPatch {
+
+    public enum HeaderLogo {
+        DEFAULT(null, null),
+        REGULAR("ytWordmarkHeader", "yt_ringo2_wordmark_header"),
+        PREMIUM("ytPremiumWordmarkHeader", "yt_ringo2_premium_wordmark_header"),
+        REVANCED("revanced_header_logo", "revanced_header_logo"),
+        REVANCED_MINIMAL("revanced_header_logo_minimal", "revanced_header_logo_minimal"),
+        CUSTOM("custom_header", "custom_header");
+
+        @Nullable
+        private final String attributeName;
+        @Nullable
+        private final String drawableName;
+
+        HeaderLogo(@Nullable String attributeName, @Nullable String drawableName) {
+            this.attributeName = attributeName;
+            this.drawableName = drawableName;
+        }
+
+        /**
+         * @return The attribute id of this header logo, or NULL if the logo should not be replaced.
+         */
+        @Nullable
+        private Integer getAttributeId() {
+            if (attributeName == null) {
+                return null;
+            }
+
+            final int identifier = Utils.getResourceIdentifier(attributeName, "attr");
+            if (identifier == 0) {
+                // Identifier is zero if custom header setting was included in imported settings
+                // and a custom image was not included during patching.
+                Logger.printDebug(() -> "Could not find attribute: " + drawableName);
+                Settings.HEADER_LOGO.resetToDefault();
+                return null;
+            }
+
+            return identifier;
+        }
+
+        @Nullable
+        public Drawable getDrawable() {
+            if (drawableName == null) {
+                return null;
+            }
+
+            String drawableFullName = drawableName + (Utils.isDarkModeEnabled()
+                    ? "_dark"
+                    : "_light");
+
+            final int identifier = Utils.getResourceIdentifier(drawableFullName, "drawable");
+            if (identifier == 0) {
+                Logger.printDebug(() -> "Could not find drawable: " + drawableFullName);
+                Settings.HEADER_LOGO.resetToDefault();
+                return null;
+            }
+            return Utils.getContext().getDrawable(identifier);
+        }
+    }
+
+    /**
+     * Injection point.
+     */
+    public static int getHeaderAttributeId(int original) {
+        return Objects.requireNonNullElse(Settings.HEADER_LOGO.get().getAttributeId(), original);
+    }
+
+    public static Drawable getDrawable(Drawable original) {
+        Drawable logo = Settings.HEADER_LOGO.get().getDrawable();
+        if (logo != null) {
+            return logo;
+        }
+
+        // TODO: If 'Hide Doodles' is enabled, this will force the regular logo regardless
+        //       what account the user has. This can be improved the next time a Doodle is
+        //       active and the attribute id is passed to this method so the correct
+        //       regular/premium logo is returned.
+        logo = HeaderLogo.REGULAR.getDrawable();
+        if (logo != null) {
+            return logo;
+        }
+
+        // Should never happen.
+        Logger.printException(() -> "Could not find regular header logo resource");
+        return original;
+    }
+}

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/DisableDoubleTapActionsPatch.java

@@ -0,0 +1,16 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public final class DisableDoubleTapActionsPatch {
+
+    /**
+     * Injection point.
+     *
+     * @return If "should skip to chapter start" flag is set.
+     */
+    public static boolean disableDoubleTapChapters(boolean original) {
+        return original && !Settings.DISABLE_CHAPTER_SKIP_DOUBLE_TAP.get();
+    }
+}

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

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

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

@@ -1,17 +1,15 @@
 package app.revanced.extension.youtube.patches;
 
+import static app.revanced.extension.youtube.settings.preference.ExternalDownloaderPreference.showDialogIfAppIsNotInstalled;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-
-import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.StringRef;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -36,7 +34,7 @@ public final class DownloadsPatch {
      *
      * Appears to always be called from the main thread.
      */
-    public static boolean inAppDownloadButtonOnClick(@NonNull String videoId) {
+    public static boolean inAppDownloadButtonOnClick(String videoId) {
         try {
             if (!Settings.EXTERNAL_DOWNLOADER_ACTION_BUTTON.get()) {
                 return false;
@@ -48,6 +46,9 @@ public final class DownloadsPatch {
             boolean isActivityContext = true;
             if (context == null) {
                 // Utils context is the application context, and not an activity context.
+                //
+                // Edit: This check may no longer be needed since YT can now
+                // only be launched from the main Activity (embedded usage in other apps no longer works).
                 context = Utils.getContext();
                 isActivityContext = false;
             }
@@ -64,8 +65,7 @@ public final class DownloadsPatch {
      * @param isActivityContext If the context parameter is for an Activity.  If this is false, then
      *                          the downloader is opened as a new task (which forces YT to minimize).
      */
-    public static void launchExternalDownloader(@NonNull String videoId,
-                                                @NonNull Context context, boolean isActivityContext) {
+    public static void launchExternalDownloader(String videoId, Context context, boolean isActivityContext) {
         try {
             Objects.requireNonNull(videoId);
             Logger.printDebug(() -> "Launching external downloader with context: " + context);
@@ -73,16 +73,8 @@ public final class DownloadsPatch {
             // Trim string to avoid any accidental whitespace.
             var downloaderPackageName = Settings.EXTERNAL_DOWNLOADER_PACKAGE_NAME.get().trim();
 
-            boolean packageEnabled = false;
-            try {
-                packageEnabled = context.getPackageManager().getApplicationInfo(downloaderPackageName, 0).enabled;
-            } catch (PackageManager.NameNotFoundException error) {
-                Logger.printDebug(() -> "External downloader could not be found: " + error);
-            }
-
-            // If the package is not installed, show the toast
-            if (!packageEnabled) {
-                Utils.showToastLong(StringRef.str("revanced_external_downloader_not_installed_warning", downloaderPackageName));
+            // If the package is not installed, show a dialog.
+            if (showDialogIfAppIsNotInstalled(context, downloaderPackageName)) {
                 return;
             }
 

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

@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import app.revanced.extension.shared.Logger;
@@ -58,6 +59,22 @@ public final class HidePlayerOverlayButtonsPatch {
         });
     }
 
+    /**
+     * Injection point.
+     */
+    public static void hidePlayerControlButtonsBackground(View rootView) {
+        try {
+            if (!Settings.HIDE_PLAYER_CONTROL_BUTTONS_BACKGROUND.get()) {
+                return;
+            }
+
+            // Each button is an ImageView with a background set to another drawable.
+            removeImageViewsBackgroundRecursive(rootView);
+        } catch (Exception ex) {
+            Logger.printException(() -> "removePlayerControlButtonsBackground failure", ex);
+        }
+    }
+
     private static void hideView(View parentView, int resourceId) {
         View nextPreviousButton = parentView.findViewById(resourceId);
 
@@ -69,4 +86,16 @@ public final class HidePlayerOverlayButtonsPatch {
         Logger.printDebug(() -> "Hiding previous/next button");
         Utils.hideViewByRemovingFromParentUnderCondition(true, nextPreviousButton);
     }
+
+    private static void removeImageViewsBackgroundRecursive(View currentView) {
+        if (currentView instanceof ImageView imageView) {
+            imageView.setBackground(null);
+        }
+
+        if (currentView instanceof ViewGroup viewGroup) {
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                removeImageViewsBackgroundRecursive(viewGroup.getChildAt(i));
+            }
+        }
+    }
 }

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

@@ -0,0 +1,13 @@
+package app.revanced.extension.youtube.patches;
+
+import app.revanced.extension.youtube.settings.Settings;
+
+@SuppressWarnings("unused")
+public final class HideRelatedVideoOverlayPatch {
+    /**
+     * Injection point.
+     */
+    public static boolean hideRelatedVideoOverlay() {
+        return Settings.HIDE_RELATED_VIDEOS_OVERLAY.get();
+    }
+}

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

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

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

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

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

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

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

@@ -16,9 +16,8 @@ import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilterPatch;
+import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilter;
 import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
-import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 
@@ -56,7 +55,7 @@ public class ReturnYouTubeDislikePatch {
     private static volatile ReturnYouTubeDislike lastLithoShortsVideoData;
 
     /**
-     * Because litho Shorts spans are created offscreen after {@link ReturnYouTubeDislikeFilterPatch}
+     * Because litho Shorts spans are created offscreen after {@link ReturnYouTubeDislikeFilter}
      * detects the video ids, but the current Short can arbitrarily reload the same span,
      * then use the {@link #lastLithoShortsVideoData} if this value is greater than zero.
      */
@@ -69,13 +68,6 @@ public class ReturnYouTubeDislikePatch {
     @Nullable
     private static volatile String lastPrefetchedVideoId;
 
-    public static void onRYDStatusChange(boolean rydEnabled) {
-        ReturnYouTubeDislikeApi.resetRateLimits();
-        // Must remove all values to protect against using stale data
-        // if the user enables RYD while a video is on screen.
-        clearData();
-    }
-
     private static void clearData() {
         currentVideoData = null;
         lastLithoShortsVideoData = null;
@@ -160,11 +152,13 @@ public class ReturnYouTubeDislikePatch {
                 return original; // No need to check for Shorts in the context.
             }
 
-            if (conversionContextString.contains("|shorts_dislike_button.eml")) {
+            if (Utils.containsAny(conversionContextString,
+                    "|shorts_dislike_button.eml", "|reel_dislike_button.eml")) {
                 return getShortsSpan(original, true);
             }
 
-            if (conversionContextString.contains("|shorts_like_button.eml")) {
+            if (Utils.containsAny(conversionContextString,
+                    "|shorts_like_button.eml", "|reel_like_button.eml")) {
                 if (!Utils.containsNumber(original)) {
                     Logger.printDebug(() -> "Replacing hidden likes count");
                     return getShortsSpan(original, false);
@@ -274,7 +268,7 @@ public class ReturnYouTubeDislikePatch {
             Logger.printDebug(() -> "Adding rolling number TextView changes");
             view.setCompoundDrawablePadding(ReturnYouTubeDislike.leftSeparatorShapePaddingPixels);
             ShapeDrawable separator = ReturnYouTubeDislike.getLeftSeparatorDrawable();
-            if (Utils.isRightToLeftTextLayout()) {
+            if (Utils.isRightToLeftLocale()) {
                 view.setCompoundDrawables(null, null, separator, null);
             } else {
                 view.setCompoundDrawables(separator, null, null, null);
@@ -369,6 +363,11 @@ public class ReturnYouTubeDislikePatch {
             if (videoId.equals(lastPrefetchedVideoId)) {
                 return;
             }
+            if (!Utils.isNetworkConnected()) {
+                Logger.printDebug(() -> "Cannot pre-fetch RYD, network is not connected");
+                lastPrefetchedVideoId = null;
+                return;
+            }
 
             final boolean videoIdIsShort = VideoInformation.lastPlayerResponseIsShort();
             // Shorts shelf in home and subscription feed causes player response hook to be called,
@@ -423,6 +422,12 @@ public class ReturnYouTubeDislikePatch {
             }
             Logger.printDebug(() -> "New video id: " + videoId + " playerType: " + currentPlayerType);
 
+            if (!Utils.isNetworkConnected()) {
+                Logger.printDebug(() -> "Cannot fetch RYD, network is not connected");
+                currentVideoData = null;
+                return;
+            }
+
             ReturnYouTubeDislike data = ReturnYouTubeDislike.getFetchForVideoId(videoId);
             // Pre-emptively set the data to short status.
             // Required to prevent Shorts data from being used on a minimized video in incognito mode.

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

@@ -7,11 +7,17 @@ public class VersionCheckPatch {
         return Utils.getAppVersionName().compareTo(version) >= 0;
     }
 
+    @Deprecated
     public static final boolean IS_19_17_OR_GREATER = isVersionOrGreater("19.17.00");
+    @Deprecated
     public static final boolean IS_19_20_OR_GREATER = isVersionOrGreater("19.20.00");
+    @Deprecated
     public static final boolean IS_19_21_OR_GREATER = isVersionOrGreater("19.21.00");
+    @Deprecated
     public static final boolean IS_19_26_OR_GREATER = isVersionOrGreater("19.26.00");
+    @Deprecated
     public static final boolean IS_19_29_OR_GREATER = isVersionOrGreater("19.29.00");
+    @Deprecated
     public static final boolean IS_19_34_OR_GREATER = isVersionOrGreater("19.34.00");
     public static final boolean IS_19_46_OR_GREATER = isVersionOrGreater("19.46.00");
 }

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

@@ -354,4 +354,23 @@ public final class VideoInformation {
         return videoTime >= videoLength && videoLength > 0;
     }
 
+    /**
+     * Overrides the current playback speed.
+     * Rest of the implementation added by patch.
+     */
+    public static void overridePlaybackSpeed(float speedOverride) {
+        Logger.printDebug(() -> "Overriding playback speed to: " + speedOverride);
+    }
+
+    /**
+     * Injection point.
+     *
+     * @param newlyLoadedPlaybackSpeed The current playback speed.
+     */
+    public static void setPlaybackSpeed(float newlyLoadedPlaybackSpeed) {
+        if (playbackSpeed != newlyLoadedPlaybackSpeed) {
+            Logger.printDebug(() -> "Video speed changed: " + newlyLoadedPlaybackSpeed);
+            playbackSpeed = newlyLoadedPlaybackSpeed;
+        }
+    }
 }

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

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

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

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

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/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;
@@ -56,10 +59,11 @@ public final class AnnouncementsPatch {
         int id = Settings.ANNOUNCEMENT_LAST_ID.defaultValue;
         try {
             final var announcementIds = new JSONArray(jsonString);
+            if (announcementIds.length() == 0) return true;
+            
             id = announcementIds.getJSONObject(0).getInt("id");
-
         } catch (Throwable ex) {
-            Logger.printException(() -> "Failed to parse announcement IDs", ex);
+            Logger.printException(() -> "Failed to parse announcement ID", ex);
         }
 
         // Do not show the announcement, if the last announcement id is the same as the current one.
@@ -120,25 +124,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/announcements/requests/AnnouncementsRoutes.java

@@ -10,8 +10,8 @@ import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 public class AnnouncementsRoutes {
     private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v4";
-    public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=youtube");
-    public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=youtube");
+    public static final Route GET_LATEST_ANNOUNCEMENT_IDS = new Route(GET, "/announcements/latest/id?tag=\uD83C\uDF9E\uFE0F%20YouTube");
+    public static final Route GET_LATEST_ANNOUNCEMENTS = new Route(GET, "/announcements/latest?tag=\uD83C\uDF9E\uFE0F%20YouTube");
 
     private AnnouncementsRoutes() {
     }

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

@@ -6,8 +6,6 @@ import android.app.Instrumentation;
 import android.view.KeyEvent;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
@@ -34,10 +32,6 @@ public final class AdsFilter extends Filter {
     private final StringFilterGroup playerShoppingShelf;
     private final ByteArrayFilterGroup playerShoppingShelfBuffer;
 
-    private final StringFilterGroup channelProfile;
-    private final ByteArrayFilterGroup visitStoreButton;
-
-    private final StringFilterGroup shoppingLinks;
 
     public AdsFilter() {
         exceptions.addPatterns(
@@ -64,83 +58,69 @@ public final class AdsFilter extends Filter {
                 "_interstitial"
         );
 
-        final var buttonedAd = new StringFilterGroup(
-                Settings.HIDE_BUTTONED_ADS,
-                "_ad_with",
-                "_buttoned_layout",
-                // text_image_button_group_layout, landscape_image_button_group_layout, full_width_square_image_button_group_layout
-                "image_button_group_layout",
-                "full_width_square_image_layout",
-                "video_display_button_group_layout",
-                "landscape_image_wide_button_layout",
-                "video_display_carousel_button_group_layout",
-                "video_display_full_buttoned_short_dr_layout",
-                "compact_landscape_image_layout", // Tablet layout search results.
-                "text_image_no_button_layout" // Tablet layout search results.
-        );
-
         final var generalAds = new StringFilterGroup(
                 Settings.HIDE_GENERAL_ADS,
+                "_ad_with",
+                "_buttoned_layout",
                 "ads_video_with_context",
                 "banner_text_icon",
-                "square_image_layout",
-                "watch_metadata_app_promo",
-                "video_display_full_layout",
-                "hero_promo_image",
-                "statement_banner",
+                "brand_video_shelf",
+                "brand_video_singleton",
                 "carousel_footered_layout",
-                "text_image_button_layout",
+                "carousel_headered_layout",
+                "compact_landscape_image_layout", // Tablet layout search results.
+                "composite_concurrent_carousel_layout",
+                "full_width_portrait_image_layout",
+                "full_width_square_image_carousel_layout",
+                "full_width_square_image_layout",
+                "hero_promo_image",
+                // text_image_button_group_layout, landscape_image_button_group_layout, full_width_square_image_button_group_layout
+                "image_button_group_layout",
+                "landscape_image_wide_button_layout",
                 "primetime_promo",
                 "product_details",
-                "composite_concurrent_carousel_layout",
-                "carousel_headered_layout",
-                "full_width_portrait_image_layout",
-                "brand_video_shelf",
-                "brand_video_singleton"
+                "square_image_layout",
+                "statement_banner",
+                "text_image_button_layout",
+                "text_image_no_button_layout", // Tablet layout search results.
+                "video_display_button_group_layout",
+                "video_display_carousel_button_group_layout",
+                "video_display_carousel_buttoned_short_dr_layout",
+                "video_display_full_buttoned_short_dr_layout",
+                "video_display_full_layout",
+                "watch_metadata_app_promo"
         );
 
         final var movieAds = new StringFilterGroup(
                 Settings.HIDE_MOVIES_SECTION,
                 "browsy_bar",
                 "compact_movie",
+                "compact_tvfilm_item",
                 "horizontal_movie_shelf",
                 "movie_and_show_upsell_card",
-                "compact_tvfilm_item",
                 "offer_module_root"
         );
 
         final var viewProducts = new StringFilterGroup(
-                Settings.HIDE_PRODUCTS_BANNER,
+                Settings.HIDE_VIEW_PRODUCTS_BANNER,
                 "product_item",
                 "products_in_video",
-                "shopping_overlay.eml", // Video player overlay shopping links.
-                "shopping_carousel.eml" // Channel profile shopping shelf.
+                "shopping_overlay.eml" // Video player overlay shopping links.
         );
 
-        shoppingLinks = new StringFilterGroup(
+        final var shoppingLinks = new StringFilterGroup(
                 Settings.HIDE_SHOPPING_LINKS,
-                "expandable_list"
+                "shopping_description_shelf.eml"
         );
 
         playerShoppingShelf = new StringFilterGroup(
-                Settings.HIDE_PLAYER_STORE_SHELF,
+                Settings.HIDE_CREATOR_STORE_SHELF,
                 "horizontal_shelf.eml"
         );
 
         playerShoppingShelfBuffer = new ByteArrayFilterGroup(
                 null,
-                "shopping_item_card_list.eml"
-        );
-
-        channelProfile = new StringFilterGroup(
-                Settings.HIDE_VISIT_STORE_BUTTON,
-                "channel_profile.eml",
-                "page_header.eml"
-        );
-
-        visitStoreButton = new ByteArrayFilterGroup(
-                null,
-                "header_store_button"
+                "shopping_item_card_list"
         );
 
         final var webLinkPanel = new StringFilterGroup(
@@ -150,7 +130,8 @@ public final class AdsFilter extends Filter {
 
         final var merchandise = new StringFilterGroup(
                 Settings.HIDE_MERCHANDISE_BANNERS,
-                "product_carousel"
+                "product_carousel",
+                "shopping_carousel.eml" // Channel profile shopping shelf.
         );
 
         final var selfSponsor = new StringFilterGroup(
@@ -159,52 +140,37 @@ public final class AdsFilter extends Filter {
         );
 
         addPathCallbacks(
-                generalAds,
-                buttonedAd,
-                merchandise,
-                viewProducts,
-                selfSponsor,
                 fullscreenAd,
-                channelProfile,
-                webLinkPanel,
-                shoppingLinks,
+                generalAds,
+                merchandise,
+                movieAds,
                 playerShoppingShelf,
-                movieAds
+                selfSponsor,
+                shoppingLinks,
+                viewProducts,
+                webLinkPanel
         );
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == playerShoppingShelf) {
-            if (contentIndex == 0 && playerShoppingShelfBuffer.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
+            return contentIndex == 0 && playerShoppingShelfBuffer.check(buffer).isFiltered();
         }
 
-        // Check for the index because of likelihood of false positives.
-        if (matchedGroup == shoppingLinks && contentIndex != 0) {
+        if (exceptions.matches(path)) {
             return false;
         }
 
-        if (exceptions.matches(path))
-            return false;
-
         if (matchedGroup == fullscreenAd) {
             if (path.contains("|ImageType|")) closeFullscreenAd();
 
-            return false; // Do not actually filter the fullscreen ad otherwise it will leave a dimmed screen.
-        }
-
-        if (matchedGroup == channelProfile) {
-            if (visitStoreButton.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
+            // Do not actually filter the fullscreen ad otherwise it will leave a dimmed screen.
             return false;
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        return true;
     }
 
     /**

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

@@ -1,12 +1,10 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.patches.playback.quality.AdvancedVideoQualityMenuPatch;
 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
@@ -21,7 +19,7 @@ public final class AdvancedVideoQualityMenuFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         isVideoQualityMenuVisible = true;
 

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

@@ -1,7 +1,5 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
@@ -46,7 +44,7 @@ final class ButtonsFilter extends Filter {
                         "|download_button.eml"
                 ),
                 new StringFilterGroup(
-                        Settings.HIDE_PLAYLIST_BUTTON,
+                        Settings.HIDE_SAVE_BUTTON,
                         "|save_to_playlist_button"
                 ),
                 new StringFilterGroup(
@@ -76,6 +74,10 @@ final class ButtonsFilter extends Filter {
                         Settings.HIDE_ASK_BUTTON,
                         "yt_fill_spark"
                 ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_STOP_ADS_BUTTON,
+                        "yt_outline_slash_circle_left"
+                ),
                 // Check for clip button both here and using a path filter,
                 // as there's a chance the path is a generic action button and won't contain 'clip_button'
                 new ByteArrayFilterGroup(
@@ -96,32 +98,26 @@ final class ButtonsFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (matchedGroup == likeSubscribeGlow) {
-            if ((path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX) || path.startsWith(COMPACT_CHANNEL_BAR_PATH_PREFIX))
-                    && path.contains(ANIMATED_VECTOR_TYPE_PATH)) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
+            return (path.startsWith(VIDEO_ACTION_BAR_PATH_PREFIX) || path.startsWith(COMPACT_CHANNEL_BAR_PATH_PREFIX))
+                    && path.contains(ANIMATED_VECTOR_TYPE_PATH);
         }
 
         // If the current matched group is the action bar group,
         // in case every filter group is enabled, hide the action bar.
         if (matchedGroup == actionBarGroup) {
-            if (!isEveryFilterGroupEnabled()) {
-                return false;
-            }
-        } else if (matchedGroup == bufferFilterPathGroup) {
-            // Make sure the current path is the right one
-            //  to avoid false positives.
-            if (!path.startsWith(VIDEO_ACTION_BAR_PATH)) return false;
-
-            // In case the group list has no match, return false.
-            if (!bufferButtonsGroupList.check(protobufBufferArray).isFiltered()) return false;
+            return isEveryFilterGroupEnabled();
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        if (matchedGroup == bufferFilterPathGroup) {
+            // Make sure the current path is the right one
+            //  to avoid false positives.
+            return path.startsWith(VIDEO_ACTION_BAR_PATH)
+                    && bufferButtonsGroupList.check(buffer).isFiltered();
+        }
+
+        return true;
     }
 }

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

@@ -1,18 +1,12 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 final class CommentsFilter extends Filter {
 
-    private static final String TIMESTAMP_OR_EMOJI_BUTTONS_ENDS_WITH_PATH
-            = "|CellType|ContainerType|ContainerType|ContainerType|ContainerType|ContainerType|";
-
-    private final StringFilterGroup commentComposer;
-    private final ByteArrayFilterGroup emojiPickerBufferGroup;
-    private final StringFilterGroup filterChipBar;
+    private final StringFilterGroup chipBar;
     private final ByteArrayFilterGroup aiCommentsSummary;
     
     public CommentsFilter() {
@@ -21,6 +15,21 @@ final class CommentsFilter extends Filter {
                 "live_chat_summary_banner.eml"
         );
 
+        chipBar = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_AI_SUMMARY,
+                "chip_bar.eml"
+        );
+
+        aiCommentsSummary = new ByteArrayFilterGroup(
+                null,
+                "yt_fill_spark_"
+        );
+
+        var channelGuidelines = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_CHANNEL_GUIDELINES,
+                "channel_guidelines_entry_banner"
+        );
+
         var commentsByMembers = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_BY_MEMBERS_HEADER,
                 "sponsorships_comments_header.eml",
@@ -33,6 +42,11 @@ final class CommentsFilter extends Filter {
                 "_comments"
         );
 
+        var communityGuidelines = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_COMMUNITY_GUIDELINES,
+                "community_guidelines"
+        );
+
         var createAShort = new StringFilterGroup(
                 Settings.HIDE_COMMENTS_CREATE_A_SHORT_BUTTON,
                 "composer_short_creation_button.eml"
@@ -50,60 +64,35 @@ final class CommentsFilter extends Filter {
                 "super_thanks_button.eml"
         );
 
-        commentComposer = new StringFilterGroup(
-                Settings.HIDE_COMMENTS_TIMESTAMP_AND_EMOJI_BUTTONS,
-                "comment_composer.eml"
-        );
-
-        emojiPickerBufferGroup = new ByteArrayFilterGroup(
-                null,
-                "id.comment.quick_emoji.button"
-        );
-
-        filterChipBar = new StringFilterGroup(
-                Settings.HIDE_COMMENTS_AI_SUMMARY,
-                "filter_chip_bar.eml"
-        );
-
-        aiCommentsSummary = new ByteArrayFilterGroup(
-                null,
-                "yt_fill_spark_"
+        StringFilterGroup timestampButton = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_TIMESTAMP_BUTTON,
+                "composer_timestamp_button.eml"
         );
 
         addPathCallbacks(
+                channelGuidelines,
                 chatSummary,
+                chipBar,
                 commentsByMembers,
                 comments,
+                communityGuidelines,
                 createAShort,
                 previewComment,
                 thanksButton,
-                commentComposer,
-                filterChipBar
+                timestampButton
+
         );
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (matchedGroup == commentComposer) {
-            // To completely hide the emoji buttons (and leave no empty space), the timestamp button is
-            // also hidden because the buffer is exactly the same and there's no way selectively hide.
-            if (contentIndex == 0
-                    && path.endsWith(TIMESTAMP_OR_EMOJI_BUTTONS_ENDS_WITH_PATH)
-                    && emojiPickerBufferGroup.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
+        if (matchedGroup == chipBar) {
+            // Playlist sort button uses same components and must only filter if the player is opened.
+            return PlayerType.getCurrent().isMaximizedOrFullscreen()
+                    && aiCommentsSummary.check(buffer).isFiltered();
         }
 
-        if (matchedGroup == filterChipBar) {
-            if (aiCommentsSummary.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
-        }
-
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        return true;
     }
 }

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

@@ -3,7 +3,6 @@ package app.revanced.extension.youtube.patches.components;
 import static app.revanced.extension.shared.StringRef.str;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -146,16 +145,18 @@ final class CustomFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         // All callbacks are custom filter groups.
         CustomFilterGroup custom = (CustomFilterGroup) matchedGroup;
         if (custom.startsWith && contentIndex != 0) {
             return false;
         }
-        if (custom.bufferSearch != null && !custom.bufferSearch.matches(protobufBufferArray)) {
-            return false;
+
+        if (custom.bufferSearch == null) {
+            return true; // No buffer filter, only path filtering.
         }
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+
+        return custom.bufferSearch.matches(buffer);
     }
 }

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

@@ -1,9 +1,8 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import app.revanced.extension.youtube.StringTrieSearch;
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 final class DescriptionComponentsFilter extends Filter {
@@ -14,6 +13,11 @@ final class DescriptionComponentsFilter extends Filter {
 
     private final StringFilterGroup macroMarkersCarousel;
 
+    private final StringFilterGroup horizontalShelf;
+    private final ByteArrayFilterGroup cellVideoAttribute;
+
+    private final StringFilterGroup aiGeneratedVideoSummarySection;
+
     public DescriptionComponentsFilter() {
         exceptions.addPatterns(
                 "compact_channel",
@@ -23,15 +27,19 @@ final class DescriptionComponentsFilter extends Filter {
                 "metadata"
         );
 
-        final StringFilterGroup aiGeneratedVideoSummarySection = new StringFilterGroup(
+        aiGeneratedVideoSummarySection = new StringFilterGroup(
                 Settings.HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION,
                 "cell_expandable_metadata.eml"
         );
 
+        final StringFilterGroup askSection = new StringFilterGroup(
+                Settings.HIDE_ASK_SECTION,
+                "youchat_entrypoint.eml"
+        );
+
         final StringFilterGroup attributesSection = new StringFilterGroup(
                 Settings.HIDE_ATTRIBUTES_SECTION,
-                "gaming_section",
-                "music_section",
+                // "gaming_section", "music_section"
                 "video_attributes_section"
         );
 
@@ -71,30 +79,48 @@ final class DescriptionComponentsFilter extends Filter {
                 )
         );
 
+        horizontalShelf = new StringFilterGroup(
+                Settings.HIDE_ATTRIBUTES_SECTION,
+                "horizontal_shelf.eml"
+        );
+
+        cellVideoAttribute = new ByteArrayFilterGroup(
+                null,
+                "cell_video_attribute"
+        );
+
         addPathCallbacks(
                 aiGeneratedVideoSummarySection,
+                askSection,
                 attributesSection,
                 infoCardsSection,
+                horizontalShelf,
                 howThisWasMadeSection,
+                macroMarkersCarousel,
                 podcastSection,
-                transcriptSection,
-                macroMarkersCarousel
+                transcriptSection
         );
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
+
+        if (matchedGroup == aiGeneratedVideoSummarySection) {
+            // Only hide if player is open, in case this component is used somewhere else.
+            return PlayerType.getCurrent().isMaximizedOrFullscreen();
+        }
+
         if (exceptions.matches(path)) return false;
 
         if (matchedGroup == macroMarkersCarousel) {
-            if (contentIndex == 0 && macroMarkersCarouselGroupList.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
+            return contentIndex == 0 && macroMarkersCarouselGroupList.check(buffer).isFiltered();
         }
 
-        return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        if (matchedGroup == horizontalShelf) {
+            return cellVideoAttribute.check(buffer).isFiltered();
+        }
+
+        return true;
     }
 }

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

@@ -1,14 +1,9 @@
 package app.revanced.extension.youtube.patches.components;
 
-import androidx.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BaseSettings;
-
 /**
  * Filters litho based components.
  *
@@ -45,6 +40,7 @@ abstract class Filter {
     /**
      * Adds callbacks to {@link #isFiltered(String, String, byte[], StringFilterGroup, FilterContentType, int)}
      * if any of the groups are found.
+     * <p>
      */
     protected final void addIdentifierCallbacks(StringFilterGroup... groups) {
         identifierCallbacks.addAll(Arrays.asList(groups));
@@ -62,10 +58,7 @@ abstract class Filter {
      * Called after an enabled filter has been matched.
      * Default implementation is to always filter the matched component and log the action.
      * Subclasses can perform additional or different checks if needed.
-     * <p>
-     * If the content is to be filtered, subclasses should always
-     * call this method (and never return a plain 'true').
-     * That way the logs will always show when a component was filtered and which filter hide it.
+     *
      * <p>
      * Method is called off the main thread.
      *
@@ -74,16 +67,8 @@ abstract class Filter {
      * @param contentIndex Matched index of the identifier or path.
      * @return True if the litho component should be filtered out.
      */
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
-        if (BaseSettings.DEBUG.get()) {
-            String filterSimpleName = getClass().getSimpleName();
-            if (contentType == FilterContentType.IDENTIFIER) {
-                Logger.printDebug(() -> filterSimpleName + " Filtered identifier: " + identifier);
-            } else {
-                Logger.printDebug(() -> filterSimpleName + " Filtered path: " + path);
-            }
-        }
         return true;
     }
 }

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

@@ -3,9 +3,9 @@ package app.revanced.extension.youtube.patches.components;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
-public final class HideInfoCardsFilterPatch extends Filter {
+public final class HideInfoCardsFilter extends Filter {
 
-    public HideInfoCardsFilterPatch() {
+    public HideInfoCardsFilter() {
         addIdentifierCallbacks(
                 new StringFilterGroup(
                         Settings.HIDE_INFO_CARDS,

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

@@ -554,7 +554,7 @@ final class KeywordContentFilter extends Filter {
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         if (contentIndex != 0 && matchedGroup == startsWithFilter) {
             return false;
@@ -574,9 +574,9 @@ final class KeywordContentFilter extends Filter {
         }
 
         MutableReference<String> matchRef = new MutableReference<>();
-        if (bufferSearch.matches(protobufBufferArray, matchRef)) {
+        if (bufferSearch.matches(buffer, matchRef)) {
             updateStats(true, matchRef.value);
-            return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+            return true;
         }
 
         updateStats(false, null);

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

@@ -4,12 +4,14 @@ import static app.revanced.extension.youtube.shared.NavigationBar.NavigationButt
 
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.StringTrieSearch;
+import app.revanced.extension.youtube.patches.ChangeHeaderPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.NavigationBar;
 import app.revanced.extension.youtube.shared.PlayerType;
@@ -30,16 +32,18 @@ public final class LayoutComponentsFilter extends Filter {
     );
 
     private final StringTrieSearch exceptions = new StringTrieSearch();
-    private final StringFilterGroup inFeedSurvey;
+    private final StringFilterGroup surveys;
     private final StringFilterGroup notifyMe;
     private final StringFilterGroup singleItemInformationPanel;
     private final StringFilterGroup expandableMetadata;
-    private final ByteArrayFilterGroup searchResultRecommendations;
-    private final StringFilterGroup searchResultVideo;
     private final StringFilterGroup compactChannelBarInner;
     private final StringFilterGroup compactChannelBarInnerButton;
     private final ByteArrayFilterGroup joinMembershipButton;
     private final StringFilterGroup horizontalShelves;
+    private final ByteArrayFilterGroup ticketShelf;
+    private final StringFilterGroup chipBar;
+    private final StringFilterGroup channelProfile;
+    private final ByteArrayFilterGroupList channelProfileBuffer;
 
     public LayoutComponentsFilter() {
         exceptions.addPatterns(
@@ -81,18 +85,13 @@ public final class LayoutComponentsFilter extends Filter {
                 "poll_post_responsive_root.eml"
         );
 
-        final var communityGuidelines = new StringFilterGroup(
-                Settings.HIDE_COMMUNITY_GUIDELINES,
-                "community_guidelines"
-        );
-
         final var subscribersCommunityGuidelines = new StringFilterGroup(
                 Settings.HIDE_SUBSCRIBERS_COMMUNITY_GUIDELINES,
                 "sponsorships_comments_upsell"
         );
 
-        final var channelMemberShelf = new StringFilterGroup(
-                Settings.HIDE_CHANNEL_MEMBER_SHELF,
+        final var channelMembersShelf = new StringFilterGroup(
+                Settings.HIDE_MEMBERS_SHELF,
                 "member_recognition_shelf"
         );
 
@@ -106,8 +105,13 @@ public final class LayoutComponentsFilter extends Filter {
                 "subscriptions_chip_bar"
         );
 
-        inFeedSurvey = new StringFilterGroup(
-                Settings.HIDE_FEED_SURVEY,
+        chipBar = new StringFilterGroup(
+                Settings.HIDE_FILTER_BAR_FEED_IN_HISTORY,
+                "chip_bar"
+        );
+
+        surveys = new StringFilterGroup(
+                Settings.HIDE_SURVEYS,
                 "in_feed_survey",
                 "slimline_survey",
                 "feed_nudge"
@@ -134,13 +138,13 @@ public final class LayoutComponentsFilter extends Filter {
         );
 
         final var latestPosts = new StringFilterGroup(
-                Settings.HIDE_HIDE_LATEST_POSTS,
+                Settings.HIDE_LATEST_POSTS,
                 "post_shelf"
         );
 
-        final var channelGuidelines = new StringFilterGroup(
-                Settings.HIDE_HIDE_CHANNEL_GUIDELINES,
-                "channel_guidelines_entry_banner"
+        final var channelLinksPreview = new StringFilterGroup(
+                Settings.HIDE_LINKS_PREVIEW,
+                "attribution.eml"
         );
 
         final var emergencyBox = new StringFilterGroup(
@@ -165,7 +169,7 @@ public final class LayoutComponentsFilter extends Filter {
         );
 
         expandableMetadata = new StringFilterGroup(
-                Settings.HIDE_EXPANDABLE_CHIP,
+                Settings.HIDE_EXPANDABLE_CARD,
                 "inline_expander"
         );
 
@@ -195,7 +199,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "image_shelf"
         );
 
-
         final var timedReactions = new StringFilterGroup(
                 Settings.HIDE_TIMED_REACTIONS,
                 "emoji_control_panel",
@@ -222,7 +225,6 @@ public final class LayoutComponentsFilter extends Filter {
                 "sponsorships"
         );
 
-
         final var channelWatermark = new StringFilterGroup(
                 Settings.HIDE_VIDEO_CHANNEL_WATERMARK,
                 "featured_channel_watermark_overlay"
@@ -233,14 +235,25 @@ public final class LayoutComponentsFilter extends Filter {
                 "mixed_content_shelf"
         );
 
-        searchResultVideo = new StringFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_RECOMMENDATIONS,
-                "search_video_with_context.eml"
+        final var videoRecommendationLabels = new StringFilterGroup(
+                Settings.HIDE_VIDEO_RECOMMENDATION_LABELS,
+                "endorsement_header_footer.eml"
         );
 
-        searchResultRecommendations = new ByteArrayFilterGroup(
-                Settings.HIDE_SEARCH_RESULT_RECOMMENDATIONS,
-                "endorsement_header_footer"
+        channelProfile = new StringFilterGroup(
+                null,
+                "channel_profile.eml",
+                "page_header.eml"
+        );
+        channelProfileBuffer = new ByteArrayFilterGroupList();
+        channelProfileBuffer.addAll(new ByteArrayFilterGroup(
+                        Settings.HIDE_VISIT_STORE_BUTTON,
+                        "header_store_button"
+                ),
+                new ByteArrayFilterGroup(
+                        Settings.HIDE_VISIT_COMMUNITY_BUTTON,
+                        "community_button"
+                )
         );
 
         horizontalShelves = new StringFilterGroup(
@@ -251,41 +264,47 @@ public final class LayoutComponentsFilter extends Filter {
                 "horizontal_tile_shelf.eml"
         );
 
+        ticketShelf = new ByteArrayFilterGroup(
+                Settings.HIDE_TICKET_SHELF,
+                "ticket_item.eml"
+        );
+
         addPathCallbacks(
-                expandableMetadata,
-                inFeedSurvey,
-                notifyMe,
-                compactChannelBar,
-                communityPosts,
-                paidPromotion,
-                searchResultVideo,
-                latestPosts,
+                artistCard,
+                audioTrackButton,
+                channelLinksPreview,
+                channelMembersShelf,
+                channelProfile,
                 channelWatermark,
-                communityGuidelines,
+                chipBar,
+                compactBanner,
+                compactChannelBar,
+                compactChannelBarInner,
+                communityPosts,
+                emergencyBox,
+                expandableMetadata,
+                forYouShelf,
+                horizontalShelves,
+                imageShelf,
+                infoPanel,
+                latestPosts,
+                medicalPanel,
+                notifyMe,
+                paidPromotion,
                 playables,
                 quickActions,
                 relatedVideos,
-                compactBanner,
-                compactChannelBarInner,
-                medicalPanel,
-                infoPanel,
                 singleItemInformationPanel,
-                emergencyBox,
                 subscribersCommunityGuidelines,
                 subscriptionsChipBar,
-                channelGuidelines,
-                audioTrackButton,
-                artistCard,
+                surveys,
                 timedReactions,
-                imageShelf,
-                channelMemberShelf,
-                forYouShelf,
-                horizontalShelves
+                videoRecommendationLabels
         );
     }
 
     @Override
-    boolean isFiltered(@Nullable String identifier, String path, byte[] protobufBufferArray,
+    boolean isFiltered(String identifier, String path, byte[] buffer,
                        StringFilterGroup matchedGroup, FilterContentType contentType, int contentIndex) {
         // This identifier is used not only in players but also in search results:
         // https://github.com/ReVanced/revanced-patches/issues/3245
@@ -293,57 +312,44 @@ public final class LayoutComponentsFilter extends Filter {
         // From 2025, the medical information panel is no longer shown in the search results.
         // Therefore, this identifier does not filter when the search bar is activated.
         if (matchedGroup == singleItemInformationPanel) {
-            if (PlayerType.getCurrent().isMaximizedOrFullscreen() || !NavigationBar.isSearchBarActive()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
-        }
-
-        if (matchedGroup == searchResultVideo) {
-            if (searchResultRecommendations.check(protobufBufferArray).isFiltered()) {
-                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-            return false;
+            return PlayerType.getCurrent().isMaximizedOrFullscreen() || !NavigationBar.isSearchBarActive();
         }
 
         // The groups are excluded from the filter due to the exceptions list below.
         // Filter them separately here.
-        if (matchedGroup == notifyMe || matchedGroup == inFeedSurvey || matchedGroup == expandableMetadata)
-        {
-            return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        if (matchedGroup == notifyMe || matchedGroup == surveys || matchedGroup == expandableMetadata) {
+            return true;
+        }
+
+        if (matchedGroup == channelProfile) {
+            return channelProfileBuffer.check(buffer).isFiltered();
         }
 
         if (exceptions.matches(path)) return false; // Exceptions are not filtered.
 
         if (matchedGroup == compactChannelBarInner) {
-            if (compactChannelBarInnerButton.check(path).isFiltered()) {
-                // The filter may be broad, but in the context of a compactChannelBarInnerButton,
-                // it's safe to assume that the button is the only thing that should be hidden.
-                if (joinMembershipButton.check(protobufBufferArray).isFiltered()) {
-                    return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
-                }
-            }
-
-            return false;
+            return compactChannelBarInnerButton.check(path).isFiltered()
+                    // The filter may be broad, but in the context of a compactChannelBarInnerButton,
+                    // it's safe to assume that the button is the only thing that should be hidden.
+                    && joinMembershipButton.check(buffer).isFiltered();
         }
 
         if (matchedGroup == horizontalShelves) {
-            if (contentIndex == 0 && hideShelves()) {
-                return super.isFiltered(path, identifier, protobufBufferArray, matchedGroup, contentType, contentIndex);
-            }
-
-            return false;
+            return contentIndex == 0 && (hideShelves() || ticketShelf.check(buffer).isFiltered());
         }
 
-        return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+        if (matchedGroup == chipBar) {
+            return contentIndex == 0 && NavigationButton.getSelectedNavigationButton() == NavigationButton.LIBRARY;
+        }
+
+        return true;
     }
 
     /**
      * Injection point.
      * Called from a different place then the other filters.
      */
-    public static boolean filterMixPlaylists(final Object conversionContext, @Nullable final byte[] bytes) {
+    public static boolean filterMixPlaylists(Object conversionContext, @Nullable final byte[] bytes) {
         try {
             if (!Settings.HIDE_MIX_PLAYLISTS.get()) {
                 return false;
@@ -433,13 +439,11 @@ public final class LayoutComponentsFilter extends Filter {
     /**
      * Injection point.
      */
-    @Nullable
-    public static Drawable hideYoodles(Drawable animatedYoodle) {
-        if (HIDE_DOODLES_ENABLED) {
-            return null;
-        }
-
-        return animatedYoodle;
+    public static void setDoodleDrawable(ImageView imageView, Drawable original) {
+        Drawable replacement = HIDE_DOODLES_ENABLED
+                ? ChangeHeaderPatch.getDrawable(original)
+                : original;
+        imageView.setImageDrawable(replacement);
     }
 
     private static final boolean HIDE_SHOW_MORE_BUTTON_ENABLED = Settings.HIDE_SHOW_MORE_BUTTON.get();
@@ -470,7 +474,7 @@ public final class LayoutComponentsFilter extends Filter {
         }
 
         // Do not hide if the navigation back button is visible,
-        // otherwise the content shelves in the explore/music/courses pages are hidde.
+        // otherwise the content shelves in the explore/music/courses pages are hidden.
         if (NavigationBar.isBackButtonVisible()) {
             return false;
         }

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

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.youtube.StringTrieSearch;
 import app.revanced.extension.youtube.settings.Settings;
 
@@ -16,29 +17,28 @@ public final class LithoFilterPatch {
      * Simple wrapper to pass the litho parameters through the prefix search.
      */
     private static final class LithoFilterParameters {
-        @Nullable
         final String identifier;
         final String path;
-        final byte[] protoBuffer;
+        final byte[] buffer;
 
-        LithoFilterParameters(@Nullable String lithoIdentifier, String lithoPath, byte[] protoBuffer) {
+        LithoFilterParameters(String lithoIdentifier, String lithoPath, byte[] buffer) {
             this.identifier = lithoIdentifier;
             this.path = lithoPath;
-            this.protoBuffer = protoBuffer;
+            this.buffer = buffer;
         }
 
         @NonNull
         @Override
         public String toString() {
             // Estimate the percentage of the buffer that are Strings.
-            StringBuilder builder = new StringBuilder(Math.max(100, protoBuffer.length / 2));
+            StringBuilder builder = new StringBuilder(Math.max(100, buffer.length / 2));
             builder.append( "ID: ");
             builder.append(identifier);
             builder.append(" Path: ");
             builder.append(path);
             if (Settings.DEBUG_PROTOBUFFER.get()) {
                 builder.append(" BufferStrings: ");
-                findAsciiStrings(builder, protoBuffer);
+                findAsciiStrings(builder, buffer);
             }
 
             return builder.toString();
@@ -47,7 +47,7 @@ public final class LithoFilterPatch {
         /**
          * Search through a byte array for all ASCII strings.
          */
-        private static void findAsciiStrings(StringBuilder builder, byte[] buffer) {
+        static void findAsciiStrings(StringBuilder builder, byte[] buffer) {
             // Valid ASCII values (ignore control characters).
             final int minimumAscii = 32;  // 32 = space character
             final int maximumAscii = 126; // 127 = delete character
@@ -73,8 +73,29 @@ public final class LithoFilterPatch {
         }
     }
 
+    /**
+     * Litho layout fixed thread pool size override.
+     * <p>
+     * Unpatched YouTube uses a layout fixed thread pool between 1 and 3 threads:
+     * <pre>
+     * 1 thread - > Device has less than 6 cores
+     * 2 threads -> Device has over 6 cores and less than 6GB of memory
+     * 3 threads -> Device has over 6 cores and more than 6GB of memory
+     * </pre>
+     *
+     * Using more than 1 thread causes layout issues such as the You tab watch/playlist shelf
+     * that is sometimes incorrectly hidden (ReVanced is not hiding it), and seems to
+     * fix a race issue if using the active navigation tab status with litho filtering.
+     */
+    private static final int LITHO_LAYOUT_THREAD_POOL_SIZE = 1;
+
+    /**
+     * Placeholder for actual filters.
+     */
+    private static final class DummyFilter extends Filter { }
+
     private static final Filter[] filters = new Filter[] {
-            new DummyFilter() // Replaced by patch.
+            new DummyFilter() // Replaced patching, do not touch.
     };
 
     private static final StringTrieSearch pathSearchTree = new StringTrieSearch();
@@ -86,11 +107,7 @@ public final class LithoFilterPatch {
      * Because litho filtering is multi-threaded and the buffer is passed in from a different injection point,
      * the buffer is saved to a ThreadLocal so each calling thread does not interfere with other threads.
      */
-    private static final ThreadLocal<ByteBuffer> bufferThreadLocal = new ThreadLocal<>();
-    /**
-     * Results of calling {@link #filter(String, StringBuilder)}.
-     */
-    private static final ThreadLocal<Boolean> filterResult = new ThreadLocal<>();
+    private static final ThreadLocal<byte[]> bufferThreadLocal = new ThreadLocal<>();
 
     static {
         for (Filter filter : filters) {
@@ -110,16 +127,33 @@ public final class LithoFilterPatch {
     private static void filterUsingCallbacks(StringTrieSearch pathSearchTree,
                                              Filter filter, List<StringFilterGroup> groups,
                                              Filter.FilterContentType type) {
+        String filterSimpleName = filter.getClass().getSimpleName();
+
         for (StringFilterGroup group : groups) {
             if (!group.includeInSearch()) {
                 continue;
             }
+
             for (String pattern : group.filters) {
-                pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex, matchedLength, callbackParameter) -> {
+                pathSearchTree.addPattern(pattern, (textSearched, matchedStartIndex,
+                                                    matchedLength, callbackParameter) -> {
                             if (!group.isEnabled()) return false;
+
                             LithoFilterParameters parameters = (LithoFilterParameters) callbackParameter;
-                            return filter.isFiltered(parameters.identifier, parameters.path, parameters.protoBuffer,
-                                    group, type, matchedStartIndex);
+                            final boolean isFiltered = filter.isFiltered(parameters.identifier,
+                                    parameters.path, parameters.buffer, group, type, matchedStartIndex);
+
+                            if (isFiltered && BaseSettings.DEBUG.get()) {
+                                if (type == Filter.FilterContentType.IDENTIFIER) {
+                                    Logger.printDebug(() -> "Filtered " + filterSimpleName
+                                            + " identifier: " + parameters.identifier);
+                                } else {
+                                    Logger.printDebug(() -> "Filtered " + filterSimpleName
+                                            + " path: " + parameters.path);
+                                }
+                            }
+
+                            return isFiltered;
                         }
                 );
             }
@@ -128,61 +162,55 @@ public final class LithoFilterPatch {
 
     /**
      * Injection point.  Called off the main thread.
+     * Targets 20.22+
      */
-    @SuppressWarnings("unused")
-    public static void setProtoBuffer(@Nullable ByteBuffer protobufBuffer) {
+    public static void setProtoBuffer(byte[] buffer) {
         // Set the buffer to a thread local.  The buffer will remain in memory, even after the call to #filter completes.
         // This is intentional, as it appears the buffer can be set once and then filtered multiple times.
         // The buffer will be cleared from memory after a new buffer is set by the same thread,
         // or when the calling thread eventually dies.
-        if (protobufBuffer == null) {
+        bufferThreadLocal.set(buffer);
+    }
+
+    /**
+     * Injection point.  Called off the main thread.
+     * Targets 20.21 and lower.
+     */
+    public static void setProtoBuffer(@Nullable ByteBuffer buffer) {
+        // Set the buffer to a thread local.  The buffer will remain in memory, even after the call to #filter completes.
+        // This is intentional, as it appears the buffer can be set once and then filtered multiple times.
+        // The buffer will be cleared from memory after a new buffer is set by the same thread,
+        // or when the calling thread eventually dies.
+        if (buffer == null || !buffer.hasArray()) {
             // It appears the buffer can be cleared out just before the call to #filter()
             // Ignore this null value and retain the last buffer that was set.
-            Logger.printDebug(() -> "Ignoring null protobuffer");
+            Logger.printDebug(() -> "Ignoring null or empty buffer: " + buffer);
         } else {
-            bufferThreadLocal.set(protobufBuffer);
+            setProtoBuffer(buffer.array());
         }
     }
 
     /**
      * Injection point.
      */
-    public static boolean shouldFilter() {
-        Boolean shouldFilter = filterResult.get();
-        return shouldFilter != null && shouldFilter;
-    }
-
-    /**
-     * Injection point.  Called off the main thread, and commonly called by multiple threads at the same time.
-     */
-    public static void filter(@Nullable String lithoIdentifier, StringBuilder pathBuilder) {
-        filterResult.set(handleFiltering(lithoIdentifier, pathBuilder));
-    }
-
-    private static boolean handleFiltering(@Nullable String lithoIdentifier, StringBuilder pathBuilder) {
+    public static boolean isFiltered(String lithoIdentifier, StringBuilder pathBuilder) {
         try {
-            if (pathBuilder.length() == 0) {
+            if (lithoIdentifier.isEmpty() && pathBuilder.length() == 0) {
                 return false;
             }
 
-            ByteBuffer protobufBuffer = bufferThreadLocal.get();
-            final byte[] bufferArray;
+            byte[] buffer = bufferThreadLocal.get();
             // Potentially the buffer may have been null or never set up until now.
             // Use an empty buffer so the litho id/path filters still work correctly.
-            if (protobufBuffer == null) {
-                bufferArray = EMPTY_BYTE_ARRAY;
-            } else if (!protobufBuffer.hasArray()) {
-                Logger.printDebug(() -> "Proto buffer does not have an array, using an empty buffer array");
-                bufferArray = EMPTY_BYTE_ARRAY;
-            } else {
-                bufferArray = protobufBuffer.array();
+            if (buffer == null) {
+                buffer = EMPTY_BYTE_ARRAY;
             }
 
-            LithoFilterParameters parameter = new LithoFilterParameters(lithoIdentifier,
-                    pathBuilder.toString(), bufferArray);
+            LithoFilterParameters parameter = new LithoFilterParameters(
+                    lithoIdentifier, pathBuilder.toString(), buffer);
             Logger.printDebug(() -> "Searching " + parameter);
 
-            if (parameter.identifier != null && identifierSearchTree.matches(parameter.identifier, parameter)) {
+            if (identifierSearchTree.matches(parameter.identifier, parameter)) {
                 return true;
             }
 
@@ -190,14 +218,33 @@ public final class LithoFilterPatch {
                 return true;
             }
         } catch (Exception ex) {
-            Logger.printException(() -> "Litho filter failure", ex);
+            Logger.printException(() -> "isFiltered failure", ex);
         }
 
         return false;
     }
-}
 
-/**
- * Placeholder for actual filters.
- */
-final class DummyFilter extends Filter { }
+    /**
+     * Injection point.
+     */
+    public static int getExecutorCorePoolSize(int originalCorePoolSize) {
+        if (originalCorePoolSize != LITHO_LAYOUT_THREAD_POOL_SIZE) {
+            Logger.printDebug(() -> "Overriding core thread pool size from: " + originalCorePoolSize
+                    + " to: " + LITHO_LAYOUT_THREAD_POOL_SIZE);
+        }
+
+        return LITHO_LAYOUT_THREAD_POOL_SIZE;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static int getExecutorMaxThreads(int originalMaxThreads) {
+        if (originalMaxThreads != LITHO_LAYOUT_THREAD_POOL_SIZE) {
+            Logger.printDebug(() -> "Overriding max thread pool size from: " + originalMaxThreads
+                    + " to: " + LITHO_LAYOUT_THREAD_POOL_SIZE);
+        }
+
+        return LITHO_LAYOUT_THREAD_POOL_SIZE;
+    }
+}