chore: Release v5.43.0-dev.4 [skip ci]

# [5.43.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.43.0-dev.3...v5.43.0-dev.4) (2025-10-14)

### Bug Fixes

* **YouTube - Force original audio:** Do not use translated audio if stream spoofing is off and force audio is on ([0c19dba](0c19dbaf30))

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -72,6 +72,7 @@ body:
 
         - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-patches/issues?q=label%3A%22Bug+report%22).
         - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Check the troubleshooting guide**: A solution to your issue might be found in the [FAQ](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/questions.md) or the [troubleshooting guide](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/troubleshooting.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -72,6 +72,7 @@ body:
 
         - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-patches/issues?q=label%3A%22Feature+request%22).
         - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Check the troubleshooting guide**: Information about your issue might be found in the [FAQ](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/questions.md) or the [troubleshooting guide](https://github.com/ReVanced/revanced-documentation/blob/main/docs/revanced-resources/troubleshooting.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:

.github/workflows/build_pull_request.yml

@@ -12,12 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/open_pull_request.yml

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

.github/workflows/pull_strings.yml

@@ -14,10 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: dev
-          fetch-depth: 0
           clean: true
 
       - name: Pull strings

.github/workflows/push_strings.yml

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

.github/workflows/release.yml

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

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

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

adsfund.json

@@ -0,0 +1,8 @@
+{
+  "info": "This is verification file for ads.fund project",
+  "project": {
+    "name": "Revanced Patches",
+    "walletAddress": "0x7ab4091e00363654bf84B34151225742cd92FCE5",
+    "tokenAddress": "0xadf325f255083a3f3d9a9d01ffb3db52a148d802"
+  }
+}

build.gradle.kts

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

extensions/baconreader/build.gradle.kts

@@ -0,0 +1,5 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
+}

extensions/baconreader/src/main/AndroidManifest.xml

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

extensions/baconreader/src/main/java/app/revanced/extension/baconreader/FixRedgifsApiPatch.java

@@ -0,0 +1,22 @@
+package app.revanced.extension.baconreader;
+
+import app.revanced.extension.shared.fixes.redgifs.BaseFixRedgifsApiPatch;
+import okhttp3.OkHttpClient;
+
+/**
+ * @noinspection unused
+ */
+public class FixRedgifsApiPatch extends BaseFixRedgifsApiPatch {
+    static {
+        INSTANCE = new FixRedgifsApiPatch();
+    }
+
+    public String getDefaultUserAgent() {
+        // BaconReader uses a static user agent for Redgifs API calls
+        return "BaconReader";
+    }
+
+    public static OkHttpClient install(OkHttpClient.Builder builder) {
+        return builder.addInterceptor(INSTANCE).build();
+    }
+}

extensions/boostforreddit/build.gradle.kts

@@ -1,4 +1,6 @@
 dependencies {
     compileOnly(project(":extensions:shared:library"))
     compileOnly(project(":extensions:boostforreddit:stub"))
+    compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
 }

extensions/boostforreddit/src/main/java/app/revanced/extension/boostforreddit/FixRedgifsApiPatch.java

@@ -0,0 +1,22 @@
+package app.revanced.extension.boostforreddit;
+
+import app.revanced.extension.shared.fixes.redgifs.BaseFixRedgifsApiPatch;
+import okhttp3.OkHttpClient;
+
+/**
+ * @noinspection unused
+ */
+public class FixRedgifsApiPatch extends BaseFixRedgifsApiPatch {
+    static {
+        INSTANCE = new FixRedgifsApiPatch();
+    }
+
+    public String getDefaultUserAgent() {
+        // Boost uses a static user agent for Redgifs API calls
+        return "Boost";
+    }
+
+    public static OkHttpClient createClient() {
+        return new OkHttpClient.Builder().addInterceptor(INSTANCE).build();
+    }
+}

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/instagram/build.gradle.kts

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

extensions/instagram/src/main/AndroidManifest.xml

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

extensions/instagram/src/main/java/app/revanced/extension/instagram/feed/LimitFeedToFollowedProfiles.java

@@ -0,0 +1,26 @@
+package app.revanced.extension.instagram.feed;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@SuppressWarnings("unused")
+public class LimitFeedToFollowedProfiles {
+
+    /**
+     * Injection point.
+     */
+    public static Map<String, String> setFollowingHeader(Map<String, String> requestHeaderMap) {
+        String paginationHeaderName = "pagination_source";
+
+        // Patch the header only if it's trying to fetch the default feed
+        String currentHeader = requestHeaderMap.get(paginationHeaderName);
+        if (currentHeader != null && !currentHeader.equals("feed_recs")) {
+            return requestHeaderMap;
+        }
+
+        // Create new map as original is unmodifiable.
+        Map<String, String> patchedRequestHeaderMap = new HashMap<>(requestHeaderMap);
+        patchedRequestHeaderMap.put(paginationHeaderName, "following");
+        return patchedRequestHeaderMap;
+    }
+}

extensions/instagram/src/main/java/app/revanced/extension/instagram/hide/navigation/HideNavigationButtonsPatch.java

@@ -0,0 +1,33 @@
+package app.revanced.extension.instagram.hide.navigation;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public class HideNavigationButtonsPatch {
+
+    /**
+     * Injection point.
+     * @param navigationButtonsList the list of navigation buttons, as an (obfuscated) Enum type
+     * @param buttonNameToRemove the name of the button we want to remove
+     * @param enumNameField the field in the nav button enum class which contains the name of the button
+     * @return the patched list of navigation buttons
+     */
+    public static List<Object> removeNavigationButtonByName(
+            List<Object> navigationButtonsList,
+            String buttonNameToRemove,
+            String enumNameField
+    )
+            throws IllegalAccessException, NoSuchFieldException {
+        for (Object button : navigationButtonsList) {
+            Field f = button.getClass().getDeclaredField(enumNameField);
+            String currentButtonEnumName = (String) f.get(button);
+
+            if (buttonNameToRemove.equals(currentButtonEnumName)) {
+                navigationButtonsList.remove(button);
+                break;
+            }
+        }
+        return navigationButtonsList;
+    }
+}

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

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

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

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

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

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

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

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

extensions/music/build.gradle.kts

