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

# [5.19.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.1...v5.19.0-dev.2) (2025-04-02)

### Features

* **YouTube - Settings:** Add icons to the ReVanced settings ([#4496](https://github.com/ReVanced/revanced-patches/issues/4496)) ([fdefb67](fdefb67d02))

.github/workflows/pull_strings.yml

@@ -2,7 +2,7 @@ name: Pull strings
 
 on:
   schedule:
-    - cron: "0 */8 * * *"
+    - cron: "0 */12 * * *"
   workflow_dispatch:
 
 jobs:

CHANGELOG.md

@@ -1,3 +1,236 @@
+# [5.19.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.1...v5.19.0-dev.2) (2025-04-02)
+
+
+### Features
+
+* **YouTube - Settings:** Add icons to the ReVanced settings ([#4496](https://github.com/ReVanced/revanced-patches/issues/4496)) ([d0c85f0](https://github.com/ReVanced/revanced-patches/commit/d0c85f044083d720c63a8ea4ff15d42eefeb9db7))
+
+# [5.19.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.18.1-dev.2...v5.19.0-dev.1) (2025-04-01)
+
+
+### Bug Fixes
+
+* **Twitter - Hide recommended users:** Make hiding work again by filtering for new entryId prefix ([#4456](https://github.com/ReVanced/revanced-patches/issues/4456)) ([ff846b0](https://github.com/ReVanced/revanced-patches/commit/ff846b0b7ef5060caaffedb08c1f901172f5b2d1))
+
+
+### Features
+
+* **Angulus:** Add `Hide ads` patch ([#4604](https://github.com/ReVanced/revanced-patches/issues/4604)) ([87c86b5](https://github.com/ReVanced/revanced-patches/commit/87c86b53a91b0054ac892a3f02bbe7bf83bbf813))
+* **Photomath:** Support latest version ([#4672](https://github.com/ReVanced/revanced-patches/issues/4672)) ([8e16483](https://github.com/ReVanced/revanced-patches/commit/8e1648322948151e4565fb0d86e0f37d0a02d73f))
+
+## [5.18.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.1-dev.1...v5.18.1-dev.2) (2025-04-01)
+
+
+### Bug Fixes
+
+* **YouTube:** Combine multiple seekbar patches into a single patch ([#4705](https://github.com/ReVanced/revanced-patches/issues/4705)) ([503b7eb](https://github.com/ReVanced/revanced-patches/commit/503b7eb8d413ef7f248394f128f3b2a6f3192ba6))
+
+## [5.18.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.18.0...v5.18.1-dev.1) (2025-03-31)
+
+
+### Bug Fixes
+
+* **YouTube - Remove background playback restrictions:** Do not show media controls when playing Shorts from the feed ([2ed675c](https://github.com/ReVanced/revanced-patches/commit/2ed675cdd058fb5876381a9d30dee5263f6b2e26))
+
+# [5.18.0](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify:** Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([84f5854](https://github.com/ReVanced/revanced-patches/commit/84f585492e4be3604c6c7680ffb3bebcea5a675f))
+
+
+### Features
+
+* **YouTube:** Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([c1379f6](https://github.com/ReVanced/revanced-patches/commit/c1379f6e520c683d2c9d6a490a69ca542168b3b3))
+
+# [5.18.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.18.0-dev.1...v5.18.0-dev.2) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify:** Ignore optional attributes if not present ([#4688](https://github.com/ReVanced/revanced-patches/issues/4688)) ([84f5854](https://github.com/ReVanced/revanced-patches/commit/84f585492e4be3604c6c7680ffb3bebcea5a675f))
+
+# [5.18.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.17.0...v5.18.0-dev.1) (2025-03-28)
+
+
+### Features
+
+* **YouTube:** Support version `20.07.39` ([#4677](https://github.com/ReVanced/revanced-patches/issues/4677)) ([c1379f6](https://github.com/ReVanced/revanced-patches/commit/c1379f6e520c683d2c9d6a490a69ca542168b3b3))
+
+# [5.17.0](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.17.0) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Facebook - Hide 'Sponsored Stories':** Constrain patch to latest compatible version ([#4657](https://github.com/ReVanced/revanced-patches/issues/4657)) ([46bd1c8](https://github.com/ReVanced/revanced-patches/commit/46bd1c829acd5f83600025e0ceb7d482ae80be69))
+* **Spotify - Unlock Premium:** Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([568b40d](https://github.com/ReVanced/revanced-patches/commit/568b40da9692eae9039bbb3cec513a61ca627c24))
+* **Spotify - Unlock Premium:** Use correct patch description convention ([a486522](https://github.com/ReVanced/revanced-patches/commit/a4865228f8481d2efc8fbf4e90902a03289d9a3f))
+* **X / Twitter:** Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([f579728](https://github.com/ReVanced/revanced-patches/commit/f5797289f45186052537982c7f5db6f2b0769aee))
+* **YouTube - Navigation buttons:** Add user dialog message to 'Disable translucent status bar' ([a4a0e68](https://github.com/ReVanced/revanced-patches/commit/a4a0e6869e23d15ee09262460f4e290c90629eeb))
+
+
+### Features
+
+* **Spotify - Unlock Premium:** Disable the "Spotify Premium" upsell experiment in context menus ([9a10ee4](https://github.com/ReVanced/revanced-patches/commit/9a10ee4d22fb53da2012a182e038749d3ad72377))
+
+# [5.17.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.3...v5.17.0-dev.4) (2025-03-28)
+
+
+### Bug Fixes
+
+* **X / Twitter:** Constrain patches to latest compatible versions ([#4683](https://github.com/ReVanced/revanced-patches/issues/4683)) ([f579728](https://github.com/ReVanced/revanced-patches/commit/f5797289f45186052537982c7f5db6f2b0769aee))
+
+# [5.17.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.2...v5.17.0-dev.3) (2025-03-28)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override additional attributes ([#4651](https://github.com/ReVanced/revanced-patches/issues/4651)) ([568b40d](https://github.com/ReVanced/revanced-patches/commit/568b40da9692eae9039bbb3cec513a61ca627c24))
+
+# [5.17.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.17.0-dev.1...v5.17.0-dev.2) (2025-03-27)
+
+
+### Bug Fixes
+
+* **YouTube - Navigation buttons:** Add user dialog message to 'Disable translucent status bar' ([a4a0e68](https://github.com/ReVanced/revanced-patches/commit/a4a0e6869e23d15ee09262460f4e290c90629eeb))
+
+# [5.17.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.2-dev.1...v5.17.0-dev.1) (2025-03-27)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Use correct patch description convention ([a486522](https://github.com/ReVanced/revanced-patches/commit/a4865228f8481d2efc8fbf4e90902a03289d9a3f))
+
+
+### Features
+
+* **Spotify - Unlock Premium:** Disable the "Spotify Premium" upsell experiment in context menus ([9a10ee4](https://github.com/ReVanced/revanced-patches/commit/9a10ee4d22fb53da2012a182e038749d3ad72377))
+
+## [5.16.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.1...v5.16.2-dev.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **Facebook - Hide 'Sponsored Stories':** Constrain patch to latest compatible version ([#4657](https://github.com/ReVanced/revanced-patches/issues/4657)) ([46bd1c8](https://github.com/ReVanced/revanced-patches/commit/46bd1c829acd5f83600025e0ceb7d482ae80be69))
+
+## [5.16.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.0...v5.16.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override streaming attribute attempting to fix streaming issues ([06be36c](https://github.com/ReVanced/revanced-patches/commit/06be36cddf3430b4179dff696b3d15718cd6963b))
+
+## [5.16.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.16.0...v5.16.1-dev.1) (2025-03-26)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Premium:** Override streaming attribute attempting to fix streaming issues ([06be36c](https://github.com/ReVanced/revanced-patches/commit/06be36cddf3430b4179dff696b3d15718cd6963b))
+
+# [5.16.0](https://github.com/ReVanced/revanced-patches/compare/v5.15.0...v5.16.0) (2025-03-26)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** System navigation bar is located above the settings ui on Android 15+ ([f7497be](https://github.com/ReVanced/revanced-patches/commit/f7497be2c5e4abcde6eb55b84955124a28f55cae))
+
+
+### Features
+
+* **Spotify:** Add `Unlock premium` patch ([#4644](https://github.com/ReVanced/revanced-patches/issues/4644)) ([f048c50](https://github.com/ReVanced/revanced-patches/commit/f048c50e56fc1f5a5c607860be4206ef83b528fe))
+* **YouTube - Comments:** Add `Hide AI Comments summary` ([#4634](https://github.com/ReVanced/revanced-patches/issues/4634)) ([e9b7f26](https://github.com/ReVanced/revanced-patches/commit/e9b7f263f739bd130f6ea79913851a52355977c5))
+* **YouTube - Video description:** Add `Hide AI-generated video summary` ([#4636](https://github.com/ReVanced/revanced-patches/issues/4636)) ([521fd48](https://github.com/ReVanced/revanced-patches/commit/521fd48602432ab436d8711c19d7130b2b05af12))
+
+# [5.16.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.16.0-dev.1...v5.16.0-dev.2) (2025-03-26)
+
+
+### Features
+
+* **Spotify:** Add `Unlock premium` patch ([#4644](https://github.com/ReVanced/revanced-patches/issues/4644)) ([f048c50](https://github.com/ReVanced/revanced-patches/commit/f048c50e56fc1f5a5c607860be4206ef83b528fe))
+
+# [5.16.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.15.0...v5.16.0-dev.1) (2025-03-24)
+
+
+### Bug Fixes
+
+* **YouTube - Settings:** System navigation bar is located above the settings ui on Android 15+ ([f7497be](https://github.com/ReVanced/revanced-patches/commit/f7497be2c5e4abcde6eb55b84955124a28f55cae))
+
+
+### Features
+
+* **YouTube - Comments:** Add `Hide AI Comments summary` ([#4634](https://github.com/ReVanced/revanced-patches/issues/4634)) ([e9b7f26](https://github.com/ReVanced/revanced-patches/commit/e9b7f263f739bd130f6ea79913851a52355977c5))
+* **YouTube - Video description:** Add `Hide AI-generated video summary` ([#4636](https://github.com/ReVanced/revanced-patches/issues/4636)) ([521fd48](https://github.com/ReVanced/revanced-patches/commit/521fd48602432ab436d8711c19d7130b2b05af12))
+
+# [5.15.0](https://github.com/ReVanced/revanced-patches/compare/v5.14.0...v5.15.0) (2025-03-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Change oldest spoof target to 19.01.34 ([5012439](https://github.com/ReVanced/revanced-patches/commit/5012439a8e53b2a4ab5e85c47976e1ab28a51208))
+* **YouTube - Spoof app version:** Remove broken spoof targets that YouTube no longer supports ([#4610](https://github.com/ReVanced/revanced-patches/issues/4610)) ([883fbe7](https://github.com/ReVanced/revanced-patches/commit/883fbe71233c57cb1241e57c122b43f40722acc7))
+* **YouTube:** Do not show restart prompt more than once if setting change is canceled ([49797fe](https://github.com/ReVanced/revanced-patches/commit/49797fe8d0c4a0981ef621a31356c4315ae3777b))
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add opacity setting to category segment colors ([#4582](https://github.com/ReVanced/revanced-patches/issues/4582)) ([6e8ffba](https://github.com/ReVanced/revanced-patches/commit/6e8ffbade9e03658f725622631e44dabf2995861))
+
+# [5.15.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.15.0-dev.3...v5.15.0-dev.4) (2025-03-21)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Change oldest spoof target to 19.01.34 ([5012439](https://github.com/ReVanced/revanced-patches/commit/5012439a8e53b2a4ab5e85c47976e1ab28a51208))
+
+# [5.15.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.15.0-dev.2...v5.15.0-dev.3) (2025-03-20)
+
+
+### Bug Fixes
+
+* **YouTube:** Do not show restart prompt more than once if setting change is canceled ([49797fe](https://github.com/ReVanced/revanced-patches/commit/49797fe8d0c4a0981ef621a31356c4315ae3777b))
+
+# [5.15.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.15.0-dev.1...v5.15.0-dev.2) (2025-03-19)
+
+
+### Bug Fixes
+
+* **YouTube - Spoof app version:** Remove broken spoof targets that YouTube no longer supports ([#4610](https://github.com/ReVanced/revanced-patches/issues/4610)) ([883fbe7](https://github.com/ReVanced/revanced-patches/commit/883fbe71233c57cb1241e57c122b43f40722acc7))
+
+# [5.15.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.14.0...v5.15.0-dev.1) (2025-03-19)
+
+
+### Features
+
+* **YouTube - SponsorBlock:** Add opacity setting to category segment colors ([#4582](https://github.com/ReVanced/revanced-patches/issues/4582)) ([6e8ffba](https://github.com/ReVanced/revanced-patches/commit/6e8ffbade9e03658f725622631e44dabf2995861))
+
+# [5.14.0](https://github.com/ReVanced/revanced-patches/compare/v5.13.0...v5.14.0) (2025-03-09)
+
+
+### Bug Fixes
+
+* **Boost for reddit - Client spoof:** Use a different user agent to combat Reddit's API issues ([5d3c817](https://github.com/ReVanced/revanced-patches/commit/5d3c8175b34a3f6ae2732b25db0851773a8c000d))
+* **YouTube - Change form factor:** Restore Automotive form factor watch history menu, channel pages, and community posts ([#4541](https://github.com/ReVanced/revanced-patches/issues/4541)) ([aa5c001](https://github.com/ReVanced/revanced-patches/commit/aa5c001968446e5270c756256724e917009612cd))
+* **YouTube - Hide ads:** Hide new type of buttoned ad ([#4528](https://github.com/ReVanced/revanced-patches/issues/4528)) ([4387a7b](https://github.com/ReVanced/revanced-patches/commit/4387a7b131f49729e902e008bb4cec073635c040))
+* **YouTube - Hide layout components:** Do not hide Movie/Courses start page content if 'Hide horizontal shelves' is enabled ([62a6164](https://github.com/ReVanced/revanced-patches/commit/62a6164b88b64200b517a5ba6b800d8214dbbad8))
+* **YouTube - Theme:** Resolve dark mode startup crash with Android 9.0 ([741c2d5](https://github.com/ReVanced/revanced-patches/commit/741c2d59406f5d602554bb3a3c0b8982f42848b4))
+* **YouTube:** Change language settings menu to use native language names ([#4568](https://github.com/ReVanced/revanced-patches/issues/4568)) ([6f3f8fd](https://github.com/ReVanced/revanced-patches/commit/6f3f8fdce05501e4fa4423c2170a916fbea3b199))
+* **YouTube:** Combine `Restore old video quality menu` and `Remember video quality` into `Video quality` patch ([#4552](https://github.com/ReVanced/revanced-patches/issues/4552)) ([ee67b76](https://github.com/ReVanced/revanced-patches/commit/ee67b763d5c5947a5b1ef4420b1efa820ed6af83))
+
+
+### Features
+
+* **Infinity for Reddit:** Add support for package name on IzzyOnDroid ([#4554](https://github.com/ReVanced/revanced-patches/issues/4554)) ([cf9f959](https://github.com/ReVanced/revanced-patches/commit/cf9f959923076c10a7f0a29f6ba277f5a055ec07))
+* **Spotify:** Add `Spoof signature` patch ([#4576](https://github.com/ReVanced/revanced-patches/issues/4576)) ([3646c70](https://github.com/ReVanced/revanced-patches/commit/3646c70556b67a6b7ecf9b86869ebf03c3611333))
+* **YouTube - Remember video quality:** Add separate Shorts default quality settings ([#4543](https://github.com/ReVanced/revanced-patches/issues/4543)) ([88142ab](https://github.com/ReVanced/revanced-patches/commit/88142ab464192b564b1b8d56a6b45663f77f5e00))
+
+# [5.14.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.8...v5.14.0-dev.9) (2025-03-09)
+
+
+### Features
+
+* **Spotify:** Add `Spoof signature` patch ([#4576](https://github.com/ReVanced/revanced-patches/issues/4576)) ([3646c70](https://github.com/ReVanced/revanced-patches/commit/3646c70556b67a6b7ecf9b86869ebf03c3611333))
+
 # [5.14.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.14.0-dev.7...v5.14.0-dev.8) (2025-03-09)
 
 

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

@@ -23,6 +23,11 @@ public class BaseSettings {
 
     public static final EnumSetting<AppLanguage> REVANCED_LANGUAGE = new EnumSetting<>("revanced_language", AppLanguage.DEFAULT, true, "revanced_language_user_dialog_message");
 
+    /**
+     * Use the icons declared in the preferences created during patching. If no icons or styles are declared then this setting does nothing.
+     */
+    public static final BooleanSetting SHOW_MENU_ICONS = new BooleanSetting("revanced_show_menu_icons", TRUE, true);
+
     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));

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

@@ -22,12 +22,23 @@ import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings("deprecation")
 public abstract class AbstractPreferenceFragment extends PreferenceFragment {
+
     /**
      * Indicates that if a preference changes,
      * to apply the change from the Setting to the UI component.
      */
     public static boolean settingImportInProgress;
 
+    /**
+     * Prevents recursive calls during preference <-> UI syncing from showing extra dialogs.
+     */
+    private static boolean updatingPreference;
+
+    /**
+     * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
+     */
+    private static boolean showingUserDialogMessage;
+
     /**
      * Confirm and restart dialog button text and title.
      * Set by subclasses if Strings cannot be added as a resource.
@@ -35,13 +46,13 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
     @Nullable
     protected static String restartDialogButtonText, restartDialogTitle, confirmDialogTitle;
 
-    /**
-     * Used to prevent showing reboot dialog, if user cancels a setting user dialog.
-     */
-    private boolean showingUserDialogMessage;
-
     private final SharedPreferences.OnSharedPreferenceChangeListener listener = (sharedPreferences, str) -> {
         try {
+            if (updatingPreference) {
+                Logger.printDebug(() -> "Ignoring preference change as sync is in progress");
+                return;
+            }
+
             Setting<?> setting = Setting.getSettingFromPath(Objects.requireNonNull(str));
             if (setting == null) {
                 return;
@@ -63,16 +74,18 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
                 }
             }
 
+            updatingPreference = true;
             // Apply 'Setting <- Preference', unless during importing when it needs to be 'Setting -> Preference'.
+            // Updating here can can cause a recursive call back into this same method.
             updatePreference(pref, setting, true, settingImportInProgress);
             // Update any other preference availability that may now be different.
             updateUIAvailability();
+            updatingPreference = false;
         } catch (Exception ex) {
             Logger.printException(() -> "OnSharedPreferenceChangeListener failure", ex);
         }
     };
 
-
     /**
      * Initialize this instance, and do any custom behavior.
      * <p>
@@ -81,7 +94,10 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * so all app specific {@link Setting} instances are loaded before this method returns.
      */
     protected void initialize() {
-        final var identifier = Utils.getResourceIdentifier("revanced_prefs", "xml");
+        String preferenceResourceName = BaseSettings.SHOW_MENU_ICONS.get()
+                ? "revanced_prefs_icons"
+                : "revanced_prefs";
+        final var identifier = Utils.getResourceIdentifier(preferenceResourceName, "xml");
         if (identifier == 0) return;
         addPreferencesFromResource(identifier);
 
@@ -97,7 +113,9 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (confirmDialogTitle == null) {
             confirmDialogTitle = str("revanced_settings_confirm_user_dialog_title");
         }
+
         showingUserDialogMessage = true;
+
         new AlertDialog.Builder(context)
                 .setTitle(confirmDialogTitle)
                 .setMessage(Objects.requireNonNull(setting.userDialogMessage).toString())
@@ -141,14 +159,16 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
      * @return If the preference is currently set to the default value of the Setting.
      */
     protected boolean prefIsSetToDefault(Preference pref, Setting<?> setting) {
+        Object defaultValue = setting.defaultValue;
         if (pref instanceof SwitchPreference switchPref) {
-            return switchPref.isChecked() == (Boolean) setting.defaultValue;
+            return switchPref.isChecked() == (Boolean) defaultValue;
         }
+        String defaultValueString = defaultValue.toString();
         if (pref instanceof EditTextPreference editPreference) {
-            return editPreference.getText().equals(setting.defaultValue.toString());
+            return editPreference.getText().equals(defaultValueString);
         }
         if (pref instanceof ListPreference listPref) {
-            return listPref.getValue().equals(setting.defaultValue.toString());
+            return listPref.getValue().equals(defaultValueString);
         }
 
         throw new IllegalStateException("Must override method to handle "
@@ -255,7 +275,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         }
     }
 
-    public static void showRestartDialog(@NonNull final Context context) {
+    public static void showRestartDialog(Context context) {
         Utils.verifyOnMainThread();
         if (restartDialogTitle == null) {
             restartDialogTitle = str("revanced_settings_restart_title");
@@ -263,6 +283,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         if (restartDialogButtonText == null) {
             restartDialogButtonText = str("revanced_settings_restart");
         }
+
         new AlertDialog.Builder(context)
                 .setMessage(restartDialogTitle)
                 .setPositiveButton(restartDialogButtonText, (dialog, id)

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

@@ -1,5 +1,7 @@
 package app.revanced.extension.shared.settings.preference;
 
+import static app.revanced.extension.shared.StringRef.str;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -8,17 +10,23 @@ import android.util.AttributeSet;
 import android.widget.Button;
 import android.widget.EditText;
 
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.Setting;
-import app.revanced.extension.shared.Logger;
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 
-import static app.revanced.extension.shared.StringRef.str;
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.Setting;
 
 @SuppressWarnings({"unused", "deprecation"})
 public class ResettableEditTextPreference extends EditTextPreference {
 
+    /**
+     * Setting to reset.
+     */
+    @Nullable
+    private Setting<?> setting;
+
     public ResettableEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
@@ -32,12 +40,22 @@ public class ResettableEditTextPreference extends EditTextPreference {
         super(context);
     }
 
+    public void setSetting(@Nullable Setting<?> setting) {
+        this.setting = setting;
+    }
+
     @Override
     protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
         super.onPrepareDialogBuilder(builder);
         Utils.setEditTextDialogTheme(builder);
 
-        Setting<?> setting = Setting.getSettingFromPath(getKey());
+        if (setting == null) {
+            String key = getKey();
+            if (key != null) {
+                setting = Setting.getSettingFromPath(key);
+            }
+        }
+
         if (setting != null) {
             builder.setNeutralButton(str("revanced_settings_reset"), null);
         }
@@ -54,8 +72,7 @@ public class ResettableEditTextPreference extends EditTextPreference {
         }
         button.setOnClickListener(v -> {
             try {
-                Setting<?> setting = Objects.requireNonNull(Setting.getSettingFromPath(getKey()));
-                String defaultStringValue = setting.defaultValue.toString();
+                String defaultStringValue = Objects.requireNonNull(setting).defaultValue.toString();
                 EditText editText = getEditText();
                 editText.setText(defaultStringValue);
                 editText.setSelection(defaultStringValue.length()); // move cursor to end of text

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

@@ -122,6 +122,21 @@ public class SpoofVideoStreamsPatch {
         return false;
     }
 
+    /**
+     * Injection point.
+     * Turns off a feature flag that interferes with video playback.
+     */
+    public static boolean usePlaybackStartFeatureFlag(boolean original) {
+        if (original) {
+            Logger.printDebug(() -> "usePlaybackStartFeatureFlag is set on");
+        }
+
+        if (!SPOOF_STREAMING_DATA) {
+            return original;
+        }
+        return false;
+    }
+
     /**
      * Injection point.
      */

extensions/spotify/build.gradle.kts

@@ -0,0 +1,16 @@
+dependencies {
+    compileOnly(project(":extensions:shared:library"))
+    compileOnly(project(":extensions:spotify:stub"))
+    compileOnly(libs.annotation)
+}
+
+android {
+    defaultConfig {
+        minSdk = 24
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}

extensions/spotify/src/main/AndroidManifest.xml

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

extensions/spotify/stub/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+}
+
+android {
+    namespace = "app.revanced.extension"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 26
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}

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

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

extensions/spotify/stub/src/main/java/com/spotify/remoteconfig/internal/AccountAttribute.java

@@ -0,0 +1,5 @@
+package com.spotify.remoteconfig.internal;
+
+public final class AccountAttribute {
+    public Object value_;
+}

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

@@ -9,7 +9,6 @@ import app.revanced.extension.tiktok.settings.preference.categories.DownloadsPre
 import app.revanced.extension.tiktok.settings.preference.categories.FeedFilterPreferenceCategory;
 import app.revanced.extension.tiktok.settings.preference.categories.ExtensionPreferenceCategory;
 import app.revanced.extension.tiktok.settings.preference.categories.SimSpoofPreferenceCategory;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Preference fragment for ReVanced settings

extensions/twitter/src/main/java/app/revanced/twitter/patches/hook/twifucker/TwiFucker.kt

@@ -163,7 +163,7 @@ internal object TwiFucker {
 
     private fun JSONObject.entryIsWhoToFollow(): Boolean =
         optString("entryId").let {
-            it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-")
+            it.startsWith("whoToFollow-") || it.startsWith("who-to-follow-") || it.startsWith("connect-module-") || it.startsWith("who-to-subscribe-")
         }
 
     private fun JSONObject.itemContainsPromotedUser(): Boolean =

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

@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
+import app.revanced.extension.youtube.shared.PlayerType;
 import app.revanced.extension.youtube.shared.ShortsPlayerState;
 
 @SuppressWarnings("unused")
@@ -23,7 +24,13 @@ public class BackgroundPlaybackPatch {
         // 7. Close the Short
         // 8. Resume playing the regular video
         // 9. Minimize the app (PIP should appear)
-        return !ShortsPlayerState.isOpen();
+        if (ShortsPlayerState.isOpen()) {
+            return false;
+        }
+
+        // Check if the video player is opened and it's not playing in the feed.
+        PlayerType current = PlayerType.getCurrent();
+        return !current.isNoneOrHidden() && current != PlayerType.INLINE_MINIMAL;
     }
 
     /**

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

@@ -2,7 +2,7 @@ package app.revanced.extension.youtube.patches;
 
 import app.revanced.extension.youtube.settings.Settings;
 
-/** @noinspection unused*/
+@SuppressWarnings("unused")
 public class DisableResumingStartupShortsPlayerPatch {
 
     /**
@@ -11,4 +11,11 @@ public class DisableResumingStartupShortsPlayerPatch {
     public static boolean disableResumingStartupShortsPlayer() {
         return Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
     }
+
+    /**
+     * Injection point.
+     */
+    public static boolean disableResumingStartupShortsPlayer(boolean original) {
+        return original && !Settings.DISABLE_RESUMING_SHORTS_PLAYER.get();
+    }
 }

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

@@ -43,10 +43,13 @@ public final class MiniplayerPatch {
         MODERN_2(null, 2),
         MODERN_3(null, 3),
         /**
-         * Half broken miniplayer, that might be work in progress or left over abandoned code.
-         * Can force this type by editing the import/export settings.
+         * Works and is functional with 20.03+
          */
-        MODERN_4(null, 4);
+        MODERN_4(null, 4),
+        /**
+         * Half broken miniplayer, and in 20.02 and earlier is declared as type 4.
+         */
+        MODERN_5(null, 5);
 
         /**
          * Legacy tablet hook value.
@@ -126,12 +129,13 @@ public final class MiniplayerPatch {
     private static final boolean DRAG_AND_DROP_ENABLED =
             CURRENT_TYPE.isModern() && Settings.MINIPLAYER_DRAG_AND_DROP.get();
 
-    private static final boolean HIDE_EXPAND_CLOSE_ENABLED =
-            Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.get()
-                    && Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.isAvailable();
+    private static final boolean HIDE_OVERLAY_BUTTONS_ENABLED =
+            Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.get()
+                    && Settings.MINIPLAYER_HIDE_OVERLAY_BUTTONS.isAvailable();
 
     private static final boolean HIDE_SUBTEXT_ENABLED =
-            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3) && Settings.MINIPLAYER_HIDE_SUBTEXT.get();
+            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3 || CURRENT_TYPE == MODERN_4)
+                    && Settings.MINIPLAYER_HIDE_SUBTEXT.get();
 
     // 19.25 is last version that has forward/back buttons for phones,
     // but buttons still show for tablets/foldable devices and they don't work well so always hide.
@@ -139,7 +143,7 @@ public final class MiniplayerPatch {
             && (VersionCheckPatch.IS_19_34_OR_GREATER || Settings.MINIPLAYER_HIDE_REWIND_FORWARD.get());
 
     private static final boolean MINIPLAYER_ROUNDED_CORNERS_ENABLED =
-            Settings.MINIPLAYER_ROUNDED_CORNERS.get();
+            CURRENT_TYPE.isModern() && Settings.MINIPLAYER_ROUNDED_CORNERS.get();
 
     private static final boolean MINIPLAYER_HORIZONTAL_DRAG_ENABLED =
             DRAG_AND_DROP_ENABLED && Settings.MINIPLAYER_HORIZONTAL_DRAG.get();
@@ -172,11 +176,12 @@ public final class MiniplayerPatch {
         }
     }
 
-    public static final class MiniplayerHideExpandCloseAvailability implements Setting.Availability {
+    public static final class MiniplayerHideOverlayButtonsAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {
             MiniplayerType type = Settings.MINIPLAYER_TYPE.get();
-            return (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
+            return type == MODERN_4
+                    || (!IS_19_20_OR_GREATER && (type == MODERN_1 || type == MODERN_3))
                     || (!IS_19_26_OR_GREATER && type == MODERN_1
                     && !Settings.MINIPLAYER_DOUBLE_TAP_ACTION.get() && !Settings.MINIPLAYER_DRAG_AND_DROP.get())
                     || (IS_19_29_OR_GREATER && type == MODERN_3);
@@ -227,9 +232,13 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static void adjustMiniplayerOpacity(ImageView view) {
+    public static void adjustMiniplayerOpacity(View view) {
         if (CURRENT_TYPE == MODERN_1) {
-            view.setImageAlpha(OPACITY_LEVEL);
+            if (view instanceof ImageView imageView) {
+                imageView.setImageAlpha(OPACITY_LEVEL);
+            } else {
+                Logger.printException(() -> "Unknown miniplayer overlay view: " + view);
+            }
         }
     }
 
@@ -247,7 +256,7 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static boolean enableMiniplayerDoubleTapAction(boolean original) {
+    public static boolean getMiniplayerDoubleTapAction(boolean original) {
         if (CURRENT_TYPE == DEFAULT) {
             return original;
         }
@@ -258,7 +267,7 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static boolean enableMiniplayerDragAndDrop(boolean original) {
+    public static boolean getMiniplayerDragAndDrop(boolean original) {
         if (CURRENT_TYPE == DEFAULT) {
             return original;
         }
@@ -266,13 +275,36 @@ public final class MiniplayerPatch {
         return DRAG_AND_DROP_ENABLED;
     }
 
+    /**
+     * Injection point.
+     */
+    public static boolean getRoundedCorners(boolean original) {
+        if (CURRENT_TYPE == DEFAULT) {
+            return original;
+        }
+
+        return MINIPLAYER_ROUNDED_CORNERS_ENABLED;
+    }
 
     /**
      * Injection point.
      */
-    public static boolean setRoundedCorners(boolean original) {
-        if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_ROUNDED_CORNERS_ENABLED;
+    public static boolean getHorizontalDrag(boolean original) {
+        if (CURRENT_TYPE == DEFAULT) {
+            return original;
+        }
+
+        return MINIPLAYER_HORIZONTAL_DRAG_ENABLED;
+    }
+
+    /**
+     * Injection point.
+     */
+    public static boolean getMaximizeAnimation(boolean original) {
+        // This must be forced on if horizontal drag is enabled,
+        // otherwise the UI has visual glitches when maximizing the miniplayer.
+        if (MINIPLAYER_HORIZONTAL_DRAG_ENABLED) {
+            return true;
         }
 
         return original;
@@ -281,7 +313,7 @@ public final class MiniplayerPatch {
     /**
      * Injection point.
      */
-    public static int setMiniplayerDefaultSize(int original) {
+    public static int getMiniplayerDefaultSize(int original) {
         if (CURRENT_TYPE.isModern()) {
             return MINIPLAYER_SIZE;
         }
@@ -289,29 +321,26 @@ public final class MiniplayerPatch {
         return original;
     }
 
+    /**
+     * Injection point.
+     */
+    public static void hideMiniplayerExpandClose(View view) {
+        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_OVERLAY_BUTTONS_ENABLED, view);
+    }
 
     /**
      * Injection point.
      */
-    public static boolean setHorizontalDrag(boolean original) {
-        if (CURRENT_TYPE.isModern()) {
-            return MINIPLAYER_HORIZONTAL_DRAG_ENABLED;
+    public static void hideMiniplayerActionButton(View view) {
+        if (CURRENT_TYPE == MODERN_4) {
+            Utils.hideViewByRemovingFromParentUnderCondition(HIDE_OVERLAY_BUTTONS_ENABLED, view);
         }
-
-        return original;
     }
 
     /**
      * Injection point.
      */
-    public static void hideMiniplayerExpandClose(ImageView view) {
-        Utils.hideViewByRemovingFromParentUnderCondition(HIDE_EXPAND_CLOSE_ENABLED, view);
-    }
-
-    /**
-     * Injection point.
-     */
-    public static void hideMiniplayerRewindForward(ImageView view) {
+    public static void hideMiniplayerRewindForward(View view) {
         Utils.hideViewByRemovingFromParentUnderCondition(HIDE_REWIND_FORWARD_ENABLED, view);
     }
 

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

@@ -21,7 +21,6 @@ import java.util.Objects;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.patches.components.ReturnYouTubeDislikeFilterPatch;
-import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
@@ -47,9 +46,6 @@ import app.revanced.extension.youtube.shared.PlayerType;
 @SuppressWarnings("unused")
 public class ReturnYouTubeDislikePatch {
 
-    public static final boolean IS_SPOOFING_TO_NON_LITHO_SHORTS_PLAYER =
-            SpoofAppVersionPatch.isSpoofingToLessThan("18.34.00");
-
     /**
      * RYD data for the current video on screen.
      */
@@ -347,137 +343,6 @@ public class ReturnYouTubeDislikePatch {
         }
     }
 
-    //
-    // Non litho Shorts player.
-    //
-
-    /**
-     * Replacement text to use for "Dislikes" while RYD is fetching.
-     */
-    private static final Spannable SHORTS_LOADING_SPAN = new SpannableString("-");
-
-    /**
-     * Dislikes TextViews used by Shorts.
-     *
-     * Multiple TextViews are loaded at once (for the prior and next videos to swipe to).
-     * Keep track of all of them, and later pick out the correct one based on their on screen position.
-     */
-    private static final List<WeakReference<TextView>> shortsTextViewRefs = new ArrayList<>();
-
-    private static void clearRemovedShortsTextViews() {
-        shortsTextViewRefs.removeIf(ref -> ref.get() == null);
-    }
-
-    /**
-     * Injection point.  Called when a Shorts dislike is updated.  Always on main thread.
-     * Handles update asynchronously, otherwise Shorts video will be frozen while the UI thread is blocked.
-     *
-     * @return if RYD is enabled and the TextView was updated.
-     */
-    public static boolean setShortsDislikes(@NonNull View likeDislikeView) {
-        try {
-            if (!Settings.RYD_ENABLED.get()) {
-                return false;
-            }
-            if (!Settings.RYD_SHORTS.get() || Settings.HIDE_SHORTS_DISLIKE_BUTTON.get()) {
-                // Must clear the data here, in case a new video was loaded while PlayerType
-                // suggested the video was not a short (can happen when spoofing to an old app version).
-                clearData();
-                return false;
-            }
-            Logger.printDebug(() -> "setShortsDislikes");
-
-            TextView textView = (TextView) likeDislikeView;
-            textView.setText(SHORTS_LOADING_SPAN); // Change 'Dislike' text to the loading text.
-            shortsTextViewRefs.add(new WeakReference<>(textView));
-
-            if (likeDislikeView.isSelected() && isShortTextViewOnScreen(textView)) {
-                Logger.printDebug(() -> "Shorts dislike is already selected");
-                ReturnYouTubeDislike videoData = currentVideoData;
-                if (videoData != null) videoData.setUserVote(Vote.DISLIKE);
-            }
-
-            // For the first short played, the Shorts dislike hook is called after the video id hook.
-            // But for most other times this hook is called before the video id (which is not ideal).
-            // Must update the TextViews here, and also after the videoId changes.
-            updateOnScreenShortsTextViews(false);
-
-            return true;
-        } catch (Exception ex) {
-            Logger.printException(() -> "setShortsDislikes failure", ex);
-            return false;
-        }
-    }
-
-    /**
-     * @param forceUpdate if false, then only update the 'loading text views.
-     *                    If true, update all on screen text views.
-     */
-    private static void updateOnScreenShortsTextViews(boolean forceUpdate) {
-        try {
-            clearRemovedShortsTextViews();
-            if (shortsTextViewRefs.isEmpty()) {
-                return;
-            }
-            ReturnYouTubeDislike videoData = currentVideoData;
-            if (videoData == null) {
-                return;
-            }
-
-            Logger.printDebug(() -> "updateShortsTextViews");
-
-            Runnable update = () -> {
-                Spanned shortsDislikesSpan = videoData.getDislikeSpanForShort(SHORTS_LOADING_SPAN);
-                Utils.runOnMainThreadNowOrLater(() -> {
-                    String videoId = videoData.getVideoId();
-                    if (!videoId.equals(VideoInformation.getVideoId())) {
-                        // User swiped to new video before fetch completed
-                        Logger.printDebug(() -> "Ignoring stale dislikes data for short: " + videoId);
-                        return;
-                    }
-
-                    // Update text views that appear to be visible on screen.
-                    // Only 1 will be the actual textview for the current Short,
-                    // but discarded and not yet garbage collected views can remain.
-                    // So must set the dislike span on all views that match.
-                    for (WeakReference<TextView> textViewRef : shortsTextViewRefs) {
-                        TextView textView = textViewRef.get();
-                        if (textView == null) {
-                            continue;
-                        }
-                        if (isShortTextViewOnScreen(textView)
-                                && (forceUpdate || textView.getText().toString().equals(SHORTS_LOADING_SPAN.toString()))) {
-                            Logger.printDebug(() -> "Setting Shorts TextView to: " + shortsDislikesSpan);
-                            textView.setText(shortsDislikesSpan);
-                        }
-                    }
-                });
-            };
-            if (videoData.fetchCompleted()) {
-                update.run(); // Network call is completed, no need to wait on background thread.
-            } else {
-                Utils.runOnBackgroundThread(update);
-            }
-        } catch (Exception ex) {
-            Logger.printException(() -> "updateOnScreenShortsTextViews failure", ex);
-        }
-    }
-
-    /**
-     * Check if a view is within the screen bounds.
-     */
-    private static boolean isShortTextViewOnScreen(@NonNull View view) {
-        final int[] location = new int[2];
-        view.getLocationInWindow(location);
-        if (location[0] <= 0 && location[1] <= 0) { // Lower bound
-            return false;
-        }
-        Rect windowRect = new Rect();
-        view.getWindowVisibleDisplayFrame(windowRect); // Upper bound
-        return location[0] < windowRect.width() && location[1] < windowRect.height();
-    }
-
-
     //
     // Video Id and voting hooks (all players).
     //
@@ -503,8 +368,7 @@ public class ReturnYouTubeDislikePatch {
             if (videoIdIsShort && (!isShortAndOpeningOrPlaying || !Settings.RYD_SHORTS.get())) {
                 return;
             }
-            final boolean waitForFetchToComplete = !IS_SPOOFING_TO_NON_LITHO_SHORTS_PLAYER
-                    && videoIdIsShort && !lastPlayerResponseWasShort;
+            final boolean waitForFetchToComplete = videoIdIsShort && !lastPlayerResponseWasShort;
 
             Logger.printDebug(() -> "Prefetching RYD for video: " + videoId);
             ReturnYouTubeDislike fetch = ReturnYouTubeDislike.getFetchForVideoId(videoId);
@@ -557,12 +421,6 @@ public class ReturnYouTubeDislikePatch {
                 data.setVideoIdIsShort(true);
             }
             currentVideoData = data;
-
-            // Current video id hook can be called out of order with the non litho Shorts text view hook.
-            // Must manually update again here.
-            if (isNoneHiddenOrSlidingMinimized) {
-                updateOnScreenShortsTextViews(true);
-            }
         } catch (Exception ex) {
             Logger.printException(() -> "newVideoLoaded failure", ex);
         }

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

@@ -3,11 +3,15 @@ package app.revanced.extension.youtube.patches;
 import app.revanced.extension.shared.Utils;
 
 public class VersionCheckPatch {
-    public static final boolean IS_19_17_OR_GREATER = Utils.getAppVersionName().compareTo("19.17.00") >= 0;
-    public static final boolean IS_19_20_OR_GREATER = Utils.getAppVersionName().compareTo("19.20.00") >= 0;
-    public static final boolean IS_19_21_OR_GREATER = Utils.getAppVersionName().compareTo("19.21.00") >= 0;
-    public static final boolean IS_19_26_OR_GREATER = Utils.getAppVersionName().compareTo("19.26.00") >= 0;
-    public static final boolean IS_19_29_OR_GREATER = Utils.getAppVersionName().compareTo("19.29.00") >= 0;
-    public static final boolean IS_19_34_OR_GREATER = Utils.getAppVersionName().compareTo("19.34.00") >= 0;
-    public static final boolean IS_19_46_OR_GREATER = Utils.getAppVersionName().compareTo("19.46.00") >= 0;
+    private static boolean isVersionOrGreater(String version) {
+        return Utils.getAppVersionName().compareTo(version) >= 0;
+    }
+
+    public static final boolean IS_19_17_OR_GREATER = isVersionOrGreater("19.17.00");
+    public static final boolean IS_19_20_OR_GREATER = isVersionOrGreater("19.20.00");
+    public static final boolean IS_19_21_OR_GREATER = isVersionOrGreater("19.21.00");
+    public static final boolean IS_19_26_OR_GREATER = isVersionOrGreater("19.26.00");
+    public static final boolean IS_19_29_OR_GREATER = isVersionOrGreater("19.29.00");
+    public static final boolean IS_19_34_OR_GREATER = isVersionOrGreater("19.34.00");
+    public static final boolean IS_19_46_OR_GREATER = isVersionOrGreater("19.46.00");
 }

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

@@ -12,10 +12,12 @@ final class CommentsFilter extends Filter {
 
     private final StringFilterGroup commentComposer;
     private final ByteArrayFilterGroup emojiPickerBufferGroup;
+    private final StringFilterGroup filterChipBar;
+    private final ByteArrayFilterGroup aiCommentsSummary;
     
     public CommentsFilter() {
         var chatSummary = new StringFilterGroup(
-                Settings.HIDE_COMMENTS_CHAT_SUMMARY,
+                Settings.HIDE_COMMENTS_AI_CHAT_SUMMARY,
                 "live_chat_summary_banner.eml"
         );
 
@@ -58,6 +60,16 @@ final class CommentsFilter extends Filter {
                 "id.comment.quick_emoji.button"
         );
 
+        filterChipBar = new StringFilterGroup(
+                Settings.HIDE_COMMENTS_AI_SUMMARY,
+                "filter_chip_bar.eml"
+        );
+
+        aiCommentsSummary = new ByteArrayFilterGroup(
+                null,
+                "yt_fill_spark_"
+        );
+
         addPathCallbacks(
                 chatSummary,
                 commentsByMembers,
@@ -65,7 +77,8 @@ final class CommentsFilter extends Filter {
                 createAShort,
                 previewComment,
                 thanksButton,
-                commentComposer
+                commentComposer,
+                filterChipBar
         );
     }
 
@@ -84,6 +97,13 @@ final class CommentsFilter extends Filter {
             return false;
         }
 
+        if (matchedGroup == filterChipBar) {
+            if (aiCommentsSummary.check(protobufBufferArray).isFiltered()) {
+                return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
+            }
+            return false;
+        }
+
         return super.isFiltered(identifier, path, protobufBufferArray, matchedGroup, contentType, contentIndex);
     }
 }

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

@@ -23,6 +23,11 @@ final class DescriptionComponentsFilter extends Filter {
                 "metadata"
         );
 
+        final StringFilterGroup aiGeneratedVideoSummarySection = new StringFilterGroup(
+                Settings.HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION,
+                "cell_expandable_metadata.eml"
+        );
+
         final StringFilterGroup attributesSection = new StringFilterGroup(
                 Settings.HIDE_ATTRIBUTES_SECTION,
                 "gaming_section",
@@ -67,6 +72,7 @@ final class DescriptionComponentsFilter extends Filter {
         );
 
         addPathCallbacks(
+                aiGeneratedVideoSummarySection,
                 attributesSection,
                 infoCardsSection,
                 howThisWasMadeSection,

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

@@ -37,7 +37,6 @@ import java.util.concurrent.*;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
 import app.revanced.extension.youtube.ThemeHelper;
-import app.revanced.extension.youtube.patches.spoof.SpoofAppVersionPatch;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.RYDVoteData;
 import app.revanced.extension.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi;
 import app.revanced.extension.youtube.settings.Settings;
@@ -87,9 +86,6 @@ public class ReturnYouTubeDislike {
      */
     private static final char MIDDLE_SEPARATOR_CHARACTER = '◎'; // 'bullseye'
 
-    private static final boolean IS_SPOOFING_TO_OLD_SEPARATOR_COLOR
-            = SpoofAppVersionPatch.isSpoofingToLessThan("18.10.00");
-
     /**
      * Cached lookup of all video ids.
      */
@@ -118,7 +114,7 @@ public class ReturnYouTubeDislike {
     private static final Rect middleSeparatorBounds;
 
     /**
-     * Left separator horizontal padding for Rolling Number layout.
+     * Horizontal padding between the left and middle separator.
      */
     public static final int leftSeparatorShapePaddingPixels;
     private static final ShapeDrawable leftSeparatorShape;
@@ -133,7 +129,7 @@ public class ReturnYouTubeDislike {
                 (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 3.7f, dp);
         middleSeparatorBounds = new Rect(0, 0, middleSeparatorSize, middleSeparatorSize);
 
-        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10.0f, dp);
+        leftSeparatorShapePaddingPixels = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8.4f, dp);
 
         leftSeparatorShape = new ShapeDrawable(new RectShape());
         leftSeparatorShape.setBounds(leftSeparatorBounds);
@@ -184,17 +180,8 @@ public class ReturnYouTubeDislike {
      * Color of the left and middle separator, based on the color of the right separator.
      * It's unknown where YT gets the color from, and the values here are approximated by hand.
      * Ideally, this would be the actual color YT uses at runtime.
-     *
-     * Older versions before the 'Me' library tab use a slightly different color.
-     * If spoofing was previously used and is now turned off,
-     * or an old version was recently upgraded then the old colors are sometimes still used.
      */
     private static int getSeparatorColor() {
-        if (IS_SPOOFING_TO_OLD_SEPARATOR_COLOR) {
-            return ThemeHelper.isDarkTheme()
-                    ? 0x29AAAAAA  // transparent dark gray
-                    : 0xFFD9D9D9; // light gray
-        }
         return ThemeHelper.isDarkTheme()
                 ? 0x33FFFFFF
                 : 0xFFD9D9D9;
@@ -251,7 +238,7 @@ public class ReturnYouTubeDislike {
             String leftSeparatorString = getTextDirectionString();
             final Spannable leftSeparatorSpan;
             if (isRollingNumber) {
-                 leftSeparatorSpan = new SpannableString(leftSeparatorString);
+                leftSeparatorSpan = new SpannableString(leftSeparatorString);
             } else {
                 leftSeparatorString += "  ";
                 leftSeparatorSpan = new SpannableString(leftSeparatorString);
@@ -636,7 +623,7 @@ public class ReturnYouTubeDislike {
                 userVote = vote;
                 clearUICache();
             }
-            
+
             if (future.isDone()) {
                 // Update the fetched vote data.
                 RYDVoteData voteData = getFetchData(MAX_MILLISECONDS_TO_BLOCK_UI_WAITING_FOR_FETCH);

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

@@ -3,7 +3,6 @@ package app.revanced.extension.youtube.settings;
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static app.revanced.extension.shared.settings.Setting.Availability;
-import static app.revanced.extension.shared.settings.Setting.migrateFromOldPreferences;
 import static app.revanced.extension.shared.settings.Setting.migrateOldSettingToNew;
 import static app.revanced.extension.shared.settings.Setting.parent;
 import static app.revanced.extension.shared.settings.Setting.parentsAny;
@@ -11,7 +10,6 @@ import static app.revanced.extension.youtube.patches.ChangeFormFactorPatch.FormF
 import static app.revanced.extension.youtube.patches.ChangeStartPagePatch.StartPage;
 import static app.revanced.extension.youtube.patches.ExitFullscreenPatch.FullscreenMode;
 import static app.revanced.extension.youtube.patches.ForceOriginalAudioPatch.ForceOriginalAudioAvailability;
-import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHideExpandCloseAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerHorizontalDragAvailability;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType;
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MINIMAL;
@@ -21,7 +19,6 @@ import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerT
 import static app.revanced.extension.youtube.patches.MiniplayerPatch.MiniplayerType.MODERN_4;
 import static app.revanced.extension.youtube.patches.OpenShortsInRegularPlayerPatch.ShortsPlayerType;
 import static app.revanced.extension.youtube.patches.SeekbarThumbnailsPatch.SeekbarThumbnailsHighQualityAvailability;
-import static app.revanced.extension.youtube.patches.VersionCheckPatch.IS_19_17_OR_GREATER;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.IGNORE;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.MANUAL_SKIP;
 import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY;
@@ -38,11 +35,11 @@ import app.revanced.extension.shared.settings.IntegerSetting;
 import app.revanced.extension.shared.settings.LongSetting;
 import app.revanced.extension.shared.settings.Setting;
 import app.revanced.extension.shared.settings.StringSetting;
-import app.revanced.extension.shared.settings.preference.SharedPrefCategory;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.DeArrowAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.StillImagesAvailability;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailOption;
 import app.revanced.extension.youtube.patches.AlternativeThumbnailsPatch.ThumbnailStillTime;
+import app.revanced.extension.youtube.patches.MiniplayerPatch;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
 
 public class Settings extends BaseSettings {
@@ -159,7 +156,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting MINIPLAYER_DOUBLE_TAP_ACTION = new BooleanSetting("revanced_miniplayer_double_tap_action", TRUE, true, MINIPLAYER_ANY_MODERN);
     public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_drag_and_drop", TRUE, true, MINIPLAYER_ANY_MODERN);
     public static final BooleanSetting MINIPLAYER_HORIZONTAL_DRAG = new BooleanSetting("revanced_miniplayer_horizontal_drag", FALSE, true, new MiniplayerHorizontalDragAvailability());
-    public static final BooleanSetting MINIPLAYER_HIDE_EXPAND_CLOSE = new BooleanSetting("revanced_miniplayer_hide_expand_close", FALSE, true, new MiniplayerHideExpandCloseAvailability());
+    public static final BooleanSetting MINIPLAYER_HIDE_OVERLAY_BUTTONS = new BooleanSetting("revanced_miniplayer_hide_overlay_buttons", FALSE, true, new MiniplayerPatch.MiniplayerHideOverlayButtonsAvailability());
     public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3));
     public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", TRUE, true, MINIPLAYER_TYPE.availability(MODERN_1));
     public static final BooleanSetting MINIPLAYER_ROUNDED_CORNERS = new BooleanSetting("revanced_miniplayer_rounded_corners", TRUE, true, MINIPLAYER_ANY_MODERN);
@@ -171,7 +168,8 @@ public class Settings extends BaseSettings {
     public static final StringSetting EXTERNAL_DOWNLOADER_PACKAGE_NAME = new StringSetting("revanced_external_downloader_name",
             "org.schabi.newpipe" /* NewPipe */, parentsAny(EXTERNAL_DOWNLOADER, EXTERNAL_DOWNLOADER_ACTION_BUTTON));
     // Comments
-    public static final BooleanSetting HIDE_COMMENTS_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_chat_summary", FALSE);
+    public static final BooleanSetting HIDE_COMMENTS_AI_CHAT_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_chat_summary", FALSE);
+    public static final BooleanSetting HIDE_COMMENTS_AI_SUMMARY = new BooleanSetting("revanced_hide_comments_ai_summary", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_BY_MEMBERS_HEADER = new BooleanSetting("revanced_hide_comments_by_members_header", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_CREATE_A_SHORT_BUTTON = new BooleanSetting("revanced_hide_comments_create_a_short_button", TRUE);
     public static final BooleanSetting HIDE_COMMENTS_TIMESTAMP_AND_EMOJI_BUTTONS = new BooleanSetting("revanced_hide_comments_timestamp_and_emoji_buttons", TRUE);
@@ -179,6 +177,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_COMMENTS_SECTION = new BooleanSetting("revanced_hide_comments_section", FALSE);
     public static final BooleanSetting HIDE_COMMENTS_THANKS_BUTTON = new BooleanSetting("revanced_hide_comments_thanks_button", TRUE);
     // Description
+    public static final BooleanSetting HIDE_AI_GENERATED_VIDEO_SUMMARY_SECTION = new BooleanSetting("revanced_hide_ai_generated_video_summary_section", FALSE);
     public static final BooleanSetting HIDE_ATTRIBUTES_SECTION = new BooleanSetting("revanced_hide_attributes_section", FALSE);
     public static final BooleanSetting HIDE_CHAPTERS_SECTION = new BooleanSetting("revanced_hide_chapters_section", TRUE);
     public static final BooleanSetting HIDE_HOW_THIS_WAS_MADE_SECTION = new BooleanSetting("revanced_hide_how_this_was_made_section", FALSE);
@@ -221,7 +220,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SPOOF_APP_VERSION = new BooleanSetting("revanced_spoof_app_version", FALSE, true, "revanced_spoof_app_version_user_dialog_message");
     public static final BooleanSetting WIDE_SEARCHBAR = new BooleanSetting("revanced_wide_searchbar", FALSE, true);
     public static final EnumSetting<StartPage> CHANGE_START_PAGE = new EnumSetting<>("revanced_change_start_page", StartPage.DEFAULT, true);
-    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", IS_19_17_OR_GREATER ? "19.26.42" : "17.33.42", true, parent(SPOOF_APP_VERSION));
+    public static final StringSetting SPOOF_APP_VERSION_TARGET = new StringSetting("revanced_spoof_app_version_target", "19.01.34", true, parent(SPOOF_APP_VERSION));
     // Custom filter
     public static final BooleanSetting CUSTOM_FILTER = new BooleanSetting("revanced_custom_filter", FALSE);
     public static final StringSetting CUSTOM_FILTER_STRINGS = new StringSetting("revanced_custom_filter_strings", "", true, parent(CUSTOM_FILTER));
@@ -234,7 +233,8 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_hide_notifications_button", FALSE, true);
     public static final BooleanSetting SWITCH_CREATE_WITH_NOTIFICATIONS_BUTTON = new BooleanSetting("revanced_switch_create_with_notifications_button", TRUE, true,
             "revanced_switch_create_with_notifications_button_user_dialog_message");
-    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true);
+    public static final BooleanSetting DISABLE_TRANSLUCENT_STATUS_BAR = new BooleanSetting("revanced_disable_translucent_status_bar", FALSE, true,
+            "revanced_disable_translucent_status_bar_user_dialog_message");
     public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_LIGHT = new BooleanSetting("revanced_disable_translucent_navigation_bar_light", FALSE, true);
     public static final BooleanSetting DISABLE_TRANSLUCENT_NAVIGATION_BAR_DARK = new BooleanSetting("revanced_disable_translucent_navigation_bar_dark", FALSE, true);
 
@@ -365,27 +365,36 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting SB_SEEN_GUIDELINES = new BooleanSetting("sb_seen_guidelines", FALSE, false, false);
     public static final StringSetting SB_CATEGORY_SPONSOR = new StringSetting("sb_sponsor", SKIP_AUTOMATICALLY_ONCE.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_SPONSOR_COLOR = new StringSetting("sb_sponsor_color", "#00D400");
+    public static final FloatSetting  SB_CATEGORY_SPONSOR_OPACITY = new FloatSetting("sb_sponsor_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_SELF_PROMO = new StringSetting("sb_selfpromo", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_SELF_PROMO_COLOR = new StringSetting("sb_selfpromo_color", "#FFFF00");
+    public static final FloatSetting  SB_CATEGORY_SELF_PROMO_OPACITY = new FloatSetting("sb_selfpromo_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_INTERACTION = new StringSetting("sb_interaction", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_INTERACTION_COLOR = new StringSetting("sb_interaction_color", "#CC00FF");
+    public static final FloatSetting  SB_CATEGORY_INTERACTION_OPACITY = new FloatSetting("sb_interaction_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_HIGHLIGHT = new StringSetting("sb_highlight", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_HIGHLIGHT_COLOR = new StringSetting("sb_highlight_color", "#FF1684");
+    public static final FloatSetting  SB_CATEGORY_HIGHLIGHT_OPACITY = new FloatSetting("sb_highlight_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_INTRO = new StringSetting("sb_intro", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_INTRO_COLOR = new StringSetting("sb_intro_color", "#00FFFF");
+    public static final FloatSetting  SB_CATEGORY_INTRO_OPACITY = new FloatSetting("sb_intro_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_OUTRO = new StringSetting("sb_outro", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_OUTRO_COLOR = new StringSetting("sb_outro_color", "#0202ED");
+    public static final FloatSetting  SB_CATEGORY_OUTRO_OPACITY = new FloatSetting("sb_outro_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_PREVIEW = new StringSetting("sb_preview", IGNORE.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_PREVIEW_COLOR = new StringSetting("sb_preview_color", "#008FD6");
+    public static final FloatSetting  SB_CATEGORY_PREVIEW_OPACITY = new FloatSetting("sb_preview_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_FILLER = new StringSetting("sb_filler", IGNORE.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_FILLER_COLOR = new StringSetting("sb_filler_color", "#7300FF");
+    public static final FloatSetting  SB_CATEGORY_FILLER_OPACITY = new FloatSetting("sb_filler_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC = new StringSetting("sb_music_offtopic", MANUAL_SKIP.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_MUSIC_OFFTOPIC_COLOR = new StringSetting("sb_music_offtopic_color", "#FF9900");
+    public static final FloatSetting  SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY = new FloatSetting("sb_music_offtopic_opacity", 0.8f);
     public static final StringSetting SB_CATEGORY_UNSUBMITTED = new StringSetting("sb_unsubmitted", SKIP_AUTOMATICALLY.reVancedKeyValue);
     public static final StringSetting SB_CATEGORY_UNSUBMITTED_COLOR = new StringSetting("sb_unsubmitted_color", "#FFFFFF");
+    public static final FloatSetting  SB_CATEGORY_UNSUBMITTED_OPACITY = new FloatSetting("sb_unsubmitted_opacity", 1.0f);
 
     // Deprecated migrations
-    private static final StringSetting DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING = new StringSetting("uuid", ""); // Delete sometime in 2024
     private static final BooleanSetting DEPRECATED_HIDE_PLAYER_BUTTONS = new BooleanSetting("revanced_hide_player_buttons", FALSE, true);
     private static final BooleanSetting DEPRECATED_HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER = new BooleanSetting("revanced_hide_video_quality_menu_footer", FALSE);
     private static final IntegerSetting DEPRECATED_SWIPE_OVERLAY_BACKGROUND_ALPHA = new IntegerSetting("revanced_swipe_overlay_background_alpha", 127);
@@ -396,16 +405,6 @@ public class Settings extends BaseSettings {
     static {
         // region Migration
 
-        // Do _not_ delete this SB private user id migration property until sometime in early 2025.
-        // This is the only setting that cannot be reconfigured if lost,
-        // and more time should be given for users who rarely upgrade.
-        SharedPrefCategory sbPrefs = new SharedPrefCategory("sponsor-block");
-        // Remove the "sb_" prefix, as old settings are saved without it.
-        String key = DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING.key.substring(3);
-        migrateFromOldPreferences(sbPrefs, DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING, key);
-
-        migrateOldSettingToNew(DEPRECATED_SB_UUID_OLD_MIGRATION_SETTING, SB_PRIVATE_USER_ID);
-
         migrateOldSettingToNew(DEPRECATED_HIDE_PLAYER_BUTTONS, HIDE_PLAYER_PREVIOUS_NEXT_BUTTONS);
 
         migrateOldSettingToNew(DEPRECATED_HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER, HIDE_PLAYER_FLYOUT_VIDEO_QUALITY_FOOTER);
@@ -449,6 +448,12 @@ public class Settings extends BaseSettings {
             DEPRECATED_SWIPE_OVERLAY_BACKGROUND_ALPHA.resetToDefault();
         }
 
+        // Old spoof versions that no longer work.
+        if (SPOOF_APP_VERSION_TARGET.get().compareTo(SPOOF_APP_VERSION_TARGET.defaultValue) < 0) {
+            Logger.printInfo(() -> "Resetting spoof app version target");
+            SPOOF_APP_VERSION_TARGET.resetToDefault();
+        }
+
         // endregion
 
         // region SB import/export callbacks

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

@@ -19,7 +19,6 @@ import android.widget.Toolbar;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.Utils;
@@ -139,11 +138,13 @@ public class ReVancedPreferenceFragment extends AbstractPreferenceFragment {
                                     .findViewById(android.R.id.content)
                                     .getParent();
 
-                            // Fix required for Android 15 and YT 19.45+
+                            // 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());
-                                    v.setPadding(0, statusInsets.top, 0, 0);
+                                    Insets navInsets = insets.getInsets(WindowInsets.Type.navigationBars());
+                                    v.setPadding(0, statusInsets.top, 0, navInsets.bottom);
                                     return insets;
                                 });
                             }

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

@@ -14,6 +14,7 @@ import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 
 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.BaseSettings;
 import app.revanced.extension.youtube.patches.ReturnYouTubeDislikePatch;
@@ -85,9 +86,7 @@ public class ReturnYouTubeDislikePreferenceFragment extends PreferenceFragment {
             shortsPreference = new SwitchPreference(context);
             shortsPreference.setChecked(Settings.RYD_SHORTS.get());
             shortsPreference.setTitle(str("revanced_ryd_shorts_title"));
-            String shortsSummary = ReturnYouTubeDislikePatch.IS_SPOOFING_TO_NON_LITHO_SHORTS_PLAYER
-                            ? str("revanced_ryd_shorts_summary_on")
-                            : str("revanced_ryd_shorts_summary_on_disclaimer");
+            String shortsSummary = str("revanced_ryd_shorts_summary_on_disclaimer");
             shortsPreference.setSummaryOn(shortsSummary);
             shortsPreference.setSummaryOff(str("revanced_ryd_shorts_summary_off"));
             shortsPreference.setOnPreferenceChangeListener((pref, newValue) -> {
@@ -237,6 +236,8 @@ public class ReturnYouTubeDislikePreferenceFragment extends PreferenceFragment {
                         "revanced_ryd_statistics_getNumberOfRateLimitRequestsEncountered_non_zero_summary"));
                 preferenceScreen.addPreference(statisticPreference);
             }
+
+            Utils.setPreferenceTitlesToMultiLineIfNeeded(preferenceScreen);
         } catch (Exception ex) {
             Logger.printException(() -> "onCreate failure", ex);
         }

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

@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 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.preference.ResettableEditTextPreference;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.sponsorblock.SegmentPlaybackController;
 import app.revanced.extension.youtube.sponsorblock.SponsorBlockSettings;
@@ -44,8 +45,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
     private SwitchPreference showTimeWithoutSegments;
     private SwitchPreference toastOnConnectionError;
 
-    private EditTextPreference newSegmentStep;
-    private EditTextPreference minSegmentDuration;
+    private ResettableEditTextPreference newSegmentStep;
+    private ResettableEditTextPreference minSegmentDuration;
     private EditTextPreference privateUserId;
     private EditTextPreference importExport;
     private Preference apiUrl;
@@ -159,6 +160,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
 
             addAboutCategory(context, preferenceScreen);
 
+            Utils.setPreferenceTitlesToMultiLineIfNeeded(preferenceScreen);
+
             updateUI();
         } catch (Exception ex) {
             Logger.printException(() -> "onCreate failure", ex);
@@ -268,7 +271,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
             return true;
         });
 
-        newSegmentStep = new EditTextPreference(context);
+        newSegmentStep = new ResettableEditTextPreference(context);
+        newSegmentStep.setSetting(Settings.SB_CREATE_NEW_SEGMENT_STEP);
         newSegmentStep.setTitle(str("revanced_sb_general_adjusting"));
         newSegmentStep.setSummary(str("revanced_sb_general_adjusting_sum"));
         newSegmentStep.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
@@ -326,7 +330,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
         });
         category.addPreference(trackSkips);
 
-        minSegmentDuration = new EditTextPreference(context);
+        minSegmentDuration = new ResettableEditTextPreference(context);
+        minSegmentDuration.setSetting(Settings.SB_SEGMENT_MIN_DURATION);
         minSegmentDuration.setTitle(str("revanced_sb_general_min_duration"));
         minSegmentDuration.setSummary(str("revanced_sb_general_min_duration_sum"));
         minSegmentDuration.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
@@ -345,7 +350,15 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
         });
         category.addPreference(minSegmentDuration);
 
-        privateUserId = new EditTextPreference(context);
+        privateUserId = new EditTextPreference(context) {
+            protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+                Utils.setEditTextDialogTheme(builder);
+
+                builder.setNeutralButton(str("revanced_sb_settings_copy"), (dialog, which) -> {
+                    Utils.setClipboard(getEditText().getText().toString());
+                });
+            }
+        };
         privateUserId.setTitle(str("revanced_sb_general_uuid"));
         privateUserId.setSummary(str("revanced_sb_general_uuid_sum"));
         privateUserId.setOnPreferenceChangeListener((preference1, newValue) -> {
@@ -504,7 +517,7 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment {
 
             if (stats.totalSegmentCountIncludingIgnored > 0) {
                 // If user has not created any segments, there's no reason to set a username.
-                EditTextPreference preference = new EditTextPreference(context);
+                EditTextPreference preference = new ResettableEditTextPreference(context);
                 statsCategory.addPreference(preference);
                 String userName = stats.userName;
                 preference.setTitle(fromHtml(str("revanced_sb_stats_username", userName)));

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

@@ -73,6 +73,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference {
         if (currentClientType == clientType) {
             return;
         }
+        currentClientType = clientType;
 
         Logger.printDebug(() -> "Updating spoof stream side effects preference");
         setEnabled(BaseSettings.SPOOF_VIDEO_STREAMS.get());

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

@@ -136,7 +136,7 @@ public class SponsorBlockSettings {
             for (SegmentCategory category : categories) {
                 JSONObject categoryObject = new JSONObject();
                 String categoryKey = category.keyValue;
-                categoryObject.put("color", category.colorString());
+                categoryObject.put("color", category.getColorString());
                 barTypesObject.put(categoryKey, categoryObject);
 
                 if (category.behaviour != CategoryBehaviour.IGNORE) {

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

@@ -5,7 +5,12 @@ import static app.revanced.extension.shared.StringRef.str;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.text.Html;
+import android.graphics.Color;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
@@ -33,7 +38,7 @@ import app.revanced.extension.youtube.sponsorblock.ui.SponsorBlockViewController
  * Not thread safe. All fields/methods must be accessed from the main thread.
  */
 public class SponsorBlockUtils {
-    private static final String LOCKED_COLOR = "#FFC83D";
+    private static final int LOCKED_COLOR = Color.parseColor("#FFC83D");
     private static final String MANUAL_EDIT_TIME_TEXT_HINT = "hh:mm:ss.sss";
     private static final Pattern manualEditTimePattern
             = Pattern.compile("((\\d{1,2}):)?(\\d{1,2}):(\\d{2})(\\.(\\d{1,3}))?");
@@ -160,32 +165,34 @@ public class SponsorBlockUtils {
             SegmentVote[] voteOptions = (segment.category == SegmentCategory.HIGHLIGHT)
                     ? SegmentVote.voteTypesWithoutCategoryChange // highlight segments cannot change category
                     : SegmentVote.values();
-            CharSequence[] items = new CharSequence[voteOptions.length];
+            final int voteOptionsLength = voteOptions.length;
+            final boolean userIsVip = Settings.SB_USER_IS_VIP.get();
+            CharSequence[] items = new CharSequence[voteOptionsLength];
 
-            for (int i = 0; i < voteOptions.length; i++) {
+            for (int i = 0; i < voteOptionsLength; i++) {
                 SegmentVote voteOption = voteOptions[i];
-                String title = voteOption.title.toString();
-                if (Settings.SB_USER_IS_VIP.get() && segment.isLocked && voteOption.shouldHighlight) {
-                    items[i] = Html.fromHtml(String.format("<font color=\"%s\">%s</font>", LOCKED_COLOR, title));
-                } else {
-                    items[i] = title;
+                CharSequence title = voteOption.title.toString();
+                if (userIsVip && segment.isLocked && voteOption.highlightIfVipAndVideoIsLocked) {
+                    SpannableString coloredTitle = new SpannableString(title);
+                    coloredTitle.setSpan(new ForegroundColorSpan(LOCKED_COLOR),
+                            0, title.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    title = coloredTitle;
                 }
+                items[i] = title;
             }
 
-            new AlertDialog.Builder(context)
-                    .setItems(items, (dialog1, which1) -> {
-                        SegmentVote voteOption = voteOptions[which1];
-                        switch (voteOption) {
-                            case UPVOTE:
-                            case DOWNVOTE:
-                                SBRequester.voteForSegmentOnBackgroundThread(segment, voteOption);
-                                break;
-                            case CATEGORY_CHANGE:
-                                onNewCategorySelect(segment, context);
-                                break;
-                        }
-                    })
-                    .show();
+            new AlertDialog.Builder(context).setItems(items, (dialog1, which1) -> {
+                SegmentVote voteOption = voteOptions[which1];
+                switch (voteOption) {
+                    case UPVOTE:
+                    case DOWNVOTE:
+                        SBRequester.voteForSegmentOnBackgroundThread(segment, voteOption);
+                        break;
+                    case CATEGORY_CHANGE:
+                        onNewCategorySelect(segment, context);
+                        break;
+                }
+            }).show();
         } catch (Exception ex) {
             Logger.printException(() -> "segmentVoteClickListener failure", ex);
         }
@@ -282,7 +289,6 @@ public class SponsorBlockUtils {
                 return;
             }
 
-
             final int numberOfSegments = segments.length;
             CharSequence[] titles = new CharSequence[numberOfSegments];
             for (int i = 0; i < numberOfSegments; i++) {
@@ -290,22 +296,33 @@ public class SponsorBlockUtils {
                 if (segment.category == SegmentCategory.UNSUBMITTED) {
                     continue;
                 }
-                StringBuilder htmlBuilder = new StringBuilder();
-                htmlBuilder.append(String.format("<b><font color=\"#%06X\">⬤</font> %s<br>",
-                        segment.category.color, segment.category.title));
-                htmlBuilder.append(formatSegmentTime(segment.start));
-                if (segment.category != SegmentCategory.HIGHLIGHT) {
-                    htmlBuilder.append(" to ").append(formatSegmentTime(segment.end));
+
+                SpannableStringBuilder spannableBuilder = new SpannableStringBuilder();
+
+                spannableBuilder.append(segment.category.getTitleWithColorDot());
+                spannableBuilder.append('\n');
+
+                String startTime = formatSegmentTime(segment.start);
+                if (segment.category == SegmentCategory.HIGHLIGHT) {
+                    spannableBuilder.append(startTime);
+                } else {
+                    String toFromString = str("revanced_sb_vote_segment_time_to_from",
+                            startTime, formatSegmentTime(segment.end));
+                    spannableBuilder.append(toFromString);
                 }
-                htmlBuilder.append("</b>");
-                if (i + 1 != numberOfSegments) // prevents trailing new line after last segment
-                    htmlBuilder.append("<br>");
-                titles[i] = Html.fromHtml(htmlBuilder.toString());
+
+                if (i + 1 != numberOfSegments) {
+                    // prevents trailing new line after last segment
+                    spannableBuilder.append('\n');
+                }
+
+                spannableBuilder.setSpan(new StyleSpan(android.graphics.Typeface.BOLD),
+                        0, spannableBuilder.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+                titles[i] = spannableBuilder;
             }
 
-            new AlertDialog.Builder(context)
-                    .setItems(titles, segmentVoteClickListener)
-                    .show();
+            new AlertDialog.Builder(context).setItems(titles, segmentVoteClickListener).show();
         } catch (Exception ex) {
             Logger.printException(() -> "onVotingClicked failure", ex);
         }

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

@@ -1,13 +1,14 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
-import static app.revanced.extension.youtube.settings.Settings.*;
 import static app.revanced.extension.shared.StringRef.sf;
+import static app.revanced.extension.youtube.settings.Settings.*;
 
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.text.Html;
-import android.text.Spanned;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -15,43 +16,45 @@ import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
-import app.revanced.extension.shared.Utils;
-import app.revanced.extension.shared.settings.StringSetting;
-import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.shared.Logger;
 import app.revanced.extension.shared.StringRef;
+import app.revanced.extension.shared.Utils;
+import app.revanced.extension.shared.settings.FloatSetting;
+import app.revanced.extension.shared.settings.StringSetting;
+import app.revanced.extension.youtube.settings.Settings;
 
 public enum SegmentCategory {
     SPONSOR("sponsor", sf("revanced_sb_segments_sponsor"), sf("revanced_sb_segments_sponsor_sum"), sf("revanced_sb_skip_button_sponsor"), sf("revanced_sb_skipped_sponsor"),
-            SB_CATEGORY_SPONSOR, SB_CATEGORY_SPONSOR_COLOR),
+            SB_CATEGORY_SPONSOR, SB_CATEGORY_SPONSOR_COLOR, SB_CATEGORY_SPONSOR_OPACITY),
     SELF_PROMO("selfpromo", sf("revanced_sb_segments_selfpromo"), sf("revanced_sb_segments_selfpromo_sum"), sf("revanced_sb_skip_button_selfpromo"), sf("revanced_sb_skipped_selfpromo"),
-            SB_CATEGORY_SELF_PROMO, SB_CATEGORY_SELF_PROMO_COLOR),
+            SB_CATEGORY_SELF_PROMO, SB_CATEGORY_SELF_PROMO_COLOR, SB_CATEGORY_SELF_PROMO_OPACITY),
     INTERACTION("interaction", sf("revanced_sb_segments_interaction"), sf("revanced_sb_segments_interaction_sum"), sf("revanced_sb_skip_button_interaction"), sf("revanced_sb_skipped_interaction"),
-            SB_CATEGORY_INTERACTION, SB_CATEGORY_INTERACTION_COLOR),
+            SB_CATEGORY_INTERACTION, SB_CATEGORY_INTERACTION_COLOR, SB_CATEGORY_INTERACTION_OPACITY),
     /**
      * Unique category that is treated differently than the rest.
      */
     HIGHLIGHT("poi_highlight", sf("revanced_sb_segments_highlight"), sf("revanced_sb_segments_highlight_sum"), sf("revanced_sb_skip_button_highlight"), sf("revanced_sb_skipped_highlight"),
-            SB_CATEGORY_HIGHLIGHT, SB_CATEGORY_HIGHLIGHT_COLOR),
+            SB_CATEGORY_HIGHLIGHT, SB_CATEGORY_HIGHLIGHT_COLOR, SB_CATEGORY_HIGHLIGHT_OPACITY),
     INTRO("intro", sf("revanced_sb_segments_intro"), sf("revanced_sb_segments_intro_sum"),
             sf("revanced_sb_skip_button_intro_beginning"), sf("revanced_sb_skip_button_intro_middle"), sf("revanced_sb_skip_button_intro_end"),
             sf("revanced_sb_skipped_intro_beginning"), sf("revanced_sb_skipped_intro_middle"), sf("revanced_sb_skipped_intro_end"),
-            SB_CATEGORY_INTRO, SB_CATEGORY_INTRO_COLOR),
+            SB_CATEGORY_INTRO, SB_CATEGORY_INTRO_COLOR, SB_CATEGORY_INTRO_OPACITY),
     OUTRO("outro", sf("revanced_sb_segments_outro"), sf("revanced_sb_segments_outro_sum"), sf("revanced_sb_skip_button_outro"), sf("revanced_sb_skipped_outro"),
-            SB_CATEGORY_OUTRO, SB_CATEGORY_OUTRO_COLOR),
+            SB_CATEGORY_OUTRO, SB_CATEGORY_OUTRO_COLOR, SB_CATEGORY_OUTRO_OPACITY),
     PREVIEW("preview", sf("revanced_sb_segments_preview"), sf("revanced_sb_segments_preview_sum"),
             sf("revanced_sb_skip_button_preview_beginning"), sf("revanced_sb_skip_button_preview_middle"), sf("revanced_sb_skip_button_preview_end"),
             sf("revanced_sb_skipped_preview_beginning"), sf("revanced_sb_skipped_preview_middle"), sf("revanced_sb_skipped_preview_end"),
-            SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR),
+            SB_CATEGORY_PREVIEW, SB_CATEGORY_PREVIEW_COLOR, SB_CATEGORY_PREVIEW_OPACITY),
     FILLER("filler", sf("revanced_sb_segments_filler"), sf("revanced_sb_segments_filler_sum"), sf("revanced_sb_skip_button_filler"), sf("revanced_sb_skipped_filler"),
-            SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR),
+            SB_CATEGORY_FILLER, SB_CATEGORY_FILLER_COLOR, SB_CATEGORY_FILLER_OPACITY),
     MUSIC_OFFTOPIC("music_offtopic", sf("revanced_sb_segments_nomusic"), sf("revanced_sb_segments_nomusic_sum"), sf("revanced_sb_skip_button_nomusic"), sf("revanced_sb_skipped_nomusic"),
-            SB_CATEGORY_MUSIC_OFFTOPIC, SB_CATEGORY_MUSIC_OFFTOPIC_COLOR),
+            SB_CATEGORY_MUSIC_OFFTOPIC, SB_CATEGORY_MUSIC_OFFTOPIC_COLOR, SB_CATEGORY_MUSIC_OFFTOPIC_OPACITY),
     UNSUBMITTED("unsubmitted", StringRef.empty, StringRef.empty, sf("revanced_sb_skip_button_unsubmitted"), sf("revanced_sb_skipped_unsubmitted"),
-            SB_CATEGORY_UNSUBMITTED, SB_CATEGORY_UNSUBMITTED_COLOR),;
+            SB_CATEGORY_UNSUBMITTED, SB_CATEGORY_UNSUBMITTED_COLOR, SB_CATEGORY_UNSUBMITTED_OPACITY);
 
     private static final StringRef skipSponsorTextCompact = sf("revanced_sb_skip_button_compact");
     private static final StringRef skipSponsorTextCompactHighlight = sf("revanced_sb_skip_button_compact_highlight");
@@ -90,12 +93,10 @@ public enum SegmentCategory {
             mValuesMap.put(value.keyValue, value);
     }
 
-    @NonNull
     public static SegmentCategory[] categoriesWithoutUnsubmitted() {
         return categoriesWithoutUnsubmitted;
     }
 
-    @NonNull
     public static SegmentCategory[] categoriesWithoutHighlights() {
         return categoriesWithoutHighlights;
     }
@@ -106,7 +107,7 @@ public enum SegmentCategory {
     }
 
     /**
-     * Must be called if behavior of any category is changed
+     * Must be called if behavior of any category is changed.
      */
     public static void updateEnabledCategories() {
         Utils.verifyOnMainThread();
@@ -133,32 +134,33 @@ public enum SegmentCategory {
         updateEnabledCategories();
     }
 
-    @NonNull
-    public final String keyValue;
-    @NonNull
-    public final StringSetting behaviorSetting;
-    @NonNull
-    private final StringSetting colorSetting;
+    public static int applyOpacityToColor(int color, float opacity) {
+        if (opacity < 0 || opacity > 1.0f) {
+            throw new IllegalArgumentException("Invalid opacity: " + opacity);
+        }
+        final int opacityInt = (int) (255 * opacity);
+        return (color & 0x00FFFFFF) | (opacityInt << 24);
+    }
+
+    public final String keyValue;
+    public final StringSetting behaviorSetting; // TODO: Replace with EnumSetting.
+    private final StringSetting colorSetting;
+    private final FloatSetting opacitySetting;
 
-    @NonNull
     public final StringRef title;
-    @NonNull
     public final StringRef description;
 
     /**
      * Skip button text, if the skip occurs in the first quarter of the video
      */
-    @NonNull
     public final StringRef skipButtonTextBeginning;
     /**
      * Skip button text, if the skip occurs in the middle half of the video
      */
-    @NonNull
     public final StringRef skipButtonTextMiddle;
     /**
      * Skip button text, if the skip occurs in the last quarter of the video
      */
-    @NonNull
     public final StringRef skipButtonTextEnd;
     /**
      * Skipped segment toast, if the skip occurred in the first quarter of the video
@@ -179,10 +181,7 @@ public enum SegmentCategory {
     @NonNull
     public final Paint paint;
 
-    /**
-     * Value must be changed using {@link #setColor(String)}.
-     */
-    public int color;
+    private int color;
 
     /**
      * Value must be changed using {@link #setBehaviour(CategoryBehaviour)}.
@@ -194,17 +193,20 @@ public enum SegmentCategory {
     SegmentCategory(String keyValue, StringRef title, StringRef description,
                     StringRef skipButtonText,
                     StringRef skippedToastText,
-                    StringSetting behavior, StringSetting color) {
+                    StringSetting behavior,
+                    StringSetting color, FloatSetting opacity) {
         this(keyValue, title, description,
                 skipButtonText, skipButtonText, skipButtonText,
                 skippedToastText, skippedToastText, skippedToastText,
-                behavior, color);
+                behavior,
+                color, opacity);
     }
 
     SegmentCategory(String keyValue, StringRef title, StringRef description,
                     StringRef skipButtonTextBeginning, StringRef skipButtonTextMiddle, StringRef skipButtonTextEnd,
                     StringRef skippedToastBeginning, StringRef skippedToastMiddle, StringRef skippedToastEnd,
-                    StringSetting behavior, StringSetting color) {
+                    StringSetting behavior,
+                    StringSetting color, FloatSetting opacity) {
         this.keyValue = Objects.requireNonNull(keyValue);
         this.title = Objects.requireNonNull(title);
         this.description = Objects.requireNonNull(description);
@@ -216,6 +218,7 @@ public enum SegmentCategory {
         this.skippedToastEnd = Objects.requireNonNull(skippedToastEnd);
         this.behaviorSetting = Objects.requireNonNull(behavior);
         this.colorSetting = Objects.requireNonNull(color);
+        this.opacitySetting = Objects.requireNonNull(opacity);
         this.paint = new Paint();
         loadFromSettings();
     }
@@ -232,11 +235,14 @@ public enum SegmentCategory {
         this.behaviour = savedBehavior;
 
         String colorString = colorSetting.get();
+        final float opacity = opacitySetting.get();
         try {
             setColor(colorString);
+            setOpacity(opacity);
         } catch (Exception ex) {
-            Logger.printException(() -> "Invalid color: " + colorString, ex);
+            Logger.printException(() -> "Invalid color: " + colorString + " opacity: " + opacity, ex);
             colorSetting.resetToDefault();
+            opacitySetting.resetToDefault();
             loadFromSettings();
         }
     }
@@ -245,45 +251,78 @@ public enum SegmentCategory {
         this.behaviour = Objects.requireNonNull(behaviour);
         this.behaviorSetting.save(behaviour.reVancedKeyValue);
     }
-    /**
-     * @return HTML color format string
-     */
-    @NonNull
-    public String colorString() {
-        return String.format("#%06X", color);
-    }
 
-    public void setColor(@NonNull String colorString) throws IllegalArgumentException {
-        final int color = Color.parseColor(colorString) & 0xFFFFFF;
-        this.color = color;
+    private void updateColor() {
+        color = applyOpacityToColor(color, opacitySetting.get());
         paint.setColor(color);
-        paint.setAlpha(255);
-        colorSetting.save(colorString); // Save after parsing.
     }
 
-    public void resetColor() {
+    /**
+     * @param opacity Segment color opacity between [0, 1].
+     */
+    public void setOpacity(float opacity) throws IllegalArgumentException {
+        if (opacity < 0 || opacity > 1) {
+            throw new IllegalArgumentException("Invalid opacity: " + opacity);
+        }
+
+        opacitySetting.save(opacity);
+        updateColor();
+    }
+
+    public float getOpacity() {
+        return opacitySetting.get();
+    }
+
+    public void resetColorAndOpacity() {
         setColor(colorSetting.defaultValue);
+        setOpacity(opacitySetting.defaultValue);
     }
 
-    @NonNull
-    private static String getCategoryColorDotHTML(int color) {
-        color &= 0xFFFFFF;
-        return String.format("<font color=\"#%06X\">⬤</font>", color);
+    /**
+     * @param colorString Segment color with #RRGGBB format.
+     */
+    public void setColor(String colorString) throws IllegalArgumentException {
+        color = Color.parseColor(colorString);
+        colorSetting.save(colorString);
+
+        updateColor();
     }
 
-    @NonNull
-    public static Spanned getCategoryColorDot(int color) {
-        return Html.fromHtml(getCategoryColorDotHTML(color));
+    /**
+     * @return Integer color of #RRGGBB format.
+     */
+    public int getColorNoOpacity() {
+        return color & 0x00FFFFFF;
     }
 
-    @NonNull
-    public Spanned getCategoryColorDot() {
+    /**
+     * @return Hex color string of #RRGGBB format with no opacity level.
+     */
+    public String getColorString() {
+        return String.format(Locale.US, "#%06X", getColorNoOpacity());
+    }
+
+    private static SpannableString getCategoryColorDotSpan(String text, int color) {
+        SpannableString dotSpan = new SpannableString('⬤' + text);
+        dotSpan.setSpan(new ForegroundColorSpan(color), 0, 1,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return dotSpan;
+    }
+
+    public static SpannableString getCategoryColorDot(int color) {
+        return getCategoryColorDotSpan("", color);
+    }
+
+    public SpannableString getCategoryColorDot() {
         return getCategoryColorDot(color);
     }
 
-    @NonNull
-    public Spanned getTitleWithColorDot() {
-        return Html.fromHtml(getCategoryColorDotHTML(color) + " " + title);
+    public SpannableString getTitleWithColorDot(int categoryColor) {
+        return getCategoryColorDotSpan(" " + title, categoryColor);
+    }
+
+    public SpannableString getTitleWithColorDot() {
+        return getTitleWithColorDot(color);
     }
 
     /**
@@ -291,7 +330,6 @@ public enum SegmentCategory {
      * @param videoLength      length of the video
      * @return the skip button text
      */
-    @NonNull
     StringRef getSkipButtonText(long segmentStartTime, long videoLength) {
         if (Settings.SB_COMPACT_SKIP_BUTTON.get()) {
             return (this == SegmentCategory.HIGHLIGHT)
@@ -300,7 +338,7 @@ public enum SegmentCategory {
         }
 
         if (videoLength == 0) {
-            return skipButtonTextBeginning; // video is still loading.  Assume it's the beginning
+            return skipButtonTextBeginning; // Video is still loading. Assume it's the beginning.
         }
         final float position = segmentStartTime / (float) videoLength;
         if (position < 0.25f) {
@@ -316,10 +354,9 @@ public enum SegmentCategory {
      * @param videoLength      length of the video
      * @return 'skipped segment' toast message
      */
-    @NonNull
     StringRef getSkippedToastText(long segmentStartTime, long videoLength) {
         if (videoLength == 0) {
-            return skippedToastBeginning; // video is still loading.  Assume it's the beginning
+            return skippedToastBeginning; // Video is still loading. Assume it's the beginning.
         }
         final float position = segmentStartTime / (float) videoLength;
         if (position < 0.25f) {

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

@@ -1,6 +1,7 @@
 package app.revanced.extension.youtube.sponsorblock.objects;
 
 import static app.revanced.extension.shared.StringRef.str;
+import static app.revanced.extension.youtube.sponsorblock.objects.SegmentCategory.applyOpacityToColor;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -11,11 +12,10 @@ import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TableLayout;
-import android.widget.TableRow;
+import android.widget.GridLayout;
 import android.widget.TextView;
 
+import java.util.Locale;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
@@ -24,27 +24,38 @@ import app.revanced.extension.shared.Utils;
 @SuppressWarnings("deprecation")
 public class SegmentCategoryListPreference extends ListPreference {
     private final SegmentCategory category;
-    private EditText mEditText;
-    private int mClickedDialogEntryIndex;
+    private TextView colorDotView;
+    private EditText colorEditText;
+    private EditText opacityEditText;
+    /**
+     * #RRGGBB
+     */
+    private int categoryColor;
+    /**
+     * [0, 1]
+     */
+    private float categoryOpacity;
+    private int selectedDialogEntryIndex;
 
     public SegmentCategoryListPreference(Context context, SegmentCategory category) {
         super(context);
-        final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
         this.category = Objects.requireNonNull(category);
 
         // Edit: Using preferences to sync together multiple pieces
-        // of code together is messy and should be rethought.
+        // of code is messy and should be rethought.
         setKey(category.behaviorSetting.key);
         setDefaultValue(category.behaviorSetting.defaultValue);
+
+        final boolean isHighlightCategory = category == SegmentCategory.HIGHLIGHT;
         setEntries(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorDescriptionsWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorDescriptions());
         setEntryValues(isHighlightCategory
                 ? CategoryBehaviour.getBehaviorKeyValuesWithoutSkipOnce()
                 : CategoryBehaviour.getBehaviorKeyValues());
-
         setSummary(category.description.toString());
-        updateTitle();
+
+        updateTitleFromCategory();
     }
 
     @Override
@@ -52,26 +63,40 @@ public class SegmentCategoryListPreference extends ListPreference {
         try {
             Utils.setEditTextDialogTheme(builder);
 
+            categoryColor = category.getColorNoOpacity();
+            categoryOpacity = category.getOpacity();
+
             Context context = builder.getContext();
-            TableLayout table = new TableLayout(context);
-            table.setOrientation(LinearLayout.HORIZONTAL);
-            table.setPadding(70, 0, 150, 0);
-
-            TableRow row = new TableRow(context);
+            GridLayout gridLayout = new GridLayout(context);
+            gridLayout.setPadding(70, 0, 150, 0); // Padding for the entire layout.
+            gridLayout.setColumnCount(3);
+            gridLayout.setRowCount(2);
 
+            GridLayout.LayoutParams gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(0); // First row.
+            gridParams.columnSpec = GridLayout.spec(0); // First column.
             TextView colorTextLabel = new TextView(context);
             colorTextLabel.setText(str("revanced_sb_color_dot_label"));
-            row.addView(colorTextLabel);
+            colorTextLabel.setLayoutParams(gridParams);
+            gridLayout.addView(colorTextLabel);
 
-            TextView colorDotView = new TextView(context);
-            colorDotView.setText(category.getCategoryColorDot());
-            colorDotView.setPadding(30, 0, 30, 0);
-            row.addView(colorDotView);
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(0); // First row.
+            gridParams.columnSpec = GridLayout.spec(1); // Second column.
+            gridParams.setMargins(0, 0, 10, 0);
+            colorDotView = new TextView(context);
+            colorDotView.setLayoutParams(gridParams);
+            gridLayout.addView(colorDotView);
+            updateCategoryColorDot();
 
-            mEditText = new EditText(context);
-            mEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
-            mEditText.setText(category.colorString());
-            mEditText.addTextChangedListener(new TextWatcher() {
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(0); // First row.
+            gridParams.columnSpec = GridLayout.spec(2); // Third column.
+            colorEditText = new EditText(context);
+            colorEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
+            colorEditText.setTextLocale(Locale.US);
+            colorEditText.setText(category.getColorString());
+            colorEditText.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 }
@@ -81,29 +106,94 @@ public class SegmentCategoryListPreference extends ListPreference {
                 }
 
                 @Override
-                public void afterTextChanged(Editable s) {
+                public void afterTextChanged(Editable edit) {
                     try {
-                        String colorString = s.toString();
+                        String colorString = edit.toString();
+                        final int colorStringLength = colorString.length();
+
                         if (!colorString.startsWith("#")) {
-                            s.insert(0, "#"); // recursively calls back into this method
+                            edit.insert(0, "#"); // Recursively calls back into this method.
                             return;
                         }
-                        if (colorString.length() > 7) {
-                            s.delete(7, colorString.length());
+
+                        final int maxColorStringLength = 7; // #RRGGBB
+                        if (colorStringLength > maxColorStringLength) {
+                            edit.delete(maxColorStringLength, colorStringLength);
                             return;
                         }
-                        final int color = Color.parseColor(colorString);
-                        colorDotView.setText(SegmentCategory.getCategoryColorDot(color));
+
+                        categoryColor = Color.parseColor(colorString);
+                        updateCategoryColorDot();
                     } catch (IllegalArgumentException ex) {
-                        // ignore
+                        // Ignore.
                     }
                 }
             });
-            mEditText.setLayoutParams(new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 1f));
-            row.addView(mEditText);
+            colorEditText.setLayoutParams(gridParams);
+            gridLayout.addView(colorEditText);
 
-            table.addView(row);
-            builder.setView(table);
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(1); // Second row.
+            gridParams.columnSpec = GridLayout.spec(0, 1); // First and second column.
+            TextView opacityLabel = new TextView(context);
+            opacityLabel.setText(str("revanced_sb_color_opacity_label"));
+            opacityLabel.setLayoutParams(gridParams);
+            gridLayout.addView(opacityLabel);
+
+            gridParams = new GridLayout.LayoutParams();
+            gridParams.rowSpec = GridLayout.spec(1); // Second row.
+            gridParams.columnSpec = GridLayout.spec(2); // Third column.
+            opacityEditText = new EditText(context);
+            opacityEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+            opacityEditText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                }
+
+                @Override
+                public void afterTextChanged(Editable edit) {
+                    try {
+                        String editString = edit.toString();
+                        final int opacityStringLength = editString.length();
+
+                        final int maxOpacityStringLength = 4; // [0.00, 1.00]
+                        if (opacityStringLength > maxOpacityStringLength) {
+                            edit.delete(maxOpacityStringLength, opacityStringLength);
+                            return;
+                        }
+
+                        final float opacity = opacityStringLength == 0
+                                ? 0
+                                : Float.parseFloat(editString);
+                        if (opacity < 0) {
+                            categoryOpacity = 0;
+                            edit.replace(0, opacityStringLength, "0");
+                            return;
+                        } else if (opacity > 1.0f) {
+                            categoryOpacity = 1;
+                            edit.replace(0, opacityStringLength, "1.0");
+                            return;
+                        } else if (!editString.endsWith(".")) {
+                            // Ignore "0." and "1." until the user finishes entering a valid number.
+                            categoryOpacity = opacity;
+                        }
+
+                        updateCategoryColorDot();
+                    } catch (NumberFormatException ex) {
+                        // Should never happen.
+                        Logger.printException(() -> "Could not parse opacity string", ex);
+                    }
+                }
+            });
+            opacityEditText.setLayoutParams(gridParams);
+            gridLayout.addView(opacityEditText);
+            updateOpacityText();
+
+            builder.setView(gridLayout);
             builder.setTitle(category.title.toString());
 
             builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
@@ -111,8 +201,8 @@ public class SegmentCategoryListPreference extends ListPreference {
             });
             builder.setNeutralButton(str("revanced_sb_reset_color"), (dialog, which) -> {
                 try {
-                    category.resetColor();
-                    updateTitle();
+                    category.resetColorAndOpacity();
+                    updateTitleFromCategory();
                     Utils.showToastShort(str("revanced_sb_color_reset"));
                 } catch (Exception ex) {
                     Logger.printException(() -> "setNeutralButton failure", ex);
@@ -120,8 +210,9 @@ public class SegmentCategoryListPreference extends ListPreference {
             });
             builder.setNegativeButton(android.R.string.cancel, null);
 
-            mClickedDialogEntryIndex = findIndexOfValue(getValue());
-            builder.setSingleChoiceItems(getEntries(), mClickedDialogEntryIndex, (dialog, which) -> mClickedDialogEntryIndex = which);
+            selectedDialogEntryIndex = findIndexOfValue(getValue());
+            builder.setSingleChoiceItems(getEntries(), selectedDialogEntryIndex,
+                    (dialog, which) -> selectedDialogEntryIndex = which);
         } catch (Exception ex) {
             Logger.printException(() -> "onPrepareDialogBuilder failure", ex);
         }
@@ -130,30 +221,51 @@ public class SegmentCategoryListPreference extends ListPreference {
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         try {
-            if (positiveResult && mClickedDialogEntryIndex >= 0 && getEntryValues() != null) {
-                String value = getEntryValues()[mClickedDialogEntryIndex].toString();
+            if (positiveResult && selectedDialogEntryIndex >= 0 && getEntryValues() != null) {
+                String value = getEntryValues()[selectedDialogEntryIndex].toString();
                 if (callChangeListener(value)) {
                     setValue(value);
                     category.setBehaviour(Objects.requireNonNull(CategoryBehaviour.byReVancedKeyValue(value)));
                     SegmentCategory.updateEnabledCategories();
                 }
-                String colorString = mEditText.getText().toString();
+
                 try {
-                    if (!colorString.equals(category.colorString())) {
+                    String colorString = colorEditText.getText().toString();
+                    if (!colorString.equals(category.getColorString()) || categoryOpacity != category.getOpacity()) {
                         category.setColor(colorString);
+                        category.setOpacity(categoryOpacity);
                         Utils.showToastShort(str("revanced_sb_color_changed"));
                     }
                 } catch (IllegalArgumentException ex) {
                     Utils.showToastShort(str("revanced_sb_color_invalid"));
                 }
-                updateTitle();
+
+                updateTitleFromCategory();
             }
         } catch (Exception ex) {
             Logger.printException(() -> "onDialogClosed failure", ex);
         }
     }
 
-    private void updateTitle() {
-        setTitle(category.getTitleWithColorDot());
+    private void applyOpacityToCategoryColor() {
+        categoryColor = applyOpacityToColor(categoryColor, categoryOpacity);
+    }
+
+    private void updateTitleFromCategory() {
+        categoryColor = category.getColorNoOpacity();
+        categoryOpacity = category.getOpacity();
+        applyOpacityToCategoryColor();
+
+        setTitle(category.getTitleWithColorDot(categoryColor));
+    }
+
+    private void updateCategoryColorDot() {
+        applyOpacityToCategoryColor();
+
+        colorDotView.setText(SegmentCategory.getCategoryColorDot(categoryColor));
+    }
+
+    private void updateOpacityText() {
+        opacityEditText.setText(String.format(Locale.US, "%.2f", categoryOpacity));
     }
 }

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

@@ -23,12 +23,15 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
         @NonNull
         public final StringRef title;
         public final int apiVoteType;
-        public final boolean shouldHighlight;
+        /**
+         * If the option should be highlighted for VIP users.
+         */
+        public final boolean highlightIfVipAndVideoIsLocked;
 
-        SegmentVote(@NonNull StringRef title, int apiVoteType, boolean shouldHighlight) {
+        SegmentVote(@NonNull StringRef title, int apiVoteType, boolean highlightIfVipAndVideoIsLocked) {
             this.title = title;
             this.apiVoteType = apiVoteType;
-            this.shouldHighlight = shouldHighlight;
+            this.highlightIfVipAndVideoIsLocked = highlightIfVipAndVideoIsLocked;
         }
     }
 

gradle.properties

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

patches/api/patches.api

@@ -132,6 +132,10 @@ public final class app/revanced/patches/amazon/DeepLinkingPatchKt {
 	public static final fun getDeepLinkingPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/angulus/ads/RemoveAdsPatchKt {
+	public static final fun getAngulusPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/backdrops/misc/pro/ProUnlockPatchKt {
 	public static final fun getProUnlockPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -776,8 +780,8 @@ public final class app/revanced/patches/shared/misc/settings/preference/TextPref
 }
 
 public final class app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatchKt {
-	public static final fun spoofVideoStreamsPatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
-	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun spoofVideoStreamsPatch (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static synthetic fun spoofVideoStreamsPatch$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/shared/misc/spoof/UserAgentClientSpoofPatchKt {
@@ -816,6 +820,18 @@ public final class app/revanced/patches/spotify/lite/ondemand/OnDemandPatchKt {
 	public static final fun getOnDemandPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/spotify/misc/UnlockPremiumPatchKt {
+	public static final fun getUnlockPremiumPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/spotify/misc/extension/ExtensionPatchKt {
+	public static final fun getSharedExtensionPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/spotify/misc/fix/SpoofSignaturePatchKt {
+	public static final fun getSpoofSignaturePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/spotify/navbar/PremiumNavbarTabPatchKt {
 	public static final fun getPremiumNavbarTabPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1084,6 +1100,14 @@ public final class app/revanced/patches/youtube/interaction/seekbar/EnableSlideT
 	public static final fun getEnableSlideToSeekPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/youtube/interaction/seekbar/HideSeekbarPatchKt {
+	public static final fun getHideSeekbarPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
+public final class app/revanced/patches/youtube/interaction/seekbar/SeekbarPatchKt {
+	public static final fun getSeekbarPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatchKt {
 	public static final fun getSeekbarThumbnailsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1173,17 +1197,7 @@ public final class app/revanced/patches/youtube/layout/hide/time/HideTimestampPa
 }
 
 public final class app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatchKt {
-	public static final fun getFloatyBarButtonTopMargin ()J
-	public static final fun getMiniplayerMaxSize ()J
 	public static final fun getMiniplayerPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
-	public static final fun getModernMiniplayerClose ()J
-	public static final fun getModernMiniplayerExpand ()J
-	public static final fun getModernMiniplayerForwardButton ()J
-	public static final fun getModernMiniplayerRewindButton ()J
-	public static final fun getPlayerOverlays ()J
-	public static final fun getScrimOverlay ()J
-	public static final fun getYtOutlinePictureInPictureWhite24 ()J
-	public static final fun getYtOutlineXWhite24 ()J
 }
 
 public final class app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatchKt {
@@ -1378,6 +1392,12 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	public static final fun is_19_46_or_greater ()Z
 	public static final fun is_19_47_or_greater ()Z
 	public static final fun is_19_49_or_greater ()Z
+	public static final fun is_20_02_or_greater ()Z
+	public static final fun is_20_03_or_greater ()Z
+	public static final fun is_20_05_or_greater ()Z
+	public static final fun is_20_07_or_greater ()Z
+	public static final fun is_20_09_or_greater ()Z
+	public static final fun is_20_10_or_greater ()Z
 }
 
 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {

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

@@ -0,0 +1,18 @@
+package app.revanced.patches.angulus.ads
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+// Keywords to search for in case the method name changes:
+//     dailyMeasurementCount
+//     lastMeasurementDate
+//     dailyAdResetCount
+//     MeasurementPrefs
+
+// This fingerprint targets a method that returns the daily measurement count.
+// This method is used to determine if the user has reached the daily limit of measurements.
+internal val getDailyMeasurementCountFingerprint = fingerprint {
+    accessFlags(AccessFlags.PRIVATE)
+    returns("I")
+    strings("dailyMeasurementCount")
+}

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

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

patches/src/main/kotlin/app/revanced/patches/facebook/ads/mainfeed/HideSponsoredStoriesPatch.kt

@@ -14,7 +14,7 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 val hideSponsoredStoriesPatch = bytecodePatch(
     name = "Hide 'Sponsored Stories'",
 ) {
-    compatibleWith("com.facebook.katana")
+    compatibleWith("com.facebook.katana"("490.0.0.63.82"))
 
     execute {
         val sponsoredDataModelTemplateMethod = getSponsoredDataModelTemplateFingerprint.originalMethod

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

@@ -12,7 +12,7 @@ val getDeviceIdPatch = bytecodePatch(
 ) {
     dependsOn(signatureDetectionPatch)
 
-    compatibleWith("com.microblink.photomath"("8.37.0"))
+    compatibleWith("com.microblink.photomath")
 
     execute {
         getDeviceIdFingerprint.method.replaceInstructions(

patches/src/main/kotlin/app/revanced/patches/photomath/detection/signature/Fingerprints.kt

@@ -14,5 +14,5 @@ internal val checkSignatureFingerprint = fingerprint {
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT,
     )
-    strings("signatures")
-}
+    strings("SHA")
+}

patches/src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/HideUpdatePopupPatch.kt

@@ -11,7 +11,7 @@ val hideUpdatePopupPatch = bytecodePatch(
 ) {
     dependsOn(signatureDetectionPatch)
 
-    compatibleWith("com.microblink.photomath"("8.32.0"))
+    compatibleWith("com.microblink.photomath")
 
     execute {
         hideUpdatePopupFingerprint.method.addInstructions(

patches/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPatch.kt

@@ -11,7 +11,7 @@ val unlockPlusPatch = bytecodePatch(
 ) {
     dependsOn(signatureDetectionPatch, enableBookpointPatch)
 
-    compatibleWith("com.microblink.photomath"("8.37.0"))
+    compatibleWith("com.microblink.photomath")
 
     execute {
         isPlusUnlockedFingerprint.method.addInstructions(

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

@@ -7,6 +7,8 @@ import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.BasePreference
 import app.revanced.patches.shared.misc.settings.preference.IntentPreference
+import app.revanced.patches.shared.misc.settings.preference.PreferenceCategory
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference
 import app.revanced.util.ResourceGroup
 import app.revanced.util.copyResources
 import app.revanced.util.getNode
@@ -36,14 +38,14 @@ fun settingsPatch (
     execute {
         copyResources(
             "settings",
-            ResourceGroup("xml", "revanced_prefs.xml"),
+            ResourceGroup("xml", "revanced_prefs.xml", "revanced_prefs_icons.xml"),
         )
 
         addResources("shared", "misc.settings.settingsResourcePatch")
     }
 
     finalize {
-        fun Node.addPreference(preference: BasePreference, prepend: Boolean = false) {
+        fun Node.addPreference(preference: BasePreference) {
             preference.serialize(ownerDocument) { resource ->
                 // TODO: Currently, resources can only be added to "values", which may not be the correct place.
                 //  It may be necessary to ask for the desired resourceValue in the future.
@@ -61,7 +63,7 @@ fun settingsPatch (
                 val preferenceFileName = "res/xml/$fileName.xml"
                 if (get(preferenceFileName).exists()) {
                     document(preferenceFileName).use { document ->
-                        document.getNode("PreferenceScreen").addPreference(intent, true)
+                        document.getNode("PreferenceScreen").addPreference(intent)
                     }
                     modified = true
                 }
@@ -71,6 +73,30 @@ fun settingsPatch (
         }
 
         // Add all preferences to the ReVanced fragment.
+        document("res/xml/revanced_prefs_icons.xml").use { document ->
+            val revancedPreferenceScreenNode = document.getNode("PreferenceScreen")
+            preferences.forEach { revancedPreferenceScreenNode.addPreference(it) }
+        }
+
+        // Because the icon preferences require declaring a layout resource,
+        // there is no easy way to change to the Android default preference layout
+        // after the preference is inflated.
+        // Using two different preference files is the simplest and most robust solution.
+        fun removeIconsAndLayout(preferences: Collection<BasePreference>) {
+            preferences.forEach { preference ->
+                preference.icon = null
+                preference.layout = null
+
+                if (preference is PreferenceCategory) {
+                    removeIconsAndLayout(preference.preferences)
+                }
+                if (preference is PreferenceScreenPreference) {
+                    removeIconsAndLayout(preference.preferences)
+                }
+            }
+        }
+        removeIconsAndLayout(preferences)
+
         document("res/xml/revanced_prefs.xml").use { document ->
             val revancedPreferenceScreenNode = document.getNode("PreferenceScreen")
             preferences.forEach { revancedPreferenceScreenNode.addPreference(it) }

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

@@ -19,10 +19,17 @@ abstract class BasePreference(
     val key: String? = null,
     val titleKey: String? = "${key}_title",
     val summaryKey: String? = "${key}_summary",
-    val icon: String? = null,
-    val layout: String? = null,
+    icon: String? = null,
+    layout: String? = null,
     val tag: String
 ) {
+
+    var icon: String? = icon
+        internal set
+
+    var layout: String? = layout
+        internal set
+
     /**
      * Serialize preference element to XML.
      * Overriding methods should invoke super and operate on its return value.

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

@@ -145,7 +145,25 @@ internal val patchIncludedExtensionMethodFingerprint = fingerprint {
 internal const val MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG = 45645570L
 
 internal val mediaFetchHotConfigFingerprint = fingerprint {
-    literal {
-        MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG
-    }
+    literal { MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG }
+}
+
+// 20.10+
+internal const val MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG = 45683169L
+
+internal val mediaFetchHotConfigAlternativeFingerprint = fingerprint {
+    literal { MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG }
+}
+
+// Feature flag that enables different code for parsing and starting video playback,
+// but it's exact purpose is not known. If this flag is enabled while stream spoofing
+// then videos will never start playback and load forever.
+// Flag does not seem to affect playback if spoofing is off.
+internal const val PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG = 45665455L
+
+internal val playbackStartDescriptorFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    parameters()
+    returns("Z")
+    literal { PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG }
 }

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

@@ -10,6 +10,7 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.util.findFreeRegister
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
@@ -31,7 +32,9 @@ internal const val EXTENSION_CLASS_DESCRIPTOR =
 
 fun spoofVideoStreamsPatch(
     block: BytecodePatchBuilder.() -> Unit = {},
-    applyMediaFetchHotConfigChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixMediaFetchHotConfigChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixMediaFetchHotConfigAlternativeChanges: BytecodePatchBuilder.() -> Boolean = { false },
+    fixParsePlaybackResponseFeatureFlag: BytecodePatchBuilder.() -> Boolean = { false },
     executeBlock: BytecodePatchContext.() -> Unit = {},
 ) = bytecodePatch(
     name = "Spoof video streams",
@@ -92,14 +95,14 @@ fun spoofVideoStreamsPatch(
                     getReference<MethodReference>()?.name == "newUrlRequestBuilder"
             }
             val urlRegister = getInstruction<FiveRegisterInstruction>(newRequestBuilderIndex).registerD
-            val freeRegister = getInstruction<OneRegisterInstruction>(newRequestBuilderIndex + 1).registerA
+            val freeRegister = findFreeRegister(newRequestBuilderIndex, urlRegister)
 
             addInstructions(
                 newRequestBuilderIndex,
                 """
-                move-object v$freeRegister, p1
-                invoke-static { v$urlRegister, v$freeRegister }, $EXTENSION_CLASS_DESCRIPTOR->fetchStreams(Ljava/lang/String;Ljava/util/Map;)V
-            """,
+                    move-object v$freeRegister, p1
+                    invoke-static { v$urlRegister, v$freeRegister }, $EXTENSION_CLASS_DESCRIPTOR->fetchStreams(Ljava/lang/String;Ljava/util/Map;)V
+                """
             )
         }
 
@@ -241,13 +244,27 @@ fun spoofVideoStreamsPatch(
 
         // region turn off stream config replacement feature flag.
 
-        if (applyMediaFetchHotConfigChanges()) {
+        if (fixMediaFetchHotConfigChanges()) {
             mediaFetchHotConfigFingerprint.method.insertFeatureFlagBooleanOverride(
                 MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
             )
         }
 
+        if (fixMediaFetchHotConfigAlternativeChanges()) {
+            mediaFetchHotConfigAlternativeFingerprint.method.insertFeatureFlagBooleanOverride(
+                MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
+            )
+        }
+
+        if (fixParsePlaybackResponseFeatureFlag()) {
+            playbackStartDescriptorFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+                PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG,
+                "$EXTENSION_CLASS_DESCRIPTOR->usePlaybackStartFeatureFlag(Z)Z"
+            )
+        }
+
         // endregion
 
         executeBlock()

patches/src/main/kotlin/app/revanced/patches/spotify/layout/theme/CustomThemePatch.kt

@@ -10,6 +10,7 @@ import org.w3c.dom.Element
 val customThemePatch = resourcePatch(
     name = "Custom theme",
     description = "Applies a custom theme.",
+    use = false,
 ) {
     compatibleWith("com.spotify.music")
 

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.spotify.misc
+
+import app.revanced.patcher.fingerprint
+
+internal val accountAttributeFingerprint = fingerprint {
+    custom { _, c -> c.endsWith("internal/AccountAttribute;") }
+}
+
+internal val productStateProtoFingerprint = fingerprint {
+    returns("Ljava/util/Map;")
+    custom { _, classDef ->
+        classDef.endsWith("ProductStateProto;")
+    }
+}
+
+internal val buildQueryParametersFingerprint = fingerprint {
+    strings("trackRows", "device_type:tablet")
+}
+
+internal val contextMenuExperimentsFingerprint = fingerprint {
+    parameters("L")
+    strings("remove_ads_upsell_enabled")
+}

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

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

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

@@ -0,0 +1,10 @@
+package app.revanced.patches.spotify.misc.extension
+
+import app.revanced.patches.shared.misc.extension.extensionHook
+
+internal val spotifyMainActivityOnCreate = extensionHook {
+    custom { method, classDef ->
+        classDef.type == "Lcom/spotify/music/SpotifyMainActivity;" &&
+                method.name == "onCreate"
+    }
+}

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

@@ -0,0 +1,5 @@
+package app.revanced.patches.spotify.misc.fix
+
+import app.revanced.patcher.fingerprint
+
+internal val getAppSignatureFingerprint = fingerprint { strings("Failed to get the application signatures") }

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

@@ -0,0 +1,33 @@
+package app.revanced.patches.spotify.misc.fix
+
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.indexOfFirstInstructionReversedOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Suppress("unused")
+val spoofSignaturePatch = bytecodePatch(
+    name = "Spoof signature",
+    description = "Spoofs the signature of the app to fix various functions of the app.",
+) {
+    compatibleWith("com.spotify.music")
+
+    execute {
+        getAppSignatureFingerprint.method.apply {
+            val failedToGetSignaturesStringMatch = getAppSignatureFingerprint.stringMatches!!.first()
+
+            val concatSignaturesIndex = indexOfFirstInstructionReversedOrThrow(
+                failedToGetSignaturesStringMatch.index,
+                Opcode.MOVE_RESULT_OBJECT,
+            )
+
+            val register = getInstruction<OneRegisterInstruction>(concatSignaturesIndex).registerA
+
+            val expectedSignature = "d6a6dced4a85f24204bf9505ccc1fce114cadb32"
+
+            replaceInstruction(concatSignaturesIndex, "const-string v$register, \"$expectedSignature\"")
+        }
+    }
+}

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

@@ -1,11 +0,0 @@
-package app.revanced.patches.spotify.navbar
-
-import app.revanced.patcher.fingerprint
-import app.revanced.util.literal
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal val addNavBarItemFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    literal { showBottomNavigationItemsTextId }
-}

patches/src/main/kotlin/app/revanced/patches/spotify/navbar/PremiumNavbarTabPatch.kt

@@ -1,50 +1,12 @@
 package app.revanced.patches.spotify.navbar
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patches.shared.misc.mapping.get
-import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
-import app.revanced.patches.shared.misc.mapping.resourceMappings
-
-internal var showBottomNavigationItemsTextId = -1L
-    private set
-internal var premiumTabId = -1L
-    private set
-
-private val premiumNavbarTabResourcePatch = resourcePatch {
-    dependsOn(resourceMappingPatch)
-
-    execute {
-        premiumTabId = resourceMappings["id", "premium_tab"]
-
-        showBottomNavigationItemsTextId = resourceMappings[
-            "bool",
-            "show_bottom_navigation_items_text",
-        ]
-    }
-}
+import app.revanced.patches.spotify.misc.unlockPremiumPatch
 
+@Deprecated("Superseded by unlockPremiumPatch", ReplaceWith("unlockPremiumPatch"))
 @Suppress("unused")
 val premiumNavbarTabPatch = bytecodePatch(
-    name = "Premium navbar tab",
     description = "Hides the premium tab from the navigation bar.",
 ) {
-    dependsOn(premiumNavbarTabResourcePatch)
-
-    compatibleWith("com.spotify.music")
-
-    // If the navigation bar item is the premium tab, do not add it.
-    execute {
-        addNavBarItemFingerprint.method.addInstructions(
-            0,
-            """
-                const v1, $premiumTabId
-                if-ne p5, v1, :continue
-                return-void
-                :continue
-                nop
-            """,
-        )
-    }
+    dependsOn(unlockPremiumPatch)
 }

patches/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/DynamicColorPatch.kt

@@ -10,7 +10,13 @@ val dynamicColorPatch = resourcePatch(
     name = "Dynamic color",
     description = "Replaces the default X (Formerly Twitter) Blue with the user's Material You palette.",
 ) {
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     execute {
         val resDirectory = get("res")

patches/src/main/kotlin/app/revanced/patches/twitter/misc/hook/HookPatch.kt

@@ -11,7 +11,15 @@ fun hookPatch(
 ) = bytecodePatch(name) {
     dependsOn(jsonHookPatch)
 
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            // 10.85+ uses Pairip and requires additional changes to work.
+            "10.84.0-release.0",
+            // Confirmed to not show reply ads. Slightly newer versions may also work.
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     execute {
         addJsonHook(JsonHook(hookClassDescriptor))

patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt

@@ -37,7 +37,13 @@ val changeLinkSharingDomainPatch = bytecodePatch(
         sharedExtensionPatch,
     )
 
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     val domainName by stringOption(
         key = "domainName",

patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/SanitizeSharingLinksPatch.kt

@@ -8,7 +8,13 @@ val sanitizeSharingLinksPatch = bytecodePatch(
     name = "Sanitize sharing links",
     description = "Removes the tracking query parameters from links before they are shared.",
 ) {
-    compatibleWith("com.twitter.android")
+    compatibleWith(
+        "com.twitter.android"(
+            "10.84.0-release.0",
+            "10.60.0-release.0",
+            "10.48.0-release.0"
+        )
+    )
 
     execute {
         sanitizeSharingLinksFingerprint.method.addInstructions(

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

@@ -82,9 +82,8 @@ val hideAdsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt

@@ -29,9 +29,8 @@ val hideGetPremiumPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt

@@ -27,9 +27,8 @@ val videoAdsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt

@@ -57,9 +57,8 @@ val copyVideoUrlPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt

@@ -28,9 +28,8 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -72,9 +72,8 @@ val downloadsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt

@@ -11,8 +11,10 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 
+private const val EXTENSION_CLASS_DESCRIPTOR =
+    "Lapp/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch;"
+
 val disablePreciseSeekingGesturePatch = bytecodePatch(
-    name = "Disable precise seeking gesture",
     description = "Adds an option to disable precise seeking when swiping up on the seekbar.",
 ) {
     dependsOn(
@@ -21,26 +23,12 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
         addResourcesPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
     execute {
         addResources("youtube", "interaction.seekbar.disablePreciseSeekingGesturePatch")
 
         PreferenceScreen.SEEKBAR.addPreferences(
             SwitchPreference("revanced_disable_precise_seeking_gesture"),
         )
-        val extensionMethodDescriptor =
-            "Lapp/revanced/extension/youtube/patches/DisablePreciseSeekingGesturePatch;"
 
         allowSwipingUpGestureFingerprint.match(
             swipingUpGestureParentFingerprint.originalClassDef,
@@ -48,7 +36,7 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
             addInstructionsWithLabels(
                 0,
                 """
-                    invoke-static { }, $extensionMethodDescriptor->isGestureDisabled()Z
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->isGestureDisabled()Z
                     move-result v0
                     if-eqz v0, :disabled
                     return-void
@@ -63,7 +51,7 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
             addInstructionsWithLabels(
                 0,
                 """
-                    invoke-static { }, $extensionMethodDescriptor->isGestureDisabled()Z
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->isGestureDisabled()Z
                     move-result v0
                     if-eqz v0, :disabled
                     const/4 v0, 0x0

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt

@@ -15,7 +15,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 val enableSeekbarTappingPatch = bytecodePatch(
-    name = "Enable tap to seek",
     description = "Adds an option to enable tap to seek on the seekbar of the video player.",
 ) {
     dependsOn(
@@ -24,18 +23,6 @@ val enableSeekbarTappingPatch = bytecodePatch(
         addResourcesPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
     execute {
         addResources("youtube", "interaction.seekbar.enableSeekbarTappingPatch")
 

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt

@@ -18,11 +18,9 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
-internal const val EXTENSION_METHOD_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/patches/SlideToSeekPatch;->isSlideToSeekDisabled(Z)Z"
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/SlideToSeekPatch;"
 
 val enableSlideToSeekPatch = bytecodePatch(
-    name = "Enable slide to seek",
     description = "Adds an option to enable slide to seek " +
         "instead of playing at 2x speed when pressing and holding in the video player."
 ) {
@@ -33,18 +31,6 @@ val enableSlideToSeekPatch = bytecodePatch(
         versionCheckPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
     execute {
         addResources("youtube", "interaction.seekbar.enableSlideToSeekPatch")
 
@@ -60,6 +46,8 @@ val enableSlideToSeekPatch = bytecodePatch(
         val checkReference = slideToSeekFingerprint.method.getInstruction(checkIndex)
             .getReference<MethodReference>()!!
 
+        val extensionMethodDescriptor = "$EXTENSION_CLASS_DESCRIPTOR->isSlideToSeekDisabled(Z)Z"
+
         // A/B check method was only called on this class.
         slideToSeekFingerprint.classDef.methods.forEach { method ->
             method.findInstructionIndicesReversed {
@@ -71,7 +59,7 @@ val enableSlideToSeekPatch = bytecodePatch(
                     addInstructions(
                         index + 2,
                         """
-                            invoke-static { v$register }, $EXTENSION_METHOD_DESCRIPTOR
+                            invoke-static { v$register }, $extensionMethodDescriptor
                             move-result v$register
                        """,
                     )
@@ -96,7 +84,7 @@ val enableSlideToSeekPatch = bytecodePatch(
                     addInstructions(
                         targetIndex + 1,
                         """
-                            invoke-static { v$targetRegister }, $EXTENSION_METHOD_DESCRIPTOR
+                            invoke-static { v$targetRegister }, $extensionMethodDescriptor
                             move-result v$targetRegister
                         """,
                     )
@@ -110,7 +98,7 @@ val enableSlideToSeekPatch = bytecodePatch(
                 addInstructions(
                     insertIndex,
                     """
-                        invoke-static { v$targetRegister }, $EXTENSION_METHOD_DESCRIPTOR
+                        invoke-static { v$targetRegister }, $extensionMethodDescriptor
                         move-result v$targetRegister
                     """,
                 )

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/HideSeekbarPatch.kt

@@ -0,0 +1,46 @@
+package app.revanced.patches.youtube.interaction.seekbar
+
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.resources.addResources
+import app.revanced.patches.all.misc.resources.addResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.layout.seekbar.seekbarColorPatch
+import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.settings.PreferenceScreen
+import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.patches.youtube.shared.seekbarFingerprint
+import app.revanced.patches.youtube.shared.seekbarOnDrawFingerprint
+
+val hideSeekbarPatch = bytecodePatch(
+    description = "Adds an option to hide the seekbar.",
+) {
+    dependsOn(
+        sharedExtensionPatch,
+        settingsPatch,
+        seekbarColorPatch,
+        addResourcesPatch,
+    )
+
+    execute {
+        addResources("youtube", "layout.hide.seekbar.hideSeekbarPatch")
+
+        PreferenceScreen.SEEKBAR.addPreferences(
+            SwitchPreference("revanced_hide_seekbar"),
+            SwitchPreference("revanced_hide_seekbar_thumbnail"),
+        )
+
+        seekbarOnDrawFingerprint.match(seekbarFingerprint.originalClassDef).method.addInstructionsWithLabels(
+            0,
+            """
+                const/4 v0, 0x0
+                invoke-static { }, Lapp/revanced/extension/youtube/patches/HideSeekbarPatch;->hideSeekbar()Z
+                move-result v0
+                if-eqz v0, :hide_seekbar
+                return-void
+                :hide_seekbar
+                nop
+            """,
+        )
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt

@@ -0,0 +1,31 @@
+package app.revanced.patches.youtube.interaction.seekbar
+
+import app.revanced.patcher.patch.bytecodePatch
+
+@Suppress("unused")
+val seekbarPatch = bytecodePatch(
+    name = "Seekbar",
+    description = "Adds options to disable precise seeking when swiping up on the seekbar, " +
+            "slide to seek instead of playing at 2x speed when pressing and holding, " +
+            "tapping the player seekbar to seek, " +
+            "and hiding the video player seekbar."
+) {
+    dependsOn(
+        disablePreciseSeekingGesturePatch,
+        enableSlideToSeekPatch,
+        enableSeekbarTappingPatch,
+        hideSeekbarPatch,
+        seekbarThumbnailsPatch
+    )
+
+    compatibleWith(
+        "com.google.android.youtube"(
+            "19.16.39",
+            "19.25.37",
+            "19.34.42",
+            "19.43.41",
+            "19.47.53",
+            "20.07.39",
+        )
+    )
+}

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt

@@ -10,6 +10,7 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.layout.seekbar.fullscreenSeekbarThumbnailsFingerprint
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_17_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_09_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 
@@ -17,7 +18,6 @@ private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/SeekbarThumbnailsPatch;"
 
 val seekbarThumbnailsPatch = bytecodePatch(
-    name = "Seekbar thumbnails",
     description = "Adds an option to use high quality fullscreen seekbar thumbnails. " +
             "Patching 19.16.39 adds an option to restore old seekbar thumbnails.",
 ) {
@@ -27,19 +27,13 @@ val seekbarThumbnailsPatch = bytecodePatch(
         versionCheckPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        )
-    )
-
     execute {
+        if (is_20_09_or_greater) {
+            // High quality seekbar thumbnails is partially broken in 20.09
+            // and the code is completely removed in 20.10+
+            return@execute
+        }
+
         addResources("youtube", "layout.seekbar.seekbarThumbnailsPatch")
 
         if (is_19_17_or_greater) {

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

@@ -84,9 +84,8 @@ val swipeControlsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt

@@ -26,9 +26,8 @@ val autoCaptionsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt

@@ -47,9 +47,8 @@ val customBrandingPatch = resourcePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt

@@ -45,9 +45,8 @@ val changeHeaderPatch = resourcePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         )
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt

@@ -26,9 +26,8 @@ val hideButtonsPatch = resourcePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt

@@ -44,9 +44,8 @@ val navigationButtonsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt

@@ -58,9 +58,8 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -37,9 +37,8 @@ val changeFormFactorPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt

@@ -63,9 +63,8 @@ val hideEndscreenCardsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt

@@ -35,9 +35,8 @@ val hideEndScreenSuggestedVideoPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt

@@ -33,9 +33,8 @@ val disableFullscreenAmbientModePatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -15,7 +15,21 @@ internal val hideShowMoreButtonFingerprint = fingerprint {
     literal { expandButtonDownId }
 }
 
+/**
+ * 20.07+
+ */
 internal val parseElementFromBufferFingerprint = fingerprint {
+    parameters("L", "L", "[B", "L", "L")
+    opcodes(
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_BOOLEAN,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+    )
+    strings("Failed to parse Element") // String is a partial match.
+}
+
+internal val parseElementFromBufferLegacyFingerprint = fingerprint {
     parameters("L", "L", "[B", "L", "L")
     opcodes(
         Opcode.IGET_OBJECT,
@@ -110,7 +124,6 @@ internal val showFloatingMicrophoneButtonFingerprint = fingerprint {
     opcodes(
         Opcode.IGET_BOOLEAN,
         Opcode.IF_EQZ,
-        Opcode.RETURN_VOID,
     )
     literal { fabButtonId }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -20,12 +20,14 @@ import app.revanced.patches.shared.misc.settings.preference.*
 import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch
-import app.revanced.patches.youtube.misc.playservice.is_19_47_or_greater
-import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
+import app.revanced.patches.youtube.misc.playservice.is_20_07_or_greater
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.findFreeRegister
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@@ -120,7 +122,6 @@ val hideLayoutComponentsPatch = bytecodePatch(
         addResourcesPatch,
         hideLayoutComponentsResourcePatch,
         navigationBarHookPatch,
-        versionCheckPatch
     )
 
     compatibleWith(
@@ -132,6 +133,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
             "19.45.38",
             "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 
@@ -142,6 +144,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
             PreferenceScreenPreference(
                 key = "revanced_hide_description_components_screen",
                 preferences = setOf(
+                    SwitchPreference("revanced_hide_ai_generated_video_summary_section"),
                     SwitchPreference("revanced_hide_attributes_section"),
                     SwitchPreference("revanced_hide_chapters_section"),
                     SwitchPreference("revanced_hide_info_cards_section"),
@@ -154,7 +157,8 @@ val hideLayoutComponentsPatch = bytecodePatch(
             PreferenceScreenPreference(
                 "revanced_comments_screen",
                 preferences = setOf(
-                    SwitchPreference("revanced_hide_comments_chat_summary"),
+                    SwitchPreference("revanced_hide_comments_ai_chat_summary"),
+                    SwitchPreference("revanced_hide_comments_ai_summary"),
                     SwitchPreference("revanced_hide_comments_by_members_header"),
                     SwitchPreference("revanced_hide_comments_section"),
                     SwitchPreference("revanced_hide_comments_create_a_short_button"),
@@ -245,29 +249,31 @@ val hideLayoutComponentsPatch = bytecodePatch(
 
         // region Mix playlists
 
-        parseElementFromBufferFingerprint.method.apply {
-            val startIndex = parseElementFromBufferFingerprint.patternMatch!!.startIndex
-            // Target code is a mess with a lot of register moves.
-            // There is no simple way to find a free register for all versions so this is hard coded.
-            val freeRegister = if (is_19_47_or_greater) 6 else 0
-            val byteArrayParameter = "p3"
-            val conversionContextRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
-            val returnEmptyComponentInstruction = instructions.last { it.opcode == Opcode.INVOKE_STATIC }
-            val returnEmptyComponentRegister = (returnEmptyComponentInstruction as FiveRegisterInstruction).registerC
+        (if (is_20_07_or_greater) parseElementFromBufferFingerprint
+        else parseElementFromBufferLegacyFingerprint).let {
+            it.method.apply {
+                val byteArrayParameter = "p3"
+                val startIndex = it.patternMatch!!.startIndex
+                val conversionContextRegister = getInstruction<TwoRegisterInstruction>(startIndex).registerA
+                val returnEmptyComponentInstruction = instructions.last { it.opcode == Opcode.INVOKE_STATIC }
+                val returnEmptyComponentRegister = (returnEmptyComponentInstruction as FiveRegisterInstruction).registerC
+                val insertIndex = startIndex + 1
+                val freeRegister = findFreeRegister(insertIndex, conversionContextRegister, returnEmptyComponentRegister)
 
-            addInstructionsWithLabels(
-                startIndex + 1,
-                """
-                    invoke-static { v$conversionContextRegister, $byteArrayParameter }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->filterMixPlaylists(Ljava/lang/Object;[B)Z
-                    move-result v$freeRegister 
-                    if-eqz v$freeRegister, :show
-                    move-object v$returnEmptyComponentRegister, p1   # Required for 19.47
-                    goto :return_empty_component
-                    :show
-                    const/4 v$freeRegister, 0x0   # Restore register, required for 19.16
-                """,
-                ExternalLabel("return_empty_component", returnEmptyComponentInstruction),
-            )
+                addInstructionsWithLabels(
+                    insertIndex,
+                    """
+                        invoke-static { v$conversionContextRegister, $byteArrayParameter }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->filterMixPlaylists(Ljava/lang/Object;[B)Z
+                        move-result v$freeRegister 
+                        if-eqz v$freeRegister, :show
+                        move-object v$returnEmptyComponentRegister, p1   # Required for 19.47
+                        goto :return_empty_component
+                        :show
+                        nop
+                    """,
+                    ExternalLabel("return_empty_component", returnEmptyComponentInstruction),
+                )
+            }
         }
 
         // endregion
@@ -343,19 +349,18 @@ val hideLayoutComponentsPatch = bytecodePatch(
 
         // region hide floating microphone
 
-        showFloatingMicrophoneButtonFingerprint.let {
-            it.method.apply {
-                val startIndex = it.patternMatch!!.startIndex
-                val register = getInstruction<TwoRegisterInstruction>(startIndex).registerA
+        showFloatingMicrophoneButtonFingerprint.method.apply {
+            val literalIndex = indexOfFirstLiteralInstructionOrThrow(fabButtonId)
+            val booleanIndex = indexOfFirstInstructionOrThrow(literalIndex, Opcode.IGET_BOOLEAN)
+            val register = getInstruction<TwoRegisterInstruction>(booleanIndex).registerA
 
-                addInstructions(
-                    startIndex + 1,
-                    """
+            addInstructions(
+                booleanIndex + 1,
+                """
                     invoke-static { v$register }, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideFloatingMicrophoneButton(Z)Z
                     move-result v$register
-                """,
-                )
-            }
+                """
+            )
         }
 
         // endregion

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt

@@ -61,9 +61,8 @@ val hideInfoCardsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt

@@ -28,9 +28,8 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt

@@ -33,9 +33,8 @@ val disableRollingNumberAnimationPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt

@@ -1,59 +1,11 @@
 package app.revanced.patches.youtube.layout.hide.seekbar
 
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.all.misc.resources.addResources
-import app.revanced.patches.all.misc.resources.addResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.layout.seekbar.seekbarColorPatch
-import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
-import app.revanced.patches.youtube.misc.settings.PreferenceScreen
-import app.revanced.patches.youtube.misc.settings.settingsPatch
-import app.revanced.patches.youtube.shared.seekbarFingerprint
-import app.revanced.patches.youtube.shared.seekbarOnDrawFingerprint
+import app.revanced.patches.youtube.interaction.seekbar.hideSeekbarPatch
 
-val hideSeekbarPatch = bytecodePatch(
-    name = "Hide seekbar",
-    description = "Adds an option to hide the seekbar.",
-) {
+@Deprecated("Patch was moved to app.revanced.patches.youtube.interaction.seekbar")
+val hideSeekbarPatch = bytecodePatch {
     dependsOn(
-        sharedExtensionPatch,
-        settingsPatch,
-        seekbarColorPatch,
-        addResourcesPatch,
+        hideSeekbarPatch
     )
-
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.45.38",
-            "19.46.42",
-            "19.47.53",
-        ),
-    )
-
-    execute {
-        addResources("youtube", "layout.hide.seekbar.hideSeekbarPatch")
-
-        PreferenceScreen.SEEKBAR.addPreferences(
-            SwitchPreference("revanced_hide_seekbar"),
-            SwitchPreference("revanced_hide_seekbar_thumbnail"),
-        )
-
-        seekbarOnDrawFingerprint.match(seekbarFingerprint.originalClassDef).method.addInstructionsWithLabels(
-            0,
-            """
-                const/4 v0, 0x0
-                invoke-static { }, Lapp/revanced/extension/youtube/patches/HideSeekbarPatch;->hideSeekbar()Z
-                move-result v0
-                if-eqz v0, :hide_seekbar
-                return-void
-                :hide_seekbar
-                nop
-            """,
-        )
-    }
 }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt

@@ -176,9 +176,8 @@ val hideShortsComponentsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt

@@ -25,9 +25,8 @@ val hideTimestampPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -30,7 +30,7 @@ internal val miniplayerModernAddViewListenerFingerprint = fingerprint {
 
 internal val miniplayerModernCloseButtonFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
     parameters()
     literal { modernMiniplayerClose }
 }
@@ -62,7 +62,7 @@ internal val miniplayerOnCloseHandlerFingerprint = fingerprint {
  */
 internal val miniplayerModernExpandButtonFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
     parameters()
     literal { modernMiniplayerExpand }
 }
@@ -82,7 +82,7 @@ internal val miniplayerModernExpandCloseDrawablesFingerprint = fingerprint {
  */
 internal val miniplayerModernForwardButtonFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
     parameters()
     literal { modernMiniplayerForwardButton }
 }
@@ -92,7 +92,6 @@ internal val miniplayerModernForwardButtonFingerprint = fingerprint {
  */
 internal val miniplayerModernOverlayViewFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
     parameters()
     literal { scrimOverlay }
 }
@@ -102,7 +101,7 @@ internal val miniplayerModernOverlayViewFingerprint = fingerprint {
  */
 internal val miniplayerModernRewindButtonFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("Landroid/widget/ImageView;")
+    returns("L")
     parameters()
     literal { modernMiniplayerRewindButton }
 }
@@ -114,6 +113,13 @@ internal val miniplayerModernViewParentFingerprint = fingerprint {
     strings("player_overlay_modern_mini_player_controls")
 }
 
+internal val miniplayerModernActionButtonFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    parameters()
+    literal { modernMiniPlayerOverlayActionButton }
+}
+
 internal val miniplayerMinimumSizeFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     custom { method, _ ->

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

@@ -34,27 +34,29 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
 
-var floatyBarButtonTopMargin = -1L
+internal var floatyBarButtonTopMargin = -1L
     private set
 
 // Only available in 19.15 and upwards.
-var ytOutlineXWhite24 = -1L
+internal var ytOutlineXWhite24 = -1L
     private set
-var ytOutlinePictureInPictureWhite24 = -1L
+internal var ytOutlinePictureInPictureWhite24 = -1L
     private set
-var scrimOverlay = -1L
+internal var scrimOverlay = -1L
     private set
-var modernMiniplayerClose = -1L
+internal var modernMiniplayerClose = -1L
     private set
-var modernMiniplayerExpand = -1L
+internal var modernMiniplayerExpand = -1L
     private set
-var modernMiniplayerRewindButton = -1L
+internal var modernMiniplayerRewindButton = -1L
     private set
-var modernMiniplayerForwardButton = -1L
+internal var modernMiniplayerForwardButton = -1L
     private set
-var playerOverlays = -1L
+internal var modernMiniPlayerOverlayActionButton = -1L
     private set
-var miniplayerMaxSize = -1L
+internal var playerOverlays = -1L
+    private set
+internal var miniplayerMaxSize = -1L
     private set
 
 private val miniplayerResourcePatch = resourcePatch {
@@ -100,6 +102,11 @@ private val miniplayerResourcePatch = resourcePatch {
             "modern_miniplayer_forward_button",
         ]
 
+        modernMiniPlayerOverlayActionButton = resourceMappings[
+            "id",
+            "modern_miniplayer_overlay_action_button"
+        ]
+
         // Resource id is not used during patching, but is used by extension.
         // Verify the resource is present while patching.
         resourceMappings[
@@ -167,6 +174,7 @@ val miniplayerPatch = bytecodePatch(
             "19.45.38",
             "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 
@@ -175,19 +183,25 @@ val miniplayerPatch = bytecodePatch(
 
         val preferences = mutableSetOf<BasePreference>()
 
-
         preferences +=
-            if (is_19_43_or_greater) {
+            if (is_20_03_or_greater) {
                 ListPreference(
                     "revanced_miniplayer_type",
                     summaryKey = null,
                 )
+            } else if (is_19_43_or_greater) {
+                ListPreference(
+                    "revanced_miniplayer_type",
+                    summaryKey = null,
+                    entriesKey = "revanced_miniplayer_type_legacy_19_43_entries",
+                    entryValuesKey = "revanced_miniplayer_type_legacy_19_43_entry_values",
+                )
             } else {
                 ListPreference(
                     "revanced_miniplayer_type",
                     summaryKey = null,
-                    entriesKey = "revanced_miniplayer_type_legacy_entries",
-                    entryValuesKey = "revanced_miniplayer_type_legacy_entry_values",
+                    entriesKey = "revanced_miniplayer_type_legacy_19_16_entries",
+                    entryValuesKey = "revanced_miniplayer_type_legacy_19_16_entry_values",
                 )
             }
 
@@ -209,13 +223,13 @@ val miniplayerPatch = bytecodePatch(
         preferences += SwitchPreference("revanced_miniplayer_hide_subtext")
 
         preferences += if (is_19_26_or_greater) {
-            SwitchPreference("revanced_miniplayer_hide_expand_close")
+            SwitchPreference("revanced_miniplayer_hide_overlay_buttons")
         } else {
             SwitchPreference(
-                key = "revanced_miniplayer_hide_expand_close",
-                titleKey = "revanced_miniplayer_hide_expand_close_legacy_title",
-                summaryOnKey = "revanced_miniplayer_hide_expand_close_legacy_summary_on",
-                summaryOffKey = "revanced_miniplayer_hide_expand_close_legacy_summary_off",
+                key = "revanced_miniplayer_hide_overlay_buttons",
+                titleKey = "revanced_miniplayer_hide_overlay_buttons_legacy_title",
+                summaryOnKey = "revanced_miniplayer_hide_overlay_buttons_legacy_summary_on",
+                summaryOffKey = "revanced_miniplayer_hide_overlay_buttons_legacy_summary_off",
             )
         }
 
@@ -365,7 +379,7 @@ val miniplayerPatch = bytecodePatch(
         if (is_19_23_or_greater) {
             miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_DRAG_DROP_FEATURE_KEY,
-                "enableMiniplayerDragAndDrop",
+                "getMiniplayerDragAndDrop",
             )
         }
 
@@ -382,7 +396,7 @@ val miniplayerPatch = bytecodePatch(
 
             miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_DOUBLE_TAP_FEATURE_KEY,
-                "enableMiniplayerDoubleTapAction",
+                "getMiniplayerDoubleTapAction",
             )
         }
 
@@ -398,7 +412,7 @@ val miniplayerPatch = bytecodePatch(
                 addInstructions(
                     targetIndex + 1,
                     """
-                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->setMiniplayerDefaultSize(I)I
+                        invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getMiniplayerDefaultSize(I)I
                         move-result v$register
                     """,
                 )
@@ -421,7 +435,7 @@ val miniplayerPatch = bytecodePatch(
         if (is_19_36_or_greater) {
             miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_ROUNDED_CORNERS_FEATURE_KEY,
-                "setRoundedCorners",
+                "getRoundedCorners",
             )
         }
 
@@ -433,7 +447,7 @@ val miniplayerPatch = bytecodePatch(
 
             miniplayerModernConstructorFingerprint.insertMiniplayerFeatureFlagBooleanOverride(
                 MINIPLAYER_HORIZONTAL_DRAG_FEATURE_KEY,
-                "setHorizontalDrag",
+                "getHorizontalDrag",
             )
         }
 
@@ -473,6 +487,11 @@ val miniplayerPatch = bytecodePatch(
                 modernMiniplayerClose,
                 "hideMiniplayerExpandClose",
             ),
+            Triple(
+                miniplayerModernActionButtonFingerprint,
+                modernMiniPlayerOverlayActionButton,
+                "hideMiniplayerActionButton"
+            ),
             Triple(
                 miniplayerModernRewindButtonFingerprint,
                 modernMiniplayerRewindButton,
@@ -490,12 +509,25 @@ val miniplayerPatch = bytecodePatch(
             ),
         ).forEach { (fingerprint, literalValue, methodName) ->
             fingerprint.match(
-                miniplayerModernViewParentFingerprint.classDef,
-            ).method.hookInflatedView(
-                literalValue,
-                "Landroid/widget/ImageView;",
-                "$EXTENSION_CLASS_DESCRIPTOR->$methodName(Landroid/widget/ImageView;)V",
-            )
+                miniplayerModernViewParentFingerprint.originalClassDef
+            ).method.apply {
+                val literalIndex = indexOfFirstLiteralInstructionOrThrow(literalValue)
+                val checkCastIndex = indexOfFirstInstruction(literalIndex) {
+                    opcode == Opcode.CHECK_CAST &&
+                            getReference<TypeReference>()?.type == "Landroid/widget/ImageView;"
+                }
+                val viewIndex = if (checkCastIndex >= 0) {
+                    checkCastIndex
+                } else {
+                    indexOfFirstInstructionOrThrow(literalIndex, Opcode.MOVE_RESULT_OBJECT)
+                }
+                val viewRegister = getInstruction<OneRegisterInstruction>(viewIndex).registerA
+
+                addInstruction(
+                    viewIndex + 1,
+                    "invoke-static { v$viewRegister }, $EXTENSION_CLASS_DESCRIPTOR->$methodName(Landroid/view/View;)V"
+                )
+            }
         }
 
         miniplayerModernAddViewListenerFingerprint.match(
@@ -510,33 +542,40 @@ val miniplayerPatch = bytecodePatch(
         // Modern 2 uses the same overlay controls as the regular video player,
         // and the overlay views are added at runtime.
         // Add a hook to the overlay class, and pass the added views to extension.
+        // Problem is fixed in 19.21+
         //
         // NOTE: Modern 2 uses the same video UI as the regular player except resized to smaller.
         // This patch code could be used to hide other player overlays that do not use Litho.
-        playerOverlaysLayoutFingerprint.classDef.methods.add(
-            ImmutableMethod(
-                YOUTUBE_PLAYER_OVERLAYS_LAYOUT_CLASS_NAME,
-                "addView",
-                listOf(
-                    ImmutableMethodParameter("Landroid/view/View;", null, null),
-                    ImmutableMethodParameter("I", null, null),
-                    ImmutableMethodParameter("Landroid/view/ViewGroup\$LayoutParams;", null, null),
-                ),
-                "V",
-                AccessFlags.PUBLIC.value,
-                null,
-                null,
-                MutableMethodImplementation(4),
-            ).toMutable().apply {
-                addInstructions(
-                    """
-                        invoke-super { p0, p1, p2, p3 }, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup${'$'}LayoutParams;)V
-                        invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->playerOverlayGroupCreated(Landroid/view/View;)V
-                        return-void
-                    """
-                )
-            }
-        )
+        if (!is_19_17_or_greater) {
+            playerOverlaysLayoutFingerprint.classDef.methods.add(
+                ImmutableMethod(
+                    YOUTUBE_PLAYER_OVERLAYS_LAYOUT_CLASS_NAME,
+                    "addView",
+                    listOf(
+                        ImmutableMethodParameter("Landroid/view/View;", null, null),
+                        ImmutableMethodParameter("I", null, null),
+                        ImmutableMethodParameter(
+                            "Landroid/view/ViewGroup\$LayoutParams;",
+                            null,
+                            null
+                        ),
+                    ),
+                    "V",
+                    AccessFlags.PUBLIC.value,
+                    null,
+                    null,
+                    MutableMethodImplementation(4),
+                ).toMutable().apply {
+                    addInstructions(
+                        """
+                            invoke-super { p0, p1, p2, p3 }, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup${'$'}LayoutParams;)V
+                            invoke-static { p1 }, $EXTENSION_CLASS_DESCRIPTOR->playerOverlayGroupCreated(Landroid/view/View;)V
+                            return-void
+                        """
+                    )
+                }
+            )
+        }
 
         // endregion
     }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt

@@ -25,9 +25,8 @@ val playerPopupPanelsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt

@@ -16,9 +16,8 @@ val playerControlsBackgroundPatch = resourcePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -25,9 +25,8 @@ internal val exitFullscreenPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         )
     )
 

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

@@ -27,6 +27,7 @@ val openVideosFullscreenPatch = bytecodePatch(
         "com.google.android.youtube"(
             "19.46.42",
             "19.47.53",
+            "20.07.39",
         )
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt

@@ -56,9 +56,8 @@ val customPlayerOverlayOpacityPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -98,20 +98,6 @@ internal val rollingNumberTextViewFingerprint = fingerprint {
     }
 }
 
-internal val shortsTextViewFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    returns("V")
-    parameters("L", "L")
-    opcodes(
-        Opcode.INVOKE_SUPER, // first instruction of method
-        Opcode.IF_NEZ,
-        null,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-    )
-}
-
 internal val textComponentConstructorFingerprint = fingerprint {
     accessFlags(AccessFlags.CONSTRUCTOR, AccessFlags.PRIVATE)
     strings("TextComponent")

patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt

@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
@@ -14,6 +12,7 @@ import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_33_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.addSettingPreference
 import app.revanced.patches.youtube.misc.settings.newIntent
@@ -58,9 +57,8 @@ val returnYouTubeDislikePatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 
@@ -72,6 +70,8 @@ val returnYouTubeDislikePatch = bytecodePatch(
                 key = "revanced_settings_screen_09",
                 titleKey = "revanced_ryd_settings_title",
                 summaryKey = null,
+                icon = "@drawable/revanced_settings_screen_09_ryd",
+                layout = "@layout/preference_with_icon",
                 intent = newIntent("revanced_ryd_settings_intent"),
             ),
         )
@@ -123,7 +123,7 @@ val returnYouTubeDislikePatch = bytecodePatch(
             val tempRegister: Int
             val charSequenceRegister: Int
 
-            if (is_19_33_or_greater) {
+            if (is_19_33_or_greater  && !is_20_10_or_greater) {
                 insertIndex = indexOfFirstInstructionOrThrow {
                     (opcode == Opcode.INVOKE_STATIC || opcode == Opcode.INVOKE_STATIC_RANGE)
                             && getReference<MethodReference>()?.returnType == textDataClassType
@@ -169,51 +169,7 @@ val returnYouTubeDislikePatch = bytecodePatch(
 
         // endregion
 
-        // region Hook for non-litho Short videos.
-        shortsTextViewFingerprint.method.apply {
-            val insertIndex = shortsTextViewFingerprint.patternMatch!!.endIndex + 1
-
-            // If the field is true, the TextView is for a dislike button.
-            val isDisLikesBooleanInstruction = instructions.first { instruction ->
-                instruction.opcode == Opcode.IGET_BOOLEAN
-            } as ReferenceInstruction
-
-            val isDisLikesBooleanReference = isDisLikesBooleanInstruction.reference
-
-            // Like/Dislike button TextView field.
-            val textViewFieldInstruction = instructions.first { instruction ->
-                instruction.opcode == Opcode.IGET_OBJECT
-            } as ReferenceInstruction
-
-            val textViewFieldReference = textViewFieldInstruction.reference
-
-            // Check if the hooked TextView object is that of the dislike button.
-            // If RYD is disabled, or the TextView object is not that of the dislike button, the execution flow is not interrupted.
-            // Otherwise, the TextView object is modified, and the execution flow is interrupted to prevent it from being changed afterward.
-            addInstructionsWithLabels(
-                insertIndex,
-                """
-                        # Check, if the TextView is for a dislike button
-                        iget-boolean v0, p0, $isDisLikesBooleanReference
-                        if-eqz v0, :is_like
-                        
-                        # Hook the TextView, if it is for the dislike button
-                        iget-object v0, p0, $textViewFieldReference
-                        invoke-static {v0}, $EXTENSION_CLASS_DESCRIPTOR->setShortsDislikes(Landroid/view/View;)Z
-                        move-result v0
-                        if-eqz v0, :ryd_disabled
-                        return-void
-                        
-                        :is_like
-                        :ryd_disabled
-                        nop
-                    """,
-            )
-        }
-
-        // endregion
-
-        // region Hook for litho Shorts
+        // region Hook Shorts
 
         // Filter that parses the video id from the UI
         addLithoFilter(FILTER_CLASS_DESCRIPTOR)
@@ -225,9 +181,6 @@ val returnYouTubeDislikePatch = bytecodePatch(
 
         // region Hook rolling numbers.
 
-        // Do this last to allow patching old unsupported versions (if the user really wants),
-        // On older unsupported version this will fail to match and throw an exception,
-        // but everything will still work correctly anyway.
         val dislikesIndex = rollingNumberSetterFingerprint.patternMatch!!.endIndex
 
         rollingNumberSetterFingerprint.method.apply {
@@ -255,22 +208,25 @@ val returnYouTubeDislikePatch = bytecodePatch(
             )
         }
 
-        // Rolling Number text views use the measured width of the raw string for layout.
-        // Modify the measure text calculation to include the left drawable separator if needed.
-        val patternMatch = rollingNumberMeasureAnimatedTextFingerprint.patternMatch!!
-        // Additional check to verify the opcodes are at the start of the method
-        if (patternMatch.startIndex != 0) throw PatchException("Unexpected opcode location")
-        val endIndex = patternMatch.endIndex
-        rollingNumberMeasureAnimatedTextFingerprint.method.apply {
-            val measuredTextWidthRegister = getInstruction<OneRegisterInstruction>(endIndex).registerA
+        rollingNumberMeasureAnimatedTextFingerprint.let {
+            // Rolling Number text views use the measured width of the raw string for layout.
+            // Modify the measure text calculation to include the left drawable separator if needed.
+            val patternMatch = it.patternMatch!!
+            // Verify the opcodes are at the start of the method.
+            if (patternMatch.startIndex != 0) throw PatchException("Unexpected opcode location")
+            val endIndex = patternMatch.endIndex
 
-            addInstructions(
-                endIndex + 1,
-                """
-                    invoke-static {p1, v$measuredTextWidthRegister}, $EXTENSION_CLASS_DESCRIPTOR->onRollingNumberMeasured(Ljava/lang/String;F)F
-                    move-result v$measuredTextWidthRegister
-                """,
-            )
+            it.method.apply {
+                val measuredTextWidthRegister = getInstruction<OneRegisterInstruction>(endIndex).registerA
+
+                addInstructions(
+                    endIndex + 1,
+                    """
+                        invoke-static {p1, v$measuredTextWidthRegister}, $EXTENSION_CLASS_DESCRIPTOR->onRollingNumberMeasured(Ljava/lang/String;F)F
+                        move-result v$measuredTextWidthRegister
+                    """
+                )
+            }
         }
 
         // Additional text measurement method. Used if YouTube decides not to animate the likes count
@@ -291,15 +247,14 @@ val returnYouTubeDislikePatch = bytecodePatch(
                 )
             }
         }
-        // The rolling number Span is missing styling since it's initially set as a String.
-        // Modify the UI text view and use the styled like/dislike Span.
-        // Initial TextView is set in this method.
-        val initiallyCreatedTextViewMethod = rollingNumberTextViewFingerprint.method
 
-        // Videos less than 24 hours after uploaded, like counts will be updated in real time.
-        // Whenever like counts are updated, TextView is set in this method.
         arrayOf(
-            initiallyCreatedTextViewMethod,
+            // The rolling number Span is missing styling since it's initially set as a String.
+            // Modify the UI text view and use the styled like/dislike Span.
+            // Initial TextView is set in this method.
+            rollingNumberTextViewFingerprint.method,
+            // Videos less than 24 hours after uploaded, like counts will be updated in real time.
+            // Whenever like counts are updated, TextView is set in this method.
             rollingNumberTextViewAnimationUpdateFingerprint.method,
         ).forEach { insertMethod ->
             insertMethod.apply {
@@ -315,9 +270,9 @@ val returnYouTubeDislikePatch = bytecodePatch(
                 addInstructions(
                     setTextIndex,
                     """
-                            invoke-static {v$textViewRegister, v$textSpanRegister}, $EXTENSION_CLASS_DESCRIPTOR->updateRollingNumber(Landroid/widget/TextView;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
-                            move-result-object v$textSpanRegister
-                        """,
+                        invoke-static {v$textViewRegister, v$textSpanRegister}, $EXTENSION_CLASS_DESCRIPTOR->updateRollingNumber(Landroid/widget/TextView;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+                        move-result-object v$textSpanRegister
+                    """
                 )
             }
         }

patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt

@@ -18,7 +18,7 @@ private const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/WideSearchbarPatch;"
 
 val wideSearchbarPatch = bytecodePatch(
-    name = "Wide searchbar",
+    name = "Wide search bar",
     description = "Adds an option to replace the search icon with a wide search bar. This will hide the YouTube logo when active.",
 ) {
     dependsOn(
@@ -33,9 +33,8 @@ val wideSearchbarPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )
 

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

@@ -37,12 +37,25 @@ internal val shortsSeekbarColorFingerprint = fingerprint {
     literal { reelTimeBarPlayedColorId }
 }
 
-internal val playerSeekbarHandleColorFingerprint = fingerprint {
+internal val playerSeekbarHandle1ColorFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     parameters("Landroid/content/Context;")
-    literal { ytStaticBrandRedId }
+    custom { method, _ ->
+        method.containsLiteralInstruction(ytTextSecondaryId) &&
+                method.containsLiteralInstruction(ytStaticBrandRedId)
+    }
 }
 
+internal val playerSeekbarHandle2ColorFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
+    parameters("Landroid/content/Context;")
+    custom { method, _ ->
+        method.containsLiteralInstruction(inlineTimeBarLiveSeekableRangeId) &&
+                method.containsLiteralInstruction(ytStaticBrandRedId)
+    }
+}
+
+
 internal val watchHistoryMenuUseProgressDrawableFingerprint = fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returns("V")

patches/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorPatch.kt

@@ -53,6 +53,10 @@ internal var ytYoutubeMagentaColorId = -1L
     private set
 internal var ytStaticBrandRedId = -1L
     private set
+internal var ytTextSecondaryId = -1L
+    private set
+internal var inlineTimeBarLiveSeekableRangeId = -1L
+    private set
 
 internal const val splashSeekbarColorAttributeName = "splash_custom_seekbar_color"
 
@@ -76,6 +80,18 @@ private val seekbarColorResourcePatch = resourcePatch {
             "color",
             "inline_time_bar_played_not_highlighted_color",
         ]
+        ytStaticBrandRedId = resourceMappings[
+            "attr",
+            "ytStaticBrandRed"
+        ]
+        ytTextSecondaryId = resourceMappings[
+            "attr",
+            "ytTextSecondary"
+        ]
+        inlineTimeBarLiveSeekableRangeId = resourceMappings[
+            "color",
+            "inline_time_bar_live_seekable_range"
+        ]
 
         // Modify the resume playback drawable and replace the progress bar with a custom drawable.
         document("res/drawable/resume_playback_progressbar_drawable.xml").use { document ->
@@ -211,7 +227,7 @@ val seekbarColorPatch = bytecodePatch(
     )
 
     execute {
-        fun MutableMethod.addColorChangeInstructions(resourceId: Long, methodName: String) {
+        fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
             val index = indexOfFirstLiteralInstructionOrThrow(resourceId)
             val insertIndex = indexOfFirstInstructionOrThrow(index, Opcode.MOVE_RESULT)
             val register = getInstruction<OneRegisterInstruction>(insertIndex).registerA
@@ -219,19 +235,19 @@ val seekbarColorPatch = bytecodePatch(
             addInstructions(
                 insertIndex + 1,
                 """
-                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->$methodName(I)I
+                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
                     move-result v$register
                 """
             )
         }
 
         playerSeekbarColorFingerprint.method.apply {
-            addColorChangeInstructions(inlineTimeBarColorizedBarPlayedColorDarkId, "getVideoPlayerSeekbarColor")
-            addColorChangeInstructions(inlineTimeBarPlayedNotHighlightedColorId, "getVideoPlayerSeekbarColor")
+            addColorChangeInstructions(inlineTimeBarColorizedBarPlayedColorDarkId)
+            addColorChangeInstructions(inlineTimeBarPlayedNotHighlightedColorId)
         }
 
         shortsSeekbarColorFingerprint.method.apply {
-            addColorChangeInstructions(reelTimeBarPlayedColorId, "getVideoPlayerSeekbarColor")
+            addColorChangeInstructions(reelTimeBarPlayedColorId)
         }
 
         setSeekbarClickedColorFingerprint.originalMethod.let {
@@ -257,8 +273,11 @@ val seekbarColorPatch = bytecodePatch(
 
         // 19.25+ changes
 
-        playerSeekbarHandleColorFingerprint.method.apply {
-            addColorChangeInstructions(ytStaticBrandRedId, "getVideoPlayerSeekbarColor")
+        arrayOf(
+            playerSeekbarHandle1ColorFingerprint,
+            playerSeekbarHandle2ColorFingerprint
+        ).forEach {
+            it.method.addColorChangeInstructions(ytStaticBrandRedId)
         }
 
         // If hiding feed seekbar thumbnails, then turn off the cairo gradient

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

@@ -37,9 +37,8 @@ val shortsAutoplayPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
+            "20.07.39",
         ),
     )