@@ -1,3 +1,9 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:youtube:stub"))
+    compileOnly(libs.annotation)
+}
+
 android {
     defaultConfig {
         minSdk = 26

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+package app.revanced.extension.music.patches;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class HideVideoAdsPatch {
+
+    /**
+     * Injection point
+     */
+    public static boolean showVideoAds(boolean original) {
+        if (Settings.HIDE_VIDEO_ADS.get()) {
+            return false;
+        }
+        return original;
+    }
+}

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

@@ -0,0 +1,74 @@
+package app.revanced.extension.music.patches;
+
+import static app.revanced.extension.shared.Utils.hideViewUnderCondition;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.music.settings.Settings;
+
+@SuppressWarnings("unused")
+public class NavigationBarPatch {
+    @NonNull
+    private static String lastYTNavigationEnumName = "";
+
+    public static void setLastAppNavigationEnum(@Nullable Enum<?> ytNavigationEnumName) {
+        if (ytNavigationEnumName != null) {
+            lastYTNavigationEnumName = ytNavigationEnumName.name();
+        }
+    }
+
+    public static void hideNavigationLabel(TextView textview) {
+        hideViewUnderCondition(Settings.HIDE_NAVIGATION_BAR_LABEL.get(), textview);
+    }
+
+    public static void hideNavigationButton(@NonNull View view) {
+        // Hide entire navigation bar.
+        if (Settings.HIDE_NAVIGATION_BAR.get() && view.getParent() != null) {
+            hideViewUnderCondition(true, (View) view.getParent());
+            return;
+        }
+
+        // Hide navigation buttons based on their type.
+        for (NavigationButton button : NavigationButton.values()) {
+            if (button.ytEnumNames.equals(lastYTNavigationEnumName)) {
+                hideViewUnderCondition(button.hidden, view);
+                break;
+            }
+        }
+    }
+
+    private enum NavigationButton {
+        HOME(
+                "TAB_HOME",
+                Settings.HIDE_NAVIGATION_BAR_HOME_BUTTON.get()
+        ),
+        SAMPLES(
+                "TAB_SAMPLES",
+                Settings.HIDE_NAVIGATION_BAR_SAMPLES_BUTTON.get()
+        ),
+        EXPLORE(
+                "TAB_EXPLORE",
+                Settings.HIDE_NAVIGATION_BAR_EXPLORE_BUTTON.get()
+        ),
+        LIBRARY(
+                "LIBRARY_MUSIC",
+                Settings.HIDE_NAVIGATION_BAR_LIBRARY_BUTTON.get()
+        ),
+        UPGRADE(
+                "TAB_MUSIC_PREMIUM",
+                Settings.HIDE_NAVIGATION_BAR_UPGRADE_BUTTON.get()
+        );
+
+        private final String ytEnumNames;
+        private final boolean hidden;
+
+        NavigationButton(@NonNull String ytEnumNames, boolean hidden) {
+            this.ytEnumNames = ytEnumNames;
+            this.hidden = hidden;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,28 @@
+package app.revanced.extension.music.patches.spoof;
+
+import static app.revanced.extension.music.settings.Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_61_48;
+import static app.revanced.extension.shared.spoof.ClientType.VISIONOS;
+
+import java.util.List;
+
+import app.revanced.extension.shared.spoof.ClientType;
+
+@SuppressWarnings("unused")
+public class SpoofVideoStreamsPatch {
+
+    /**
+     * Injection point.
+     */
+    public static void setClientOrderToUse() {
+        List<ClientType> availableClients = List.of(
+                ANDROID_VR_1_43_32,
+                ANDROID_VR_1_61_48,
+                VISIONOS
+        );
+
+        app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.setClientsToUse(
+                availableClients, SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get());
+    }
+}

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

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

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

@@ -0,0 +1,126 @@
+package app.revanced.extension.music.settings;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceFragment;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
+import app.revanced.extension.music.settings.search.MusicSearchViewController;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseActivityHook;
+
+/**
+ * Hooks GoogleApiActivity to inject a custom {@link MusicPreferenceFragment} with a toolbar and search.
+ */
+public class MusicActivityHook extends BaseActivityHook {
+
+    @SuppressLint("StaticFieldLeak")
+    public static MusicSearchViewController searchViewController;
+
+    /**
+     * Injection point.
+     */
+    @SuppressWarnings("unused")
+    public static void initialize(Activity parentActivity) {
+        // Must touch the Music settings to ensure the class is loaded and
+        // the values can be found when setting the UI preferences.
+        // Logging anything under non debug ensures this is set.
+        Logger.printInfo(() -> "Permanent repeat enabled: " + Settings.PERMANENT_REPEAT.get());
+
+        // YT Music always uses dark mode.
+        Utils.setIsDarkModeEnabled(true);
+
+        BaseActivityHook.initialize(new MusicActivityHook(), parentActivity);
+    }
+
+    /**
+     * Sets the fixed theme for the activity.
+     */
+    @Override
+    protected void customizeActivityTheme(Activity activity) {
+        // Override the default YouTube Music theme to increase start padding of list items.
+        // Custom style located in resources/music/values/style.xml
+        activity.setTheme(Utils.getResourceIdentifierOrThrow(
+                "Theme.ReVanced.YouTubeMusic.Settings", "style"));
+    }
+
+    /**
+     * Returns the resource ID for the YouTube Music settings layout.
+     */
+    @Override
+    protected int getContentViewResourceId() {
+        return LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR;
+    }
+
+    /**
+     * Returns the fixed background color for the toolbar.
+     */
+    @Override
+    protected int getToolbarBackgroundColor() {
+        return Utils.getResourceColor("ytm_color_black");
+    }
+
+    /**
+     * Returns the navigation icon with a color filter applied.
+     */
+    @Override
+    protected Drawable getNavigationIcon() {
+        Drawable navigationIcon = MusicPreferenceFragment.getBackButtonDrawable();
+        navigationIcon.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
+        return navigationIcon;
+    }
+
+    /**
+     * Returns the click listener that finishes the activity when the navigation icon is clicked.
+     */
+    @Override
+    protected View.OnClickListener getNavigationClickListener(Activity activity) {
+        return view -> {
+            if (searchViewController != null && searchViewController.isSearchActive()) {
+                searchViewController.closeSearch();
+            } else {
+                activity.finish();
+            }
+        };
+    }
+
+    /**
+     * Adds search view components to the toolbar for {@link MusicPreferenceFragment}.
+     *
+     * @param activity The activity hosting the toolbar.
+     * @param toolbar  The configured toolbar.
+     * @param fragment The PreferenceFragment associated with the activity.
+     */
+    @Override
+    protected void onPostToolbarSetup(Activity activity, Toolbar toolbar, PreferenceFragment fragment) {
+        if (fragment instanceof MusicPreferenceFragment) {
+            searchViewController = MusicSearchViewController.addSearchViewComponents(
+                    activity, toolbar, (MusicPreferenceFragment) fragment);
+        }
+    }
+
+    /**
+     * Creates a new {@link MusicPreferenceFragment} for the activity.
+     */
+    @Override
+    protected PreferenceFragment createPreferenceFragment() {
+        return new MusicPreferenceFragment();
+    }
+
+    /**
+     * Injection point.
+     * <p>
+     * Overrides {@link Activity#finish()} of the injection Activity.
+     *
+     * @return if the original activity finish method should be allowed to run.
+     */
+    @SuppressWarnings("unused")
+    public static boolean handleFinish() {
+        return MusicSearchViewController.handleFinish(searchViewController);
+    }
+}

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

@@ -0,0 +1,37 @@
+package app.revanced.extension.music.settings;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+import static app.revanced.extension.shared.settings.Setting.parent;
+
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.BooleanSetting;
+import app.revanced.extension.shared.settings.EnumSetting;
+import app.revanced.extension.shared.spoof.ClientType;
+
+public class Settings extends BaseSettings {
+
+    // Ads
+    public static final BooleanSetting HIDE_VIDEO_ADS = new BooleanSetting("revanced_music_hide_video_ads", TRUE, true);
+    public static final BooleanSetting HIDE_GET_PREMIUM_LABEL = new BooleanSetting("revanced_music_hide_get_premium_label", TRUE, true);
+
+    // General
+    public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", TRUE, false);
+    public static final BooleanSetting HIDE_CATEGORY_BAR = new BooleanSetting("revanced_music_hide_category_bar", FALSE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR_HOME_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_home_button", FALSE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR_SAMPLES_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_samples_button", FALSE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR_EXPLORE_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_explore_button", FALSE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR_LIBRARY_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_library_button", FALSE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR_UPGRADE_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_upgrade_button", TRUE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR = new BooleanSetting("revanced_music_hide_navigation_bar", FALSE, true);
+    public static final BooleanSetting HIDE_NAVIGATION_BAR_LABEL = new BooleanSetting("revanced_music_hide_navigation_bar_labels", FALSE, true);
+
+    // Player
+    public static final BooleanSetting PERMANENT_REPEAT = new BooleanSetting("revanced_music_play_permanent_repeat", FALSE, true);
+
+    // Miscellaneous
+    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type",
+            ClientType.ANDROID_VR_1_43_32, true, parent(SPOOF_VIDEO_STREAMS));
+
+    public static final BooleanSetting FORCE_ORIGINAL_AUDIO = new BooleanSetting("revanced_force_original_audio", TRUE, true);
+}

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

@@ -0,0 +1,93 @@
+package app.revanced.extension.music.settings.preference;
+
+import android.app.Dialog;
+import android.preference.PreferenceScreen;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.MusicActivityHook;
+import app.revanced.extension.shared.GmsCoreSupport;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+
+/**
+ * Preference fragment for ReVanced settings.
+ */
+@SuppressWarnings("deprecation")
+public class MusicPreferenceFragment extends ToolbarPreferenceFragment {
+    /**
+     * The main PreferenceScreen used to display the current set of preferences.
+     */
+    private PreferenceScreen preferenceScreen;
+
+    /**
+     * Initializes the preference fragment.
+     */
+    @Override
+    protected void initialize() {
+        super.initialize();
+
+        try {
+            preferenceScreen = getPreferenceScreen();
+            Utils.sortPreferenceGroups(preferenceScreen);
+            setPreferenceScreenToolbar(preferenceScreen);
+
+            // Clunky work around until preferences are custom classes that manage themselves.
+            // Custom branding only works with non-root install. But the preferences must be
+            // added during patched because of difficulties detecting during patching if it's
+            // a root install. So instead the non-functional preferences are removed during
+            // runtime if the app is mount (root) installation.
+            if (GmsCoreSupport.isPackageNameOriginal()) {
+                removePreferences(
+                        BaseSettings.CUSTOM_BRANDING_ICON.key,
+                        BaseSettings.CUSTOM_BRANDING_NAME.key);
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "initialize failure", ex);
+        }
+    }
+
+    /**
+     * Called when the fragment starts.
+     */
+    @Override
+    public void onStart() {
+        super.onStart();
+        try {
+            // Initialize search controller if needed
+            if (MusicActivityHook.searchViewController != null) {
+                // Trigger search data collection after fragment is ready.
+                MusicActivityHook.searchViewController.initializeSearchData();
+            }
+        } catch (Exception ex) {
+            Logger.printException(() -> "onStart failure", ex);
+        }
+    }
+
+    /**
+     * Sets toolbar for all nested preference screens.
+     */
+    @Override
+    protected void customizeToolbar(Toolbar toolbar) {
+        MusicActivityHook.setToolbarLayoutParams(toolbar);
+    }
+
+    /**
+     * Perform actions after toolbar setup.
+     */
+    @Override
+    protected void onPostToolbarSetup(Toolbar toolbar, Dialog preferenceScreenDialog) {
+        if (MusicActivityHook.searchViewController != null
+                && MusicActivityHook.searchViewController.isSearchActive()) {
+            toolbar.post(() -> MusicActivityHook.searchViewController.closeSearch());
+        }
+    }
+
+    /**
+     * Returns the preference screen for external access by SearchViewController.
+     */
+    public PreferenceScreen getPreferenceScreenForSearch() {
+        return preferenceScreen;
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchResultsAdapter.java

@@ -0,0 +1,28 @@
+package app.revanced.extension.music.settings.search;
+
+import android.content.Context;
+import android.preference.PreferenceScreen;
+
+import app.revanced.extension.shared.settings.search.BaseSearchResultsAdapter;
+import app.revanced.extension.shared.settings.search.BaseSearchViewController;
+import app.revanced.extension.shared.settings.search.BaseSearchResultItem;
+
+import java.util.List;
+
+/**
+ * Music-specific search results adapter.
+ */
+@SuppressWarnings("deprecation")
+public class MusicSearchResultsAdapter extends BaseSearchResultsAdapter {
+
+    public MusicSearchResultsAdapter(Context context, List<BaseSearchResultItem> items,
+                                     BaseSearchViewController.BasePreferenceFragment fragment,
+                                     BaseSearchViewController searchViewController) {
+        super(context, items, fragment, searchViewController);
+    }
+
+    @Override
+    protected PreferenceScreen getMainPreferenceScreen() {
+        return fragment.getPreferenceScreenForSearch();
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/settings/search/MusicSearchViewController.java

@@ -0,0 +1,71 @@
+package app.revanced.extension.music.settings.search;
+
+import android.app.Activity;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.view.View;
+import android.widget.Toolbar;
+
+import app.revanced.extension.music.settings.preference.MusicPreferenceFragment;
+import app.revanced.extension.shared.settings.search.*;
+
+/**
+ * Music-specific search view controller implementation.
+ */
+@SuppressWarnings("deprecation")
+public class MusicSearchViewController extends BaseSearchViewController {
+
+    public static MusicSearchViewController addSearchViewComponents(Activity activity, Toolbar toolbar,
+                                                                    MusicPreferenceFragment fragment) {
+        return new MusicSearchViewController(activity, toolbar, fragment);
+    }
+
+    private MusicSearchViewController(Activity activity, Toolbar toolbar, MusicPreferenceFragment fragment) {
+        super(activity, toolbar, new PreferenceFragmentAdapter(fragment));
+    }
+
+    @Override
+    protected BaseSearchResultsAdapter createSearchResultsAdapter() {
+        return new MusicSearchResultsAdapter(activity, filteredSearchItems, fragment, this);
+    }
+
+    @Override
+    protected boolean isSpecialPreferenceGroup(Preference preference) {
+        // Music doesn't have SponsorBlock, so no special groups.
+        return false;
+    }
+
+    @Override
+    protected void setupSpecialPreferenceListeners(BaseSearchResultItem item) {
+        // Music doesn't have special preferences.
+        // This method can be empty or handle music-specific preferences if any.
+    }
+
+    // Static method for handling Activity finish
+    public static boolean handleFinish(MusicSearchViewController searchViewController) {
+        if (searchViewController != null && searchViewController.isSearchActive()) {
+            searchViewController.closeSearch();
+            return true;
+        }
+        return false;
+    }
+
+    // Adapter to wrap MusicPreferenceFragment to BasePreferenceFragment interface.
+    private record PreferenceFragmentAdapter(MusicPreferenceFragment fragment) implements BasePreferenceFragment {
+
+        @Override
+        public PreferenceScreen getPreferenceScreenForSearch() {
+            return fragment.getPreferenceScreenForSearch();
+        }
+
+        @Override
+        public View getView() {
+            return fragment.getView();
+        }
+
+        @Override
+        public Activity getActivity() {
+            return fragment.getActivity();
+        }
+    }
+}

extensions/music/src/main/java/app/revanced/extension/music/spoof/SpoofClientPatch.java

@@ -1,27 +0,0 @@
-package app.revanced.extension.music.spoof;
-
-/**
- * @noinspection unused
- */
-public class SpoofClientPatch {
-    private static final int CLIENT_TYPE_ID = 26;
-    private static final String CLIENT_VERSION = "6.21";
-    private static final String DEVICE_MODEL = "iPhone16,2";
-    private static final String OS_VERSION = "17.7.2.21H221";
-
-    public static int getClientId() {
-        return CLIENT_TYPE_ID;
-    }
-
-    public static String getClientVersion() {
-        return CLIENT_VERSION;
-    }
-
-    public static String getClientModel() {
-        return DEVICE_MODEL;
-    }
-
-    public static String getOsVersion() {
-        return OS_VERSION;
-    }
-}

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/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/build.gradle.kts

@@ -1,3 +1,4 @@
 dependencies {
     implementation(project(":extensions:shared:library"))
+    compileOnly(libs.okhttp)
 }

extensions/shared/library/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.android.library) 
 }
 
 android {
@@ -18,4 +18,5 @@ android {
 
 dependencies {
     compileOnly(libs.annotation)
+    compileOnly(libs.okhttp)
 }

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

@@ -1,6 +1,4 @@
-package app.revanced.extension.youtube;
-
-import androidx.annotation.NonNull;
+package app.revanced.extension.shared;
 
 import java.nio.charset.StandardCharsets;
 
@@ -39,7 +37,7 @@ public final class ByteTrieSearch extends TrieSearch<byte[]> {
         return replacement;
     }
 
-    public ByteTrieSearch(@NonNull byte[]... patterns) {
+    public ByteTrieSearch(byte[]... patterns) {
         super(new ByteTrieNode(), patterns);
     }
 }

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

@@ -19,7 +19,6 @@ import android.util.Pair;
 import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -28,13 +27,10 @@ import java.util.Locale;
 
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
-import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings("unused")
 public class GmsCoreSupport {
-    private static final String PACKAGE_NAME_YOUTUBE = "com.google.android.youtube";
-    private static final String PACKAGE_NAME_YOUTUBE_MUSIC = "com.google.android.apps.youtube.music";
-
     private static final String GMS_CORE_PACKAGE_NAME
             = getGmsCoreVendorGroupId() + ".android.gms";
     private static final Uri GMS_CORE_PROVIDER
@@ -54,6 +50,20 @@ public class GmsCoreSupport {
     @Nullable
     private static volatile Boolean DONT_KILL_MY_APP_MANUFACTURER_SUPPORTED;
 
+    private static String getOriginalPackageName() {
+       return null; // Modified during patching.
+    }
+
+    /**
+     * @return If the current package name is the same as the original unpatched app.
+     *         If `GmsCore support` was not included during patching, this returns true;
+     */
+    public static boolean isPackageNameOriginal() {
+        String originalPackageName = getOriginalPackageName();
+        return originalPackageName == null
+                || originalPackageName.equals(Utils.getContext().getPackageName());
+    }
+
     private static void open(String queryOrLink) {
         Logger.printInfo(() -> "Opening link: " + queryOrLink);
 
@@ -82,17 +92,17 @@ public class GmsCoreSupport {
         // 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(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     context,
                     str("gms_core_dialog_title"), // Title.
-                    str(dialogMessageRef),        // Message.
-                    null,                         // No EditText.
-                    str(positiveButtonTextRef),   // OK button text.
+                    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.
+                    null, // No Cancel button action.
+                    null, // No Neutral button text.
+                    null, // No Neutral button action.
+                    true // Dismiss dialog when onNeutralClick.
             );
 
             Dialog dialog = dialogPair.first;
@@ -109,17 +119,15 @@ 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.
             // GmsCore Support changes the package name, but with a mounted installation
             // all manifest changes are ignored and the original package name is used.
-            String packageName = context.getPackageName();
-            if (packageName.equals(PACKAGE_NAME_YOUTUBE) || packageName.equals(PACKAGE_NAME_YOUTUBE_MUSIC)) {
+            if (isPackageNameOriginal()) {
                 Logger.printInfo(() -> "App is mounted with root, but GmsCore patch was included");
-                // Cannot use localize text here, since the app will load
-                // resources from the unpatched app and all patch strings are missing.
+                // Cannot use localize text here, since the app will load resources
+                // from the unpatched app and all patch strings are missing.
                 Utils.showToastLong("The 'GmsCore support' patch breaks mount installations");
 
                 // Do not exit. If the app exits before launch completes (and without
@@ -157,7 +165,9 @@ 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();
@@ -167,6 +177,8 @@ public class GmsCoreSupport {
                             "gms_core_dialog_open_website_text",
                             (dialog, id) -> openDontKillMyApp());
                 }
+            } finally {
+                if (client != null) client.close();
             }
         } catch (Exception ex) {
             Logger.printException(() -> "checkGmsCore failure", ex);
@@ -226,6 +238,11 @@ public class GmsCoreSupport {
      * @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);
     }
@@ -243,8 +260,7 @@ public class GmsCoreSupport {
         };
     }
 
-    // Modified by a patch. Do not touch.
     private static String getGmsCoreVendorGroupId() {
-        return "app.revanced";
+        return "app.revanced"; // Modified during patching.
     }
 }

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

@@ -1,6 +1,4 @@
-package app.revanced.extension.youtube;
-
-import androidx.annotation.NonNull;
+package app.revanced.extension.shared;
 
 /**
  * Text pattern searching using a prefix tree (trie).
@@ -28,7 +26,7 @@ public final class StringTrieSearch extends TrieSearch<String> {
         }
     }
 
-    public StringTrieSearch(@NonNull String... patterns) {
+    public StringTrieSearch(String... patterns) {
         super(new StringTrieNode(), patterns);
     }
 }

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

@@ -1,6 +1,5 @@
-package app.revanced.extension.youtube;
+package app.revanced.extension.shared;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
@@ -57,11 +56,13 @@ public abstract class TrieSearch<T> {
             if (searchTextLength - searchTextIndex < patternLength - patternStartIndex) {
                 return false; // Remaining search text is shorter than the remaining leaf pattern and they cannot match.
             }
+
             for (int i = searchTextIndex, j = patternStartIndex; j < patternLength; i++, j++) {
                 if (enclosingNode.getCharValue(searchText, i) != enclosingNode.getCharValue(pattern, j)) {
                     return false;
                 }
             }
+
             return callback == null || callback.patternMatched(searchText,
                     searchTextIndex - patternStartIndex, patternLength, callbackParameter);
         }
@@ -136,7 +137,7 @@ public abstract class TrieSearch<T> {
          * @param patternLength Length of the pattern.
          * @param callback      Callback, where a value of NULL indicates to always accept a pattern match.
          */
-        private void addPattern(@NonNull T pattern, int patternIndex, int patternLength,
+        private void addPattern(T pattern, int patternIndex, int patternLength,
                                 @Nullable TriePatternMatchedCallback<T> callback) {
             if (patternIndex == patternLength) { // Reached the end of the pattern.
                 if (endOfPatternCallback == null) {
@@ -145,6 +146,7 @@ public abstract class TrieSearch<T> {
                 endOfPatternCallback.add(callback);
                 return;
             }
+
             if (leaf != null) {
                 // Reached end of the graph and a leaf exist.
                 // Recursively call back into this method and push the existing leaf down 1 level.
@@ -159,6 +161,7 @@ public abstract class TrieSearch<T> {
                 leaf = new TrieCompressedPath<>(pattern, patternIndex, patternLength, callback);
                 return;
             }
+
             final char character = getCharValue(pattern, patternIndex);
             final int arrayIndex = hashIndexForTableSize(children.length, character);
             TrieNode<T> child = children[arrayIndex];
@@ -183,6 +186,7 @@ public abstract class TrieSearch<T> {
                 //noinspection unchecked
                 TrieNode<T>[] replacement = new TrieNode[replacementArraySize];
                 addNodeToArray(replacement, child);
+
                 boolean collision = false;
                 for (TrieNode<T> existingChild : children) {
                     if (existingChild != null) {
@@ -195,6 +199,7 @@ public abstract class TrieSearch<T> {
                 if (collision) {
                     continue;
                 }
+
                 children = replacement;
                 return;
             }
@@ -234,6 +239,7 @@ public abstract class TrieSearch<T> {
                 if (leaf != null && leaf.matches(startNode, searchText, searchTextEndIndex, searchTextIndex, callbackParameter)) {
                     return true; // Leaf exists and it matched the search text.
                 }
+
                 List<TriePatternMatchedCallback<T>> endOfPatternCallback = node.endOfPatternCallback;
                 if (endOfPatternCallback != null) {
                     final int matchStartIndex = searchTextIndex - currentMatchLength;
@@ -246,6 +252,7 @@ public abstract class TrieSearch<T> {
                         }
                     }
                 }
+
                 TrieNode<T>[] children = node.children;
                 if (children == null) {
                     return false; // Reached a graph end point and there's no further patterns to search.
@@ -278,9 +285,11 @@ public abstract class TrieSearch<T> {
             if (leaf != null) {
                 numberOfPointers += 4; // Number of fields in leaf node.
             }
+
             if (endOfPatternCallback != null) {
                 numberOfPointers += endOfPatternCallback.size();
             }
+
             if (children != null) {
                 numberOfPointers += children.length;
                 for (TrieNode<T> child : children) {
@@ -308,13 +317,13 @@ public abstract class TrieSearch<T> {
     private final List<T> patterns = new ArrayList<>();
 
     @SafeVarargs
-    TrieSearch(@NonNull TrieNode<T> root, @NonNull T... patterns) {
+    TrieSearch(TrieNode<T> root, T... patterns) {
         this.root = Objects.requireNonNull(root);
         addPatterns(patterns);
     }
 
     @SafeVarargs
-    public final void addPatterns(@NonNull T... patterns) {
+    public final void addPatterns(T... patterns) {
         for (T pattern : patterns) {
             addPattern(pattern);
         }
@@ -325,7 +334,7 @@ public abstract class TrieSearch<T> {
      *
      * @param pattern Pattern to add. Calling this with a zero length pattern does nothing.
      */
-    public void addPattern(@NonNull T pattern) {
+    public void addPattern(T pattern) {
         addPattern(pattern, root.getTextLength(pattern), null);
     }
 
@@ -333,31 +342,31 @@ public abstract class TrieSearch<T> {
      * @param pattern  Pattern to add. Calling this with a zero length pattern does nothing.
      * @param callback Callback to determine if searching should halt when a match is found.
      */
-    public void addPattern(@NonNull T pattern, @NonNull TriePatternMatchedCallback<T> callback) {
+    public void addPattern(T pattern, TriePatternMatchedCallback<T> callback) {
         addPattern(pattern, root.getTextLength(pattern), Objects.requireNonNull(callback));
     }
 
-    void addPattern(@NonNull T pattern, int patternLength, @Nullable TriePatternMatchedCallback<T> callback) {
+    void addPattern(T pattern, int patternLength, @Nullable TriePatternMatchedCallback<T> callback) {
         if (patternLength == 0) return; // Nothing to match
 
         patterns.add(pattern);
         root.addPattern(pattern, 0, patternLength, callback);
     }
 
-    public final boolean matches(@NonNull T textToSearch) {
+    public final boolean matches(T textToSearch) {
         return matches(textToSearch, 0);
     }
 
-    public boolean matches(@NonNull T textToSearch, @NonNull Object callbackParameter) {
+    public boolean matches(T textToSearch, Object callbackParameter) {
         return matches(textToSearch, 0, root.getTextLength(textToSearch),
                 Objects.requireNonNull(callbackParameter));
     }
 
-    public boolean matches(@NonNull T textToSearch, int startIndex) {
+    public boolean matches(T textToSearch, int startIndex) {
         return matches(textToSearch, startIndex, root.getTextLength(textToSearch));
     }
 
-    public final boolean matches(@NonNull T textToSearch, int startIndex, int endIndex) {
+    public final boolean matches(T textToSearch, int startIndex, int endIndex) {
         return matches(textToSearch, startIndex, endIndex, null);
     }
 
@@ -370,11 +379,11 @@ public abstract class TrieSearch<T> {
      * @param callbackParameter Optional parameter passed to the callbacks.
      * @return If any pattern matched, and it's callback halted searching.
      */
-    public boolean matches(@NonNull T textToSearch, int startIndex, int endIndex, @Nullable Object callbackParameter) {
+    public boolean matches(T textToSearch, int startIndex, int endIndex, @Nullable Object callbackParameter) {
         return matches(textToSearch, root.getTextLength(textToSearch), startIndex, endIndex, callbackParameter);
     }
 
-    private boolean matches(@NonNull T textToSearch, int textToSearchLength, int startIndex, int endIndex,
+    private boolean matches(T textToSearch, int textToSearchLength, int startIndex, int endIndex,
                             @Nullable Object callbackParameter) {
         if (endIndex > textToSearchLength) {
             throw new IllegalArgumentException("endIndex: " + endIndex

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

@@ -4,6 +4,8 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -12,10 +14,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RoundRectShape;
 import android.net.ConnectivityManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -23,9 +23,6 @@ import android.os.Looper;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
 import android.util.DisplayMetrics;
 import android.util.Pair;
 import android.util.TypedValue;
@@ -37,13 +34,9 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
@@ -69,6 +62,7 @@ import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.preference.ReVancedAboutPreference;
 
+@SuppressWarnings("NewApi")
 public class Utils {
 
     @SuppressLint("StaticFieldLeak")
@@ -116,7 +110,7 @@ public class Utils {
     }
 
     /**
-     * @return The version name of the app, such as 19.11.43
+     * @return The version name of the app, such as 20.13.41
      */
     public static String getAppVersionName() {
         if (versionName == null) {
@@ -278,37 +272,63 @@ public class Utils {
      * @return zero, if the resource is not found.
      */
     @SuppressLint("DiscouragedApi")
-    public static int getResourceIdentifier(Context context, String resourceIdentifierName, String type) {
+    public static int getResourceIdentifier(Context context, String resourceIdentifierName, @Nullable String type) {
         return context.getResources().getIdentifier(resourceIdentifierName, type, context.getPackageName());
     }
 
+    public static int getResourceIdentifierOrThrow(Context context, String resourceIdentifierName, @Nullable String type) {
+        final int resourceId = getResourceIdentifier(context, resourceIdentifierName, type);
+        if (resourceId == 0) {
+            throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
+                    + " type: " + type);
+        }
+        return resourceId;
+    }
+
     /**
      * @return zero, if the resource is not found.
+     * @see #getResourceIdentifierOrThrow(String, String)
      */
-    public static int getResourceIdentifier(String resourceIdentifierName, String type) {
+    public static int getResourceIdentifier(String resourceIdentifierName, @Nullable String type) {
         return getResourceIdentifier(getContext(), resourceIdentifierName, type);
     }
 
+    /**
+     * @return The resource identifier, or throws an exception if not found.
+     */
+    public static int getResourceIdentifierOrThrow(String resourceIdentifierName, @Nullable String type) {
+        final int resourceId = getResourceIdentifier(getContext(), resourceIdentifierName, type);
+        if (resourceId == 0) {
+            throw new Resources.NotFoundException("No resource id exists with name: " + resourceIdentifierName
+                    + " type: " + type);
+        }
+        return resourceId;
+    }
+
     public static int getResourceInteger(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getInteger(getResourceIdentifier(resourceIdentifierName, "integer"));
+        return getContext().getResources().getInteger(getResourceIdentifierOrThrow(resourceIdentifierName, "integer"));
     }
 
     public static Animation getResourceAnimation(String resourceIdentifierName) throws Resources.NotFoundException {
-        return AnimationUtils.loadAnimation(getContext(), getResourceIdentifier(resourceIdentifierName, "anim"));
+        return AnimationUtils.loadAnimation(getContext(), getResourceIdentifierOrThrow(resourceIdentifierName, "anim"));
     }
 
     @ColorInt
     public static int getResourceColor(String resourceIdentifierName) throws Resources.NotFoundException {
         //noinspection deprecation
-        return getContext().getResources().getColor(getResourceIdentifier(resourceIdentifierName, "color"));
+        return getContext().getResources().getColor(getResourceIdentifierOrThrow(resourceIdentifierName, "color"));
     }
 
     public static int getResourceDimensionPixelSize(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getDimensionPixelSize(getResourceIdentifier(resourceIdentifierName, "dimen"));
+        return getContext().getResources().getDimensionPixelSize(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
     }
 
     public static float getResourceDimension(String resourceIdentifierName) throws Resources.NotFoundException {
-        return getContext().getResources().getDimension(getResourceIdentifier(resourceIdentifierName, "dimen"));
+        return getContext().getResources().getDimension(getResourceIdentifierOrThrow(resourceIdentifierName, "dimen"));
+    }
+
+    public static String[] getResourceStringArray(String resourceIdentifierName) throws Resources.NotFoundException {
+        return getContext().getResources().getStringArray(getResourceIdentifierOrThrow(resourceIdentifierName, "array"));
     }
 
     public interface MatchFilter<T> {
@@ -319,13 +339,9 @@ public class Utils {
      * Includes sub children.
      */
     public static <R extends View> R getChildViewByResourceName(View view, String str) {
-        var child = view.findViewById(Utils.getResourceIdentifier(str, "id"));
-        if (child != null) {
-            //noinspection unchecked
-            return (R) child;
-        }
-
-        throw new IllegalArgumentException("View with resource name '" + str + "' not found");
+        var child = view.findViewById(Utils.getResourceIdentifierOrThrow(str, "id"));
+        //noinspection unchecked
+        return (R) child;
     }
 
     /**
@@ -411,9 +427,9 @@ public class Utils {
     }
 
     public static void setClipboard(CharSequence text) {
-        android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context
+        ClipboardManager clipboard = (ClipboardManager) context
                 .getSystemService(Context.CLIPBOARD_SERVICE);
-        android.content.ClipData clip = android.content.ClipData.newPlainText("ReVanced", text);
+        ClipData clip = ClipData.newPlainText("ReVanced", text);
         clipboard.setPrimaryClip(clip);
     }
 
@@ -573,13 +589,19 @@ public class Utils {
         showToast(messageToToast, Toast.LENGTH_LONG);
     }
 
-    private static void showToast(String messageToToast, int toastDuration) {
+    /**
+     * Safe to call from any thread.
+     *
+     * @param messageToToast Message to show.
+     * @param toastDuration Either {@link Toast#LENGTH_SHORT} or {@link Toast#LENGTH_LONG}.
+     */
+    public static void showToast(String messageToToast, int toastDuration) {
         Objects.requireNonNull(messageToToast);
         runOnMainThreadNowOrLater(() -> {
             Context currentContext = context;
 
             if (currentContext == null) {
-                Logger.printException(() -> "Cannot show toast (context is null): " + messageToToast, null);
+                Logger.printException(() -> "Cannot show toast (context is null): " + messageToToast);
             } else {
                 Logger.printDebug(() -> "Showing toast: " + messageToToast);
                 Toast.makeText(currentContext, messageToToast, toastDuration).show();
@@ -675,6 +697,18 @@ public class Utils {
         }
     }
 
+    public static void openLink(String url) {
+        try {
+            Intent intent = new Intent("android.intent.action.VIEW", Uri.parse(url));
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            Logger.printInfo(() -> "Opening link with external browser: " + intent);
+            getContext().startActivity(intent);
+        } catch (Exception ex) {
+            Logger.printException(() -> "openLink failure", ex);
+        }
+    }
+
     public enum NetworkType {
         NONE,
         MOBILE,
@@ -743,396 +777,32 @@ public class Utils {
     }
 
     /**
-     * Creates a custom dialog with a styled layout, including a title, message, buttons, and an
-     * optional EditText. The dialog's appearance adapts to the app's dark mode setting, with
-     * rounded corners and customizable button actions. Buttons adjust dynamically to their text
-     * content and are arranged in a single row if they fit within 80% of the screen width,
-     * with the Neutral button aligned to the left and OK/Cancel buttons centered on the right.
-     * If buttons do not fit, each is placed on a separate row, all aligned to the right.
+     * Configures the parameters of a dialog window, including its width, gravity, vertical offset and background dimming.
+     * The width is calculated as a percentage of the screen's portrait width and the vertical offset is specified in DIP.
+     * The default dialog background is removed to allow for custom styling.
      *
-     * @param context           Context used to create the dialog.
-     * @param title             Title text of the dialog.
-     * @param message           Message text of the dialog (supports Spanned for HTML), or null if replaced by EditText.
-     * @param editText          EditText to include in the dialog, or null if no EditText is needed.
-     * @param okButtonText      OK button text, or null to use the default "OK" string.
-     * @param onOkClick         Action to perform when the OK button is clicked.
-     * @param onCancelClick     Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
-     * @param neutralButtonText Neutral button text, or null if no Neutral button is needed.
-     * @param onNeutralClick    Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
-     * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
-     * @return The Dialog and its main LinearLayout container.
+     * @param window The {@link Window} object to configure.
+     * @param gravity The gravity for positioning the dialog (e.g., {@link Gravity#BOTTOM}).
+     * @param yOffsetDip The vertical offset from the gravity position in DIP.
+     * @param widthPercentage The width of the dialog as a percentage of the screen's portrait width (0-100).
+     * @param dimAmount If true, sets the background dim amount to 0 (no dimming); if false, leaves the default dim amount.
      */
-    @SuppressWarnings("ExtractMethodRecommender")
-    public static Pair<Dialog, LinearLayout> createCustomDialog(
-            Context context, String title, CharSequence message, @Nullable EditText editText,
-            String okButtonText, Runnable onOkClick, Runnable onCancelClick,
-            @Nullable String neutralButtonText, @Nullable Runnable onNeutralClick,
-            boolean dismissDialogOnNeutralClick
-    ) {
-        Logger.printDebug(() -> "Creating custom dialog with title: " + title);
-
-        Dialog dialog = new Dialog(context);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
-
-        // Preset size constants.
-        final int dip4 = dipToPixels(4);
-        final int dip8 = dipToPixels(8);
-        final int dip16 = dipToPixels(16);
-        final int dip24 = dipToPixels(24);
-
-        // Create main layout.
-        LinearLayout mainLayout = new LinearLayout(context);
-        mainLayout.setOrientation(LinearLayout.VERTICAL);
-        mainLayout.setPadding(dip24, dip16, dip24, dip24);
-        // Set rounded rectangle background.
-        ShapeDrawable mainBackground = new ShapeDrawable(new RoundRectShape(
-                createCornerRadii(28), null, null));
-        mainBackground.getPaint().setColor(getDialogBackgroundColor()); // Dialog background.
-        mainLayout.setBackground(mainBackground);
-
-        // Title.
-        if (!TextUtils.isEmpty(title)) {
-            TextView titleView = new TextView(context);
-            titleView.setText(title);
-            titleView.setTypeface(Typeface.DEFAULT_BOLD);
-            titleView.setTextSize(18);
-            titleView.setTextColor(getAppForegroundColor());
-            titleView.setGravity(Gravity.CENTER);
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            );
-            layoutParams.setMargins(0, 0, 0, dip16);
-            titleView.setLayoutParams(layoutParams);
-            mainLayout.addView(titleView);
-        }
-
-        // Create content container (message/EditText) inside a ScrollView only if message or editText is provided.
-        ScrollView contentScrollView = null;
-        LinearLayout contentContainer = null;
-        if (message != null || editText != null) {
-            contentScrollView = new ScrollView(context);
-            contentScrollView.setVerticalScrollBarEnabled(false); // Disable the vertical scrollbar.
-            contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
-            if (editText != null) {
-                ShapeDrawable scrollViewBackground = new ShapeDrawable(new RoundRectShape(
-                        createCornerRadii(10), null, null));
-                scrollViewBackground.getPaint().setColor(getEditTextBackground());
-                contentScrollView.setPadding(dip8, dip8, dip8, dip8);
-                contentScrollView.setBackground(scrollViewBackground);
-                contentScrollView.setClipToOutline(true);
-            }
-            LinearLayout.LayoutParams contentParams = new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    0,
-                    1.0f // Weight to take available space.
-            );
-            contentScrollView.setLayoutParams(contentParams);
-            contentContainer = new LinearLayout(context);
-            contentContainer.setOrientation(LinearLayout.VERTICAL);
-            contentScrollView.addView(contentContainer);
-
-            // Message (if not replaced by EditText).
-            if (editText == null && message != null) {
-                TextView messageView = new TextView(context);
-                messageView.setText(message); // Supports Spanned (HTML).
-                messageView.setTextSize(16);
-                messageView.setTextColor(getAppForegroundColor());
-                // Enable HTML link clicking if the message contains links.
-                if (message instanceof Spanned) {
-                    messageView.setMovementMethod(LinkMovementMethod.getInstance());
-                }
-                LinearLayout.LayoutParams messageParams = new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                );
-                messageView.setLayoutParams(messageParams);
-                contentContainer.addView(messageView);
-            }
-
-            // EditText (if provided).
-            if (editText != null) {
-                // Remove EditText from its current parent, if any.
-                ViewGroup parent = (ViewGroup) editText.getParent();
-                if (parent != null) {
-                    parent.removeView(editText);
-                }
-                // Style the EditText to match the dialog theme.
-                editText.setTextColor(getAppForegroundColor());
-                editText.setBackgroundColor(Color.TRANSPARENT);
-                editText.setPadding(0, 0, 0, 0);
-                LinearLayout.LayoutParams editTextParams = new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.WRAP_CONTENT
-                );
-                contentContainer.addView(editText, editTextParams);
-            }
-        }
-
-        // Button container.
-        LinearLayout buttonContainer = new LinearLayout(context);
-        buttonContainer.setOrientation(LinearLayout.VERTICAL);
-        buttonContainer.removeAllViews();
-        LinearLayout.LayoutParams buttonContainerParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
-        buttonContainerParams.setMargins(0, dip16, 0, 0);
-        buttonContainer.setLayoutParams(buttonContainerParams);
-
-        // Lists to track buttons.
-        List<Button> buttons = new ArrayList<>();
-        List<Integer> buttonWidths = new ArrayList<>();
-
-        // Create buttons in order: Neutral, Cancel, OK.
-        if (neutralButtonText != null && onNeutralClick != null) {
-            Button neutralButton = addButton(
-                    context,
-                    neutralButtonText,
-                    onNeutralClick,
-                    false,
-                    dismissDialogOnNeutralClick,
-                    dialog
-            );
-            buttons.add(neutralButton);
-            neutralButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            buttonWidths.add(neutralButton.getMeasuredWidth());
-        }
-
-        if (onCancelClick != null) {
-            Button cancelButton = addButton(
-                    context,
-                    context.getString(android.R.string.cancel),
-                    onCancelClick,
-                    false,
-                    true,
-                    dialog
-            );
-            buttons.add(cancelButton);
-            cancelButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            buttonWidths.add(cancelButton.getMeasuredWidth());
-        }
-
-        if (onOkClick != null) {
-            Button okButton = addButton(
-                    context,
-                    okButtonText != null ? okButtonText : context.getString(android.R.string.ok),
-                    onOkClick,
-                    true,
-                    true,
-                    dialog
-            );
-            buttons.add(okButton);
-            okButton.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-            buttonWidths.add(okButton.getMeasuredWidth());
-        }
-
-        // Handle button layout.
-        int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
-        int totalWidth = 0;
-        for (Integer width : buttonWidths) {
-            totalWidth += width;
-        }
-        if (buttonWidths.size() > 1) {
-            totalWidth += (buttonWidths.size() - 1) * dip8; // Add margins for gaps.
-        }
-
-        if (buttons.size() == 1) {
-            // Single button: stretch to full width.
-            Button singleButton = buttons.get(0);
-            LinearLayout singleContainer = new LinearLayout(context);
-            singleContainer.setOrientation(LinearLayout.HORIZONTAL);
-            singleContainer.setGravity(Gravity.CENTER);
-            ViewGroup parent = (ViewGroup) singleButton.getParent();
-            if (parent != null) {
-                parent.removeView(singleButton);
-            }
-            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    dipToPixels(36)
-            );
-            params.setMargins(0, 0, 0, 0);
-            singleButton.setLayoutParams(params);
-            singleContainer.addView(singleButton);
-            buttonContainer.addView(singleContainer);
-        } else if (buttons.size() > 1) {
-            // Check if buttons fit in one row.
-            if (totalWidth <= screenWidth * 0.8) {
-                // Single row: Neutral, Cancel, OK.
-                LinearLayout rowContainer = new LinearLayout(context);
-                rowContainer.setOrientation(LinearLayout.HORIZONTAL);
-                rowContainer.setGravity(Gravity.CENTER);
-                rowContainer.setLayoutParams(new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.WRAP_CONTENT
-                ));
-
-                // Add all buttons with proportional weights and specific margins.
-                for (int i = 0; i < buttons.size(); i++) {
-                    Button button = buttons.get(i);
-                    ViewGroup parent = (ViewGroup) button.getParent();
-                    if (parent != null) {
-                        parent.removeView(button);
-                    }
-                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                            0,
-                            dipToPixels(36),
-                            buttonWidths.get(i) // Use measured width as weight.
-                    );
-                    // Set margins based on button type and combination.
-                    if (buttons.size() == 2) {
-                        // Neutral + OK or Cancel + OK.
-                        if (i == 0) { // Neutral or Cancel.
-                            params.setMargins(0, 0, dip4, 0);
-                        } else { // OK
-                            params.setMargins(dip4, 0, 0, 0);
-                        }
-                    } else if (buttons.size() == 3) {
-                        if (i == 0) { // Neutral.
-                            params.setMargins(0, 0, dip4, 0);
-                        } else if (i == 1) { // Cancel
-                            params.setMargins(dip4, 0, dip4, 0);
-                        } else { // OK
-                            params.setMargins(dip4, 0, 0, 0);
-                        }
-                    }
-                    button.setLayoutParams(params);
-                    rowContainer.addView(button);
-                }
-                buttonContainer.addView(rowContainer);
-            } else {
-                // Multiple rows: OK, Cancel, Neutral.
-                List<Button> reorderedButtons = new ArrayList<>();
-                // Reorder: OK, Cancel, Neutral.
-                if (onOkClick != null) {
-                    reorderedButtons.add(buttons.get(buttons.size() - 1));
-                }
-                if (onCancelClick != null) {
-                    reorderedButtons.add(buttons.get((neutralButtonText != null && onNeutralClick != null) ? 1 : 0));
-                }
-                if (neutralButtonText != null && onNeutralClick != null) {
-                    reorderedButtons.add(buttons.get(0));
-                }
-
-                // Add each button in its own row with spacers.
-                for (int i = 0; i < reorderedButtons.size(); i++) {
-                    Button button = reorderedButtons.get(i);
-                    LinearLayout singleContainer = new LinearLayout(context);
-                    singleContainer.setOrientation(LinearLayout.HORIZONTAL);
-                    singleContainer.setGravity(Gravity.CENTER);
-                    singleContainer.setLayoutParams(new LinearLayout.LayoutParams(
-                            LinearLayout.LayoutParams.MATCH_PARENT,
-                            dipToPixels(36)
-                    ));
-                    ViewGroup parent = (ViewGroup) button.getParent();
-                    if (parent != null) {
-                        parent.removeView(button);
-                    }
-                    LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(
-                            LinearLayout.LayoutParams.MATCH_PARENT,
-                            dipToPixels(36)
-                    );
-                    buttonParams.setMargins(0, 0, 0, 0);
-                    button.setLayoutParams(buttonParams);
-                    singleContainer.addView(button);
-                    buttonContainer.addView(singleContainer);
-
-                    // Add a spacer between the buttons (except the last one).
-                    // Adding a margin between buttons is not suitable, as it conflicts with the single row layout.
-                    if (i < reorderedButtons.size() - 1) {
-                        View spacer = new View(context);
-                        LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
-                                LinearLayout.LayoutParams.MATCH_PARENT,
-                                dipToPixels(8)
-                        );
-                        spacer.setLayoutParams(spacerParams);
-                        buttonContainer.addView(spacer);
-                    }
-                }
-            }
-        }
-
-        // Add ScrollView to main layout only if content exist.
-        if (contentScrollView != null) {
-            mainLayout.addView(contentScrollView);
-        }
-        mainLayout.addView(buttonContainer);
-        dialog.setContentView(mainLayout);
-
-        // Set dialog window attributes.
-        Window window = dialog.getWindow();
-        if (window != null) {
-            setDialogWindowParameters(window);
-        }
-
-        return new Pair<>(dialog, mainLayout);
-    }
-
-    public static void setDialogWindowParameters(Window window) {
+    public static void setDialogWindowParameters(Window window, int gravity, int yOffsetDip, int widthPercentage, boolean dimAmount) {
         WindowManager.LayoutParams params = window.getAttributes();
 
         DisplayMetrics displayMetrics = Resources.getSystem().getDisplayMetrics();
-        int portraitWidth = (int) (displayMetrics.widthPixels * 0.9);
+        int portraitWidth = Math.min(displayMetrics.widthPixels, displayMetrics.heightPixels);
 
-        if (Resources.getSystem().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            portraitWidth = (int) Math.min(portraitWidth, displayMetrics.heightPixels * 0.9);
-        }
-        params.width = portraitWidth;
+        params.width = (int) (portraitWidth * (widthPercentage / 100.0f)); // Set width based on parameters.
         params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.CENTER;
-        window.setAttributes(params);
-        window.setBackgroundDrawable(null); // Remove default dialog background.
-    }
+        params.gravity = gravity;
+        params.y = yOffsetDip > 0 ? dipToPixels(yOffsetDip) : 0;
+        if (dimAmount) {
+            params.dimAmount = 0f;
+        }
 
-    /**
-     * Adds a styled button to a dialog's button container with customizable text, click behavior, and appearance.
-     * The button's background and text colors adapt to the app's dark mode setting. Buttons stretch to full width
-     * when on separate rows or proportionally based on content when in a single row (Neutral, Cancel, OK order).
-     * When wrapped to separate rows, buttons are ordered OK, Cancel, Neutral.
-     *
-     * @param context         Context to create the button and access resources.
-     * @param buttonText      Button text to display.
-     * @param onClick         Action to perform when the button is clicked, or null if no action is required.
-     * @param isOkButton      If this is the OK button, which uses distinct background and text colors.
-     * @param dismissDialog   If the dialog should be dismissed when the button is clicked.
-     * @param dialog          The Dialog to dismiss when the button is clicked.
-     * @return The created Button.
-     */
-    private static Button addButton(Context context, String buttonText, Runnable onClick,
-                                    boolean isOkButton, boolean dismissDialog, Dialog dialog) {
-        Button button = new Button(context, null, 0);
-        button.setText(buttonText);
-        button.setTextSize(14);
-        button.setAllCaps(false);
-        button.setSingleLine(true);
-        button.setEllipsize(android.text.TextUtils.TruncateAt.END);
-        button.setGravity(Gravity.CENTER);
-
-        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(createCornerRadii(20), null, null));
-        int backgroundColor = isOkButton
-                ? getOkButtonBackgroundColor() // Background color for OK button (inversion).
-                : getCancelOrNeutralButtonBackgroundColor(); // Background color for Cancel or Neutral buttons.
-        background.getPaint().setColor(backgroundColor);
-        button.setBackground(background);
-
-        button.setTextColor(isDarkModeEnabled()
-                ? (isOkButton ? Color.BLACK : Color.WHITE)
-                : (isOkButton ? Color.WHITE : Color.BLACK));
-
-        // Set internal padding.
-        final int dip16 = dipToPixels(16);
-        button.setPadding(dip16, 0, dip16, 0);
-
-        button.setOnClickListener(v -> {
-            if (onClick != null) {
-                onClick.run();
-            }
-            if (dismissDialog) {
-                dialog.dismiss();
-            }
-        });
-
-        return button;
+        window.setAttributes(params); // Apply window attributes.
+        window.setBackgroundDrawable(null); // Remove default dialog background
     }
 
     /**
@@ -1319,9 +989,9 @@ public class Utils {
 
     /**
      * Sort a PreferenceGroup and all it's sub groups by title or key.
-     *
+     * <p>
      * Sort order is determined by the preferences key {@link Sort} suffix.
-     *
+     * <p>
      * If a preference has no key or no {@link Sort} suffix,
      * then the preferences are left unsorted.
      */
@@ -1384,7 +1054,7 @@ public class Utils {
      * Set all preferences to multiline titles if the device is not using an English variant.
      * The English strings are heavily scrutinized and all titles fit on screen
      * except 2 or 3 preference strings and those do not affect readability.
-     *
+     * <p>
      * Allowing multiline for those 2 or 3 English preferences looks weird and out of place,
      * and visually it looks better to clip the text and keep all titles 1 line.
      */
@@ -1434,6 +1104,38 @@ public class Utils {
         );
     }
 
+    /**
+     * Converts a percentage of the screen height to actual device pixels.
+     *
+     * @param percentage The percentage of the screen height (e.g., 30 for 30%).
+     * @return The device pixel value corresponding to the percentage of screen height.
+     */
+    public static int percentageHeightToPixels(int percentage) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        return (int) (metrics.heightPixels * (percentage / 100.0f));
+    }
+
+    /**
+     * Converts a percentage of the screen width to actual device pixels.
+     *
+     * @param percentage The percentage of the screen width (e.g., 30 for 30%).
+     * @return The device pixel value corresponding to the percentage of screen width.
+     */
+    public static int percentageWidthToPixels(int percentage) {
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        return (int) (metrics.widthPixels * (percentage / 100.0f));
+    }
+
+    /**
+     * Uses {@link #adjustColorBrightness(int, float)} depending if light or dark mode is active.
+     */
+    @ColorInt
+    public static int adjustColorBrightness(@ColorInt int baseColor, float lightThemeFactor, float darkThemeFactor) {
+        return isDarkModeEnabled()
+                ? adjustColorBrightness(baseColor, darkThemeFactor)
+                : adjustColorBrightness(baseColor, lightThemeFactor);
+    }
+
     /**
      * Adjusts the brightness of a color by lightening or darkening it based on the given factor.
      * <p>
@@ -1461,9 +1163,9 @@ public class Utils {
             blue = Math.round(blue + (255 - blue) * t);
         } else {
             // Darken or no change: Scale toward black.
-            red *= factor;
-            green *= factor;
-            blue *= factor;
+            red = Math.round(red * factor);
+            green = Math.round(green * factor);
+            blue = Math.round(blue * factor);
         }
 
         // Ensure values are within [0, 255].

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

@@ -3,7 +3,6 @@ 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;
@@ -26,6 +25,7 @@ import java.util.Collection;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 abstract class Check {
     private static final int NUMBER_OF_TIMES_TO_IGNORE_WARNING_BEFORE_DISABLING = 2;
@@ -93,7 +93,7 @@ abstract class Check {
 
         Utils.runOnMainThreadDelayed(() -> {
             // Create the custom dialog.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     activity,
                     str("revanced_check_environment_failed_title"), // Title.
                     message, // Message.
@@ -127,7 +127,8 @@ abstract class Check {
 
             // Add icon to the dialog.
             ImageView iconView = new ImageView(activity);
-            iconView.setImageResource(Utils.getResourceIdentifier("revanced_ic_dialog_alert", "drawable"));
+            iconView.setImageResource(Utils.getResourceIdentifierOrThrow(
+                    "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(
@@ -158,8 +159,8 @@ abstract class Check {
                     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);
+                    if (buttonContainer.getChildCount() == 1
+                            && buttonContainer.getChildAt(0) instanceof LinearLayout rowContainer) {
                         // Neutral button is the first child (index 0).
                         ignoreButton = (Button) rowContainer.getChildAt(0);
                         // OK button is the last child.

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

@@ -0,0 +1,71 @@
+package app.revanced.extension.shared.fixes.redgifs;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+
+import app.revanced.extension.shared.Logger;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+
+public abstract class BaseFixRedgifsApiPatch implements Interceptor {
+    protected static BaseFixRedgifsApiPatch INSTANCE;
+    public abstract String getDefaultUserAgent();
+
+    @NonNull
+    @Override
+    public Response intercept(@NonNull Chain chain) throws IOException {
+        Request request = chain.request();
+        if (!request.url().host().equals("api.redgifs.com")) {
+            return chain.proceed(request);
+        }
+
+        String userAgent = getDefaultUserAgent();
+
+        if (request.header("Authorization") != null) {
+            Response response = chain.proceed(request.newBuilder().header("User-Agent", userAgent).build());
+            if (response.isSuccessful()) {
+                return response;
+            }
+            // It's possible that the user agent is being overwritten later down in the interceptor
+            // chain, so make sure we grab the new user agent from the request headers.
+            userAgent = response.request().header("User-Agent");
+            response.close();
+        }
+
+        try {
+            RedgifsTokenManager.RedgifsToken token = RedgifsTokenManager.refreshToken(userAgent);
+
+            // Emulate response for old OAuth endpoint
+            if (request.url().encodedPath().equals("/v2/oauth/client")) {
+                String responseBody = RedgifsTokenManager.getEmulatedOAuthResponseBody(token);
+                return new Response.Builder()
+                        .message("OK")
+                        .code(HttpURLConnection.HTTP_OK)
+                        .protocol(Protocol.HTTP_1_1)
+                        .request(request)
+                        .header("Content-Type", "application/json")
+                        .body(ResponseBody.create(
+                                responseBody, MediaType.get("application/json")))
+                        .build();
+            }
+
+            Request modifiedRequest = request.newBuilder()
+                    .header("Authorization", "Bearer " + token.getAccessToken())
+                    .header("User-Agent", userAgent)
+                    .build();
+            return chain.proceed(modifiedRequest);
+        } catch (JSONException ex) {
+            Logger.printException(() -> "Could not parse Redgifs response", ex);
+            throw new IOException(ex);
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+package app.revanced.extension.shared.fixes.redgifs;
+
+import static app.revanced.extension.shared.requests.Route.Method.GET;
+
+import androidx.annotation.GuardedBy;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import app.revanced.extension.shared.requests.Requester;
+
+
+/**
+ * Manages Redgifs token lifecycle.
+ */
+public class RedgifsTokenManager {
+    public static class RedgifsToken {
+        // Expire after 23 hours to provide some breathing room
+        private static final long EXPIRY_SECONDS = 23 * 60 * 60;
+
+        private final String accessToken;
+        private final long refreshTimeInSeconds;
+
+        public RedgifsToken(String accessToken, long refreshTime) {
+            this.accessToken = accessToken;
+            this.refreshTimeInSeconds = refreshTime;
+        }
+
+        public String getAccessToken() {
+            return accessToken;
+        }
+
+        public long getExpiryTimeInSeconds() {
+            return refreshTimeInSeconds + EXPIRY_SECONDS;
+        }
+
+        public boolean isValid() {
+            if (accessToken == null) return false;
+            return getExpiryTimeInSeconds() >= System.currentTimeMillis() / 1000;
+        }
+    }
+    public static final String REDGIFS_API_HOST = "https://api.redgifs.com";
+    private static final String GET_TEMPORARY_TOKEN = REDGIFS_API_HOST + "/v2/auth/temporary";
+    @GuardedBy("itself")
+    private static final Map<String, RedgifsToken> tokenMap = new HashMap<>();
+
+    private static String getToken(String userAgent) throws IOException, JSONException {
+        HttpURLConnection connection = (HttpURLConnection) new URL(GET_TEMPORARY_TOKEN).openConnection();
+        connection.setFixedLengthStreamingMode(0);
+        connection.setRequestMethod(GET.name());
+        connection.setRequestProperty("User-Agent", userAgent);
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setRequestProperty("Accept", "application/json");
+        connection.setUseCaches(false);
+
+        JSONObject responseObject = Requester.parseJSONObject(connection);
+        return responseObject.getString("token");
+    }
+
+    public static RedgifsToken refreshToken(String userAgent) throws IOException, JSONException {
+        synchronized(tokenMap) {
+            // Reference: https://github.com/JeffreyCA/Apollo-ImprovedCustomApi/pull/67
+            RedgifsToken token = tokenMap.get(userAgent);
+            if (token != null && token.isValid()) {
+                return token;
+            }
+
+            // Copy user agent from original request if present because Redgifs verifies
+            // that the user agent in subsequent requests matches the one in the OAuth token.
+            String accessToken = getToken(userAgent);
+            long refreshTime = System.currentTimeMillis() / 1000;
+            token = new RedgifsToken(accessToken, refreshTime);
+            tokenMap.put(userAgent, token);
+            return token;
+        }
+    }
+
+    public static String getEmulatedOAuthResponseBody(RedgifsToken token) throws JSONException {
+        // Reference: https://github.com/JeffreyCA/Apollo-ImprovedCustomApi/pull/67
+        JSONObject responseObject = new JSONObject();
+        responseObject.put("access_token", token.accessToken);
+        responseObject.put("expiry_time", token.getExpiryTimeInSeconds() - (System.currentTimeMillis() / 1000));
+        responseObject.put("scope", "read");
+        responseObject.put("token_type", "Bearer");
+        return responseObject.toString();
+    }
+}

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

@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.patches;
+package app.revanced.extension.shared.patches;
 
 import static app.revanced.extension.shared.StringRef.str;
 
@@ -13,7 +13,8 @@ import java.net.UnknownHostException;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
-import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings("unused")
 public class CheckWatchHistoryDomainNameResolutionPatch {
@@ -45,10 +46,10 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
     /**
      * Injection point.
      *
-     * Checks if s.youtube.com is blacklisted and playback history will fail to work.
+     * Checks if YouTube watch history endpoint cannot be reached.
      */
     public static void checkDnsResolver(Activity context) {
-        if (!Utils.isNetworkConnected() || !Settings.CHECK_WATCH_HISTORY_DOMAIN_NAME.get()) return;
+        if (!Utils.isNetworkConnected() || !BaseSettings.CHECK_WATCH_HISTORY_DOMAIN_NAME.get()) return;
 
         Utils.runOnBackgroundThread(() -> {
             try {
@@ -60,34 +61,26 @@ public class CheckWatchHistoryDomainNameResolutionPatch {
                 // Prevent this false positive by verify youtube.com resolves.
                 // If youtube.com does not resolve, then it's not a watch history domain resolving error
                 // because the entire app will not work since no domains are resolving.
-                if (domainResolvesToValidIP(HISTORY_TRACKING_ENDPOINT)
-                        || !domainResolvesToValidIP("youtube.com")) {
+                if (!domainResolvesToValidIP("youtube.com")
+                        || domainResolvesToValidIP(HISTORY_TRACKING_ENDPOINT)) {
                     return;
                 }
 
                 Utils.runOnMainThread(() -> {
-                    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.
-                        );
+                    Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                            context,
+                            str("revanced_check_watch_history_domain_name_dialog_title"), // Title.
+                            Html.fromHtml(str("revanced_check_watch_history_domain_name_dialog_message")), // Message (HTML).
+                            null, // No EditText.
+                            null, // OK button text.
+                            () -> {}, // OK button action (just dismiss).
+                            null, // No cancel button.
+                            str("revanced_check_watch_history_domain_name_dialog_ignore"), // Neutral button text.
+                            () -> BaseSettings.CHECK_WATCH_HISTORY_DOMAIN_NAME.save(false),    // Neutral button action (Ignore).
+                            true // Dismiss dialog on Neutral button click.
+                    );
 
-                        // Show the dialog.
-                        Dialog dialog = dialogPair.first;
-
-                        Utils.showDialog(context, dialog, false, null);
-                    } catch (Exception ex) {
-                        Logger.printException(() -> "checkDnsResolver dialog creation failure", ex);
-                    }
+                    Utils.showDialog(context, dialogPair.first, false, null);
                 });
             } catch (Exception ex) {
                 Logger.printException(() -> "checkDnsResolver failure", ex);

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

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

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

@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.patches;
+package app.revanced.extension.shared.patches;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

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

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

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

@@ -0,0 +1,31 @@
+package app.revanced.extension.shared.patches;
+
+import app.revanced.extension.shared.privacy.LinkSanitizer;
+import app.revanced.extension.shared.settings.BaseSettings;
+
+/**
+ * YouTube and YouTube Music.
+ */
+@SuppressWarnings("unused")
+public final class SanitizeSharingLinksPatch {
+
+    private static final LinkSanitizer sanitizer = new LinkSanitizer(
+            "si",
+            "feature" // Old tracking parameter name, and may be obsolete.
+    );
+
+    /**
+     * Injection point.
+     */
+    public static String sanitize(String url) {
+        if (BaseSettings.SANITIZE_SHARED_LINKS.get()) {
+            url = sanitizer.sanitizeUrlString(url);
+        }
+
+        if (BaseSettings.REPLACE_MUSIC_LINKS_WITH_YOUTUBE.get()) {
+            url = url.replace("music.youtube.com", "youtube.com");
+        }
+
+        return url;
+    }
+}

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

@@ -0,0 +1,60 @@
+package app.revanced.extension.shared.privacy;
+
+import android.net.Uri;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import app.revanced.extension.shared.Logger;
+
+/**
+ * Strips away specific parameters from URLs.
+ */
+public class LinkSanitizer {
+
+    private final Collection<String> parametersToRemove;
+
+    public LinkSanitizer(String ... parametersToRemove) {
+        final int parameterCount = parametersToRemove.length;
+        if (parameterCount == 0) {
+            throw new IllegalArgumentException("No parameters specified");
+        }
+
+        // List is faster if only checking a few parameters.
+        this.parametersToRemove = parameterCount > 4
+                ? Set.of(parametersToRemove)
+                : List.of(parametersToRemove);
+    }
+
+    public String sanitizeUrlString(String url) {
+        try {
+            return sanitizeUri(Uri.parse(url)).toString();
+        } catch (Exception ex) {
+            Logger.printException(() -> "sanitizeUrlString failure: " + url, ex);
+            return url;
+        }
+    }
+
+    public Uri sanitizeUri(Uri uri) {
+        try {
+            Uri.Builder builder = uri.buildUpon().clearQuery();
+
+            for (String paramName : uri.getQueryParameterNames()) {
+                if (!parametersToRemove.contains(paramName)) {
+                    for (String value : uri.getQueryParameters(paramName)) {
+                        builder.appendQueryParameter(paramName, value);
+                    }
+                }
+            }
+
+            Uri sanitizedUrl = builder.build();
+            Logger.printInfo(() -> "Sanitized url: " + uri + " to: " + sanitizedUrl);
+
+            return sanitizedUrl;
+        } catch (Exception ex) {
+            Logger.printException(() -> "sanitizeUri failure: " + uri, ex);
+            return uri;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,167 @@
+package app.revanced.extension.shared.settings;
+
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceFragment;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ToolbarPreferenceFragment;
+
+/**
+ * Base class for hooking activities to inject a custom PreferenceFragment with a toolbar.
+ * Provides common logic for initializing the activity and setting up the toolbar.
+ */
+@SuppressWarnings({"deprecation", "NewApi"})
+public abstract class BaseActivityHook extends Activity {
+
+    private static final int ID_REVANCED_SETTINGS_FRAGMENTS =
+            getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
+    private static final int ID_REVANCED_TOOLBAR_PARENT =
+            getResourceIdentifierOrThrow("revanced_toolbar_parent", "id");
+    public static final int LAYOUT_REVANCED_SETTINGS_WITH_TOOLBAR =
+            getResourceIdentifierOrThrow("revanced_settings_with_toolbar", "layout");
+    private static final int STRING_REVANCED_SETTINGS_TITLE =
+            getResourceIdentifierOrThrow("revanced_settings_title", "string");
+
+    /**
+     * Layout parameters for the toolbar, extracted from the dummy toolbar.
+     */
+    protected static ViewGroup.LayoutParams toolbarLayoutParams;
+
+    /**
+     * Sets the layout parameters for the toolbar.
+     */
+    public static void setToolbarLayoutParams(Toolbar toolbar) {
+        if (toolbarLayoutParams != null) {
+            toolbar.setLayoutParams(toolbarLayoutParams);
+        }
+    }
+
+    /**
+     * Initializes the activity by setting the theme, content view and injecting a PreferenceFragment.
+     */
+    public static void initialize(BaseActivityHook hook, Activity activity) {
+        try {
+            hook.customizeActivityTheme(activity);
+            activity.setContentView(hook.getContentViewResourceId());
+
+            // Sanity check.
+            String dataString = activity.getIntent().getDataString();
+            if (!"revanced_settings_intent".equals(dataString)) {
+                Logger.printException(() -> "Unknown intent: " + dataString);
+                return;
+            }
+
+            PreferenceFragment fragment = hook.createPreferenceFragment();
+            hook.createToolbar(activity, fragment);
+
+            activity.getFragmentManager()
+                    .beginTransaction()
+                    .replace(ID_REVANCED_SETTINGS_FRAGMENTS, fragment)
+                    .commit();
+        } catch (Exception ex) {
+            Logger.printException(() -> "initialize failure", ex);
+        }
+    }
+
+    /**
+     * Injection point.
+     * Overrides the ReVanced settings language.
+     */
+    @SuppressWarnings("unused")
+    public static Context getAttachBaseContext(Context original) {
+        AppLanguage language = BaseSettings.REVANCED_LANGUAGE.get();
+        if (language == AppLanguage.DEFAULT) {
+            return original;
+        }
+
+        return Utils.getContext();
+    }
+
+    /**
+     * Creates and configures a toolbar for the activity, replacing a dummy placeholder.
+     */
+    @SuppressLint("UseCompatLoadingForDrawables")
+    protected void createToolbar(Activity activity, PreferenceFragment fragment) {
+        // Replace dummy placeholder toolbar.
+        // This is required to fix submenu title alignment issue with Android ASOP 15+
+        ViewGroup toolBarParent = activity.findViewById(ID_REVANCED_TOOLBAR_PARENT);
+        ViewGroup dummyToolbar = Utils.getChildViewByResourceName(toolBarParent, "revanced_toolbar");
+        toolbarLayoutParams = dummyToolbar.getLayoutParams();
+        toolBarParent.removeView(dummyToolbar);
+
+        // Sets appropriate system navigation bar color for the activity.
+        ToolbarPreferenceFragment.setNavigationBarColor(activity.getWindow());
+
+        Toolbar toolbar = new Toolbar(toolBarParent.getContext());
+        toolbar.setBackgroundColor(getToolbarBackgroundColor());
+        toolbar.setNavigationIcon(getNavigationIcon());
+        toolbar.setNavigationOnClickListener(getNavigationClickListener(activity));
+        toolbar.setTitle(STRING_REVANCED_SETTINGS_TITLE);
+
+        final int margin = Utils.dipToPixels(16);
+        toolbar.setTitleMarginStart(margin);
+        toolbar.setTitleMarginEnd(margin);
+        TextView toolbarTextView = Utils.getChildView(toolbar, false, view -> view instanceof TextView);
+        if (toolbarTextView != null) {
+            toolbarTextView.setTextColor(Utils.getAppForegroundColor());
+            toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+        }
+        setToolbarLayoutParams(toolbar);
+
+        onPostToolbarSetup(activity, toolbar, fragment);
+
+        toolBarParent.addView(toolbar, 0);
+    }
+
+    /**
+     * Customizes the activity's theme.
+     */
+    protected abstract void customizeActivityTheme(Activity activity);
+
+    /**
+     * Returns the resource ID for the content view layout.
+     */
+    protected abstract int getContentViewResourceId();
+
+    /**
+     * Returns the background color for the toolbar.
+     */
+    protected abstract int getToolbarBackgroundColor();
+
+    /**
+     * Returns the navigation icon drawable for the toolbar.
+     */
+    protected abstract Drawable getNavigationIcon();
+
+    /**
+     * Returns the click listener for the toolbar's navigation icon.
+     */
+    protected abstract View.OnClickListener getNavigationClickListener(Activity activity);
+
+    /**
+     * Creates the PreferenceFragment to be injected into the activity.
+     */
+    protected PreferenceFragment createPreferenceFragment() {
+        return new ToolbarPreferenceFragment();
+    }
+
+    /**
+     * Performs additional setup after the toolbar is configured.
+     *
+     * @param activity The activity hosting the toolbar.
+     * @param toolbar  The configured toolbar.
+     * @param fragment The PreferenceFragment associated with the activity.
+     */
+    protected void onPostToolbarSetup(Activity activity, Toolbar toolbar, PreferenceFragment fragment) {}
+}

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

@@ -2,11 +2,9 @@ package app.revanced.extension.shared.settings;
 
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
+import static app.revanced.extension.shared.patches.CustomBrandingPatch.BrandingTheme;
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.AudioStreamLanguageOverrideAvailability;
-import static app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch.SpoofiOSAvailability;
-
-import app.revanced.extension.shared.spoof.ClientType;
 
 /**
  * Settings shared across multiple apps.
@@ -28,12 +26,22 @@ public class BaseSettings {
      */
     public static final BooleanSetting SHOW_MENU_ICONS = new BooleanSetting("revanced_show_menu_icons", TRUE, true);
 
+    public static final BooleanSetting SETTINGS_SEARCH_HISTORY = new BooleanSetting("revanced_settings_search_history", TRUE, true);
+    public static final StringSetting SETTINGS_SEARCH_ENTRIES = new StringSetting("revanced_settings_search_entries", "");
+
+    //
+    // Settings shared by YouTube and YouTube Music.
+    //
+
     public static final BooleanSetting SPOOF_VIDEO_STREAMS = new BooleanSetting("revanced_spoof_video_streams", TRUE, true, "revanced_spoof_video_streams_user_dialog_message");
     public static final EnumSetting<AppLanguage> SPOOF_VIDEO_STREAMS_LANGUAGE = new EnumSetting<>("revanced_spoof_video_streams_language", AppLanguage.DEFAULT, new AudioStreamLanguageOverrideAvailability());
     public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE, parent(SPOOF_VIDEO_STREAMS));
-    public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true,
-            "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability());
-    // Client type must be last spoof setting due to cyclic references.
-    public static final EnumSetting<ClientType> SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_UNPLUGGED, true, parent(SPOOF_VIDEO_STREAMS));
 
+    public static final BooleanSetting SANITIZE_SHARED_LINKS = new BooleanSetting("revanced_sanitize_sharing_links", TRUE);
+    public static final BooleanSetting REPLACE_MUSIC_LINKS_WITH_YOUTUBE = new BooleanSetting("revanced_replace_music_with_youtube", FALSE);
+
+    public static final BooleanSetting CHECK_WATCH_HISTORY_DOMAIN_NAME = new BooleanSetting("revanced_check_watch_history_domain_name", TRUE, false, false);
+
+    public static final EnumSetting<BrandingTheme> CUSTOM_BRANDING_ICON = new EnumSetting<>("revanced_custom_branding_icon", BrandingTheme.ORIGINAL, true);
+    public static final IntegerSetting CUSTOM_BRANDING_NAME = new IntegerSetting("revanced_custom_branding_name", 1, true);
 }

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

@@ -1,18 +1,27 @@
 package app.revanced.extension.shared.settings;
 
+import static app.revanced.extension.shared.StringRef.str;
+
 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+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.shared.settings.preference.SharedPrefCategory;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.*;
-
-import static app.revanced.extension.shared.StringRef.str;
 
 public abstract class Setting<T> {
 
@@ -23,39 +32,69 @@ public abstract class Setting<T> {
      */
     public interface Availability {
         boolean isAvailable();
+
+        /**
+         * @return parent settings (dependencies) of this availability.
+         */
+        default List<Setting<?>> getParentSettings() {
+            return Collections.emptyList();
+        }
     }
 
     /**
      * Availability based on a single parent setting being enabled.
      */
-    @NonNull
-    public static Availability parent(@NonNull BooleanSetting parent) {
-        return parent::get;
+    public static Availability parent(BooleanSetting parent) {
+        return new Availability() {
+            @Override
+            public boolean isAvailable() {
+                return parent.get();
+            }
+
+            @Override
+            public List<Setting<?>> getParentSettings() {
+                return Collections.singletonList(parent);
+            }
+        };
     }
 
     /**
      * Availability based on all parents being enabled.
      */
-    @NonNull
-    public static Availability parentsAll(@NonNull BooleanSetting... parents) {
-        return () -> {
-            for (BooleanSetting parent : parents) {
-                if (!parent.get()) return false;
+    public static Availability parentsAll(BooleanSetting... parents) {
+        return new Availability() {
+            @Override
+            public boolean isAvailable() {
+                for (BooleanSetting parent : parents) {
+                    if (!parent.get()) return false;
+                }
+                return true;
+            }
+
+            @Override
+            public List<Setting<?>> getParentSettings() {
+                return Collections.unmodifiableList(Arrays.asList(parents));
             }
-            return true;
         };
     }
 
     /**
      * Availability based on any parent being enabled.
      */
-    @NonNull
-    public static Availability parentsAny(@NonNull BooleanSetting... parents) {
-        return () -> {
-            for (BooleanSetting parent : parents) {
-                if (parent.get()) return true;
+    public static Availability parentsAny(BooleanSetting... parents) {
+        return new Availability() {
+            @Override
+            public boolean isAvailable() {
+                for (BooleanSetting parent : parents) {
+                    if (parent.get()) return true;
+                }
+                return false;
+            }
+
+            @Override
+            public List<Setting<?>> getParentSettings() {
+                return Collections.unmodifiableList(Arrays.asList(parents));
             }
-            return false;
         };
     }
 
@@ -79,7 +118,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 +139,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,8 +153,8 @@ public abstract class Setting<T> {
     /**
      * @return All settings that have been created, sorted by keys.
      */
-    @NonNull
     private static List<Setting<?>> allLoadedSettingsSorted() {
+        //noinspection ComparatorCombinators
         Collections.sort(SETTINGS, (Setting<?> o1, Setting<?> o2) -> o1.key.compareTo(o2.key));
         return allLoadedSettings();
     }
@@ -124,13 +162,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 +197,6 @@ public abstract class Setting<T> {
     /**
      * The value of the setting.
      */
-    @NonNull
     protected volatile T value;
 
     public Setting(String key, T defaultValue) {
@@ -199,8 +234,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,
@@ -215,9 +250,7 @@ public abstract class Setting<T> {
 
         SETTINGS.add(this);
         if (PATH_TO_SETTINGS.put(key, this) != null) {
-            // Debug setting may not be created yet so using Logger may cause an initialization crash.
-            // Show a toast instead.
-            Utils.showToastLong(this.getClass().getSimpleName()
+            Logger.printException(() -> this.getClass().getSimpleName()
                     + " error: Duplicate Setting key found: " + key);
         }
 
@@ -227,7 +260,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()) {
@@ -239,11 +272,11 @@ public abstract class Setting<T> {
 
     /**
      * Migrate an old Setting value previously stored in a different SharedPreference.
-     *
+     * <p>
      * This method will be deleted in the future.
      */
-    @SuppressWarnings("rawtypes")
-    public static void migrateFromOldPreferences(@NonNull SharedPrefCategory oldPrefs, @NonNull Setting setting, String settingKey) {
+    @SuppressWarnings({"rawtypes", "NewApi"})
+    public static void migrateFromOldPreferences(SharedPrefCategory oldPrefs, Setting setting, String settingKey) {
         if (!oldPrefs.preferences.contains(settingKey)) {
             return; // Nothing to do.
         }
@@ -262,7 +295,7 @@ public abstract class Setting<T> {
             migratedValue = oldPrefs.getString(settingKey, (String) newValue);
         } else {
             Logger.printException(() -> "Unknown setting: " + setting);
-            // Remove otherwise it'll show a toast on every launch
+            // Remove otherwise it'll show a toast on every launch.
             oldPrefs.preferences.edit().remove(settingKey).apply();
             return;
         }
@@ -281,11 +314,11 @@ public abstract class Setting<T> {
     /**
      * Sets, but does _not_ persistently save the value.
      * This method is only to be used by the Settings preference code.
-     *
+     * <p>
      * 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 +332,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 +342,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;
         }
@@ -357,6 +390,14 @@ public abstract class Setting<T> {
         return availability == null || availability.isAvailable();
     }
 
+    /**
+     * Get the parent Settings that this setting depends on.
+     * @return List of parent Settings (e.g., BooleanSetting or EnumSetting), or empty list if no dependencies exist.
+     */
+    public List<Setting<?>> getParentSettings() {
+        return availability == null ? Collections.emptyList() : availability.getParentSettings();
+    }
+
     /**
      * @return if the currently set value is the same as {@link #defaultValue}
      */
@@ -406,7 +447,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 +485,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
@@ -476,9 +516,12 @@ public abstract class Setting<T> {
                 callback.settingsImported(alertDialogContext);
             }
 
-            Utils.showToastLong(numberOfSettingsImported == 0
-                    ? str("revanced_settings_import_reset")
-                    : str("revanced_settings_import_success", numberOfSettingsImported));
+            // Use a delay, otherwise the toast can move about on screen from the dismissing dialog.
+            final int numberOfSettingsImportedFinal = numberOfSettingsImported;
+            Utils.runOnMainThreadDelayed(() -> Utils.showToastLong(numberOfSettingsImportedFinal == 0
+                            ? str("revanced_settings_import_reset")
+                            : str("revanced_settings_import_success", numberOfSettingsImportedFinal)),
+                    150);
 
             return rebootSettingChanged;
         } catch (JSONException | IllegalArgumentException ex) {

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

@@ -27,6 +27,7 @@ import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.BooleanSetting;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings("deprecation")
 public abstract class AbstractPreferenceFragment extends PreferenceFragment {
@@ -52,7 +53,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, restartDialogMessage;
+    protected static CharSequence restartDialogTitle, restartDialogMessage, restartDialogButtonText, confirmDialogTitle;
 
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
@@ -124,10 +125,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
 
         showingUserDialogMessage = true;
 
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        CharSequence message = BulletPointPreference.formatIntoBulletPoints(
+                Objects.requireNonNull(setting.userDialogMessage).toString());
+
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
                 confirmDialogTitle, // Title.
-                Objects.requireNonNull(setting.userDialogMessage).toString(), // No message.
+                message,
                 null, // No EditText.
                 null, // OK button text.
                 () -> {
@@ -151,6 +155,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         );
 
         dialogPair.first.setOnDismissListener(d -> showingUserDialogMessage = false);
+        dialogPair.first.setCancelable(false);
 
         // Show the dialog.
         dialogPair.first.show();
@@ -248,7 +253,8 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                 Setting.privateSetValueFromString(setting, listPref.getValue());
             }
             updateListPreferenceSummary(listPref, setting);
-        } else {
+        } else if (!pref.getClass().equals(Preference.class)) {
+            // Ignore root preference class because there is no data to sync.
             Logger.printException(() -> "Setting cannot be handled: " + pref.getClass() + ": " + pref);
         }
     }
@@ -302,7 +308,8 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
             restartDialogButtonText = str("revanced_settings_restart");
         }
 
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(context,
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                context,
                 restartDialogTitle,              // Title.
                 restartDialogMessage,            // Message.
                 null,                            // No EditText.

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

@@ -0,0 +1,86 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.SpannedString;
+import android.text.TextUtils;
+import android.text.style.BulletSpan;
+import android.util.AttributeSet;
+
+/**
+ * Formats the summary text bullet points into Spanned text for better presentation.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class BulletPointPreference extends Preference {
+
+    /**
+     * Replaces bullet points with styled spans.
+     */
+    public static CharSequence formatIntoBulletPoints(CharSequence source) {
+        final char bulletPoint = '•';
+        if (TextUtils.indexOf(source, bulletPoint) < 0) {
+            return source; // Nothing to do.
+        }
+
+        SpannableStringBuilder builder = new SpannableStringBuilder(source);
+
+        int lineStart = 0;
+        int length = builder.length();
+
+        while (lineStart < length) {
+            int lineEnd = TextUtils.indexOf(builder, '\n', lineStart);
+            if (lineEnd < 0) lineEnd = length;
+
+            // Apply BulletSpan only if the line starts with the '•' character.
+            if (lineEnd > lineStart && builder.charAt(lineStart) == bulletPoint) {
+                int deleteEnd = lineStart + 1; // remove the bullet itself
+
+                // If there's a single space right after the bullet, remove that too.
+                if (deleteEnd < builder.length() && builder.charAt(deleteEnd) == ' ') {
+                    deleteEnd++;
+                }
+
+                builder.delete(lineStart, deleteEnd);
+
+                // Apply the BulletSpan to the remainder of that line.
+                builder.setSpan(new BulletSpan(20),
+                        lineStart,
+                        lineEnd - (deleteEnd - lineStart), // adjust for deleted chars.
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                );
+
+                // Update total length and lineEnd after deletion.
+                length = builder.length();
+                final int removed = deleteEnd - lineStart;
+                lineEnd -= removed;
+            }
+
+            lineStart = lineEnd + 1;
+        }
+
+        return new SpannedString(builder);
+    }
+
+    public BulletPointPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BulletPointPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BulletPointPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BulletPointPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        super.setSummary(formatIntoBulletPoints(summary));
+    }
+}

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

@@ -0,0 +1,45 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.settings.preference.BulletPointPreference.formatIntoBulletPoints;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+
+/**
+ * Formats the summary text bullet points into Spanned text for better presentation.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class BulletPointSwitchPreference extends SwitchPreference {
+
+    public BulletPointSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public BulletPointSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public BulletPointSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BulletPointSwitchPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        super.setSummary(formatIntoBulletPoints(summary));
+    }
+
+    @Override
+    public void setSummaryOn(CharSequence summaryOn) {
+        super.setSummaryOn(formatIntoBulletPoints(summaryOn));
+    }
+
+    @Override
+    public void setSummaryOff(CharSequence summaryOff) {
+        super.setSummaryOff(formatIntoBulletPoints(summaryOff));
+    }
+}

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

@@ -1,9 +1,8 @@
-package app.revanced.extension.youtube.settings.preference;
+package app.revanced.extension.shared.settings.preference;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.preference.Preference;
-import app.revanced.extension.shared.settings.preference.LogBufferManager;
 
 /**
  * A custom preference that clears the ReVanced debug log buffer when clicked.

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

@@ -1,8 +1,8 @@
 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 static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -13,20 +13,20 @@ 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.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import android.widget.*;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
@@ -35,6 +35,8 @@ 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;
+import app.revanced.extension.shared.ui.ColorDot;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 /**
  * A custom preference for selecting a color via a hexadecimal code or a color picker dialog.
@@ -43,100 +45,98 @@ import app.revanced.extension.shared.settings.StringSetting;
  */
 @SuppressWarnings({"unused", "deprecation"})
 public class ColorPickerPreference extends EditTextPreference {
+    /** Length of a valid color string of format #RRGGBB (without alpha) or #AARRGGBB (with alpha). */
+    public static final int COLOR_STRING_LENGTH_WITHOUT_ALPHA = 7;
+    public static final int COLOR_STRING_LENGTH_WITH_ALPHA = 9;
 
-    /**
-     * 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.
-     */
+    /** 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%
+    /** Alpha for dimming when the preference is disabled. */
+    public static final float DISABLED_ALPHA = 0.5f; // 50%
 
-    /**
-     * View displaying a colored dot in the widget area.
-     */
+    /** View displaying a colored dot in the widget area. */
     private View widgetColorDot;
 
-    /**
-     * Current color in RGB format (without alpha).
-     */
+    /** Dialog View displaying a colored dot for the selected color preview in the dialog. */
+    private View dialogColorDot;
+
+    /** Current color, including alpha channel if opacity slider is enabled. */
     @ColorInt
     private int currentColor;
 
-    /**
-     * Associated setting for storing the color value.
-     */
+    /** Associated setting for storing the color value. */
     private StringSetting colorSetting;
 
-    /**
-     * Dialog TextWatcher for the EditText to monitor color input changes.
-     */
+    /** 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. */
+    protected ColorPickerView dialogColorPickerView;
 
-    /**
-     * Dialog color picker view.
-     */
-    private ColorPickerView dialogColorPickerView;
+    /** Listener for color changes. */
+    protected OnColorChangeListener colorChangeListener;
+
+    /** Whether the opacity slider is enabled. */
+    private boolean opacitySliderEnabled = false;
+
+    public static final int ID_REVANCED_COLOR_PICKER_VIEW =
+            getResourceIdentifierOrThrow("revanced_color_picker_view", "id");
+    public static final int ID_PREFERENCE_COLOR_DOT =
+            getResourceIdentifierOrThrow("preference_color_dot", "id");
+    public static final int LAYOUT_REVANCED_COLOR_DOT_WIDGET =
+            getResourceIdentifierOrThrow("revanced_color_dot_widget", "layout");
+    public static final int LAYOUT_REVANCED_COLOR_PICKER =
+            getResourceIdentifierOrThrow("revanced_color_picker", "layout");
 
     /**
      * 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
+    public static String cleanupColorCodeString(String colorString, boolean includeAlpha) {
         String result = "#" + PATTERN_NOT_HEX.matcher(colorString)
                 .replaceAll("").toUpperCase(Locale.ROOT);
 
-        if (result.length() < COLOR_STRING_LENGTH) {
+        int maxLength = includeAlpha ? COLOR_STRING_LENGTH_WITH_ALPHA : COLOR_STRING_LENGTH_WITHOUT_ALPHA;
+        if (result.length() < maxLength) {
             return result;
         }
 
-        return result.substring(0, COLOR_STRING_LENGTH);
+        return result.substring(0, maxLength);
     }
 
     /**
-     * @param color RGB color, without an alpha channel.
-     * @return #RRGGBB hex color string
+     * @param color Color, with or without alpha channel.
+     * @param includeAlpha Whether to include the alpha channel in the output string.
+     * @return #RRGGBB or #AARRGGBB 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);
+    public static String getColorString(@ColorInt int color, boolean includeAlpha) {
+        if (includeAlpha) {
+            return String.format("#%08X", color);
         }
-        return colorString;
+        color = color & 0x00FFFFFF; // Mask to strip alpha.
+        return String.format("#%06X", color);
     }
 
     /**
-     * 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.
+     * Interface for notifying color changes.
      */
-    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 interface OnColorChangeListener {
+        void onColorChanged(String key, int newColor);
+    }
+
+    /**
+     * Sets the listener for color changes.
+     */
+    public void setOnColorChangeListener(OnColorChangeListener listener) {
+        this.colorChangeListener = listener;
+    }
+
+    /**
+     * Enables or disables the opacity slider in the color picker dialog.
+     */
+    public void setOpacitySliderEnabled(boolean enabled) {
+        this.opacitySliderEnabled = enabled;
     }
 
     public ColorPickerPreference(Context context) {
@@ -158,9 +158,13 @@ public class ColorPickerPreference extends EditTextPreference {
      * 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());
+        if (getKey() != null) {
+            colorSetting = (StringSetting) Setting.getSettingFromPath(getKey());
+            if (colorSetting == null) {
+                Logger.printException(() -> "Could not find color setting for: " + getKey());
+            }
+        } else {
+            Logger.printDebug(() -> "initialized without key, settings will be loaded later");
         }
 
         EditText editText = getEditText();
@@ -171,27 +175,29 @@ public class ColorPickerPreference extends EditTextPreference {
         }
 
         // Set the widget layout to a custom layout containing the colored dot.
-        setWidgetLayoutResource(getResourceIdentifier("revanced_color_dot_widget", "layout"));
+        setWidgetLayoutResource(LAYOUT_REVANCED_COLOR_DOT_WIDGET);
     }
 
     /**
      * 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) {
+    public void setText(String colorString) {
         try {
             Logger.printDebug(() -> "setText: " + colorString);
             super.setText(colorString);
 
-            currentColor = Color.parseColor(colorString) & 0x00FFFFFF;
+            currentColor = Color.parseColor(colorString);
             if (colorSetting != null) {
-                colorSetting.save(getColorString(currentColor));
+                colorSetting.save(getColorString(currentColor, opacitySliderEnabled));
             }
-            updateColorPreview();
+            updateDialogColorDot();
             updateWidgetColorDot();
+
+            // Notify the listener about the color change.
+            if (colorChangeListener != null) {
+                colorChangeListener.onColorChanged(getKey(), currentColor);
+            }
         } 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.
@@ -203,38 +209,8 @@ public class ColorPickerPreference extends EditTextPreference {
         }
     }
 
-    @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() {
@@ -250,15 +226,16 @@ public class ColorPickerPreference extends EditTextPreference {
             public void afterTextChanged(Editable edit) {
                 try {
                     String colorString = edit.toString();
-
-                    String sanitizedColorString = cleanupColorCodeString(colorString);
+                    String sanitizedColorString = cleanupColorCodeString(colorString, opacitySliderEnabled);
                     if (!sanitizedColorString.equals(colorString)) {
                         edit.replace(0, colorString.length(), sanitizedColorString);
                         return;
                     }
 
-                    if (sanitizedColorString.length() != COLOR_STRING_LENGTH) {
-                        // User is still typing out the color.
+                    int expectedLength = opacitySliderEnabled
+                            ? COLOR_STRING_LENGTH_WITH_ALPHA
+                            : COLOR_STRING_LENGTH_WITHOUT_ALPHA;
+                    if (sanitizedColorString.length() != expectedLength) {
                         return;
                     }
 
@@ -266,7 +243,7 @@ public class ColorPickerPreference extends EditTextPreference {
                     if (currentColor != newColor) {
                         Logger.printDebug(() -> "afterTextChanged: " + sanitizedColorString);
                         currentColor = newColor;
-                        updateColorPreview();
+                        updateDialogColorDot();
                         updateWidgetColorDot();
                         colorPickerView.setColor(newColor);
                     }
@@ -279,32 +256,68 @@ public class ColorPickerPreference extends EditTextPreference {
     }
 
     /**
-     * Creates a Dialog with a color preview and EditText for hex color input.
+     * Hook for subclasses to add a custom view to the top of the dialog.
      */
+    @Nullable
+    protected View createExtraDialogContentView(Context context) {
+        return null; // Default implementation returns no extra view.
+    }
+
+    /**
+     * Hook for subclasses to handle the OK button click.
+     */
+    protected void onDialogOkClicked() {
+        // Default implementation does nothing.
+    }
+
+    /**
+     * Hook for subclasses to handle the Neutral button click.
+     */
+    protected void onDialogNeutralClicked() {
+        // Default implementation.
+        try {
+            final int defaultColor = Color.parseColor(colorSetting.defaultValue);
+            dialogColorPickerView.setColor(defaultColor);
+        } catch (Exception ex) {
+            Logger.printException(() -> "Reset button failure", ex);
+        }
+    }
+
     @Override
     protected void showDialog(Bundle state) {
         Context context = getContext();
 
+        // Create content container for all dialog views.
+        LinearLayout contentContainer = new LinearLayout(context);
+        contentContainer.setOrientation(LinearLayout.VERTICAL);
+
+        // Add extra view from subclass if it exists.
+        View extraView = createExtraDialogContentView(context);
+        if (extraView != null) {
+            contentContainer.addView(extraView);
+        }
+
         // 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"));
+        View colorPicker = LayoutInflater.from(context).inflate(LAYOUT_REVANCED_COLOR_PICKER, null);
+        dialogColorPickerView = colorPicker.findViewById(ID_REVANCED_COLOR_PICKER_VIEW);
+        dialogColorPickerView.setOpacitySliderEnabled(opacitySliderEnabled);
         dialogColorPickerView.setColor(currentColor);
+        contentContainer.addView(colorPicker);
 
         // Horizontal layout for preview and EditText.
         LinearLayout inputLayout = new LinearLayout(context);
         inputLayout.setOrientation(LinearLayout.HORIZONTAL);
+        inputLayout.setGravity(Gravity.CENTER_VERTICAL);
 
-        dialogColorPreview = new TextView(context);
+        dialogColorDot = new View(context);
         LinearLayout.LayoutParams previewParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.WRAP_CONTENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
+                dipToPixels(20),
+                dipToPixels(20)
         );
-        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();
+        previewParams.setMargins(dipToPixels(16), 0, dipToPixels(10), 0);
+        dialogColorDot.setLayoutParams(previewParams);
+        inputLayout.addView(dialogColorDot);
+        updateDialogColorDot();
 
         EditText editText = getEditText();
         ViewParent parent = editText.getParent();
@@ -315,7 +328,7 @@ public class ColorPickerPreference extends EditTextPreference {
                 LinearLayout.LayoutParams.WRAP_CONTENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT
         ));
-        String currentColorString = getColorString(currentColor);
+        String currentColorString = getColorString(currentColor, opacitySliderEnabled);
         editText.setText(currentColorString);
         editText.setSelection(currentColorString.length());
         editText.setTypeface(Typeface.MONOSPACE);
@@ -334,16 +347,12 @@ public class ColorPickerPreference extends EditTextPreference {
         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.
+        contentScrollView.setVerticalScrollBarEnabled(false);
+        contentScrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
         LinearLayout.LayoutParams scrollViewParams = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 0,
@@ -352,51 +361,43 @@ public class ColorPickerPreference extends EditTextPreference {
         contentScrollView.setLayoutParams(scrollViewParams);
         contentScrollView.addView(contentContainer);
 
-        // Create custom dialog.
-        final int originalColor = currentColor & 0x00FFFFFF;
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        final int originalColor = currentColor;
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 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.
+                getTitle() != null ? getTitle().toString() : str("revanced_settings_color_picker_title"),
+                null,
+                null,
+                null,
+                () -> { // OK button action.
                     try {
                         String colorString = editText.getText().toString();
-                        if (colorString.length() != COLOR_STRING_LENGTH) {
+                        int expectedLength = opacitySliderEnabled
+                                ? COLOR_STRING_LENGTH_WITH_ALPHA
+                                : COLOR_STRING_LENGTH_WITHOUT_ALPHA;
+                        if (colorString.length() != expectedLength) {
                             Utils.showToastShort(str("revanced_settings_color_invalid"));
-                            setText(getColorString(originalColor));
+                            setText(getColorString(originalColor, opacitySliderEnabled));
                             return;
                         }
                         setText(colorString);
+
+                        onDialogOkClicked();
                     } 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.
+                () -> { // Cancel button action.
                     try {
-                        // Restore the original color.
-                        setText(getColorString(originalColor));
+                        setText(getColorString(originalColor, opacitySliderEnabled));
                     } 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.
+                this::onDialogNeutralClicked, // Neutral button action.
+                false // Do not dismiss dialog.
         );
 
         // Add the ScrollView to the dialog's main layout.
@@ -412,13 +413,13 @@ public class ColorPickerPreference extends EditTextPreference {
                 return;
             }
 
-            String updatedColorString = getColorString(color);
+            String updatedColorString = getColorString(color, opacitySliderEnabled);
             Logger.printDebug(() -> "onColorChanged: " + updatedColorString);
             currentColor = color;
             editText.setText(updatedColorString);
             editText.setSelection(updatedColorString.length());
 
-            updateColorPreview();
+            updateDialogColorDot();
             updateWidgetColorDot();
         });
 
@@ -437,7 +438,7 @@ public class ColorPickerPreference extends EditTextPreference {
             colorTextWatcher = null;
         }
 
-        dialogColorPreview = null;
+        dialogColorDot = null;
         dialogColorPickerView = null;
     }
 
@@ -446,4 +447,32 @@ public class ColorPickerPreference extends EditTextPreference {
         super.setEnabled(enabled);
         updateWidgetColorDot();
     }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        widgetColorDot = view.findViewById(ID_PREFERENCE_COLOR_DOT);
+        updateWidgetColorDot();
+    }
+
+    private void updateWidgetColorDot() {
+        if (widgetColorDot == null) return;
+
+        ColorDot.applyColorDot(
+                widgetColorDot,
+                currentColor,
+                widgetColorDot.isEnabled()
+        );
+    }
+
+    private void updateDialogColorDot() {
+        if (dialogColorDot == null) return;
+
+        ColorDot.applyColorDot(
+                dialogColorDot,
+                currentColor,
+                true
+        );
+    }
 }

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

@@ -23,57 +23,73 @@ 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.
+ * A custom color picker view that allows the user to select a color using a hue slider, a saturation-value selector
+ * and an optional opacity slider.
  * This implementation is density-independent and responsive across different screen sizes and DPIs.
- *
  * <p>
- * This view displays two main components for color selection:
+ * This view displays three 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.
+ *     <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.
+ *     <li><b>Opacity Slider:</b> An optional horizontal bar below the hue bar that allows the user to adjust
+ *     the opacity (alpha channel) of the color.
  * </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).
- *
+ * The view uses {@link LinearGradient} and {@link ComposeShader} to create the color gradients for the hue bar,
+ * opacity slider, 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. */
+    /** Expanded touch area for the hue and opacity bars to increase the touch-sensitive area. */
     public static final float TOUCH_EXPANSION = dipToPixels(20f);
 
+    /** Margin between different areas of the view (saturation-value selector, hue bar, and opacity slider). */
     private static final float MARGIN_BETWEEN_AREAS = dipToPixels(24);
+
+    /** Padding around the view. */
     private static final float VIEW_PADDING = dipToPixels(16);
+
+    /** Height of the hue bar. */
     private static final float HUE_BAR_HEIGHT = dipToPixels(12);
+
+    /** Height of the opacity slider. */
+    private static final float OPACITY_BAR_HEIGHT = dipToPixels(12);
+
+    /** Corner radius for the hue bar. */
     private static final float HUE_CORNER_RADIUS = dipToPixels(6);
+
+    /** Corner radius for the opacity slider. */
+    private static final float OPACITY_CORNER_RADIUS = dipToPixels(6);
+
+    /** Radius of the selector handles. */
     private static final float SELECTOR_RADIUS = dipToPixels(12);
+
+    /** Stroke width for the selector handle outlines. */
     private static final float SELECTOR_STROKE_WIDTH = 8;
+
     /**
-     * Hue fill radius. Use slightly smaller radius for the selector handle fill,
+     * Hue and opacity 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;
+
+    /** Radius for the outer edge of the selector rings, including stroke width. */
     public static final float SELECTOR_EDGE_RADIUS =
             SELECTOR_RADIUS + SELECTOR_STROKE_WIDTH / 2 + SELECTOR_EDGE_STROKE_WIDTH / 2;
 
@@ -85,6 +101,7 @@ public class ColorPickerView extends View {
     @ColorInt
     private static final int SELECTOR_EDGE_COLOR = Color.parseColor("#CFCFCF");
 
+    /** Precomputed array of hue colors for the hue bar (0-360 degrees). */
     private static final int[] HUE_COLORS = new int[361];
     static {
         for (int i = 0; i < 361; i++) {
@@ -92,11 +109,16 @@ public class ColorPickerView extends View {
         }
     }
 
-    /** Hue bar. */
+    /** Paint for the hue bar. */
     private final Paint huePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    /** Saturation-value selector. */
+
+    /** Paint for the opacity slider. */
+    private final Paint opacityPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    /** Paint for the saturation-value selector. */
     private final Paint saturationValuePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    /** Draggable selector. */
+
+    /** Paint for the draggable selector handles. */
     private final Paint selectorPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     {
         selectorPaint.setStrokeWidth(SELECTOR_STROKE_WIDTH);
@@ -104,6 +126,10 @@ public class ColorPickerView extends View {
 
     /** Bounds of the hue bar. */
     private final RectF hueRect = new RectF();
+
+    /** Bounds of the opacity slider. */
+    private final RectF opacityRect = new RectF();
+
     /** Bounds of the saturation-value selector. */
     private final RectF saturationValueRect = new RectF();
 
@@ -112,21 +138,35 @@ public class ColorPickerView extends View {
 
     /** 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. */
+    /** Current opacity value (0-1). */
+    private float opacity = 1f;
+
+    /** The currently selected color, including alpha channel if opacity slider is enabled. */
     @ColorInt
     private int selectedColor;
 
+    /** Listener for color change events. */
     private OnColorChangedListener colorChangedListener;
 
-    /** Track if we're currently dragging the hue or saturation handle. */
+    /** Tracks if the hue selector is being dragged. */
     private boolean isDraggingHue;
+
+    /** Tracks if the saturation-value selector is being dragged. */
     private boolean isDraggingSaturation;
 
+    /** Tracks if the opacity selector is being dragged. */
+    private boolean isDraggingOpacity;
+
+    /** Flag to enable/disable the opacity slider. */
+    private boolean opacitySliderEnabled = false;
+
     public ColorPickerView(Context context) {
         super(context);
     }
@@ -139,12 +179,32 @@ public class ColorPickerView extends View {
         super(context, attrs, defStyleAttr);
     }
 
+    /**
+     * Enables or disables the opacity slider.
+     */
+    public void setOpacitySliderEnabled(boolean enabled) {
+        if (opacitySliderEnabled != enabled) {
+            opacitySliderEnabled = enabled;
+            if (!enabled) {
+                opacity = 1f; // Reset to fully opaque when disabled.
+                updateSelectedColor();
+            }
+            updateOpacityShader();
+            requestLayout(); // Trigger re-measure to account for opacity slider.
+            invalidate();
+        }
+    }
+
+    /**
+     * Measures the view, ensuring a consistent aspect ratio and minimum dimensions.
+     */
     @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);
+        final int minWidth = dipToPixels(250);
+        final int minHeight = (int) (minWidth * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS)
+                + (opacitySliderEnabled ? (int) (OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS) : 0);
 
         int width = resolveSize(minWidth, widthMeasureSpec);
         int height = resolveSize(minHeight, heightMeasureSpec);
@@ -154,7 +214,8 @@ public class ColorPickerView extends View {
         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);
+        final int desiredHeight = (int) (width * DESIRED_ASPECT_RATIO) + (int) (HUE_BAR_HEIGHT + MARGIN_BETWEEN_AREAS)
+                + (opacitySliderEnabled ? (int) (OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS) : 0);
         if (MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY) {
             height = desiredHeight;
         }
@@ -163,17 +224,16 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * 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.
+     * Updates the view's layout when its size changes, recalculating bounds and shaders.
      */
     @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.
+        // Calculate bounds with hue bar and optional opacity bar at the bottom.
         final float effectiveWidth = width - (2 * VIEW_PADDING);
-        final float effectiveHeight = height - (2 * VIEW_PADDING) - HUE_BAR_HEIGHT - MARGIN_BETWEEN_AREAS;
+        final float effectiveHeight = height - (2 * VIEW_PADDING) - HUE_BAR_HEIGHT - MARGIN_BETWEEN_AREAS
+                - (opacitySliderEnabled ? OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS : 0);
 
         // Adjust rectangles to account for padding and density-independent dimensions.
         saturationValueRect.set(
@@ -185,18 +245,28 @@ public class ColorPickerView extends View {
 
         hueRect.set(
                 VIEW_PADDING,
-                height - VIEW_PADDING - HUE_BAR_HEIGHT,
+                height - VIEW_PADDING - HUE_BAR_HEIGHT - (opacitySliderEnabled ? OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS : 0),
                 VIEW_PADDING + effectiveWidth,
-                height - VIEW_PADDING
+                height - VIEW_PADDING - (opacitySliderEnabled ? OPACITY_BAR_HEIGHT + MARGIN_BETWEEN_AREAS : 0)
         );
 
+        if (opacitySliderEnabled) {
+            opacityRect.set(
+                    VIEW_PADDING,
+                    height - VIEW_PADDING - OPACITY_BAR_HEIGHT,
+                    VIEW_PADDING + effectiveWidth,
+                    height - VIEW_PADDING
+            );
+        }
+
         // Update the shaders.
         updateHueShader();
         updateSaturationValueShader();
+        updateOpacityShader();
     }
 
     /**
-     * Updates the hue full spectrum (0-360 degrees).
+     * Updates the shader for the hue bar to reflect the color gradient.
      */
     private void updateHueShader() {
         LinearGradient hueShader = new LinearGradient(
@@ -211,8 +281,29 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * 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.
+     * Updates the shader for the opacity slider to reflect the current RGB color with varying opacity.
+     */
+    private void updateOpacityShader() {
+        if (!opacitySliderEnabled) {
+            opacityPaint.setShader(null);
+            return;
+        }
+
+        // Create a linear gradient for opacity from transparent to opaque, using the current RGB color.
+        int rgbColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+        LinearGradient opacityShader = new LinearGradient(
+                opacityRect.left, opacityRect.top,
+                opacityRect.right, opacityRect.top,
+                rgbColor & 0x00FFFFFF, // Fully transparent
+                rgbColor | 0xFF000000, // Fully opaque
+                Shader.TileMode.CLAMP
+        );
+
+        opacityPaint.setShader(opacityShader);
+    }
+
+    /**
+     * Updates the shader for the saturation-value selector to reflect the current hue.
      */
     private void updateSaturationValueShader() {
         // Create a saturation-value gradient based on the current hue.
@@ -232,7 +323,6 @@ public class ColorPickerView extends View {
         );
 
         // 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,
@@ -249,11 +339,7 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * 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.
+     * Draws the color picker components, including the saturation-value selector, hue bar, opacity slider, and their respective handles.
      */
     @Override
     protected void onDraw(Canvas canvas) {
@@ -263,49 +349,67 @@ public class ColorPickerView extends View {
         // Draw the hue bar.
         canvas.drawRoundRect(hueRect, HUE_CORNER_RADIUS, HUE_CORNER_RADIUS, huePaint);
 
+        // Draw the opacity bar if enabled.
+        if (opacitySliderEnabled) {
+            canvas.drawRoundRect(opacityRect, OPACITY_CORNER_RADIUS, OPACITY_CORNER_RADIUS, opacityPaint);
+        }
+
         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.
+        // Draw the saturation and hue selector handles filled with their respective colors (fully opaque).
         hsvArray[0] = hue;
-        final int hueHandleColor = Color.HSVToColor(0xFF, hsvArray);
+        final int hueHandleColor = Color.HSVToColor(0xFF, hsvArray); // Force opaque for hue handle.
+        final int satHandleColor = Color.HSVToColor(0xFF, new float[]{hue, saturation, value}); // Force opaque for sat-val handle.
         selectorPaint.setStyle(Paint.Style.FILL_AND_STROKE);
 
         selectorPaint.setColor(hueHandleColor);
         canvas.drawCircle(hueSelectorX, hueSelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
 
-        selectorPaint.setColor(selectedColor | 0xFF000000);
+        selectorPaint.setColor(satHandleColor);
         canvas.drawCircle(satSelectorX, satSelectorY, SELECTOR_FILL_RADIUS, selectorPaint);
 
+        if (opacitySliderEnabled) {
+            final float opacitySelectorX = opacityRect.left + opacity * opacityRect.width();
+            final float opacitySelectorY = opacityRect.centerY();
+            selectorPaint.setColor(selectedColor); // Use full ARGB color to show opacity.
+            canvas.drawCircle(opacitySelectorX, opacitySelectorY, 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);
+        if (opacitySliderEnabled) {
+            final float opacitySelectorX = opacityRect.left + opacity * opacityRect.width();
+            final float opacitySelectorY = opacityRect.centerY();
+            canvas.drawCircle(opacitySelectorX, opacitySelectorY, 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);
+        if (opacitySliderEnabled) {
+            final float opacitySelectorX = opacityRect.left + opacity * opacityRect.width();
+            final float opacitySelectorY = opacityRect.centerY();
+            canvas.drawCircle(opacitySelectorX, opacitySelectorY, 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.
+     * Handles touch events to allow dragging of the hue, saturation-value, and opacity selectors.
      *
      * @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.
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         try {
@@ -314,13 +418,19 @@ public class ColorPickerView extends View {
             final int action = event.getAction();
             Logger.printDebug(() -> "onTouchEvent action: " + action + " x: " + x + " y: " + y);
 
-            // Define touch expansion for the hue bar.
+            // Define touch expansion for the hue and opacity bars.
             RectF expandedHueRect = new RectF(
                     hueRect.left,
                     hueRect.top - TOUCH_EXPANSION,
                     hueRect.right,
                     hueRect.bottom + TOUCH_EXPANSION
             );
+            RectF expandedOpacityRect = opacitySliderEnabled ? new RectF(
+                    opacityRect.left,
+                    opacityRect.top - TOUCH_EXPANSION,
+                    opacityRect.right,
+                    opacityRect.bottom + TOUCH_EXPANSION
+            ) : new RectF();
 
             switch (action) {
                 case MotionEvent.ACTION_DOWN:
@@ -331,7 +441,10 @@ public class ColorPickerView extends View {
                     final float satSelectorX = saturationValueRect.left + saturation * saturationValueRect.width();
                     final float valSelectorY = saturationValueRect.top + (1 - value) * saturationValueRect.height();
 
-                    // Create hit areas for both handles.
+                    final float opacitySelectorX = opacitySliderEnabled ? opacityRect.left + opacity * opacityRect.width() : 0;
+                    final float opacitySelectorY = opacitySliderEnabled ? opacityRect.centerY() : 0;
+
+                    // Create hit areas for all handles.
                     RectF hueHitRect = new RectF(
                             hueSelectorX - SELECTOR_RADIUS,
                             hueSelectorY - SELECTOR_RADIUS,
@@ -344,14 +457,23 @@ public class ColorPickerView extends View {
                             satSelectorX + SELECTOR_RADIUS,
                             valSelectorY + SELECTOR_RADIUS
                     );
+                    RectF opacityHitRect = opacitySliderEnabled ? new RectF(
+                            opacitySelectorX - SELECTOR_RADIUS,
+                            opacitySelectorY - SELECTOR_RADIUS,
+                            opacitySelectorX + SELECTOR_RADIUS,
+                            opacitySelectorY + SELECTOR_RADIUS
+                    ) : new RectF();
 
-                    // Check if the touch started on a handle or within the expanded hue bar area.
+                    // Check if the touch started on a handle or within the expanded bar areas.
                     if (hueHitRect.contains(x, y)) {
                         isDraggingHue = true;
                         updateHueFromTouch(x);
                     } else if (satValHitRect.contains(x, y)) {
                         isDraggingSaturation = true;
                         updateSaturationValueFromTouch(x, y);
+                    } else if (opacitySliderEnabled && opacityHitRect.contains(x, y)) {
+                        isDraggingOpacity = true;
+                        updateOpacityFromTouch(x);
                     } else if (expandedHueRect.contains(x, y)) {
                         // Handle touch within the expanded hue bar area.
                         isDraggingHue = true;
@@ -359,6 +481,9 @@ public class ColorPickerView extends View {
                     } else if (saturationValueRect.contains(x, y)) {
                         isDraggingSaturation = true;
                         updateSaturationValueFromTouch(x, y);
+                    } else if (opacitySliderEnabled && expandedOpacityRect.contains(x, y)) {
+                        isDraggingOpacity = true;
+                        updateOpacityFromTouch(x);
                     }
                     break;
 
@@ -368,6 +493,8 @@ public class ColorPickerView extends View {
                         updateHueFromTouch(x);
                     } else if (isDraggingSaturation) {
                         updateSaturationValueFromTouch(x, y);
+                    } else if (isDraggingOpacity) {
+                        updateOpacityFromTouch(x);
                     }
                     break;
 
@@ -375,6 +502,7 @@ public class ColorPickerView extends View {
                 case MotionEvent.ACTION_CANCEL:
                     isDraggingHue = false;
                     isDraggingSaturation = false;
+                    isDraggingOpacity = false;
                     break;
             }
         } catch (Exception ex) {
@@ -385,9 +513,7 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Updates the hue value based on touch position, clamping to valid range.
-     *
-     * @param x The x-coordinate of the touch position.
+     * Updates the hue value based on a touch event.
      */
     private void updateHueFromTouch(float x) {
         // Clamp x to the hue rectangle bounds.
@@ -399,14 +525,12 @@ public class ColorPickerView extends View {
 
         hue = updatedHue;
         updateSaturationValueShader();
+        updateOpacityShader();
         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.
+     * Updates the saturation and value based on a touch event.
      */
     private void updateSaturationValueFromTouch(float x, float y) {
         // Clamp x and y to the saturation-value rectangle bounds.
@@ -421,14 +545,34 @@ public class ColorPickerView extends View {
         }
         saturation = updatedSaturation;
         value = updatedValue;
+        updateOpacityShader();
         updateSelectedColor();
     }
 
     /**
-     * Updates the selected color and notifies listeners.
+     * Updates the opacity value based on a touch event.
+     */
+    private void updateOpacityFromTouch(float x) {
+        if (!opacitySliderEnabled) {
+            return;
+        }
+        final float clampedX = Utils.clamp(x, opacityRect.left, opacityRect.right);
+        final float updatedOpacity = (clampedX - opacityRect.left) / opacityRect.width();
+        if (opacity == updatedOpacity) {
+            return;
+        }
+        opacity = updatedOpacity;
+        updateSelectedColor();
+    }
+
+    /**
+     * Updates the selected color based on the current hue, saturation, value, and opacity.
      */
     private void updateSelectedColor() {
-        final int updatedColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+        final int rgbColor = Color.HSVToColor(0, new float[]{hue, saturation, value});
+        final int updatedColor = opacitySliderEnabled
+                ? (rgbColor & 0x00FFFFFF) | (((int) (opacity * 255)) << 24)
+                : (rgbColor & 0x00FFFFFF) | 0xFF000000;
 
         if (selectedColor != updatedColor) {
             selectedColor = updatedColor;
@@ -444,19 +588,16 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Sets the currently selected color.
-     *
-     * @param color The color to set in either ARGB or RGB format.
+     * Sets the selected color, updating the hue, saturation, value and opacity sliders accordingly.
      */
     public void setColor(@ColorInt int color) {
-        color &= 0x00FFFFFF;
         if (selectedColor == color) {
             return;
         }
 
         // Update the selected color.
         selectedColor = color;
-        Logger.printDebug(() -> "setColor: " + getColorString(selectedColor));
+        Logger.printDebug(() -> "setColor: " + getColorString(selectedColor, opacitySliderEnabled));
 
         // Convert the ARGB color to HSV values.
         float[] hsv = new float[3];
@@ -466,9 +607,11 @@ public class ColorPickerView extends View {
         hue = hsv[0];
         saturation = hsv[1];
         value = hsv[2];
+        opacity = opacitySliderEnabled ? ((color >> 24) & 0xFF) / 255f : 1f;
 
         // Update the saturation-value shader based on the new hue.
         updateSaturationValueShader();
+        updateOpacityShader();
 
         // Notify the listener if it's set.
         if (colorChangedListener != null) {
@@ -481,8 +624,6 @@ public class ColorPickerView extends View {
 
     /**
      * Gets the currently selected color.
-     *
-     * @return The selected color in RGB format with no alpha channel.
      */
     @ColorInt
     public int getColor() {
@@ -490,9 +631,7 @@ public class ColorPickerView extends View {
     }
 
     /**
-     * Sets the listener to be notified when the selected color changes.
-     *
-     * @param listener The listener to set.
+     * Sets a listener to be notified when the selected color changes.
      */
     public void setOnColorChangedListener(OnColorChangedListener listener) {
         colorChangedListener = listener;

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

@@ -0,0 +1,34 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * Extended ColorPickerPreference that enables the opacity slider for color selection.
+ */
+@SuppressWarnings("unused")
+public class ColorPickerWithOpacitySliderPreference extends ColorPickerPreference {
+
+    public ColorPickerWithOpacitySliderPreference(Context context) {
+        super(context);
+        init();
+    }
+
+    public ColorPickerWithOpacitySliderPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ColorPickerWithOpacitySliderPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    /**
+     * Initialize the preference with opacity slider enabled.
+     */
+    private void init() {
+        // Enable the opacity slider for alpha channel support.
+        setOpacitySliderEnabled(true);
+    }
+}

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

@@ -1,6 +1,6 @@
 package app.revanced.extension.shared.settings.preference;
 
-import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -11,22 +11,90 @@ import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 /**
- * A custom ListPreference that uses a styled custom dialog with a custom checkmark indicator.
+ * A custom ListPreference that uses a styled custom dialog with a custom checkmark indicator,
+ * supports a static summary and highlighted entries for search functionality.
  */
 @SuppressWarnings({"unused", "deprecation"})
 public class CustomDialogListPreference extends ListPreference {
 
+    public static final int ID_REVANCED_CHECK_ICON =
+            getResourceIdentifierOrThrow("revanced_check_icon", "id");
+    public static final int ID_REVANCED_CHECK_ICON_PLACEHOLDER =
+            getResourceIdentifierOrThrow("revanced_check_icon_placeholder", "id");
+    public static final int ID_REVANCED_ITEM_TEXT =
+            getResourceIdentifierOrThrow("revanced_item_text", "id");
+    public static final int LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED =
+            getResourceIdentifierOrThrow("revanced_custom_list_item_checked", "layout");
+
+    private String staticSummary = null;
+    private CharSequence[] highlightedEntriesForDialog = null;
+
+    /**
+     * Set a static summary that will not be overwritten by value changes.
+     */
+    public void setStaticSummary(String summary) {
+        this.staticSummary = summary;
+    }
+
+    /**
+     * Returns the static summary if set, otherwise null.
+     */
+    @Nullable
+    public String getStaticSummary() {
+        return staticSummary;
+    }
+
+    /**
+     * Always return static summary if set.
+     */
+    @Override
+    public CharSequence getSummary() {
+        if (staticSummary != null) {
+            return staticSummary;
+        }
+        return super.getSummary();
+    }
+
+    /**
+     * Sets highlighted entries for display in the dialog.
+     * These entries are used only for the current dialog and are automatically cleared.
+     */
+    public void setHighlightedEntriesForDialog(CharSequence[] highlightedEntries) {
+        this.highlightedEntriesForDialog = highlightedEntries;
+    }
+
+    /**
+     * Clears highlighted entries after the dialog is closed.
+     */
+    public void clearHighlightedEntriesForDialog() {
+        this.highlightedEntriesForDialog = null;
+    }
+
+    /**
+     * Returns entries for display in the dialog.
+     * If highlighted entries exist, they are used; otherwise, the original entries are returned.
+     */
+    private CharSequence[] getEntriesForDialog() {
+        return highlightedEntriesForDialog != null ? highlightedEntriesForDialog : getEntries();
+    }
+
     /**
      * Custom ArrayAdapter to handle checkmark visibility.
      */
-    private static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
+    public static class ListPreferenceArrayAdapter extends ArrayAdapter<CharSequence> {
         private static class SubViewDataContainer {
             ImageView checkIcon;
             View placeholder;
@@ -37,8 +105,10 @@ public class CustomDialogListPreference extends ListPreference {
         final CharSequence[] entryValues;
         String selectedValue;
 
-        public ListPreferenceArrayAdapter(Context context, int resource, CharSequence[] entries,
-                                          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;
@@ -55,19 +125,16 @@ public class CustomDialogListPreference extends ListPreference {
                 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"));
+                holder.checkIcon = view.findViewById(ID_REVANCED_CHECK_ICON);
+                holder.placeholder = view.findViewById(ID_REVANCED_CHECK_ICON_PLACEHOLDER);
+                holder.itemText = view.findViewById(ID_REVANCED_ITEM_TEXT);
                 view.setTag(holder);
             } else {
                 holder = (SubViewDataContainer) view.getTag();
             }
 
-            // Set text.
-            holder.itemText.setText(getItem(position));
+            CharSequence itemText = getItem(position);
+            holder.itemText.setText(itemText);
             holder.itemText.setTextColor(Utils.getAppForegroundColor());
 
             // Show or hide checkmark and placeholder.
@@ -105,6 +172,9 @@ public class CustomDialogListPreference extends ListPreference {
     protected void showDialog(Bundle state) {
         Context context = getContext();
 
+        CharSequence[] entriesToShow = getEntriesForDialog();
+        CharSequence[] entryValues = getEntryValues();
+
         // Create ListView.
         ListView listView = new ListView(context);
         listView.setId(android.R.id.list);
@@ -113,9 +183,9 @@ public class CustomDialogListPreference extends ListPreference {
         // Create custom adapter for the ListView.
         ListPreferenceArrayAdapter adapter = new ListPreferenceArrayAdapter(
                 context,
-                Utils.getResourceIdentifier("revanced_custom_list_item_checked", "layout"),
-                getEntries(),
-                getEntryValues(),
+                LAYOUT_REVANCED_CUSTOM_LIST_ITEM_CHECKED,
+                entriesToShow,
+                entryValues,
                 getValue()
         );
         listView.setAdapter(adapter);
@@ -123,7 +193,6 @@ public class CustomDialogListPreference extends ListPreference {
         // 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);
@@ -134,19 +203,23 @@ public class CustomDialogListPreference extends ListPreference {
         }
 
         // Create the custom dialog without OK button.
-        Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                 context,
                 getTitle() != null ? getTitle().toString() : "",
                 null,
                 null,
-                null, // No OK button text.
-                null, // No OK button action.
-                () -> {}, // Cancel button action (just dismiss).
+                null,
+                null,
+                this::clearHighlightedEntriesForDialog, // Cancel button action.
                 null,
                 null,
                 true
         );
 
+        Dialog dialog = dialogPair.first;
+        // Add a listener to clear when the dialog is closed in any way.
+        dialog.setOnDismissListener(dialogInterface -> clearHighlightedEntriesForDialog());
+
         // Add the ListView to the main layout.
         LinearLayout mainLayout = dialogPair.second;
         LinearLayout.LayoutParams listViewParams = new LinearLayout.LayoutParams(
@@ -158,16 +231,28 @@ public class CustomDialogListPreference extends ListPreference {
 
         // Handle item click to select value and dismiss dialog.
         listView.setOnItemClickListener((parent, view, position, id) -> {
-            String selectedValue = getEntryValues()[position].toString();
+            String selectedValue = entryValues[position].toString();
             if (callChangeListener(selectedValue)) {
                 setValue(selectedValue);
+
+                // Update summaries from the original entries (without highlighting).
+                if (staticSummary == null) {
+                    CharSequence[] originalEntries = getEntries();
+                    if (originalEntries != null && position < originalEntries.length) {
+                        setSummary(originalEntries[position]);
+                    }
+                }
+
                 adapter.setSelectedValue(selectedValue);
                 adapter.notifyDataSetChanged();
             }
-            dialogPair.first.dismiss();
+
+            // Clear highlighted entries before closing.
+            clearHighlightedEntriesForDialog();
+            dialog.dismiss();
         });
 
         // Show the dialog.
-        dialogPair.first.show();
+        dialog.show();
     }
 }

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

@@ -1,9 +1,8 @@
-package app.revanced.extension.youtube.settings.preference;
+package app.revanced.extension.shared.settings.preference;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.preference.Preference;
-import app.revanced.extension.shared.settings.preference.LogBufferManager;
 
 /**
  * A custom preference that triggers exporting ReVanced debug logs to the clipboard when clicked.

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

@@ -0,0 +1,63 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.spoof.ClientType;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
+
+@SuppressWarnings({"deprecation", "unused"})
+public class ForceOriginalAudioSwitchPreference extends SwitchPreference {
+
+    // Spoof stream patch is not included, or is not currently spoofing to Android Studio.
+    private static final boolean available = !SpoofVideoStreamsPatch.isPatchIncluded()
+            || !(BaseSettings.SPOOF_VIDEO_STREAMS.get()
+            && SpoofVideoStreamsPatch.getPreferredClient() == ClientType.ANDROID_CREATOR);
+
+    {
+        if (!available) {
+            // Show why force audio is not available.
+            String summary = str("revanced_force_original_audio_not_available");
+            super.setSummary(summary);
+            super.setSummaryOn(summary);
+            super.setSummaryOff(summary);
+            super.setEnabled(false);
+        }
+    }
+
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public ForceOriginalAudioSwitchPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (!available) {
+            return;
+        }
+
+        super.setEnabled(enabled);
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        if (!available) {
+            return;
+        }
+
+        super.setSummary(summary);
+    }
+}
+

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

@@ -1,7 +1,6 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -10,21 +9,17 @@ 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.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 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 app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener {
@@ -82,7 +77,7 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
             EditText editText = getEditText();
 
             // Create a custom dialog with the EditText.
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     context,
                     str("revanced_pref_import_export_title"), // Title.
                     null,     // No message (EditText replaces it).
@@ -98,6 +93,20 @@ public class ImportExportPreference extends EditTextPreference implements Prefer
                     true // Dismiss dialog when onNeutralClick.
             );
 
+            // If there are no settings yet, then show the on screen keyboard and bring focus to
+            // the edit text. This makes it easier to paste saved settings after a reinstall.
+             dialogPair.first.setOnShowListener(dialogInterface -> {
+                 if (existingSettings.isEmpty()) {
+                     editText.postDelayed(() -> {
+                         editText.requestFocus();
+
+                         InputMethodManager inputMethodManager = (InputMethodManager)
+                                 editText.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                         inputMethodManager.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
+                     }, 100);
+                 }
+             });
+
             // Show the dialog.
             dialogPair.first.show();
         } catch (Exception ex) {

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

@@ -5,6 +5,7 @@ import static app.revanced.extension.shared.Utils.dipToPixels;
 import static app.revanced.extension.shared.requests.Route.Method.GET;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -17,6 +18,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.preference.Preference;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.webkit.WebView;
@@ -124,6 +126,8 @@ public class ReVancedAboutPreference extends Preference {
 
     {
         setOnPreferenceClickListener(pref -> {
+            Context context = pref.getContext();
+
             // Show a progress spinner if the social links are not fetched yet.
             if (!AboutLinksRoutes.hasFetchedLinks() && Utils.isNetworkConnected()) {
                 // Show a progress spinner, but only if the api fetch takes more than a half a second.
@@ -136,17 +140,18 @@ public class ReVancedAboutPreference extends Preference {
                 handler.postDelayed(showDialogRunnable, delayToShowProgressSpinner);
 
                 Utils.runOnBackgroundThread(() ->
-                        fetchLinksAndShowDialog(handler, showDialogRunnable, progress));
+                        fetchLinksAndShowDialog(context, handler, showDialogRunnable, progress));
             } else {
                 // No network call required and can run now.
-                fetchLinksAndShowDialog(null, null, null);
+                fetchLinksAndShowDialog(context, null, null, null);
             }
 
             return false;
         });
     }
 
-    private void fetchLinksAndShowDialog(@Nullable Handler handler,
+    private void fetchLinksAndShowDialog(Context context,
+                                         @Nullable Handler handler,
                                          Runnable showDialogRunnable,
                                          @Nullable ProgressDialog progress) {
         WebLink[] links = AboutLinksRoutes.fetchAboutLinks();
@@ -163,7 +168,17 @@ public class ReVancedAboutPreference extends Preference {
             if (handler != null) {
                 handler.removeCallbacks(showDialogRunnable);
             }
-            if (progress != null) {
+
+            // Don't continue if the activity is done. To test this tap the
+            // about dialog and immediately press back before the dialog can show.
+            if (context instanceof Activity activity) {
+                if (activity.isFinishing() || activity.isDestroyed()) {
+                    Logger.printDebug(() -> "Not showing about dialog, activity is closed");
+                    return;
+                }
+            }
+
+            if (progress != null && progress.isShowing()) {
                 progress.dismiss();
             }
             new WebViewDialog(getContext(), htmlDialog).show();
@@ -228,10 +243,10 @@ class WebViewDialog extends Dialog {
 
         setContentView(mainLayout);
 
-        // Set dialog window attributes
+        // Set dialog window attributes.
         Window window = getWindow();
         if (window != null) {
-            Utils.setDialogWindowParameters(window);
+            Utils.setDialogWindowParameters(window, Gravity.CENTER, 0, 90, false);
         }
     }
 

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

@@ -1,36 +1,23 @@
 package app.revanced.extension.shared.settings.preference;
 
 import static app.revanced.extension.shared.StringRef.str;
-import static app.revanced.extension.shared.Utils.dipToPixels;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.graphics.drawable.shapes.RectShape;
-import android.graphics.drawable.shapes.RoundRectShape;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.Paint.Style;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Pair;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.ui.CustomDialog;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ResettableEditTextPreference extends EditTextPreference {
@@ -79,7 +66,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
 
             // Create custom dialog.
             String neutralButtonText = (setting != null) ? str("revanced_settings_reset") : null;
-            Pair<Dialog, LinearLayout> dialogPair = Utils.createCustomDialog(
+            Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
                     context,
                     getTitle() != null ? getTitle().toString() : "", // Title.
                     null,     // Message is replaced by EditText.

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

@@ -0,0 +1,169 @@
+package app.revanced.extension.shared.settings.preference;
+
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.graphics.Insets;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.util.TypedValue;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowInsets;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import androidx.annotation.Nullable;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.BaseActivityHook;
+
+@SuppressWarnings({"deprecation", "NewApi"})
+public class ToolbarPreferenceFragment extends AbstractPreferenceFragment {
+
+    /**
+     * Removes the list of preferences from this fragment, if they exist.
+     * @param keys Preference keys.
+     */
+    protected void removePreferences(String ... keys) {
+        for (String key : keys) {
+            Preference pref = findPreference(key);
+            if (pref != null) {
+                PreferenceGroup parent = pref.getParent();
+                if (parent != null) {
+                    Logger.printDebug(() -> "Removing preference: " + key);
+                    parent.removePreference(pref);
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets toolbar for all nested preference screens.
+     */
+    protected void setPreferenceScreenToolbar(PreferenceScreen parentScreen) {
+        for (int i = 0, count = parentScreen.getPreferenceCount(); i < count; i++) {
+            Preference childPreference = parentScreen.getPreference(i);
+            if (childPreference instanceof PreferenceScreen) {
+                // Recursively set sub preferences.
+                setPreferenceScreenToolbar((PreferenceScreen) childPreference);
+
+                childPreference.setOnPreferenceClickListener(
+                        childScreen -> {
+                            Dialog preferenceScreenDialog = ((PreferenceScreen) childScreen).getDialog();
+                            ViewGroup rootView = (ViewGroup) preferenceScreenDialog
+                                    .findViewById(android.R.id.content)
+                                    .getParent();
+
+                            // Allow package-specific background customization.
+                            customizeDialogBackground(rootView);
+
+                            // Fix the system navigation bar color for submenus.
+                            setNavigationBarColor(preferenceScreenDialog.getWindow());
+
+                            // Fix edge-to-edge screen with Android 15 and YT 19.45+
+                            // https://developer.android.com/develop/ui/views/layout/edge-to-edge#system-bars-insets
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                rootView.setOnApplyWindowInsetsListener((v, insets) -> {
+                                    Insets statusInsets = insets.getInsets(WindowInsets.Type.statusBars());
+                                    Insets navInsets = insets.getInsets(WindowInsets.Type.navigationBars());
+                                    Insets cutoutInsets = insets.getInsets(WindowInsets.Type.displayCutout());
+
+                                    // Apply padding for display cutout in landscape.
+                                    int leftPadding = cutoutInsets.left;
+                                    int rightPadding = cutoutInsets.right;
+                                    int topPadding = statusInsets.top;
+                                    int bottomPadding = navInsets.bottom;
+
+                                    v.setPadding(leftPadding, topPadding, rightPadding, bottomPadding);
+                                    return insets;
+                                });
+                            }
+
+                            Toolbar toolbar = new Toolbar(childScreen.getContext());
+                            toolbar.setTitle(childScreen.getTitle());
+                            toolbar.setNavigationIcon(getBackButtonDrawable());
+                            toolbar.setNavigationOnClickListener(view -> preferenceScreenDialog.dismiss());
+
+                            final int margin = Utils.dipToPixels(16);
+                            toolbar.setTitleMargin(margin, 0, margin, 0);
+
+                            TextView toolbarTextView = Utils.getChildView(toolbar,
+                                    true, TextView.class::isInstance);
+                            if (toolbarTextView != null) {
+                                toolbarTextView.setTextColor(Utils.getAppForegroundColor());
+                                toolbarTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+                            }
+
+                            // Allow package-specific toolbar customization.
+                            customizeToolbar(toolbar);
+
+                            // Allow package-specific post-toolbar setup.
+                            onPostToolbarSetup(toolbar, preferenceScreenDialog);
+
+                            rootView.addView(toolbar, 0);
+                            return false;
+                        }
+                );
+            }
+        }
+    }
+
+    /**
+     * Sets the system navigation bar color for the activity.
+     * Applies the background color obtained from {@link Utils#getAppBackgroundColor()} to the navigation bar.
+     * For Android 10 (API 29) and above, enforces navigation bar contrast to ensure visibility.
+     */
+    public static void setNavigationBarColor(@Nullable Window window) {
+        if (window == null) {
+            Logger.printDebug(() -> "Cannot set navigation bar color, window is null");
+            return;
+        }
+
+        window.setNavigationBarColor(Utils.getAppBackgroundColor());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.setNavigationBarContrastEnforced(true);
+        }
+    }
+
+    /**
+     * Returns the drawable for the back button.
+     */
+    @SuppressLint("UseCompatLoadingForDrawables")
+    public static Drawable getBackButtonDrawable() {
+        final int backButtonResource = Utils.getResourceIdentifierOrThrow(
+                "revanced_settings_toolbar_arrow_left", "drawable");
+        Drawable drawable = Utils.getContext().getResources().getDrawable(backButtonResource);
+        customizeBackButtonDrawable(drawable);
+        return drawable;
+    }
+
+    /**
+     * Customizes the back button drawable.
+     */
+    protected static void customizeBackButtonDrawable(Drawable drawable) {
+        drawable.setTint(Utils.getAppForegroundColor());
+    }
+
+    /**
+     * Allows subclasses to customize the dialog's root view background.
+     */
+    protected void customizeDialogBackground(ViewGroup rootView) {
+        rootView.setBackgroundColor(Utils.getAppBackgroundColor());
+    }
+
+    /**
+     * Allows subclasses to customize the toolbar.
+     */
+    protected void customizeToolbar(Toolbar toolbar) {
+        BaseActivityHook.setToolbarLayoutParams(toolbar);
+    }
+
+    /**
+     * Allows subclasses to perform actions after toolbar setup.
+     */
+    protected void onPostToolbarSetup(Toolbar toolbar, Dialog preferenceScreenDialog) {}
+}

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

@@ -1,4 +1,4 @@
-package app.revanced.extension.youtube.settings.preference;
+package app.revanced.extension.shared.settings.preference;
 
 import android.content.Context;
 import android.content.Intent;

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

@@ -0,0 +1,365 @@
+package app.revanced.extension.shared.settings.search;
+
+import android.graphics.Color;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.SwitchPreference;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.BackgroundColorSpan;
+
+import androidx.annotation.ColorInt;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
+
+/**
+ * Abstract base class for search result items, defining common fields and behavior.
+ */
+public abstract class BaseSearchResultItem {
+    // Enum to represent view types.
+    public enum ViewType {
+        REGULAR,
+        SWITCH,
+        LIST,
+        COLOR_PICKER,
+        GROUP_HEADER,
+        NO_RESULTS,
+        URL_LINK;
+
+        // Get the corresponding layout resource ID.
+        public int getLayoutResourceId() {
+            return switch (this) {
+                case REGULAR, URL_LINK -> getResourceIdentifier("revanced_preference_search_result_regular");
+                case SWITCH -> getResourceIdentifier("revanced_preference_search_result_switch");
+                case LIST   -> getResourceIdentifier("revanced_preference_search_result_list");
+                case COLOR_PICKER -> getResourceIdentifier("revanced_preference_search_result_color");
+                case GROUP_HEADER -> getResourceIdentifier("revanced_preference_search_result_group_header");
+                case NO_RESULTS   -> getResourceIdentifier("revanced_preference_search_no_result");
+            };
+        }
+
+        private static int getResourceIdentifier(String name) {
+            // Placeholder for actual resource identifier retrieval.
+            return Utils.getResourceIdentifierOrThrow(name, "layout");
+        }
+    }
+
+    final String navigationPath;
+    final List<String> navigationKeys;
+    final ViewType preferenceType;
+    CharSequence highlightedTitle;
+    CharSequence highlightedSummary;
+    boolean highlightingApplied;
+
+    BaseSearchResultItem(String navPath, List<String> navKeys, ViewType type) {
+        this.navigationPath = navPath;
+        this.navigationKeys = new ArrayList<>(navKeys != null ? navKeys : Collections.emptyList());
+        this.preferenceType = type;
+        this.highlightedTitle = "";
+        this.highlightedSummary = "";
+        this.highlightingApplied = false;
+    }
+
+    abstract boolean matchesQuery(String query);
+    abstract void applyHighlighting(Pattern queryPattern);
+    abstract void clearHighlighting();
+
+    // Shared method for highlighting text with search query.
+    protected static CharSequence highlightSearchQuery(CharSequence text, Pattern queryPattern) {
+        if (TextUtils.isEmpty(text)) return text;
+
+        final int adjustedColor = Utils.adjustColorBrightness(
+                Utils.getAppBackgroundColor(), 0.95f, 1.20f);
+        BackgroundColorSpan highlightSpan = new BackgroundColorSpan(adjustedColor);
+        SpannableStringBuilder spannable = new SpannableStringBuilder(text);
+
+        Matcher matcher = queryPattern.matcher(text);
+        while (matcher.find()) {
+            spannable.setSpan(highlightSpan, matcher.start(), matcher.end(),
+                    SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        return spannable;
+    }
+
+    /**
+     * Search result item for group headers (navigation path only).
+     */
+    public static class GroupHeaderItem extends BaseSearchResultItem {
+        GroupHeaderItem(String navPath, List<String> navKeys) {
+            super(navPath, navKeys, ViewType.GROUP_HEADER);
+            this.highlightedTitle = navPath;
+        }
+
+        @Override
+        boolean matchesQuery(String query) {
+            return false; // Headers are not directly searchable.
+        }
+
+        @Override
+        void applyHighlighting(Pattern queryPattern) {}
+
+        @Override
+        void clearHighlighting() {}
+    }
+
+    /**
+     * Search result item for preferences, handling type-specific data and search text.
+     */
+    @SuppressWarnings("deprecation")
+    public static class PreferenceSearchItem extends BaseSearchResultItem {
+        public final Preference preference;
+        final String searchableText;
+        final CharSequence originalTitle;
+        final CharSequence originalSummary;
+        final CharSequence originalSummaryOn;
+        final CharSequence originalSummaryOff;
+        final CharSequence[] originalEntries;
+        private CharSequence[] highlightedEntries;
+        private boolean entriesHighlightingApplied;
+
+        @ColorInt
+        private int color;
+
+        // Store last applied highlighting pattern to reapply when needed.
+        Pattern lastQueryPattern;
+
+        PreferenceSearchItem(Preference pref, String navPath, List<String> navKeys) {
+            super(navPath, navKeys, determineType(pref));
+            this.preference = pref;
+            this.originalTitle = pref.getTitle() != null ? pref.getTitle() : "";
+            this.originalSummary = pref.getSummary();
+            this.highlightedTitle = this.originalTitle;
+            this.highlightedSummary = this.originalSummary != null ? this.originalSummary : "";
+            this.color = 0;
+            this.lastQueryPattern = null;
+
+            // Initialize type-specific fields.
+            FieldInitializationResult result = initTypeSpecificFields(pref);
+            this.originalSummaryOn = result.summaryOn;
+            this.originalSummaryOff = result.summaryOff;
+            this.originalEntries = result.entries;
+
+            // Build searchable text.
+            this.searchableText = buildSearchableText(pref);
+        }
+
+        private static class FieldInitializationResult {
+            CharSequence summaryOn = null;
+            CharSequence summaryOff = null;
+            CharSequence[] entries = null;
+        }
+
+        private static ViewType determineType(Preference pref) {
+            if (pref instanceof SwitchPreference) return ViewType.SWITCH;
+            if (pref instanceof ListPreference) return ViewType.LIST;
+            if (pref instanceof ColorPickerPreference) return ViewType.COLOR_PICKER;
+            if (pref instanceof UrlLinkPreference) return ViewType.URL_LINK;
+            if ("no_results_placeholder".equals(pref.getKey())) return ViewType.NO_RESULTS;
+            return ViewType.REGULAR;
+        }
+
+        private FieldInitializationResult initTypeSpecificFields(Preference pref) {
+            FieldInitializationResult result = new FieldInitializationResult();
+
+            if (pref instanceof SwitchPreference switchPref) {
+                result.summaryOn = switchPref.getSummaryOn();
+                result.summaryOff = switchPref.getSummaryOff();
+            } else if (pref instanceof ColorPickerPreference colorPref) {
+                String colorString = colorPref.getText();
+                this.color = TextUtils.isEmpty(colorString) ? 0 : Color.parseColor(colorString);
+            } else if (pref instanceof ListPreference listPref) {
+                result.entries = listPref.getEntries();
+                if (result.entries != null) {
+                    this.highlightedEntries = new CharSequence[result.entries.length];
+                    System.arraycopy(result.entries, 0, this.highlightedEntries, 0, result.entries.length);
+                }
+            }
+
+            this.entriesHighlightingApplied = false;
+            return result;
+        }
+
+        private String buildSearchableText(Preference pref) {
+            StringBuilder searchBuilder = new StringBuilder();
+            String key = pref.getKey();
+            String normalizedKey = "";
+            if (key != null) {
+                // Normalize preference key by removing the common "revanced_" prefix
+                // so that users can search by the meaningful part only.
+                normalizedKey = key.startsWith("revanced_")
+                        ? key.substring("revanced_".length())
+                        : key;
+            }
+            appendText(searchBuilder, normalizedKey);
+            appendText(searchBuilder, originalTitle);
+            appendText(searchBuilder, originalSummary);
+
+            // Add type-specific searchable content.
+            if (pref instanceof ListPreference) {
+                if (originalEntries != null) {
+                    for (CharSequence entry : originalEntries) {
+                        appendText(searchBuilder, entry);
+                    }
+                }
+            } else if (pref instanceof SwitchPreference) {
+                appendText(searchBuilder, originalSummaryOn);
+                appendText(searchBuilder, originalSummaryOff);
+            } else if (pref instanceof ColorPickerPreference) {
+                appendText(searchBuilder, ColorPickerPreference.getColorString(color, false));
+            }
+
+            // Include navigation path in searchable text.
+            appendText(searchBuilder, navigationPath);
+
+            return searchBuilder.toString();
+        }
+
+        private void appendText(StringBuilder builder, CharSequence text) {
+            if (!TextUtils.isEmpty(text)) {
+                if (builder.length() > 0) builder.append(" ");
+                builder.append(Utils.removePunctuationToLowercase(text));
+            }
+        }
+
+        /**
+         * Gets the current effective summary for this preference, considering state-dependent summaries.
+         */
+        public CharSequence getCurrentEffectiveSummary() {
+            if (preference instanceof CustomDialogListPreference customPref) {
+                String staticSum = customPref.getStaticSummary();
+                if (staticSum != null) {
+                    return staticSum;
+                }
+            }
+            if (preference instanceof SwitchPreference switchPref) {
+                boolean currentState = switchPref.isChecked();
+                return currentState
+                        ? (originalSummaryOn != null ? originalSummaryOn :
+                        originalSummary != null ? originalSummary : "")
+                        : (originalSummaryOff != null ? originalSummaryOff :
+                        originalSummary != null ? originalSummary : "");
+            } else if (preference instanceof ListPreference listPref) {
+                String value = listPref.getValue();
+                CharSequence[] entries = listPref.getEntries();
+                CharSequence[] entryValues = listPref.getEntryValues();
+                if (value != null && entries != null && entryValues != null) {
+                    for (int i = 0, length = entries.length; i < length; i++) {
+                        if (value.equals(entryValues[i].toString())) {
+                            return originalEntries != null && i < originalEntries.length && originalEntries[i] != null
+                                    ? originalEntries[i]
+                                    : originalSummary != null ? originalSummary : "";
+                        }
+                    }
+                }
+                return originalSummary != null ? originalSummary : "";
+            }
+            return originalSummary != null ? originalSummary : "";
+        }
+
+        /**
+         * Checks if this search result item matches the provided query.
+         * Uses case-insensitive matching against the searchable text.
+         */
+        @Override
+        boolean matchesQuery(String query) {
+            return searchableText.contains(Utils.removePunctuationToLowercase(query));
+        }
+
+        /**
+         * Get highlighted entries to show in dialog.
+         */
+        public CharSequence[] getHighlightedEntries() {
+            return highlightedEntries;
+        }
+
+        /**
+         * Whether highlighting is applied to entries.
+         */
+        public boolean isEntriesHighlightingApplied() {
+            return entriesHighlightingApplied;
+        }
+
+        /**
+         * Highlights the search query in the title and summary.
+         */
+        @Override
+        void applyHighlighting(Pattern queryPattern) {
+            this.lastQueryPattern = queryPattern;
+            // Highlight the title.
+            highlightedTitle = highlightSearchQuery(originalTitle, queryPattern);
+
+            // Get the current effective summary and highlight it.
+            CharSequence currentSummary = getCurrentEffectiveSummary();
+            highlightedSummary = highlightSearchQuery(currentSummary, queryPattern);
+
+            // Highlight the entries.
+            if (preference instanceof ListPreference && originalEntries != null) {
+                highlightedEntries = new CharSequence[originalEntries.length];
+                for (int i = 0, length = originalEntries.length; i < length; i++) {
+                    if (originalEntries[i] != null) {
+                        highlightedEntries[i] = highlightSearchQuery(originalEntries[i], queryPattern);
+                    } else {
+                        highlightedEntries[i] = null;
+                    }
+                }
+                entriesHighlightingApplied = true;
+            }
+
+            highlightingApplied = true;
+        }
+
+        /**
+         * Clears all search query highlighting and restores original state completely.
+         */
+        @Override
+        void clearHighlighting() {
+            if (!highlightingApplied) return;
+
+            // Restore original title.
+            highlightedTitle = originalTitle;
+
+            // Restore current effective summary without highlighting.
+            highlightedSummary = getCurrentEffectiveSummary();
+
+            // Restore original entries.
+            if (originalEntries != null && highlightedEntries != null) {
+                System.arraycopy(originalEntries, 0, highlightedEntries, 0,
+                        Math.min(originalEntries.length, highlightedEntries.length));
+            }
+
+            entriesHighlightingApplied = false;
+            highlightingApplied = false;
+            lastQueryPattern = null;
+        }
+
+        /**
+         * Refreshes highlighting for dynamic summaries (like switch preferences).
+         * Should be called when the preference state changes.
+         */
+        public void refreshHighlighting() {
+            if (highlightingApplied && lastQueryPattern != null) {
+                CharSequence currentSummary = getCurrentEffectiveSummary();
+                highlightedSummary = highlightSearchQuery(currentSummary, lastQueryPattern);
+            }
+        }
+
+        public void setColor(int newColor) {
+            this.color = newColor;
+        }
+
+        @ColorInt
+        public int getColor() {
+            return color;
+        }
+    }
+}

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

@@ -0,0 +1,621 @@
+package app.revanced.extension.shared.settings.search;
+
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+import static app.revanced.extension.shared.settings.search.BaseSearchViewController.DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON;
+
+import android.animation.AnimatorSet;
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.settings.preference.UrlLinkPreference;
+import app.revanced.extension.shared.ui.ColorDot;
+
+/**
+ * Abstract adapter for displaying search results in overlay ListView with ViewHolder pattern.
+ */
+@SuppressWarnings("deprecation")
+public abstract class BaseSearchResultsAdapter extends ArrayAdapter<BaseSearchResultItem> {
+    protected final LayoutInflater inflater;
+    protected final BaseSearchViewController.BasePreferenceFragment fragment;
+    protected final BaseSearchViewController searchViewController;
+    protected AnimatorSet currentAnimator;
+    protected abstract PreferenceScreen getMainPreferenceScreen();
+
+    protected static final int BLINK_DURATION = 400;
+    protected static final int PAUSE_BETWEEN_BLINKS = 100;
+
+    protected static final int ID_PREFERENCE_TITLE = getResourceIdentifierOrThrow(
+            "preference_title", "id");
+    protected static final int ID_PREFERENCE_SUMMARY = getResourceIdentifierOrThrow(
+            "preference_summary", "id");
+    protected static final int ID_PREFERENCE_PATH = getResourceIdentifierOrThrow(
+            "preference_path", "id");
+    protected static final int ID_PREFERENCE_SWITCH = getResourceIdentifierOrThrow(
+            "preference_switch", "id");
+    protected static final int ID_PREFERENCE_COLOR_DOT = getResourceIdentifierOrThrow(
+            "preference_color_dot", "id");
+
+    protected static class RegularViewHolder {
+        TextView titleView;
+        TextView summaryView;
+    }
+
+    protected static class SwitchViewHolder {
+        TextView titleView;
+        TextView summaryView;
+        Switch switchWidget;
+    }
+
+    protected static class ColorViewHolder {
+        TextView titleView;
+        TextView summaryView;
+        View colorDot;
+    }
+
+    protected static class GroupHeaderViewHolder {
+        TextView pathView;
+    }
+
+    protected static class NoResultsViewHolder {
+        TextView titleView;
+        TextView summaryView;
+        ImageView iconView;
+    }
+
+    public BaseSearchResultsAdapter(Context context, List<BaseSearchResultItem> items,
+                                    BaseSearchViewController.BasePreferenceFragment fragment,
+                                    BaseSearchViewController searchViewController) {
+        super(context, 0, items);
+        this.inflater = LayoutInflater.from(context);
+        this.fragment = fragment;
+        this.searchViewController = searchViewController;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        BaseSearchResultItem item = getItem(position);
+        return item == null ? 0 : item.preferenceType.ordinal();
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return BaseSearchResultItem.ViewType.values().length;
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+        BaseSearchResultItem item = getItem(position);
+        if (item == null) return new View(getContext());
+        // Use the ViewType enum.
+        BaseSearchResultItem.ViewType viewType = item.preferenceType;
+        // Create or reuse preference view based on type.
+        return createPreferenceView(item, convertView, viewType, parent);
+    }
+
+    @Override
+    public boolean isEnabled(int position) {
+        BaseSearchResultItem item = getItem(position);
+        // Disable for NO_RESULTS items to prevent ripple/selection.
+        return item != null && item.preferenceType != BaseSearchResultItem.ViewType.NO_RESULTS;
+    }
+
+    /**
+     * Creates or reuses a view for the given SearchResultItem.
+     * <p>
+     * Thanks to {@link #getItemViewType(int)} and {@link #getViewTypeCount()}, ListView knows
+     * how many different row types exist and keeps a separate "recycling pool" for each.
+     * That means convertView passed here is ALWAYS of the correct type for this position.
+     * So only need to check if (view == null), and if so – inflate a new layout and create the proper ViewHolder.
+     */
+    protected View createPreferenceView(BaseSearchResultItem item, View convertView,
+                                        BaseSearchResultItem.ViewType viewType, ViewGroup parent) {
+        View view = convertView;
+        if (view == null) {
+            view = inflateViewForType(viewType, parent);
+            createViewHolderForType(view, viewType);
+        }
+
+        // Retrieve the cached ViewHolder.
+        Object holder = view.getTag();
+        bindDataToViewHolder(item, holder, viewType, view);
+        return view;
+    }
+
+    protected View inflateViewForType(BaseSearchResultItem.ViewType viewType, ViewGroup parent) {
+        return inflater.inflate(viewType.getLayoutResourceId(), parent, false);
+    }
+
+    protected void createViewHolderForType(View view, BaseSearchResultItem.ViewType viewType) {
+        switch (viewType) {
+            case REGULAR, LIST, URL_LINK -> {
+                RegularViewHolder regularHolder = new RegularViewHolder();
+                regularHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                regularHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                view.setTag(regularHolder);
+            }
+            case SWITCH -> {
+                SwitchViewHolder switchHolder = new SwitchViewHolder();
+                switchHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                switchHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                switchHolder.switchWidget = view.findViewById(ID_PREFERENCE_SWITCH);
+                view.setTag(switchHolder);
+            }
+            case COLOR_PICKER -> {
+                ColorViewHolder colorHolder = new ColorViewHolder();
+                colorHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                colorHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                colorHolder.colorDot = view.findViewById(ID_PREFERENCE_COLOR_DOT);
+                view.setTag(colorHolder);
+            }
+            case GROUP_HEADER -> {
+                GroupHeaderViewHolder groupHolder = new GroupHeaderViewHolder();
+                groupHolder.pathView = view.findViewById(ID_PREFERENCE_PATH);
+                view.setTag(groupHolder);
+            }
+            case NO_RESULTS -> {
+                NoResultsViewHolder noResultsHolder = new NoResultsViewHolder();
+                noResultsHolder.titleView = view.findViewById(ID_PREFERENCE_TITLE);
+                noResultsHolder.summaryView = view.findViewById(ID_PREFERENCE_SUMMARY);
+                noResultsHolder.iconView = view.findViewById(android.R.id.icon);
+                view.setTag(noResultsHolder);
+            }
+            default -> throw new IllegalStateException("Unknown viewType: " + viewType);
+        }
+    }
+
+    protected void bindDataToViewHolder(BaseSearchResultItem item, Object holder,
+                                        BaseSearchResultItem.ViewType viewType, View view) {
+        switch (viewType) {
+            case REGULAR, URL_LINK, LIST -> bindRegularViewHolder(item, (RegularViewHolder) holder, view);
+            case SWITCH -> bindSwitchViewHolder(item, (SwitchViewHolder) holder, view);
+            case COLOR_PICKER -> bindColorViewHolder(item, (ColorViewHolder) holder, view);
+            case GROUP_HEADER -> bindGroupHeaderViewHolder(item, (GroupHeaderViewHolder) holder, view);
+            case NO_RESULTS -> bindNoResultsViewHolder(item, (NoResultsViewHolder) holder);
+            default -> throw new IllegalStateException("Unknown viewType: " + viewType);
+        }
+    }
+
+    protected void bindRegularViewHolder(BaseSearchResultItem item, RegularViewHolder holder, View view) {
+        BaseSearchResultItem.PreferenceSearchItem prefItem = (BaseSearchResultItem.PreferenceSearchItem) item;
+        prefItem.refreshHighlighting();
+        holder.titleView.setText(item.highlightedTitle);
+        holder.summaryView.setText(item.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
+        setupPreferenceView(view, holder.titleView, holder.summaryView, prefItem.preference,
+                () -> {
+                    handlePreferenceClick(prefItem.preference);
+                    if (prefItem.preference instanceof ListPreference) {
+                        prefItem.refreshHighlighting();
+                        holder.summaryView.setText(prefItem.getCurrentEffectiveSummary());
+                        holder.summaryView.setVisibility(TextUtils.isEmpty(prefItem.highlightedSummary) ? View.GONE : View.VISIBLE);
+                        notifyDataSetChanged();
+                    }
+                },
+                () -> navigateAndScrollToPreference(item));
+    }
+
+    protected void bindSwitchViewHolder(BaseSearchResultItem item, SwitchViewHolder holder, View view) {
+        BaseSearchResultItem.PreferenceSearchItem prefItem = (BaseSearchResultItem.PreferenceSearchItem) item;
+        SwitchPreference switchPref = (SwitchPreference) prefItem.preference;
+        holder.titleView.setText(item.highlightedTitle);
+        holder.switchWidget.setBackground(null); // Remove ripple/highlight.
+        // Sync switch state with preference without animation.
+        boolean currentState = switchPref.isChecked();
+        if (holder.switchWidget.isChecked() != currentState) {
+            holder.switchWidget.setChecked(currentState);
+            holder.switchWidget.jumpDrawablesToCurrentState();
+        }
+        prefItem.refreshHighlighting();
+        holder.summaryView.setText(prefItem.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(prefItem.highlightedSummary) ? View.GONE : View.VISIBLE);
+        setupPreferenceView(view, holder.titleView, holder.summaryView, switchPref,
+                () -> {
+                    boolean newState = !switchPref.isChecked();
+                    switchPref.setChecked(newState);
+                    holder.switchWidget.setChecked(newState);
+                    prefItem.refreshHighlighting();
+                    holder.summaryView.setText(prefItem.getCurrentEffectiveSummary());
+                    holder.summaryView.setVisibility(TextUtils.isEmpty(prefItem.highlightedSummary) ? View.GONE : View.VISIBLE);
+                    if (switchPref.getOnPreferenceChangeListener() != null) {
+                        switchPref.getOnPreferenceChangeListener().onPreferenceChange(switchPref, newState);
+                    }
+                    notifyDataSetChanged();
+                },
+                () -> navigateAndScrollToPreference(item));
+        holder.switchWidget.setEnabled(switchPref.isEnabled());
+    }
+
+    protected void bindColorViewHolder(BaseSearchResultItem item, ColorViewHolder holder, View view) {
+        BaseSearchResultItem.PreferenceSearchItem prefItem = (BaseSearchResultItem.PreferenceSearchItem) item;
+        holder.titleView.setText(item.highlightedTitle);
+        holder.summaryView.setText(item.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
+        ColorDot.applyColorDot(holder.colorDot, prefItem.getColor(), prefItem.preference.isEnabled());
+        setupPreferenceView(view, holder.titleView, holder.summaryView, prefItem.preference,
+                () -> handlePreferenceClick(prefItem.preference),
+                () -> navigateAndScrollToPreference(item));
+    }
+
+    protected void bindGroupHeaderViewHolder(BaseSearchResultItem item, GroupHeaderViewHolder holder, View view) {
+        holder.pathView.setText(item.highlightedTitle);
+        view.setOnClickListener(v -> navigateToTargetScreen(item));
+    }
+
+    protected void bindNoResultsViewHolder(BaseSearchResultItem item, NoResultsViewHolder holder) {
+        holder.titleView.setText(item.highlightedTitle);
+        holder.summaryView.setText(item.highlightedSummary);
+        holder.summaryView.setVisibility(TextUtils.isEmpty(item.highlightedSummary) ? View.GONE : View.VISIBLE);
+        holder.iconView.setImageResource(DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON);
+    }
+
+    /**
+     * Sets up a preference view with click listeners and proper enabled state handling.
+     */
+    protected void setupPreferenceView(View view, TextView titleView, TextView summaryView, Preference preference,
+                                       Runnable onClickAction, Runnable onLongClickAction) {
+        boolean enabled = preference.isEnabled();
+
+        // To enable long-click navigation for disabled settings, manually control the enabled state of the title
+        // and summary and disable the ripple effect instead of using 'view.setEnabled(enabled)'.
+
+        titleView.setEnabled(enabled);
+        summaryView.setEnabled(enabled);
+
+        if (!enabled) view.setBackground(null); // Disable ripple effect.
+
+        // In light mode, alpha 0.5 is applied to a disabled title automatically,
+        // but in dark mode it needs to be applied manually.
+        if (Utils.isDarkModeEnabled()) {
+            titleView.setAlpha(enabled ? 1.0f : ColorPickerPreference.DISABLED_ALPHA);
+        }
+        // Set up click and long-click listeners.
+        view.setOnClickListener(enabled ? v -> onClickAction.run() : null);
+        view.setOnLongClickListener(v -> {
+            onLongClickAction.run();
+            return true;
+        });
+    }
+
+    /**
+     * Navigates to the settings screen containing the given search result item and triggers scrolling.
+     */
+    protected void navigateAndScrollToPreference(BaseSearchResultItem item) {
+        // No navigation for URL_LINK items.
+        if (item.preferenceType == BaseSearchResultItem.ViewType.URL_LINK) return;
+
+        PreferenceScreen targetScreen = navigateToTargetScreen(item);
+        if (targetScreen == null) return;
+        if (!(item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem)) return;
+
+        Preference targetPreference = prefItem.preference;
+
+        fragment.getView().post(() -> {
+            ListView listView = targetScreen == getMainPreferenceScreen()
+                    ? getPreferenceListView()
+                    : targetScreen.getDialog().findViewById(android.R.id.list);
+
+            if (listView == null) return;
+
+            int targetPosition = findPreferencePosition(targetPreference, listView);
+            if (targetPosition == -1) return;
+
+            int firstVisible = listView.getFirstVisiblePosition();
+            int lastVisible = listView.getLastVisiblePosition();
+
+            if (targetPosition >= firstVisible && targetPosition <= lastVisible) {
+                // The preference is already visible, but still scroll it to the bottom of the list for consistency.
+                View child = listView.getChildAt(targetPosition - firstVisible);
+                if (child != null) {
+                    // Calculate how much to scroll so the item is aligned at the bottom.
+                    int scrollAmount = child.getBottom() - listView.getHeight();
+                    if (scrollAmount > 0) {
+                        // Perform smooth scroll animation for better user experience.
+                        listView.smoothScrollBy(scrollAmount, 300);
+                    }
+                }
+                // Highlight the preference once it is positioned.
+                highlightPreferenceAtPosition(listView, targetPosition);
+            } else {
+                // The preference is outside of the current visible range, scroll to it from the top.
+                listView.smoothScrollToPositionFromTop(targetPosition, 0);
+
+                Handler handler = new Handler(Looper.getMainLooper());
+                // Fallback runnable in case the OnScrollListener does not trigger.
+                Runnable fallback = () -> {
+                    listView.setOnScrollListener(null);
+                    highlightPreferenceAtPosition(listView, targetPosition);
+                };
+                // Post fallback with a small delay.
+                handler.postDelayed(fallback, 350);
+
+                listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                    private boolean isScrolling = false;
+
+                    @Override
+                    public void onScrollStateChanged(AbsListView view, int scrollState) {
+                        if (scrollState == SCROLL_STATE_TOUCH_SCROLL || scrollState == SCROLL_STATE_FLING) {
+                            // Mark that scrolling has started.
+                            isScrolling = true;
+                        }
+                        if (scrollState == SCROLL_STATE_IDLE && isScrolling) {
+                            // Scrolling is finished, cleanup listener and cancel fallback.
+                            isScrolling = false;
+                            listView.setOnScrollListener(null);
+                            handler.removeCallbacks(fallback);
+                            // Highlight the target preference when scrolling is done.
+                            highlightPreferenceAtPosition(listView, targetPosition);
+                        }
+                    }
+
+                    @Override
+                    public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {}
+                });
+            }
+        });
+    }
+
+    /**
+     * Navigates to the final PreferenceScreen using preference keys or titles as fallback.
+     */
+    protected PreferenceScreen navigateToTargetScreen(BaseSearchResultItem item) {
+        PreferenceScreen currentScreen = getMainPreferenceScreen();
+        Preference targetPref = null;
+
+        // Try key-based navigation first.
+        if (item.navigationKeys != null && !item.navigationKeys.isEmpty()) {
+            String finalKey = item.navigationKeys.get(item.navigationKeys.size() - 1);
+            targetPref = findPreferenceByKey(currentScreen, finalKey);
+        }
+
+        // Fallback to title-based navigation.
+        if (targetPref == null && !TextUtils.isEmpty(item.navigationPath)) {
+            String[] pathSegments = item.navigationPath.split(" > ");
+            String finalSegment = pathSegments[pathSegments.length - 1].trim();
+            if (!TextUtils.isEmpty(finalSegment)) {
+                targetPref = findPreferenceByTitle(currentScreen, finalSegment);
+            }
+        }
+
+        if (targetPref instanceof PreferenceScreen targetScreen) {
+            handlePreferenceClick(targetScreen);
+            return targetScreen;
+        }
+
+        return currentScreen;
+    }
+
+    /**
+     * Recursively searches for a preference by title in a preference group.
+     */
+    protected Preference findPreferenceByTitle(PreferenceGroup group, String title) {
+        for (int i = 0; i < group.getPreferenceCount(); i++) {
+            Preference pref = group.getPreference(i);
+            CharSequence prefTitle = pref.getTitle();
+            if (prefTitle != null && (prefTitle.toString().trim().equalsIgnoreCase(title)
+                    || normalizeString(prefTitle.toString()).equals(normalizeString(title)))) {
+                return pref;
+            }
+            if (pref instanceof PreferenceGroup) {
+                Preference found = findPreferenceByTitle((PreferenceGroup) pref, title);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Normalizes string for comparison (removes extra characters, spaces etc).
+     */
+    protected String normalizeString(String input) {
+        if (TextUtils.isEmpty(input)) return "";
+        return input.trim().toLowerCase().replaceAll("\\s+", " ").replaceAll("[^\\w\\s]", "");
+    }
+
+    /**
+     * Gets the ListView from the PreferenceFragment.
+     */
+    protected ListView getPreferenceListView() {
+        View fragmentView = fragment.getView();
+        if (fragmentView != null) {
+            ListView listView = findListViewInViewGroup(fragmentView);
+            if (listView != null) {
+                return listView;
+            }
+        }
+        return fragment.getActivity().findViewById(android.R.id.list);
+    }
+
+    /**
+     * Recursively searches for a ListView in a ViewGroup.
+     */
+    protected ListView findListViewInViewGroup(View view) {
+        if (view instanceof ListView) {
+            return (ListView) view;
+        }
+        if (view instanceof ViewGroup group) {
+            for (int i = 0; i < group.getChildCount(); i++) {
+                ListView result = findListViewInViewGroup(group.getChildAt(i));
+                if (result != null) {
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Finds the position of a preference in the ListView adapter.
+     */
+    protected int findPreferencePosition(Preference targetPreference, ListView listView) {
+        ListAdapter adapter = listView.getAdapter();
+        if (adapter == null) {
+            return -1;
+        }
+
+        for (int i = 0; i < adapter.getCount(); i++) {
+            Object item = adapter.getItem(i);
+            if (item == targetPreference) {
+                return i;
+            }
+            if (item instanceof Preference pref && targetPreference.getKey() != null) {
+                if (targetPreference.getKey().equals(pref.getKey())) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Highlights a preference at the specified position with a blink effect.
+     */
+    protected void highlightPreferenceAtPosition(ListView listView, int position) {
+        int firstVisible = listView.getFirstVisiblePosition();
+        if (position < firstVisible || position > listView.getLastVisiblePosition()) {
+            return;
+        }
+
+        View itemView = listView.getChildAt(position - firstVisible);
+        if (itemView != null) {
+            blinkView(itemView);
+        }
+    }
+
+    /**
+     * Creates a smooth double-blink effect on a view's background without affecting the text.
+     * @param view The View to apply the animation to.
+     */
+    protected void blinkView(View view) {
+        // If a previous animation is still running, cancel it to prevent conflicts.
+        if (currentAnimator != null && currentAnimator.isRunning()) {
+            currentAnimator.cancel();
+        }
+        int startColor = Utils.getAppBackgroundColor();
+        int highlightColor = Utils.adjustColorBrightness(
+                startColor,
+                Utils.isDarkModeEnabled() ? 1.25f : 0.8f
+        );
+        // Animator for transitioning from the start color to the highlight color.
+        ObjectAnimator fadeIn = ObjectAnimator.ofObject(
+                view,
+                "backgroundColor",
+                new ArgbEvaluator(),
+                startColor,
+                highlightColor
+        );
+        fadeIn.setDuration(BLINK_DURATION);
+        // Animator to return to the start color.
+        ObjectAnimator fadeOut = ObjectAnimator.ofObject(
+                view,
+                "backgroundColor",
+                new ArgbEvaluator(),
+                highlightColor,
+                startColor
+        );
+        fadeOut.setDuration(BLINK_DURATION);
+
+        currentAnimator = new AnimatorSet();
+        // Create the sequence: fadeIn -> fadeOut -> (pause) -> fadeIn -> fadeOut.
+        AnimatorSet firstBlink = new AnimatorSet();
+        firstBlink.playSequentially(fadeIn, fadeOut);
+        AnimatorSet secondBlink = new AnimatorSet();
+        secondBlink.playSequentially(fadeIn.clone(), fadeOut.clone()); // Use clones for the second blink.
+
+        currentAnimator.play(secondBlink).after(firstBlink).after(PAUSE_BETWEEN_BLINKS);
+        currentAnimator.start();
+    }
+
+    /**
+     * Recursively finds a preference by key in a preference group.
+     */
+    protected Preference findPreferenceByKey(PreferenceGroup group, String key) {
+        if (group == null || TextUtils.isEmpty(key)) {
+            return null;
+        }
+
+        // First search on current level.
+        for (int i = 0; i < group.getPreferenceCount(); i++) {
+            Preference pref = group.getPreference(i);
+            if (key.equals(pref.getKey())) {
+                return pref;
+            }
+            if (pref instanceof PreferenceGroup) {
+                Preference found = findPreferenceByKey((PreferenceGroup) pref, key);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Handles preference click actions by invoking the preference's performClick method via reflection.
+     */
+    @SuppressWarnings("all")
+    private void handlePreferenceClick(Preference preference) {
+        try {
+            if (preference instanceof CustomDialogListPreference listPref) {
+                BaseSearchResultItem.PreferenceSearchItem searchItem =
+                        searchViewController.findSearchItemByPreference(preference);
+                if (searchItem != null && searchItem.isEntriesHighlightingApplied()) {
+                    listPref.setHighlightedEntriesForDialog(searchItem.getHighlightedEntries());
+                }
+            }
+
+            Method m = Preference.class.getDeclaredMethod("performClick", PreferenceScreen.class);
+            m.setAccessible(true);
+            m.invoke(preference, fragment.getPreferenceScreenForSearch());
+        } catch (Exception e) {
+            Logger.printException(() -> "Failed to invoke performClick()", e);
+        }
+    }
+
+    /**
+     * Checks if a preference has navigation capability (can open a new screen).
+     */
+    boolean hasNavigationCapability(Preference preference) {
+        // PreferenceScreen always allows navigation.
+        if (preference instanceof PreferenceScreen) return true;
+        // UrlLinkPreference does not navigate to a new screen, it opens an external URL.
+        if (preference instanceof UrlLinkPreference) return false;
+        // Other group types that might have their own screens.
+        if (preference instanceof PreferenceGroup) {
+            // Check if it has its own fragment or intent.
+            return preference.getIntent() != null || preference.getFragment() != null;
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,683 @@
+package app.revanced.extension.shared.settings.search;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.SearchView;
+import android.widget.Toolbar;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.RequiresApi;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.AppLanguage;
+import app.revanced.extension.shared.settings.BaseSettings;
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.settings.preference.ColorPickerPreference;
+import app.revanced.extension.shared.settings.preference.CustomDialogListPreference;
+import app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory;
+
+/**
+ * Abstract controller for managing the overlay search view in ReVanced settings.
+ * Subclasses must implement app-specific preference handling.
+ */
+@SuppressWarnings("deprecation")
+public abstract class BaseSearchViewController {
+    protected SearchView searchView;
+    protected FrameLayout searchContainer;
+    protected FrameLayout overlayContainer;
+    protected final Toolbar toolbar;
+    protected final Activity activity;
+    protected final BasePreferenceFragment fragment;
+    protected final CharSequence originalTitle;
+    protected BaseSearchResultsAdapter searchResultsAdapter;
+    protected final List<BaseSearchResultItem> allSearchItems;
+    protected final List<BaseSearchResultItem> filteredSearchItems;
+    protected final Map<String, BaseSearchResultItem> keyToSearchItem;
+    protected final InputMethodManager inputMethodManager;
+    protected SearchHistoryManager searchHistoryManager;
+    protected boolean isSearchActive;
+    protected boolean isShowingSearchHistory;
+
+    protected static final int MAX_SEARCH_RESULTS = 50; // Maximum number of search results displayed.
+
+    protected static final int ID_REVANCED_SEARCH_VIEW = getResourceIdentifierOrThrow("revanced_search_view", "id");
+    protected static final int ID_REVANCED_SEARCH_VIEW_CONTAINER = getResourceIdentifierOrThrow("revanced_search_view_container", "id");
+    protected static final int ID_ACTION_SEARCH = getResourceIdentifierOrThrow("action_search", "id");
+    protected static final int ID_REVANCED_SETTINGS_FRAGMENTS = getResourceIdentifierOrThrow("revanced_settings_fragments", "id");
+    public static final int DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON =
+            getResourceIdentifierOrThrow("revanced_settings_search_icon", "drawable");
+    protected static final int MENU_REVANCED_SEARCH_MENU =
+            getResourceIdentifierOrThrow("revanced_search_menu", "menu");
+
+    /**
+     * Constructs a new BaseSearchViewController instance.
+     *
+     * @param activity The activity hosting the search view.
+     * @param toolbar  The toolbar containing the search action.
+     * @param fragment The preference fragment to manage search preferences.
+     */
+    protected BaseSearchViewController(Activity activity, Toolbar toolbar, BasePreferenceFragment fragment) {
+        this.activity = activity;
+        this.toolbar = toolbar;
+        this.fragment = fragment;
+        this.originalTitle = toolbar.getTitle();
+        this.allSearchItems = new ArrayList<>();
+        this.filteredSearchItems = new ArrayList<>();
+        this.keyToSearchItem = new HashMap<>();
+        this.inputMethodManager = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        this.isShowingSearchHistory = false;
+
+        // Initialize components
+        initializeSearchView();
+        initializeOverlayContainer();
+        initializeSearchHistoryManager();
+        setupToolbarMenu();
+        setupListeners();
+    }
+
+    /**
+     * Initializes the search view with proper configurations, such as background, query hint, and RTL support.
+     */
+    private void initializeSearchView() {
+        // Retrieve SearchView and container from XML.
+        searchView = activity.findViewById(ID_REVANCED_SEARCH_VIEW);
+        EditText searchEditText = searchView.findViewById(Utils.getResourceIdentifierOrThrow(
+                "android:id/search_src_text", null));
+        // Disable fullscreen keyboard mode.
+        searchEditText.setImeOptions(searchEditText.getImeOptions() | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+
+        searchContainer = activity.findViewById(ID_REVANCED_SEARCH_VIEW_CONTAINER);
+
+        // Set background and query hint.
+        searchView.setBackground(createBackgroundDrawable());
+        searchView.setQueryHint(str("revanced_settings_search_hint"));
+
+        // Set text size.
+        searchEditText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+
+        // Set cursor color.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            setCursorColor(searchEditText);
+        }
+
+        // Configure RTL support based on app language.
+        AppLanguage appLanguage = BaseSettings.REVANCED_LANGUAGE.get();
+        if (Utils.isRightToLeftLocale(appLanguage.getLocale())) {
+            searchView.setTextDirection(View.TEXT_DIRECTION_RTL);
+            searchView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
+        }
+    }
+
+    /**
+     * Sets the cursor color (for Android 10+ devices).
+     */
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    private void setCursorColor(EditText editText) {
+        // Get the cursor color based on the current theme.
+        final int cursorColor = Utils.isDarkModeEnabled() ? Color.WHITE : Color.BLACK;
+
+        // Create cursor drawable.
+        GradientDrawable cursorDrawable = new GradientDrawable();
+        cursorDrawable.setShape(GradientDrawable.RECTANGLE);
+        cursorDrawable.setSize(Utils.dipToPixels(2), -1); // Width: 2dp, Height: match text height.
+        cursorDrawable.setColor(cursorColor);
+
+        // Set cursor drawable.
+        editText.setTextCursorDrawable(cursorDrawable);
+    }
+
+    /**
+     * Initializes the overlay container for displaying search results and history.
+     */
+    private void initializeOverlayContainer() {
+        // Create overlay container for search results and history.
+        overlayContainer = new FrameLayout(activity);
+        overlayContainer.setVisibility(View.GONE);
+        overlayContainer.setBackgroundColor(Utils.getAppBackgroundColor());
+        overlayContainer.setElevation(Utils.dipToPixels(8));
+
+        // Container for search results.
+        FrameLayout searchResultsContainer = new FrameLayout(activity);
+        searchResultsContainer.setVisibility(View.VISIBLE);
+
+        // Create a ListView for the results.
+        ListView searchResultsListView = new ListView(activity);
+        searchResultsListView.setDivider(null);
+        searchResultsListView.setDividerHeight(0);
+        searchResultsAdapter = createSearchResultsAdapter();
+        searchResultsListView.setAdapter(searchResultsAdapter);
+
+        // Add results list into container.
+        searchResultsContainer.addView(searchResultsListView, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        // Add results container into overlay.
+        overlayContainer.addView(searchResultsContainer, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        // Add overlay to the main content container.
+        FrameLayout mainContainer = activity.findViewById(ID_REVANCED_SETTINGS_FRAGMENTS);
+        if (mainContainer != null) {
+            FrameLayout.LayoutParams overlayParams = new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT);
+            overlayParams.gravity = Gravity.TOP;
+            mainContainer.addView(overlayContainer, overlayParams);
+        }
+    }
+
+    /**
+     * Initializes the search history manager with the specified overlay container and listener.
+     */
+    private void initializeSearchHistoryManager() {
+        searchHistoryManager = new SearchHistoryManager(activity, overlayContainer, query -> {
+            searchView.setQuery(query, true);
+            hideSearchHistory();
+        });
+    }
+
+    // Abstract methods that subclasses must implement.
+    protected abstract BaseSearchResultsAdapter createSearchResultsAdapter();
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    protected abstract boolean isSpecialPreferenceGroup(Preference preference);
+    protected abstract void setupSpecialPreferenceListeners(BaseSearchResultItem item);
+
+    // Abstract interface for preference fragments.
+    public interface BasePreferenceFragment {
+        PreferenceScreen getPreferenceScreenForSearch();
+        android.view.View getView();
+        Activity getActivity();
+    }
+
+    /**
+     * Determines whether a preference should be included in the search index.
+     *
+     * @param preference   The preference to evaluate.
+     * @param currentDepth The current depth in the preference hierarchy.
+     * @param includeDepth The maximum depth to include in the search index.
+     * @return True if the preference should be included, false otherwise.
+     */
+    protected boolean shouldIncludePreference(Preference preference, int currentDepth, int includeDepth) {
+        return includeDepth <= currentDepth
+                && !(preference instanceof PreferenceCategory)
+                && !isSpecialPreferenceGroup(preference)
+                && !(preference instanceof PreferenceScreen);
+    }
+
+    /**
+     * Sets up the toolbar menu for the search action.
+     */
+    protected void setupToolbarMenu() {
+        toolbar.inflateMenu(MENU_REVANCED_SEARCH_MENU);
+        toolbar.setOnMenuItemClickListener(item -> {
+            if (item.getItemId() == ID_ACTION_SEARCH && !isSearchActive) {
+                openSearch();
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     * Configures listeners for the search view and toolbar navigation.
+     */
+    protected void setupListeners() {
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                try {
+                    String queryTrimmed = query.trim();
+                    if (!queryTrimmed.isEmpty()) {
+                        searchHistoryManager.saveSearchQuery(queryTrimmed);
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onQueryTextSubmit failure", ex);
+                }
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                try {
+                    Logger.printDebug(() -> "Search query: " + newText);
+
+                    String trimmedText = newText.trim();
+                    if (!isSearchActive) {
+                        Logger.printDebug(() -> "Search is not active, skipping query processing");
+                        return true;
+                    }
+
+                    if (trimmedText.isEmpty()) {
+                        // If empty query: show history.
+                        hideSearchResults();
+                        showSearchHistory();
+                    } else {
+                        // If has search text: hide history and show search results.
+                        hideSearchHistory();
+                        filterAndShowResults(newText);
+                    }
+                } catch (Exception ex) {
+                    Logger.printException(() -> "onQueryTextChange failure", ex);
+                }
+                return true;
+            }
+        });
+        // Set navigation click listener.
+        toolbar.setNavigationOnClickListener(view -> {
+            if (isSearchActive) {
+                closeSearch();
+            } else {
+                activity.finish();
+            }
+        });
+    }
+
+    /**
+     * Initializes search data by collecting all searchable preferences from the fragment.
+     * This method should be called after the preference fragment is fully loaded.
+     * Runs on the UI thread to ensure proper access to preference components.
+     */
+    public void initializeSearchData() {
+        allSearchItems.clear();
+        keyToSearchItem.clear();
+        // Wait until fragment is properly initialized.
+        activity.runOnUiThread(() -> {
+            try {
+                PreferenceScreen screen = fragment.getPreferenceScreenForSearch();
+                if (screen != null) {
+                    collectSearchablePreferences(screen);
+                    for (BaseSearchResultItem item : allSearchItems) {
+                        if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                            String key = prefItem.preference.getKey();
+                            if (key != null) {
+                                keyToSearchItem.put(key, item);
+                            }
+                        }
+                    }
+                    setupPreferenceListeners();
+                    Logger.printDebug(() -> "Collected " + allSearchItems.size() + " searchable preferences");
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "Failed to initialize search data", ex);
+            }
+        });
+    }
+
+    /**
+     * Sets up listeners for preferences to keep search results in sync when preference values change.
+     */
+    protected void setupPreferenceListeners() {
+        for (BaseSearchResultItem item : allSearchItems) {
+            // Skip non-preference items.
+            if (!(item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem)) continue;
+            Preference pref = prefItem.preference;
+
+            if (pref instanceof ColorPickerPreference colorPref) {
+                colorPref.setOnColorChangeListener((prefKey, newColor) -> {
+                    BaseSearchResultItem.PreferenceSearchItem searchItem =
+                            (BaseSearchResultItem.PreferenceSearchItem) keyToSearchItem.get(prefKey);
+                    if (searchItem != null) {
+                        searchItem.setColor(newColor);
+                        refreshSearchResults();
+                    }
+                });
+            } else if (pref instanceof CustomDialogListPreference listPref) {
+                listPref.setOnPreferenceChangeListener((preference, newValue) -> {
+                    BaseSearchResultItem.PreferenceSearchItem searchItem =
+                            (BaseSearchResultItem.PreferenceSearchItem) keyToSearchItem.get(preference.getKey());
+                    if (searchItem == null) return true;
+
+                    int index = listPref.findIndexOfValue(newValue.toString());
+                    if (index >= 0) {
+                        // Check if a static summary is set.
+                        boolean isStaticSummary = listPref.getStaticSummary() != null;
+                        if (!isStaticSummary) {
+                            // Only update summary if it is not static.
+                            CharSequence newSummary = listPref.getEntries()[index];
+                            listPref.setSummary(newSummary);
+                        }
+                    }
+
+                    listPref.clearHighlightedEntriesForDialog();
+                    searchItem.refreshHighlighting();
+                    refreshSearchResults();
+                    return true;
+                });
+            }
+
+            // Let subclasses handle special preferences.
+            setupSpecialPreferenceListeners(item);
+        }
+    }
+
+    /**
+     * Collects searchable preferences from a preference group.
+     */
+    protected void collectSearchablePreferences(PreferenceGroup group) {
+        collectSearchablePreferencesWithKeys(group, "", new ArrayList<>(), 1, 0);
+    }
+
+    /**
+     * Collects searchable preferences with their navigation paths and keys.
+     *
+     * @param group        The preference group to collect from.
+     * @param parentPath   The navigation path of the parent group.
+     * @param parentKeys   The keys of parent preferences.
+     * @param includeDepth The maximum depth to include in the search index.
+     * @param currentDepth The current depth in the preference hierarchy.
+     */
+    protected void collectSearchablePreferencesWithKeys(PreferenceGroup group, String parentPath,
+                                                        List<String> parentKeys, int includeDepth, int currentDepth) {
+        if (group == null) return;
+
+        for (int i = 0, count = group.getPreferenceCount(); i < count; i++) {
+            Preference preference = group.getPreference(i);
+
+            // Add to search results only if it is not a category, special group, or PreferenceScreen.
+            if (shouldIncludePreference(preference, currentDepth, includeDepth)) {
+                allSearchItems.add(new BaseSearchResultItem.PreferenceSearchItem(
+                        preference, parentPath, parentKeys));
+            }
+
+            // If the preference is a group, recurse into it.
+            if (preference instanceof PreferenceGroup subGroup) {
+                String newPath = parentPath;
+                List<String> newKeys = new ArrayList<>(parentKeys);
+
+                // Append the group title to the path and save key for navigation.
+                if (!isSpecialPreferenceGroup(preference)
+                        && !(preference instanceof NoTitlePreferenceCategory)) {
+                    CharSequence title = preference.getTitle();
+                    if (!TextUtils.isEmpty(title)) {
+                        newPath = TextUtils.isEmpty(parentPath)
+                                ? title.toString()
+                                : parentPath + " > " + title;
+                    }
+
+                    // Add key for navigation if this is a PreferenceScreen or group with navigation capability.
+                    String key = preference.getKey();
+                    if (!TextUtils.isEmpty(key) && (preference instanceof PreferenceScreen
+                            || searchResultsAdapter.hasNavigationCapability(preference))) {
+                        newKeys.add(key);
+                    }
+                }
+
+                collectSearchablePreferencesWithKeys(subGroup, newPath, newKeys, includeDepth, currentDepth + 1);
+            }
+        }
+    }
+
+    /**
+     * Filters all search items based on the provided query and displays results in the overlay.
+     * Applies highlighting to matching text and shows a "no results" message if nothing matches.
+     */
+    protected void filterAndShowResults(String query) {
+        hideSearchHistory();
+        // Keep track of the previously displayed items to clear their highlights.
+        List<BaseSearchResultItem> previouslyDisplayedItems = new ArrayList<>(filteredSearchItems);
+
+        filteredSearchItems.clear();
+
+        String queryLower = Utils.removePunctuationToLowercase(query);
+        Pattern queryPattern = Pattern.compile(Pattern.quote(queryLower), Pattern.CASE_INSENSITIVE);
+
+        // Clear highlighting only for items that were previously visible.
+        // This avoids iterating through all items on every keystroke during filtering.
+        for (BaseSearchResultItem item : previouslyDisplayedItems) {
+            item.clearHighlighting();
+        }
+
+        // Collect matched items first.
+        List<BaseSearchResultItem> matched = new ArrayList<>();
+        int matchCount = 0;
+        for (BaseSearchResultItem item : allSearchItems) {
+            if (matchCount >= MAX_SEARCH_RESULTS) break; // Stop after collecting max results.
+            if (item.matchesQuery(queryLower)) {
+                item.applyHighlighting(queryPattern);
+                matched.add(item);
+                matchCount++;
+            }
+        }
+
+        // Build filteredSearchItems, inserting parent enablers for disabled dependents.
+        Set<String> addedParentKeys = new HashSet<>(2 * matched.size());
+        for (BaseSearchResultItem item : matched) {
+            if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                String key = prefItem.preference.getKey();
+                Setting<?> setting = (key != null) ? Setting.getSettingFromPath(key) : null;
+                if (setting != null && !setting.isAvailable()) {
+                    List<Setting<?>> parentSettings = setting.getParentSettings();
+                    for (Setting<?> parentSetting : parentSettings) {
+                        BaseSearchResultItem parentItem = keyToSearchItem.get(parentSetting.key);
+                        if (parentItem != null && !addedParentKeys.contains(parentSetting.key)) {
+                            if (!parentItem.matchesQuery(queryLower)) {
+                                // Apply highlighting to parent items even if they don't match the query.
+                                // This ensures they get their current effective summary calculated.
+                                parentItem.applyHighlighting(queryPattern);
+                                filteredSearchItems.add(parentItem);
+                            }
+                            addedParentKeys.add(parentSetting.key);
+                        }
+                    }
+                }
+                filteredSearchItems.add(item);
+                if (key != null) {
+                    addedParentKeys.add(key);
+                }
+            }
+        }
+
+        if (!filteredSearchItems.isEmpty()) {
+            //noinspection ComparatorCombinators
+            Collections.sort(filteredSearchItems, (o1, o2) ->
+                    o1.navigationPath.compareTo(o2.navigationPath)
+            );
+            List<BaseSearchResultItem> displayItems = new ArrayList<>();
+            String currentPath = null;
+            for (BaseSearchResultItem item : filteredSearchItems) {
+                if (!item.navigationPath.equals(currentPath)) {
+                    BaseSearchResultItem header = new BaseSearchResultItem.GroupHeaderItem(item.navigationPath, item.navigationKeys);
+                    displayItems.add(header);
+                    currentPath = item.navigationPath;
+                }
+                displayItems.add(item);
+            }
+            filteredSearchItems.clear();
+            filteredSearchItems.addAll(displayItems);
+        }
+        // Show "No results found" if search results are empty.
+        if (filteredSearchItems.isEmpty()) {
+            Preference noResultsPreference = new Preference(activity);
+            noResultsPreference.setKey("no_results_placeholder");
+            noResultsPreference.setTitle(str("revanced_settings_search_no_results_title", query));
+            noResultsPreference.setSummary(str("revanced_settings_search_no_results_summary"));
+            noResultsPreference.setSelectable(false);
+            noResultsPreference.setIcon(DRAWABLE_REVANCED_SETTINGS_SEARCH_ICON);
+            filteredSearchItems.add(new BaseSearchResultItem.PreferenceSearchItem(noResultsPreference, "", Collections.emptyList()));
+        }
+
+        searchResultsAdapter.notifyDataSetChanged();
+        overlayContainer.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Opens the search interface by showing the search view and hiding the menu item.
+     * Configures the UI for search mode, shows the keyboard, and displays search suggestions.
+     */
+    protected void openSearch() {
+        isSearchActive = true;
+        toolbar.getMenu().findItem(ID_ACTION_SEARCH).setVisible(false);
+        toolbar.setTitle("");
+        searchContainer.setVisibility(View.VISIBLE);
+        searchView.requestFocus();
+        // Configure soft input mode to adjust layout and show keyboard.
+        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN
+                | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        inputMethodManager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT);
+        // Always show search history when opening search.
+        showSearchHistory();
+    }
+
+    /**
+     * Closes the search interface and restores the normal UI state.
+     * Hides the overlay, clears search results, dismisses the keyboard, and removes highlighting.
+     */
+    public void closeSearch() {
+        isSearchActive = false;
+        isShowingSearchHistory = false;
+
+        searchHistoryManager.hideSearchHistoryContainer();
+        overlayContainer.setVisibility(View.GONE);
+
+        filteredSearchItems.clear();
+
+        searchContainer.setVisibility(View.GONE);
+        toolbar.getMenu().findItem(ID_ACTION_SEARCH).setVisible(true);
+        toolbar.setTitle(originalTitle);
+        searchView.setQuery("", false);
+        // Hide keyboard and reset soft input mode.
+        inputMethodManager.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
+        activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+        // Clear highlighting for all search items.
+        for (BaseSearchResultItem item : allSearchItems) {
+            item.clearHighlighting();
+        }
+
+        searchResultsAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Shows the search history if enabled.
+     */
+    protected void showSearchHistory() {
+        if (searchHistoryManager.isSearchHistoryEnabled()) {
+            overlayContainer.setVisibility(View.VISIBLE);
+            searchHistoryManager.showSearchHistory();
+            isShowingSearchHistory = true;
+        } else {
+            hideAllOverlays();
+        }
+    }
+
+    /**
+     * Hides the search history container.
+     */
+    protected void hideSearchHistory() {
+        searchHistoryManager.hideSearchHistoryContainer();
+        isShowingSearchHistory = false;
+    }
+
+    /**
+     * Hides all overlay containers, including search results and history.
+     */
+    protected void hideAllOverlays() {
+        hideSearchHistory();
+        hideSearchResults();
+    }
+
+    /**
+     * Hides the search results overlay and clears the filtered results.
+     */
+    protected void hideSearchResults() {
+        overlayContainer.setVisibility(View.GONE);
+        filteredSearchItems.clear();
+        searchResultsAdapter.notifyDataSetChanged();
+        for (BaseSearchResultItem item : allSearchItems) {
+            item.clearHighlighting();
+        }
+    }
+
+    /**
+     * Refreshes the search results display if the search is active and history is not shown.
+     */
+    protected void refreshSearchResults() {
+        if (isSearchActive && !isShowingSearchHistory) {
+            searchResultsAdapter.notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * Finds a search item corresponding to the given preference.
+     *
+     * @param preference The preference to find a search item for.
+     * @return The corresponding PreferenceSearchItem, or null if not found.
+     */
+    public BaseSearchResultItem.PreferenceSearchItem findSearchItemByPreference(Preference preference) {
+        // First, search in filtered results.
+        for (BaseSearchResultItem item : filteredSearchItems) {
+            if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                if (prefItem.preference == preference) {
+                    return prefItem;
+                }
+            }
+        }
+        // If not found, search in all items.
+        for (BaseSearchResultItem item : allSearchItems) {
+            if (item instanceof BaseSearchResultItem.PreferenceSearchItem prefItem) {
+                if (prefItem.preference == preference) {
+                    return prefItem;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets the background color for search view components based on current theme.
+     */
+    @ColorInt
+    public static int getSearchViewBackground() {
+        return Utils.adjustColorBrightness(Utils.getDialogBackgroundColor(), Utils.isDarkModeEnabled() ? 1.11f : 0.95f);
+    }
+
+    /**
+     * Creates a rounded background drawable for the main search view.
+     */
+    protected static GradientDrawable createBackgroundDrawable() {
+        GradientDrawable background = new GradientDrawable();
+        background.setShape(GradientDrawable.RECTANGLE);
+        background.setCornerRadius(Utils.dipToPixels(28));
+        background.setColor(getSearchViewBackground());
+        return background;
+    }
+
+    /**
+     * Return if a search is currently active.
+     */
+    public boolean isSearchActive() {
+        return isSearchActive;
+    }
+}

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

@@ -0,0 +1,377 @@
+package app.revanced.extension.shared.settings.search;
+
+import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.shared.Utils.getResourceIdentifierOrThrow;
+import static app.revanced.extension.shared.settings.BaseSettings.SETTINGS_SEARCH_ENTRIES;
+import static app.revanced.extension.shared.settings.BaseSettings.SETTINGS_SEARCH_HISTORY;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.LinkedList;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.settings.preference.BulletPointPreference;
+import app.revanced.extension.shared.ui.CustomDialog;
+
+/**
+ * Manager for search history functionality.
+ */
+public class SearchHistoryManager {
+    /**
+     * Interface for handling history item selection.
+     */
+    private static final int MAX_HISTORY_SIZE = 5;  // Maximum history items stored.
+
+    private static final int ID_CLEAR_HISTORY_BUTTON = getResourceIdentifierOrThrow(
+            "clear_history_button", "id");
+    private static final int ID_HISTORY_TEXT = getResourceIdentifierOrThrow(
+            "history_text", "id");
+    private static final int ID_DELETE_ICON = getResourceIdentifierOrThrow(
+            "delete_icon", "id");
+    private static final int ID_EMPTY_HISTORY_TITLE = getResourceIdentifierOrThrow(
+            "empty_history_title", "id");
+    private static final int ID_EMPTY_HISTORY_SUMMARY = getResourceIdentifierOrThrow(
+            "empty_history_summary", "id");
+    private static final int ID_SEARCH_HISTORY_HEADER = getResourceIdentifierOrThrow(
+            "search_history_header", "id");
+    private static final int ID_SEARCH_TIPS_SUMMARY = getResourceIdentifierOrThrow(
+            "revanced_settings_search_tips_summary", "id");
+    private static final int LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN = getResourceIdentifierOrThrow(
+            "revanced_preference_search_history_screen", "layout");
+    private static final int LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM = getResourceIdentifierOrThrow(
+            "revanced_preference_search_history_item", "layout");
+    private static final int ID_SEARCH_HISTORY_LIST = getResourceIdentifierOrThrow(
+            "search_history_list", "id");
+
+    private final Deque<String> searchHistory;
+    private final Activity activity;
+    private final SearchHistoryAdapter searchHistoryAdapter;
+    private final boolean showSettingsSearchHistory;
+    private final FrameLayout searchHistoryContainer;
+
+    public interface OnSelectHistoryItemListener {
+        void onSelectHistoryItem(String query);
+    }
+
+    /**
+     * Constructor for SearchHistoryManager.
+     *
+     * @param activity                  The parent activity.
+     * @param overlayContainer          The overlay container to hold the search history container.
+     * @param onSelectHistoryItemAction Callback for when a history item is selected.
+     */
+    SearchHistoryManager(Activity activity, FrameLayout overlayContainer,
+                         OnSelectHistoryItemListener onSelectHistoryItemAction) {
+        this.activity = activity;
+        this.showSettingsSearchHistory = SETTINGS_SEARCH_HISTORY.get();
+        this.searchHistory = new LinkedList<>();
+
+        // Initialize search history from settings.
+        if (showSettingsSearchHistory) {
+            String entries = SETTINGS_SEARCH_ENTRIES.get();
+            if (!entries.isBlank()) {
+                searchHistory.addAll(Arrays.asList(entries.split("\n")));
+            }
+        } else {
+            // Clear old saved history if the feature is disabled.
+            SETTINGS_SEARCH_ENTRIES.resetToDefault();
+        }
+
+        // Create search history container.
+        this.searchHistoryContainer = new FrameLayout(activity);
+        searchHistoryContainer.setVisibility(View.GONE);
+
+        // Inflate search history layout.
+        LayoutInflater inflater = LayoutInflater.from(activity);
+        View historyView = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_SCREEN, searchHistoryContainer, false);
+        searchHistoryContainer.addView(historyView, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        // Add history container to overlay.
+        FrameLayout.LayoutParams overlayParams = new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT);
+        overlayParams.gravity = Gravity.TOP;
+        overlayContainer.addView(searchHistoryContainer, overlayParams);
+
+        // Find the LinearLayout for the history list within the container.
+        LinearLayout searchHistoryListView = searchHistoryContainer.findViewById(ID_SEARCH_HISTORY_LIST);
+        if (searchHistoryListView == null) {
+            throw new IllegalStateException("Search history list view not found in container");
+        }
+
+        // Set up history adapter. Use a copy of the search history.
+        this.searchHistoryAdapter = new SearchHistoryAdapter(activity, searchHistoryListView,
+                new ArrayList<>(searchHistory), onSelectHistoryItemAction);
+
+        // Set up clear history button.
+        TextView clearHistoryButton = searchHistoryContainer.findViewById(ID_CLEAR_HISTORY_BUTTON);
+        clearHistoryButton.setOnClickListener(v -> createAndShowDialog(
+                str("revanced_settings_search_clear_history"),
+                str("revanced_settings_search_clear_history_message"),
+                this::clearAllSearchHistory
+        ));
+
+        // Set up search tips summary.
+        CharSequence text = BulletPointPreference.formatIntoBulletPoints(
+                str("revanced_settings_search_tips_summary"));
+        TextView tipsSummary = historyView.findViewById(ID_SEARCH_TIPS_SUMMARY);
+        tipsSummary.setText(text);
+    }
+
+    /**
+     * Shows search history screen - either with history items or empty history message.
+     */
+    public void showSearchHistory() {
+        if (!showSettingsSearchHistory) {
+            return;
+        }
+
+        // Find all view elements.
+        TextView emptyHistoryTitle = searchHistoryContainer.findViewById(ID_EMPTY_HISTORY_TITLE);
+        TextView emptyHistorySummary = searchHistoryContainer.findViewById(ID_EMPTY_HISTORY_SUMMARY);
+        TextView historyHeader = searchHistoryContainer.findViewById(ID_SEARCH_HISTORY_HEADER);
+        LinearLayout historyList = searchHistoryContainer.findViewById(ID_SEARCH_HISTORY_LIST);
+        TextView clearHistoryButton = searchHistoryContainer.findViewById(ID_CLEAR_HISTORY_BUTTON);
+
+        if (searchHistory.isEmpty()) {
+            // Show empty history state.
+            showEmptyHistoryViews(emptyHistoryTitle, emptyHistorySummary);
+            hideHistoryViews(historyHeader, historyList, clearHistoryButton);
+        } else {
+            // Show history list state.
+            hideEmptyHistoryViews(emptyHistoryTitle, emptyHistorySummary);
+            showHistoryViews(historyHeader, historyList, clearHistoryButton);
+
+            // Update adapter with current history.
+            searchHistoryAdapter.clear();
+            searchHistoryAdapter.addAll(searchHistory);
+            searchHistoryAdapter.notifyDataSetChanged();
+        }
+
+        // Show the search history container.
+        showSearchHistoryContainer();
+    }
+
+    /**
+     * Saves a search query to the history, maintaining the size limit.
+     */
+    public void saveSearchQuery(String query) {
+        if (!showSettingsSearchHistory) return;
+
+        searchHistory.remove(query); // Remove if already exists to update position.
+        searchHistory.addFirst(query); // Add to the most recent.
+
+        // Remove extra old entries.
+        while (searchHistory.size() > MAX_HISTORY_SIZE) {
+            String last = searchHistory.removeLast();
+            Logger.printDebug(() -> "Removing search history query: " + last);
+        }
+
+        saveSearchHistory();
+    }
+
+    /**
+     * Saves the search history to shared preferences.
+     */
+    protected void saveSearchHistory() {
+        Logger.printDebug(() -> "Saving search history: " + searchHistory);
+        SETTINGS_SEARCH_ENTRIES.save(String.join("\n", searchHistory));
+    }
+
+    /**
+     * Removes a search query from the history.
+     */
+    public void removeSearchQuery(String query) {
+        searchHistory.remove(query);
+        saveSearchHistory();
+    }
+
+    /**
+     * Clears all search history.
+     */
+    public void clearAllSearchHistory() {
+        searchHistory.clear();
+        saveSearchHistory();
+        searchHistoryAdapter.clear();
+        searchHistoryAdapter.notifyDataSetChanged();
+        showSearchHistory();
+    }
+
+    /**
+     * Checks if search history feature is enabled.
+     */
+    public boolean isSearchHistoryEnabled() {
+        return showSettingsSearchHistory;
+    }
+
+    /**
+     * Shows the search history container and overlay.
+     */
+    public void showSearchHistoryContainer() {
+        searchHistoryContainer.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Hides the search history container.
+     */
+    public void hideSearchHistoryContainer() {
+        searchHistoryContainer.setVisibility(View.GONE);
+    }
+
+    /**
+     * Helper method to show empty history views.
+     */
+    protected void showEmptyHistoryViews(TextView emptyTitle, TextView emptySummary) {
+        emptyTitle.setVisibility(View.VISIBLE);
+        emptyTitle.setText(str("revanced_settings_search_empty_history_title"));
+        emptySummary.setVisibility(View.VISIBLE);
+        emptySummary.setText(str("revanced_settings_search_empty_history_summary"));
+    }
+
+    /**
+     * Helper method to hide empty history views.
+     */
+    protected void hideEmptyHistoryViews(TextView emptyTitle, TextView emptySummary) {
+        emptyTitle.setVisibility(View.GONE);
+        emptySummary.setVisibility(View.GONE);
+    }
+
+    /**
+     * Helper method to show history list views.
+     */
+    protected void showHistoryViews(TextView header, LinearLayout list, TextView clearButton) {
+        header.setVisibility(View.VISIBLE);
+        list.setVisibility(View.VISIBLE);
+        clearButton.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Helper method to hide history list views.
+     */
+    protected void hideHistoryViews(TextView header, LinearLayout list, TextView clearButton) {
+        header.setVisibility(View.GONE);
+        list.setVisibility(View.GONE);
+        clearButton.setVisibility(View.GONE);
+    }
+
+    /**
+     * Creates and shows a dialog with the specified title, message, and confirmation action.
+     *
+     * @param title            The title of the dialog.
+     * @param message          The message to display in the dialog.
+     * @param confirmAction    The action to perform when the dialog is confirmed.
+     */
+    protected void createAndShowDialog(String title, String message, Runnable confirmAction) {
+        Pair<Dialog, LinearLayout> dialogPair = CustomDialog.create(
+                activity,
+                title,
+                message,
+                null,
+                null,
+                confirmAction,
+                () -> {},
+                null,
+                null,
+                false
+        );
+
+        Dialog dialog = dialogPair.first;
+        dialog.setCancelable(true);
+        dialog.show();
+    }
+
+
+    /**
+     * Custom adapter for search history items.
+     */
+    protected class SearchHistoryAdapter {
+        protected final Collection<String> history;
+        protected final LayoutInflater inflater;
+        protected final LinearLayout container;
+        protected final OnSelectHistoryItemListener onSelectHistoryItemListener;
+
+        public SearchHistoryAdapter(Context context, LinearLayout container, Collection<String> history,
+                                    OnSelectHistoryItemListener listener) {
+            this.history = history;
+            this.inflater = LayoutInflater.from(context);
+            this.container = container;
+            this.onSelectHistoryItemListener = listener;
+        }
+
+        /**
+         * Updates the container with current history items.
+         */
+        public void notifyDataSetChanged() {
+            container.removeAllViews();
+            for (String query : history) {
+                View view = inflater.inflate(LAYOUT_REVANCED_PREFERENCE_SEARCH_HISTORY_ITEM, container, false);
+
+                TextView historyText = view.findViewById(ID_HISTORY_TEXT);
+                ImageView deleteIcon = view.findViewById(ID_DELETE_ICON);
+
+                historyText.setText(query);
+
+                // Set click listener for main item (select query).
+                view.setOnClickListener(v -> onSelectHistoryItemListener.onSelectHistoryItem(query));
+
+                // Set click listener for delete icon.
+                deleteIcon.setOnClickListener(v -> createAndShowDialog(
+                        query,
+                        str("revanced_settings_search_remove_message"),
+                        () -> {
+                            removeSearchQuery(query);
+                            remove(query);
+                            notifyDataSetChanged();
+                        }
+                ));
+
+                container.addView(view);
+            }
+        }
+
+        /**
+         * Clears all views from the container and history list.
+         */
+        public void clear() {
+            history.clear();
+            container.removeAllViews();
+        }
+
+        /**
+         * Adds all provided history items to the container.
+         */
+        public void addAll(Collection<String> items) {
+            history.addAll(items);
+            notifyDataSetChanged();
+        }
+
+        /**
+         * Removes a query from the history and updates the container.
+         */
+        public void remove(String query) {
+            history.remove(query);
+            if (history.isEmpty()) {
+                // If history is now empty, show the empty history state.
+                showSearchHistory();
+            } else {
+                notifyDataSetChanged();
+            }
+        }
+    }
+}

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

@@ -2,17 +2,22 @@ package app.revanced.extension.shared.spoof;
 
 import android.os.Build;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.Locale;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
-import app.revanced.extension.shared.settings.BaseSettings;
 
+@SuppressWarnings("ConstantLocale")
 public enum ClientType {
+    /**
+     * Video not playable: Kids / Paid / Movie / Private / Age-restricted.
+     * This client can only be used when logged out.
+     */
     // https://dumps.tadiphone.dev/dumps/oculus/eureka
-    ANDROID_VR_NO_AUTH(
+    ANDROID_VR_1_61_48(
             28,
             "ANDROID_VR",
             "com.google.android.apps.youtube.vr.oculus",
@@ -27,29 +32,32 @@ public enum ClientType {
             "1.61.48",
             false,
             false,
-            "Android VR No auth"
+            "Android VR 1.61"
     ),
-    // Chromecast with Google TV 4K.
-    // https://dumps.tadiphone.dev/dumps/google/kirkwood
-    ANDROID_UNPLUGGED(
-            29,
-            "ANDROID_UNPLUGGED",
-            "com.google.android.apps.youtube.unplugged",
-            "Google",
-            "Google TV Streamer",
-            "Android",
-            "14",
-            "34",
-            "UTT3.240625.001.K5",
-            "132.0.6808.3",
-            "8.49.0",
-            true,
-            true,
-            "Android TV"
+    /**
+     * Uses non adaptive bitrate, which fixes audio stuttering with YT Music.
+     * Does not use AV1.
+     */
+    ANDROID_VR_1_43_32(
+            ANDROID_VR_1_61_48.id,
+            ANDROID_VR_1_61_48.clientName,
+            Objects.requireNonNull(ANDROID_VR_1_61_48.packageName),
+            ANDROID_VR_1_61_48.deviceMake,
+            ANDROID_VR_1_61_48.deviceModel,
+            ANDROID_VR_1_61_48.osName,
+            ANDROID_VR_1_61_48.osVersion,
+            Objects.requireNonNull(ANDROID_VR_1_61_48.androidSdkVersion),
+            Objects.requireNonNull(ANDROID_VR_1_61_48.buildId),
+            "107.0.5284.2",
+            "1.43.32",
+            ANDROID_VR_1_61_48.useAuth,
+            ANDROID_VR_1_61_48.supportsMultiAudioTracks,
+            "Android VR 1.43"
     ),
-    // Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
-    // Google Pixel 9 Pro Fold
-    // https://dumps.tadiphone.dev/dumps/google/barbet
+    /**
+     * Cannot play livestreams and lacks HDR, but can play videos with music and labeled "for children".
+     * <a href="https://dumps.tadiphone.dev/dumps/google/barbet">Google Pixel 9 Pro Fold</a>
+     */
     ANDROID_CREATOR(
             14,
             "ANDROID_CREATOR",
@@ -63,61 +71,50 @@ public enum ClientType {
             "132.0.6779.0",
             "23.47.101",
             true,
-            true,
-            "Android Creator"
+            false,
+            "Android Studio"
     ),
-    IOS_UNPLUGGED(
-            33,
-            "IOS_UNPLUGGED",
-            "com.google.ios.youtubeunplugged",
+    /**
+     * Internal YT client for an unreleased YT client. May stop working at any time.
+     */
+    VISIONOS(101,
+            "VISIONOS",
             "Apple",
-            forceAVC()
-                    // 11 Pro Max (last device with iOS 13)
-                    ? "iPhone12,5"
-                    // 15 Pro Max
-                    : "iPhone16,2",
-            "iOS",
-            forceAVC()
-                    // iOS 13 and earlier uses only AVC. 14+ adds VP9 and AV1.
-                    ? "13.7.17H35"
-                    : "18.2.22C152",
-            null,
-            null,
-            null,
-            // Version number should be a valid iOS release.
-            // https://www.ipa4fun.com/history/152043/
-            forceAVC()
-                    // Some newer versions can also force AVC,
-                    // but 6.45 is the last version that supports iOS 13.
-                    ? "6.45"
-                    : "8.49",
-            true,
-            true,
-            forceAVC()
-                    ? "iOS TV Force AVC"
-                    : "iOS TV"
+            "RealityDevice14,1",
+            "visionOS",
+            "1.3.21O771",
+            "0.1",
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
+            false,
+            false,
+            "visionOS"
     ),
-    ANDROID_VR_AUTH(
-            ANDROID_VR_NO_AUTH.id,
-            ANDROID_VR_NO_AUTH.clientName,
-            ANDROID_VR_NO_AUTH.packageName,
-            ANDROID_VR_NO_AUTH.deviceMake,
-            ANDROID_VR_NO_AUTH.deviceModel,
-            ANDROID_VR_NO_AUTH.osName,
-            ANDROID_VR_NO_AUTH.osVersion,
-            ANDROID_VR_NO_AUTH.androidSdkVersion,
-            ANDROID_VR_NO_AUTH.buildId,
-            ANDROID_VR_NO_AUTH.cronetVersion,
-            ANDROID_VR_NO_AUTH.clientVersion,
-            ANDROID_VR_NO_AUTH.requiresAuth,
+    /**
+     * The device machine id for the iPad 6th Gen (iPad7,6).
+     * AV1 hardware decoding is not supported.
+     * See [this GitHub Gist](https://gist.github.com/adamawolf/3048717) for more information.
+     *
+     * Based on Google's actions to date, PoToken may not be required on devices with very low specs.
+     * For example, suppose the User-Agent for a PlayStation 3 (with 256MB of RAM) is used.
+     * Accessing 'Web' (https://www.youtube.com) will redirect to 'TV' (https://www.youtube.com/tv).
+     * 'TV' target devices with very low specs, such as embedded devices, game consoles, and blu-ray players, so PoToken is not required.
+     *
+     * For this reason, the device machine id for the iPad 6th Gen (with 2GB of RAM),
+     * the lowest spec device capable of running iPadOS 17, was used.
+     */
+    IPADOS(5,
+            "IOS",
+            "Apple",
+            "iPad7,6",
+            "iPadOS",
+            "17.7.10.21H450",
+            "19.22.3",
+            "com.google.ios.youtube/19.22.3 (iPad7,6; U; CPU iPadOS 17_7_10 like Mac OS X; " + Locale.getDefault() + ")",
+            false,
             true,
-            "Android VR Auth"
+            "iPadOS"
     );
 
-    private static boolean forceAVC() {
-        return BaseSettings.SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC.get();
-    }
-
     /**
      * YouTube
      * <a href="https://github.com/zerodytrash/YouTube-Internal-Clients?tab=readme-ov-file#clients">client type</a>
@@ -129,6 +126,7 @@ public enum ClientType {
     /**
      * App package name.
      */
+    @Nullable
     private final String packageName;
 
     /**
@@ -182,36 +180,37 @@ public enum ClientType {
      */
     public final String clientVersion;
 
-    /**
-     * If this client requires authentication and does not work
-     * if logged out or in incognito mode.
-     */
-    public final boolean requiresAuth;
-
     /**
      * If the client should use authentication if available.
      */
     public final boolean useAuth;
 
+    /**
+     * If the client supports multiple audio tracks.
+     */
+    public final boolean supportsMultiAudioTracks;
+
     /**
      * Friendly name displayed in stats for nerds.
      */
     public final String friendlyName;
 
-    @SuppressWarnings("ConstantLocale")
+    /**
+     * Android constructor.
+     */
     ClientType(int id,
                String clientName,
-               String packageName,
+               @NonNull String packageName,
                String deviceMake,
                String deviceModel,
                String osName,
                String osVersion,
-               @Nullable String androidSdkVersion,
-               @Nullable String buildId,
-               @Nullable String cronetVersion,
+               @NonNull String androidSdkVersion,
+               @NonNull String buildId,
+               @NonNull String cronetVersion,
                String clientVersion,
-               boolean requiresAuth,
                boolean useAuth,
+               boolean supportsMultiAudioTracks,
                String friendlyName) {
         this.id = id;
         this.clientName = clientName;
@@ -224,36 +223,49 @@ public enum ClientType {
         this.buildId = buildId;
         this.cronetVersion = cronetVersion;
         this.clientVersion = clientVersion;
-        this.requiresAuth = requiresAuth;
         this.useAuth = useAuth;
+        this.supportsMultiAudioTracks = supportsMultiAudioTracks;
         this.friendlyName = friendlyName;
 
         Locale defaultLocale = Locale.getDefault();
-        if (androidSdkVersion == null) {
-            // Convert version from '18.2.22C152' into '18_2_22'
-            String userAgentOsVersion = osVersion
-                    .replaceAll("(\\d+\\.\\d+\\.\\d+).*", "$1")
-                    .replace(".", "_");
-            // https://github.com/mitmproxy/mitmproxy/issues/4836
-            this.userAgent = String.format("%s/%s (%s; U; CPU iOS %s like Mac OS X; %s)",
-                    packageName,
-                    clientVersion,
-                    deviceModel,
-                    userAgentOsVersion,
-                    defaultLocale
-            );
-        } else {
-            this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s; Cronet/%s)",
-                    packageName,
-                    clientVersion,
-                    osVersion,
-                    defaultLocale,
-                    deviceModel,
-                    Objects.requireNonNull(buildId),
-                    Objects.requireNonNull(cronetVersion)
-            );
-        }
+        this.userAgent = String.format("%s/%s (Linux; U; Android %s; %s; %s; Build/%s; Cronet/%s)",
+                packageName,
+                clientVersion,
+                osVersion,
+                defaultLocale,
+                deviceModel,
+                Objects.requireNonNull(buildId),
+                Objects.requireNonNull(cronetVersion)
+        );
         Logger.printDebug(() -> "userAgent: " + this.userAgent);
     }
 
+    @SuppressWarnings("ConstantLocale")
+    ClientType(int id,
+               String clientName,
+               String deviceMake,
+               String deviceModel,
+               String osName,
+               String osVersion,
+               String clientVersion,
+               String userAgent,
+               boolean useAuth,
+               boolean supportsMultiAudioTracks,
+               String friendlyName) {
+        this.id = id;
+        this.clientName = clientName;
+        this.deviceMake = deviceMake;
+        this.deviceModel = deviceModel;
+        this.osName = osName;
+        this.osVersion = osVersion;
+        this.clientVersion = clientVersion;
+        this.userAgent = userAgent;
+        this.useAuth = useAuth;
+        this.supportsMultiAudioTracks = supportsMultiAudioTracks;
+        this.friendlyName = friendlyName;
+        this.packageName = null;
+        this.androidSdkVersion = null;
+        this.buildId = null;
+        this.cronetVersion = null;
+    }
 }

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

@@ -6,38 +6,82 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 
 import java.nio.ByteBuffer;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.spoof.requests.StreamingDataRequest;
 
 @SuppressWarnings("unused")
 public class SpoofVideoStreamsPatch {
-    private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_VIDEO_STREAMS.get();
 
-    private static final boolean FIX_HLS_CURRENT_TIME = SPOOF_STREAMING_DATA
-            && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+    public static final class AudioStreamLanguageOverrideAvailability implements Setting.Availability {
+        @Override
+        public boolean isAvailable() {
+            return BaseSettings.SPOOF_VIDEO_STREAMS.get() && !preferredClient.useAuth;
+        }
+    }
 
     /**
-     * Any unreachable ip address.  Used to intentionally fail requests.
+     * Domain used for internet connectivity verification.
+     * It has an empty response body and is only used to check for a 204 response code.
+     * <p>
+     * If an unreachable IP address (127.0.0.1) is used, no response code is provided.
+     * <p>
+     * YouTube handles unreachable IP addresses without issue.
+     * YouTube Music has an issue with waiting for the Cronet connect timeout of 30s on mobile networks.
+     * <p>
+     * Using a VPN or DNS can temporarily resolve this issue,
+     * But the ideal workaround is to avoid using an unreachable IP address.
      */
-    private static final String UNREACHABLE_HOST_URI_STRING = "https://127.0.0.0";
-    private static final Uri UNREACHABLE_HOST_URI = Uri.parse(UNREACHABLE_HOST_URI_STRING);
+    private static final String INTERNET_CONNECTION_CHECK_URI_STRING = "https://www.google.com/gen_204";
+    private static final Uri INTERNET_CONNECTION_CHECK_URI = Uri.parse(INTERNET_CONNECTION_CHECK_URI_STRING);
+
+    private static final boolean SPOOF_STREAMING_DATA = BaseSettings.SPOOF_VIDEO_STREAMS.get();
+
+    @Nullable
+    private static volatile AppLanguage languageOverride;
+
+    private static volatile ClientType preferredClient = ClientType.ANDROID_VR_1_43_32;
 
     /**
      * @return If this patch was included during patching.
      */
-    private static boolean isPatchIncluded() {
+    public static boolean isPatchIncluded() {
         return false; // Modified during patching.
     }
 
-    public static boolean notSpoofingToAndroid() {
-        return !isPatchIncluded()
-                || !BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                || BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
+    @Nullable
+    public static AppLanguage getLanguageOverride() {
+        return languageOverride;
+    }
+
+    /**
+     * @param language Language override for non-authenticated requests. If this is null then
+     *                 {@link BaseSettings#SPOOF_VIDEO_STREAMS_LANGUAGE} is used.
+     */
+    public static void setLanguageOverride(@Nullable AppLanguage language) {
+        languageOverride = language;
+    }
+
+    public static void setClientsToUse(List<ClientType> availableClients, ClientType client) {
+        preferredClient = Objects.requireNonNull(client);
+        StreamingDataRequest.setClientOrderToUse(availableClients, client);
+    }
+
+    public static ClientType getPreferredClient() {
+        return preferredClient;
+    }
+
+    public static boolean spoofingToClientWithNoMultiAudioStreams() {
+        return isPatchIncluded()
+                && SPOOF_STREAMING_DATA
+                && preferredClient != ClientType.IPADOS;
     }
 
     /**
@@ -53,9 +97,9 @@ public class SpoofVideoStreamsPatch {
                 String path = playerRequestUri.getPath();
 
                 if (path != null && path.contains("get_watch")) {
-                    Logger.printDebug(() -> "Blocking 'get_watch' by returning unreachable uri");
+                    Logger.printDebug(() -> "Blocking 'get_watch' by returning internet connection check uri");
 
-                    return UNREACHABLE_HOST_URI;
+                    return INTERNET_CONNECTION_CHECK_URI;
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "blockGetWatchRequest failure", ex);
@@ -65,6 +109,35 @@ public class SpoofVideoStreamsPatch {
         return playerRequestUri;
     }
 
+    /**
+     * Injection point.
+     *
+     * Blocks /get_watch requests by returning an unreachable URI.
+     * /att/get requests are used to obtain a PoToken challenge.
+     * See: <a href="https://github.com/FreeTubeApp/FreeTube/blob/4b7208430bc1032019a35a35eb7c8a84987ddbd7/src/botGuardScript.js#L15">botGuardScript.js#L15</a>
+     * <p>
+     * Since the Spoof streaming data patch was implemented because a valid PoToken cannot be obtained,
+     * Blocking /att/get requests are not a problem.
+     */
+    public static String blockGetAttRequest(String originalUrlString) {
+        if (SPOOF_STREAMING_DATA) {
+            try {
+                var originalUri = Uri.parse(originalUrlString);
+                String path = originalUri.getPath();
+
+                if (path != null && path.contains("att/get")) {
+                    Logger.printDebug(() -> "Blocking 'att/get' by returning internet connection check uri");
+
+                    return INTERNET_CONNECTION_CHECK_URI_STRING;
+                }
+            } catch (Exception ex) {
+                Logger.printException(() -> "blockGetAttRequest failure", ex);
+            }
+        }
+
+        return originalUrlString;
+    }
+
     /**
      * Injection point.
      * <p>
@@ -77,9 +150,9 @@ public class SpoofVideoStreamsPatch {
                 String path = originalUri.getPath();
 
                 if (path != null && path.contains("initplayback")) {
-                    Logger.printDebug(() -> "Blocking 'initplayback' by clearing query");
+                    Logger.printDebug(() -> "Blocking 'initplayback' by returning internet connection check uri");
 
-                    return originalUri.buildUpon().clearQuery().build().toString();
+                    return INTERNET_CONNECTION_CHECK_URI_STRING;
                 }
             } catch (Exception ex) {
                 Logger.printException(() -> "blockInitPlaybackRequest failure", ex);
@@ -98,7 +171,7 @@ public class SpoofVideoStreamsPatch {
 
     /**
      * Injection point.
-     * Only invoked when playing a livestream on an iOS client.
+     * Only invoked when playing a livestream on an Apple client.
      */
     public static boolean fixHLSCurrentTime(boolean original) {
         if (!SPOOF_STREAMING_DATA) {
@@ -107,6 +180,14 @@ public class SpoofVideoStreamsPatch {
         return false;
     }
 
+    /*
+     * Injection point.
+     * Fix audio stuttering in YouTube Music.
+     */
+    public static boolean disableSABR() {
+        return SPOOF_STREAMING_DATA;
+    }
+
     /**
      * Injection point.
      * Turns off a feature flag that interferes with spoofing.
@@ -248,20 +329,4 @@ public class SpoofVideoStreamsPatch {
 
         return videoFormat;
     }
-
-    public static final class AudioStreamLanguageOverrideAvailability implements Setting.Availability {
-        @Override
-        public boolean isAvailable() {
-            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.ANDROID_VR_NO_AUTH;
-        }
-    }
-
-    public static final class SpoofiOSAvailability implements Setting.Availability {
-        @Override
-        public boolean isAvailable() {
-            return BaseSettings.SPOOF_VIDEO_STREAMS.get()
-                    && BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get() == ClientType.IOS_UNPLUGGED;
-        }
-    }
 }

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

@@ -1,5 +1,7 @@
 package app.revanced.extension.shared.spoof.requests;
 
+import static app.revanced.extension.shared.spoof.ClientType.ANDROID_VR_1_43_32;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -10,8 +12,10 @@ import java.util.Locale;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.requests.Requester;
 import app.revanced.extension.shared.requests.Route;
+import app.revanced.extension.shared.settings.AppLanguage;
 import app.revanced.extension.shared.settings.BaseSettings;
 import app.revanced.extension.shared.spoof.ClientType;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 
 final class PlayerRoutes {
     static final Route.CompiledRoute GET_STREAMING_DATA = new Route(
@@ -37,14 +41,13 @@ final class PlayerRoutes {
         try {
             JSONObject context = new JSONObject();
 
-            // Can override default language only if no login is used.
-            // Could use preferred audio for all clients that do not login,
-            // but if this is a fall over client it will set the language even though
-            // the audio language is not selectable in the UI.
-            ClientType userSelectedClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
-            Locale streamLocale = userSelectedClient == ClientType.ANDROID_VR_NO_AUTH
-                    ? BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get().getLocale()
-                    : Locale.getDefault();
+            AppLanguage language = SpoofVideoStreamsPatch.getLanguageOverride();
+            if (language == null) {
+                // Force original audio has not overrode the language.
+                language = BaseSettings.SPOOF_VIDEO_STREAMS_LANGUAGE.get();
+            }
+            //noinspection ExtractMethodRecommender
+            Locale streamLocale = language.getLocale();
 
             JSONObject client = new JSONObject();
             client.put("deviceMake", clientType.deviceMake);

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

@@ -1,5 +1,6 @@
 package app.revanced.extension.shared.spoof.requests;
 
+import static app.revanced.extension.shared.ByteTrieSearch.convertStringsToBytes;
 import static app.revanced.extension.shared.spoof.requests.PlayerRoutes.GET_STREAMING_DATA;
 
 import androidx.annotation.NonNull;
@@ -13,12 +14,18 @@ import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import app.revanced.extension.shared.ByteTrieSearch;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.shared.settings.BaseSettings;
@@ -35,21 +42,27 @@ import app.revanced.extension.shared.spoof.ClientType;
  */
 public class StreamingDataRequest {
 
-    private static final ClientType[] CLIENT_ORDER_TO_USE;
+    private static volatile ClientType[] clientOrderToUse = ClientType.values();
 
-    static {
-        ClientType[] allClientTypes = ClientType.values();
-        ClientType preferredClient = BaseSettings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
+    public static void setClientOrderToUse(List<ClientType> availableClients, ClientType preferredClient) {
+        Objects.requireNonNull(preferredClient);
 
-        CLIENT_ORDER_TO_USE = new ClientType[allClientTypes.length];
-        CLIENT_ORDER_TO_USE[0] = preferredClient;
+        int availableClientSize = availableClients.size();
+        if (!availableClients.contains(preferredClient)) {
+            availableClientSize++;
+        }
+
+        clientOrderToUse = new ClientType[availableClientSize];
+        clientOrderToUse[0] = preferredClient;
 
         int i = 1;
-        for (ClientType c : allClientTypes) {
+        for (ClientType c : availableClients) {
             if (c != preferredClient) {
-                CLIENT_ORDER_TO_USE[i++] = c;
+                clientOrderToUse[i++] = c;
             }
         }
+
+        Logger.printDebug(() -> "Available spoof clients: " + Arrays.toString(clientOrderToUse));
     }
 
     private static final String AUTHORIZATION_HEADER = "Authorization";
@@ -87,6 +100,16 @@ public class StreamingDataRequest {
                 }
             });
 
+    /**
+     * Strings found in the response if the video is a livestream.
+     */
+    private static final ByteTrieSearch liveStreamBufferSearch = new ByteTrieSearch(
+            convertStringsToBytes(
+                    "yt_live_broadcast",
+                    "yt_premiere_broadcast"
+            )
+    );
+
     private static volatile ClientType lastSpoofedClientType;
 
     public static String getLastSpoofedClientName() {
@@ -154,7 +177,7 @@ public class StreamingDataRequest {
                 }
             }
 
-            if (!authHeadersIncludes && clientType.requiresAuth) {
+            if (!authHeadersIncludes && clientType.useAuth) {
                 Logger.printDebug(() -> "Skipping client since user is not logged in: " + clientType
                         + " videoId: " + videoId);
                 return null;
@@ -193,9 +216,9 @@ public class StreamingDataRequest {
 
         // Retry with different client if empty response body is received.
         int i = 0;
-        for (ClientType clientType : CLIENT_ORDER_TO_USE) {
+        for (ClientType clientType : clientOrderToUse) {
             // Show an error if the last client type fails, or if debug is enabled then show for all attempts.
-            final boolean showErrorToast = (++i == CLIENT_ORDER_TO_USE.length) || debugEnabled;
+            final boolean showErrorToast = (++i == clientOrderToUse.length) || debugEnabled;
 
             HttpURLConnection connection = send(clientType, videoId, playerHeaders, showErrorToast);
             if (connection != null) {
@@ -215,9 +238,13 @@ public class StreamingDataRequest {
                             while ((bytesRead = inputStream.read(buffer)) >= 0) {
                                 baos.write(buffer, 0, bytesRead);
                             }
-                            lastSpoofedClientType = clientType;
+                            if (clientType == ClientType.ANDROID_CREATOR && liveStreamBufferSearch.matches(buffer)) {
+                                Logger.printDebug(() -> "Skipping Android Studio as video is a livestream: " + videoId);
+                            } else {
+                                lastSpoofedClientType = clientType;
 
-                            return ByteBuffer.wrap(baos.toByteArray());
+                                return ByteBuffer.wrap(baos.toByteArray());
+                            }
                         }
                     }
                 } catch (IOException ex) {

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

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

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

@@ -0,0 +1,61 @@
+package app.revanced.extension.shared.ui;
+
+import static app.revanced.extension.shared.Utils.adjustColorBrightness;
+import static app.revanced.extension.shared.Utils.dipToPixels;
+import static app.revanced.extension.shared.Utils.getAppBackgroundColor;
+import static app.revanced.extension.shared.Utils.isDarkModeEnabled;
+import static app.revanced.extension.shared.settings.preference.ColorPickerPreference.DISABLED_ALPHA;
+
+import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
+import android.view.View;
+
+import androidx.annotation.ColorInt;
+
+public class ColorDot {
+    private static final int STROKE_WIDTH = dipToPixels(1.5f); // Stroke width in dp.
+
+    /**
+     * Creates a circular drawable with a main fill and a stroke.
+     * Stroke adapts to dark/light theme and transparency, applied only when color is transparent or matches app background.
+     */
+    public static GradientDrawable createColorDotDrawable(@ColorInt int color) {
+        final boolean isDarkTheme = isDarkModeEnabled();
+        final boolean isTransparent = Color.alpha(color) == 0;
+        final int opaqueColor = color | 0xFF000000;
+        final int appBackground = getAppBackgroundColor();
+        final int strokeColor;
+        final int strokeWidth;
+
+        // Determine stroke color.
+        if (isTransparent || (opaqueColor == appBackground)) {
+            final int baseColor = isTransparent ? appBackground : opaqueColor;
+            strokeColor = adjustColorBrightness(baseColor, isDarkTheme ? 1.2f : 0.8f);
+            strokeWidth = STROKE_WIDTH;
+        } else {
+            strokeColor = 0;
+            strokeWidth = 0;
+        }
+
+        // Create circular drawable with conditional stroke.
+        GradientDrawable circle = new GradientDrawable();
+        circle.setShape(GradientDrawable.OVAL);
+        circle.setColor(color);
+        circle.setStroke(strokeWidth, strokeColor);
+
+        return circle;
+    }
+
+    /**
+     * Applies the color dot drawable to the target view.
+     */
+    public static void applyColorDot(View targetView, @ColorInt int color, boolean enabled) {
+        if (targetView == null) return;
+        targetView.setBackground(createColorDotDrawable(color));
+        targetView.setAlpha(enabled ? 1.0f : DISABLED_ALPHA);
+        if (!isDarkModeEnabled()) {
+            targetView.setClipToOutline(true);
+            targetView.setElevation(dipToPixels(2));
+        }
+    }
+}

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

@@ -0,0 +1,472 @@
+package app.revanced.extension.shared.ui;
+
+import static app.revanced.extension.shared.Utils.dipToPixels;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import androidx.annotation.Nullable;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A utility class for creating a customizable dialog with a title, message or EditText, and up to three buttons (OK, Cancel, Neutral).
+ * The dialog supports themed colors, rounded corners, and dynamic button layout based on screen width. It is dismissible by default.
+ */
+public class CustomDialog {
+    private final Context context;
+    private final Dialog dialog;
+    private final LinearLayout mainLayout;
+    private final int dip4, dip8, dip16, dip24, dip36;
+
+    /**
+     * Creates a custom dialog with a styled layout, including a title, message, buttons, and an optional EditText.
+     * The dialog's appearance adapts to the app's dark mode setting, with rounded corners and customizable button actions.
+     * Buttons adjust dynamically to their text content and are arranged in a single row if they fit within 80% of the
+     * screen width, with the Neutral button aligned to the left and OK/Cancel buttons centered on the right.
+     * If buttons do not fit, each is placed on a separate row, all aligned to the right.
+     *
+     * @param context                     Context used to create the dialog.
+     * @param title                       Title text of the dialog.
+     * @param message                     Message text of the dialog (supports Spanned for HTML), or null if replaced by EditText.
+     * @param editText                    EditText to include in the dialog, or null if no EditText is needed.
+     * @param okButtonText                OK button text, or null to use the default "OK" string.
+     * @param onOkClick                   Action to perform when the OK button is clicked.
+     * @param onCancelClick               Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
+     * @param neutralButtonText           Neutral button text, or null if no Neutral button is needed.
+     * @param onNeutralClick              Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
+     * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
+     * @return The Dialog and its main LinearLayout container.
+     */
+    public static Pair<Dialog, LinearLayout> create(Context context, CharSequence title, CharSequence message,
+                                                    @Nullable EditText editText, CharSequence okButtonText,
+                                                    Runnable onOkClick, Runnable onCancelClick,
+                                                    @Nullable CharSequence neutralButtonText,
+                                                    @Nullable Runnable onNeutralClick,
+                                                    boolean dismissDialogOnNeutralClick) {
+        Logger.printDebug(() -> "Creating custom dialog with title: " + title);
+        CustomDialog customDialog = new CustomDialog(context, title, message, editText,
+                okButtonText, onOkClick, onCancelClick,
+                neutralButtonText, onNeutralClick, dismissDialogOnNeutralClick);
+        return new Pair<>(customDialog.dialog, customDialog.mainLayout);
+    }
+
+    /**
+     * Initializes a custom dialog with the specified parameters.
+     *
+     * @param context                     Context used to create the dialog.
+     * @param title                       Title text of the dialog.
+     * @param message                     Message text of the dialog, or null if replaced by EditText.
+     * @param editText                    EditText to include in the dialog, or null if no EditText is needed.
+     * @param okButtonText                OK button text, or null to use the default "OK" string.
+     * @param onOkClick                   Action to perform when the OK button is clicked.
+     * @param onCancelClick               Action to perform when the Cancel button is clicked, or null if no Cancel button is needed.
+     * @param neutralButtonText           Neutral button text, or null if no Neutral button is needed.
+     * @param onNeutralClick              Action to perform when the Neutral button is clicked, or null if no Neutral button is needed.
+     * @param dismissDialogOnNeutralClick If the dialog should be dismissed when the Neutral button is clicked.
+     */
+    private CustomDialog(Context context, CharSequence title, CharSequence message, @Nullable EditText editText,
+                         CharSequence okButtonText, Runnable onOkClick, Runnable onCancelClick,
+                         @Nullable CharSequence neutralButtonText, @Nullable Runnable onNeutralClick,
+                         boolean dismissDialogOnNeutralClick) {
+        this.context = context;
+        this.dialog = new Dialog(context);
+        this.dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
+
+        // Preset size constants.
+        dip4 = dipToPixels(4);
+        dip8 = dipToPixels(8);
+        dip16 = dipToPixels(16);
+        dip24 = dipToPixels(24);
+        dip36 = dipToPixels(36);
+
+        // Create main layout.
+        mainLayout = createMainLayout();
+        addTitle(title);
+        addContent(message, editText);
+        addButtons(okButtonText, onOkClick, onCancelClick, neutralButtonText, onNeutralClick, dismissDialogOnNeutralClick);
+
+        // Set dialog content and window attributes.
+        dialog.setContentView(mainLayout);
+        Window window = dialog.getWindow();
+        if (window != null) {
+            Utils.setDialogWindowParameters(window, Gravity.CENTER, 0, 90, false);
+        }
+    }
+
+    /**
+     * Creates the main layout for the dialog with vertical orientation and rounded corners.
+     *
+     * @return The configured LinearLayout for the dialog.
+     */
+    private LinearLayout createMainLayout() {
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(dip24, dip16, dip24, dip24);
+
+        // Set rounded rectangle background.
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(28), null, null));
+        // Dialog background.
+        background.getPaint().setColor(Utils.getDialogBackgroundColor());
+        layout.setBackground(background);
+
+        return layout;
+    }
+
+    /**
+     * Adds a title to the dialog if provided.
+     *
+     * @param title The title text to display.
+     */
+    private void addTitle(CharSequence title) {
+        if (TextUtils.isEmpty(title)) return;
+
+        TextView titleView = new TextView(context);
+        titleView.setText(title);
+        titleView.setTypeface(Typeface.DEFAULT_BOLD);
+        titleView.setTextSize(18);
+        titleView.setTextColor(Utils.getAppForegroundColor());
+        titleView.setGravity(Gravity.CENTER);
+
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(0, 0, 0, dip16);
+        titleView.setLayoutParams(params);
+
+        mainLayout.addView(titleView);
+    }
+
+    /**
+     * Adds a message or EditText to the dialog within a ScrollView.
+     *
+     * @param message  The message text to display (supports Spanned for HTML), or null if replaced by EditText.
+     * @param editText The EditText to include, or null if no EditText is needed.
+     */
+    private void addContent(CharSequence message, @Nullable EditText editText) {
+        // Create content container (message/EditText) inside a ScrollView only if message or editText is provided.
+        if (message == null && editText == null) return;
+
+        ScrollView scrollView = new ScrollView(context);
+        // Disable the vertical scrollbar.
+        scrollView.setVerticalScrollBarEnabled(false);
+        scrollView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+
+        LinearLayout contentContainer = new LinearLayout(context);
+        contentContainer.setOrientation(LinearLayout.VERTICAL);
+        scrollView.addView(contentContainer);
+
+        // EditText (if provided).
+        if (editText != null) {
+            ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                    Utils.createCornerRadii(10), null, null));
+            background.getPaint().setColor(Utils.getEditTextBackground());
+            scrollView.setPadding(dip8, dip8, dip8, dip8);
+            scrollView.setBackground(background);
+            scrollView.setClipToOutline(true);
+
+            // Remove EditText from its current parent, if any.
+            ViewGroup parent = (ViewGroup) editText.getParent();
+            if (parent != null) parent.removeView(editText);
+            // Style the EditText to match the dialog theme.
+            editText.setTextColor(Utils.getAppForegroundColor());
+            editText.setBackgroundColor(Color.TRANSPARENT);
+            editText.setPadding(0, 0, 0, 0);
+            contentContainer.addView(editText, new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT));
+            // Message (if not replaced by EditText).
+        } else {
+            TextView messageView = new TextView(context);
+            // Supports Spanned (HTML).
+            messageView.setText(message);
+            messageView.setTextSize(16);
+            messageView.setTextColor(Utils.getAppForegroundColor());
+            // Enable HTML link clicking if the message contains links.
+            if (message instanceof Spanned) {
+                messageView.setMovementMethod(LinkMovementMethod.getInstance());
+            }
+            contentContainer.addView(messageView, new LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT));
+        }
+
+        // Weight to take available space.
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                0,
+                1.0f);
+        scrollView.setLayoutParams(params);
+        // Add ScrollView to main layout only if content exist.
+        mainLayout.addView(scrollView);
+    }
+
+    /**
+     * Adds buttons to the dialog, arranging them dynamically based on their widths.
+     *
+     * @param okButtonText                OK button text, or null to use the default "OK" string.
+     * @param onOkClick                   Action for the OK button click.
+     * @param onCancelClick               Action for the Cancel button click, or null if no Cancel button.
+     * @param neutralButtonText           Neutral button text, or null if no Neutral button.
+     * @param onNeutralClick              Action for the Neutral button click, or null if no Neutral button.
+     * @param dismissDialogOnNeutralClick If the dialog should dismiss on Neutral button click.
+     */
+    private void addButtons(CharSequence okButtonText, Runnable onOkClick, Runnable onCancelClick,
+                            @Nullable CharSequence neutralButtonText, @Nullable Runnable onNeutralClick,
+                            boolean dismissDialogOnNeutralClick) {
+        // Button container.
+        LinearLayout buttonContainer = new LinearLayout(context);
+        buttonContainer.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams buttonContainerParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        buttonContainerParams.setMargins(0, dip16, 0, 0);
+        buttonContainer.setLayoutParams(buttonContainerParams);
+
+        List<Button> buttons = new ArrayList<>();
+        List<Integer> buttonWidths = new ArrayList<>();
+
+        // Create buttons in order: Neutral, Cancel, OK.
+        if (neutralButtonText != null && onNeutralClick != null) {
+            Button neutralButton = createButton(neutralButtonText, onNeutralClick, false, dismissDialogOnNeutralClick);
+            buttons.add(neutralButton);
+            buttonWidths.add(measureButtonWidth(neutralButton));
+        }
+        if (onCancelClick != null) {
+            Button cancelButton = createButton(context.getString(android.R.string.cancel), onCancelClick, false, true);
+            buttons.add(cancelButton);
+            buttonWidths.add(measureButtonWidth(cancelButton));
+        }
+        if (onOkClick != null) {
+            Button okButton = createButton(
+                    okButtonText != null ? okButtonText : context.getString(android.R.string.ok),
+                    onOkClick, true, true);
+            buttons.add(okButton);
+            buttonWidths.add(measureButtonWidth(okButton));
+        }
+
+        // Handle button layout.
+        layoutButtons(buttonContainer, buttons, buttonWidths);
+        mainLayout.addView(buttonContainer);
+    }
+
+    /**
+     * Creates a styled button with customizable text, click behavior, and appearance.
+     *
+     * @param text         The button text to display.
+     * @param onClick      The action to perform on button click.
+     * @param isOkButton   If this is the OK button, which uses distinct styling.
+     * @param dismissDialog If the dialog should dismiss when the button is clicked.
+     * @return The created Button.
+     */
+    private Button createButton(CharSequence text, Runnable onClick, boolean isOkButton, boolean dismissDialog) {
+        Button button = new Button(context, null, 0);
+        button.setText(text);
+        button.setTextSize(14);
+        button.setAllCaps(false);
+        button.setSingleLine(true);
+        button.setEllipsize(TextUtils.TruncateAt.END);
+        button.setGravity(Gravity.CENTER);
+        // Set internal padding.
+        button.setPadding(dip16, 0, dip16, 0);
+
+        // Background color for OK button (inversion).
+        // Background color for Cancel or Neutral buttons.
+        ShapeDrawable background = new ShapeDrawable(new RoundRectShape(
+                Utils.createCornerRadii(20), null, null));
+        background.getPaint().setColor(isOkButton
+                ? Utils.getOkButtonBackgroundColor()
+                : Utils.getCancelOrNeutralButtonBackgroundColor());
+        button.setBackground(background);
+
+        button.setTextColor(Utils.isDarkModeEnabled()
+                ? (isOkButton ? Color.BLACK : Color.WHITE)
+                : (isOkButton ? Color.WHITE : Color.BLACK));
+
+        button.setOnClickListener(v -> {
+            if (onClick != null) onClick.run();
+            if (dismissDialog) dialog.dismiss();
+        });
+
+        return button;
+    }
+
+    /**
+     * Measures the width of a button.
+     */
+    private int measureButtonWidth(Button button) {
+        button.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+        return button.getMeasuredWidth();
+    }
+
+    /**
+     * Arranges buttons in the dialog, either in a single row or multiple rows based on their total width.
+     *
+     * @param buttonContainer The container for the buttons.
+     * @param buttons         The list of buttons to arrange.
+     * @param buttonWidths    The measured widths of the buttons.
+     */
+    private void layoutButtons(LinearLayout buttonContainer, List<Button> buttons, List<Integer> buttonWidths) {
+        if (buttons.isEmpty()) return;
+
+        // Check if buttons fit in one row.
+        int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
+        int totalWidth = 0;
+        for (Integer width : buttonWidths) {
+            totalWidth += width;
+        }
+        if (buttonWidths.size() > 1) {
+            // Add margins for gaps.
+            totalWidth += (buttonWidths.size() - 1) * dip8;
+        }
+
+        // Single button: stretch to full width.
+        if (buttons.size() == 1) {
+            layoutSingleButton(buttonContainer, buttons.get(0));
+        } else if (totalWidth <= screenWidth * 0.8) {
+            // Single row: Neutral, Cancel, OK.
+            layoutButtonsInRow(buttonContainer, buttons, buttonWidths);
+        } else {
+            // Multiple rows: OK, Cancel, Neutral.
+            layoutButtonsInColumns(buttonContainer, buttons);
+        }
+    }
+
+    /**
+     * Arranges a single button, stretching it to full width.
+     *
+     * @param buttonContainer The container for the button.
+     * @param button          The button to arrange.
+     */
+    private void layoutSingleButton(LinearLayout buttonContainer, Button button) {
+        LinearLayout singleContainer = new LinearLayout(context);
+        singleContainer.setOrientation(LinearLayout.HORIZONTAL);
+        singleContainer.setGravity(Gravity.CENTER);
+
+        ViewGroup parent = (ViewGroup) button.getParent();
+        if (parent != null) parent.removeView(button);
+
+        button.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                dip36));
+        singleContainer.addView(button);
+        buttonContainer.addView(singleContainer);
+    }
+
+    /**
+     * Arranges buttons in a single horizontal row with proportional widths.
+     *
+     * @param buttonContainer The container for the buttons.
+     * @param buttons         The list of buttons to arrange.
+     * @param buttonWidths    The measured widths of the buttons.
+     */
+    private void layoutButtonsInRow(LinearLayout buttonContainer, List<Button> buttons, List<Integer> buttonWidths) {
+        LinearLayout rowContainer = new LinearLayout(context);
+        rowContainer.setOrientation(LinearLayout.HORIZONTAL);
+        rowContainer.setGravity(Gravity.CENTER);
+        rowContainer.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT));
+
+        // Add all buttons with proportional weights and specific margins.
+        for (int i = 0; i < buttons.size(); i++) {
+            Button button = getButton(buttons, buttonWidths, i);
+            rowContainer.addView(button);
+        }
+
+        buttonContainer.addView(rowContainer);
+    }
+
+    @NotNull
+    private Button getButton(List<Button> buttons, List<Integer> buttonWidths, int i) {
+        Button button = buttons.get(i);
+        ViewGroup parent = (ViewGroup) button.getParent();
+        if (parent != null) parent.removeView(button);
+
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                0, dip36, buttonWidths.get(i));
+
+        // Set margins based on button type and combination.
+        if (buttons.size() == 2) {
+            // Neutral + OK or Cancel + OK.
+            params.setMargins(i == 0 ? 0 : dip4, 0, i == 0 ? dip4 : 0, 0);
+        } else if (buttons.size() == 3) {
+            // Neutral.
+            // Cancel.
+            // OK.
+            params.setMargins(i == 0 ? 0 : dip4, 0, i == 2 ? 0 : dip4, 0);
+        }
+
+        button.setLayoutParams(params);
+        return button;
+    }
+
+    /**
+     * Arranges buttons in separate rows, ordered OK, Cancel, Neutral.
+     *
+     * @param buttonContainer The container for the buttons.
+     * @param buttons         The list of buttons to arrange.
+     */
+    private void layoutButtonsInColumns(LinearLayout buttonContainer, List<Button> buttons) {
+        // Reorder: OK, Cancel, Neutral.
+        List<Button> reorderedButtons = new ArrayList<>();
+        if (buttons.size() == 3) {
+            reorderedButtons.add(buttons.get(2)); // OK
+            reorderedButtons.add(buttons.get(1)); // Cancel
+            reorderedButtons.add(buttons.get(0)); // Neutral
+        } else if (buttons.size() == 2) {
+            reorderedButtons.add(buttons.get(1)); // OK or Cancel
+            reorderedButtons.add(buttons.get(0)); // Neutral or Cancel
+        }
+
+        for (int i = 0; i < reorderedButtons.size(); i++) {
+            Button button = reorderedButtons.get(i);
+            LinearLayout singleContainer = new LinearLayout(context);
+            singleContainer.setOrientation(LinearLayout.HORIZONTAL);
+            singleContainer.setGravity(Gravity.CENTER);
+            singleContainer.setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    dip36));
+
+            ViewGroup parent = (ViewGroup) button.getParent();
+            if (parent != null) parent.removeView(button);
+
+            button.setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    dip36));
+            singleContainer.addView(button);
+            buttonContainer.addView(singleContainer);
+
+            // Add a spacer between the buttons (except the last one).
+            if (i < reorderedButtons.size() - 1) {
+                View spacer = new View(context);
+                LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT,
+                        dip8);
+                spacer.setLayoutParams(spacerParams);
+                buttonContainer.addView(spacer);
+            }
+        }
+    }
+}