chore: Release v5.20.0-dev.3 [skip ci]

# [5.20.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.2...v5.20.0-dev.3) (2025-04-13)

### Bug Fixes

* **YouTube - Remove background playback restrictions:** Restore PiP button functionality after screen is unlocked ([b4e8540](b4e8540bbc))

CHANGELOG.md

@@ -1,3 +1,209 @@
+# [5.20.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.2...v5.20.0-dev.3) (2025-04-13)
+
+
+### Bug Fixes
+
+* **YouTube - Remove background playback restrictions:** Restore PiP button functionality after screen is unlocked ([6837348](https://github.com/ReVanced/revanced-patches/commit/6837348c45156d6743a63fef8b6e045087afbda8))
+
+# [5.20.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.20.0-dev.1...v5.20.0-dev.2) (2025-04-13)
+
+
+### Features
+
+* **Spotify - Custom theme:** Add option to use unmodified player background gradient ([#4741](https://github.com/ReVanced/revanced-patches/issues/4741)) ([0ee3693](https://github.com/ReVanced/revanced-patches/commit/0ee36939f43f325afca37119db1cf1af3b63be27))
+
+# [5.20.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.19.1...v5.20.0-dev.1) (2025-04-13)
+
+
+### Features
+
+* Add `Set target SDK version 34` patch (Disable edge-to-edge display) ([#4780](https://github.com/ReVanced/revanced-patches/issues/4780)) ([dcf6178](https://github.com/ReVanced/revanced-patches/commit/dcf6178f19f86dd1b57d54c855b8c47b086dd33a))
+
+## [5.19.1](https://github.com/ReVanced/revanced-patches/compare/v5.19.0...v5.19.1) (2025-04-12)
+
+
+### Bug Fixes
+
+* **Google Photos:** Restore patching with ReVanced Manager ([#4773](https://github.com/ReVanced/revanced-patches/issues/4773)) ([3e18e86](https://github.com/ReVanced/revanced-patches/commit/3e18e868bbd9fd0600fe81a7fe8767b4bd89a00e))
+* **Spotify:** Restore patching with ReVanced Manager ([#4769](https://github.com/ReVanced/revanced-patches/issues/4769)) ([89d44da](https://github.com/ReVanced/revanced-patches/commit/89d44da171c3f56f13112d1d82bc4ea4a56c7c06))
+
+## [5.19.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.19.1-dev.1...v5.19.1-dev.2) (2025-04-12)
+
+
+### Bug Fixes
+
+* **Google Photos:** Restore patching with ReVanced Manager ([#4773](https://github.com/ReVanced/revanced-patches/issues/4773)) ([3e18e86](https://github.com/ReVanced/revanced-patches/commit/3e18e868bbd9fd0600fe81a7fe8767b4bd89a00e))
+
+## [5.19.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.19.0...v5.19.1-dev.1) (2025-04-12)
+
+
+### Bug Fixes
+
+* **Spotify:** Restore patching with ReVanced Manager ([#4769](https://github.com/ReVanced/revanced-patches/issues/4769)) ([89d44da](https://github.com/ReVanced/revanced-patches/commit/89d44da171c3f56f13112d1d82bc4ea4a56c7c06))
+
+# [5.19.0](https://github.com/ReVanced/revanced-patches/compare/v5.18.0...v5.19.0) (2025-04-12)
+
+
+### Bug Fixes
+
+* **Google Photos - Restore hidden 'Back up while charging' toggle:** Constrain to last working app target ([#4761](https://github.com/ReVanced/revanced-patches/issues/4761)) ([152bb7c](https://github.com/ReVanced/revanced-patches/commit/152bb7c3ee7cf36bc07460e7a3444631ec540441))
+* **Google Photos:** Remove obsolete non functional patch `Restore hidden 'Back up while charging' toggle` ([#4764](https://github.com/ReVanced/revanced-patches/issues/4764)) ([56e48f4](https://github.com/ReVanced/revanced-patches/commit/56e48f4c89da51f81ff11a79a164eaa5b440690e))
+* **Spotify - Custom theme:** Override more color resources ([#4690](https://github.com/ReVanced/revanced-patches/issues/4690)) ([d7a7a0b](https://github.com/ReVanced/revanced-patches/commit/d7a7a0b982dbafa181b04f984a5f7618fb067c2a))
+* **Spotify - Unlock Spotify Premium:** Remove restrictions for Google voice assistant ([#4702](https://github.com/ReVanced/revanced-patches/issues/4702)) ([106202f](https://github.com/ReVanced/revanced-patches/commit/106202f9ebb7699c4ba4ae46b82133e35f1ac6b9))
+* **Spotify:** Remove ads sections from home ([#4722](https://github.com/ReVanced/revanced-patches/issues/4722)) ([0b9a5e7](https://github.com/ReVanced/revanced-patches/commit/0b9a5e7f89a89d971762b3539166d4f145111481))
+* **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))
+* **YouTube - Hide layout components:** Do not hide video description music/game links if hide horizontal shelves is enabled ([3864f35](https://github.com/ReVanced/revanced-patches/commit/3864f3550153617e23ad9979fb543d8a7fb4dc0a))
+* **YouTube - Hide player flyout menu items:** Show more detailed summary text for 'Hide Audio track' if using Android spoof client ([#4756](https://github.com/ReVanced/revanced-patches/issues/4756)) ([b67bbb2](https://github.com/ReVanced/revanced-patches/commit/b67bbb299669336addb68cf52a8ce5b39c68cec0))
+* **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))
+* **YouTube - Return YouTube Dislike:** Correctly update label after disliking a Short with 20.07 ([0bb3e32](https://github.com/ReVanced/revanced-patches/commit/0bb3e32244fa10809aee5c4e549f77ed4054537e))
+* **YouTube - Return YouTube Dislike:** Fix inconsistent label after disliking a Short ([ea92a2e](https://github.com/ReVanced/revanced-patches/commit/ea92a2e36c7aab3bd115f7d0ec40467179485b32))
+* **YouTube - Seekbar:** Correctly hide the feed seekbar with target 20.07 ([ddc6e4c](https://github.com/ReVanced/revanced-patches/commit/ddc6e4c34fe35fa34bd859bf34e25645a23dbdc9))
+* **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))
+
+
+### Features
+
+* **Angulus:** Add `Hide ads` patch ([#4604](https://github.com/ReVanced/revanced-patches/issues/4604)) ([87c86b5](https://github.com/ReVanced/revanced-patches/commit/87c86b53a91b0054ac892a3f02bbe7bf83bbf813))
+* **Messenger:** Add `Remove Meta AI tab` patch ([#4726](https://github.com/ReVanced/revanced-patches/issues/4726)) ([e3fad97](https://github.com/ReVanced/revanced-patches/commit/e3fad97484d7eb962aeb53d44a0047b34a881071))
+* **Photomath:** Support latest version ([#4672](https://github.com/ReVanced/revanced-patches/issues/4672)) ([8e16483](https://github.com/ReVanced/revanced-patches/commit/8e1648322948151e4565fb0d86e0f37d0a02d73f))
+* **Proton Mail:** Add `Remove 'Sent from' signature` patch ([#4514](https://github.com/ReVanced/revanced-patches/issues/4514)) ([34c14c9](https://github.com/ReVanced/revanced-patches/commit/34c14c9b443092824d035afd77adb678c6f89e3e))
+* **Spotify:** Add `Check environment` patch ([#4765](https://github.com/ReVanced/revanced-patches/issues/4765)) ([6d7101c](https://github.com/ReVanced/revanced-patches/commit/6d7101cb2e546e01a934eff9cad1264367aeafe3))
+* **Spotify:** Add limited support for version `8.6.98.900` (last version that supports Kenwood and Pioneer car stereos) ([#4750](https://github.com/ReVanced/revanced-patches/issues/4750)) ([a3fde87](https://github.com/ReVanced/revanced-patches/commit/a3fde874af993125ba7a741820e7bd48e3641b84))
+* **Strava - Disable subscription suggestions:** Make compatible with latest version ([#4739](https://github.com/ReVanced/revanced-patches/issues/4739)) ([649a2c0](https://github.com/ReVanced/revanced-patches/commit/649a2c06161c72a2040b179dbed5b415847d7527))
+* **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.17](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.16...v5.19.0-dev.17) (2025-04-12)
+
+
+### Features
+
+* **Spotify:** Add `Check environment` patch ([#4765](https://github.com/ReVanced/revanced-patches/issues/4765)) ([6d7101c](https://github.com/ReVanced/revanced-patches/commit/6d7101cb2e546e01a934eff9cad1264367aeafe3))
+
+# [5.19.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.15...v5.19.0-dev.16) (2025-04-11)
+
+
+### Bug Fixes
+
+* **Google Photos:** Remove obsolete non functional patch `Restore hidden 'Back up while charging' toggle` ([#4764](https://github.com/ReVanced/revanced-patches/issues/4764)) ([56e48f4](https://github.com/ReVanced/revanced-patches/commit/56e48f4c89da51f81ff11a79a164eaa5b440690e))
+
+# [5.19.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.14...v5.19.0-dev.15) (2025-04-11)
+
+
+### Bug Fixes
+
+* **Google Photos - Restore hidden 'Back up while charging' toggle:** Constrain to last working app target ([#4761](https://github.com/ReVanced/revanced-patches/issues/4761)) ([152bb7c](https://github.com/ReVanced/revanced-patches/commit/152bb7c3ee7cf36bc07460e7a3444631ec540441))
+
+# [5.19.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.13...v5.19.0-dev.14) (2025-04-11)
+
+
+### Bug Fixes
+
+* **Spotify - Unlock Spotify Premium:** Remove restrictions for Google voice assistant ([#4702](https://github.com/ReVanced/revanced-patches/issues/4702)) ([106202f](https://github.com/ReVanced/revanced-patches/commit/106202f9ebb7699c4ba4ae46b82133e35f1ac6b9))
+
+# [5.19.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.12...v5.19.0-dev.13) (2025-04-11)
+
+
+### Features
+
+* **Spotify:** Add limited support for version `8.6.98.900` (last version that supports Kenwood and Pioneer car stereos) ([#4750](https://github.com/ReVanced/revanced-patches/issues/4750)) ([a3fde87](https://github.com/ReVanced/revanced-patches/commit/a3fde874af993125ba7a741820e7bd48e3641b84))
+
+# [5.19.0-dev.12](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.11...v5.19.0-dev.12) (2025-04-11)
+
+
+### Features
+
+* **Strava - Disable subscription suggestions:** Make compatible with latest version ([#4739](https://github.com/ReVanced/revanced-patches/issues/4739)) ([649a2c0](https://github.com/ReVanced/revanced-patches/commit/649a2c06161c72a2040b179dbed5b415847d7527))
+
+# [5.19.0-dev.11](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.10...v5.19.0-dev.11) (2025-04-10)
+
+
+### Features
+
+* **Messenger:** Add `Remove Meta AI tab` patch ([#4726](https://github.com/ReVanced/revanced-patches/issues/4726)) ([e3fad97](https://github.com/ReVanced/revanced-patches/commit/e3fad97484d7eb962aeb53d44a0047b34a881071))
+
+# [5.19.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.9...v5.19.0-dev.10) (2025-04-10)
+
+
+### Bug Fixes
+
+* **YouTube - Hide layout components:** Do not hide video description music/game links if hide horizontal shelves is enabled ([3864f35](https://github.com/ReVanced/revanced-patches/commit/3864f3550153617e23ad9979fb543d8a7fb4dc0a))
+
+# [5.19.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.8...v5.19.0-dev.9) (2025-04-10)
+
+
+### Bug Fixes
+
+* **YouTube - Hide player flyout menu items:** Show more detailed summary text for 'Hide Audio track' if using Android spoof client ([#4756](https://github.com/ReVanced/revanced-patches/issues/4756)) ([b67bbb2](https://github.com/ReVanced/revanced-patches/commit/b67bbb299669336addb68cf52a8ce5b39c68cec0))
+
+# [5.19.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.7...v5.19.0-dev.8) (2025-04-09)
+
+
+### Bug Fixes
+
+* **YouTube - Return YouTube Dislike:** Fix inconsistent label after disliking a Short ([ea92a2e](https://github.com/ReVanced/revanced-patches/commit/ea92a2e36c7aab3bd115f7d0ec40467179485b32))
+
+# [5.19.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.6...v5.19.0-dev.7) (2025-04-07)
+
+
+### Bug Fixes
+
+* **YouTube - Return YouTube Dislike:** Correctly update label after disliking a Short with 20.07 ([0bb3e32](https://github.com/ReVanced/revanced-patches/commit/0bb3e32244fa10809aee5c4e549f77ed4054537e))
+
+# [5.19.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.5...v5.19.0-dev.6) (2025-04-04)
+
+
+### Bug Fixes
+
+* **Spotify:** Remove ads sections from home ([#4722](https://github.com/ReVanced/revanced-patches/issues/4722)) ([0b9a5e7](https://github.com/ReVanced/revanced-patches/commit/0b9a5e7f89a89d971762b3539166d4f145111481))
+
+# [5.19.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.4...v5.19.0-dev.5) (2025-04-02)
+
+
+### Bug Fixes
+
+* **Spotify - Custom theme:** Override more color resources ([#4690](https://github.com/ReVanced/revanced-patches/issues/4690)) ([d7a7a0b](https://github.com/ReVanced/revanced-patches/commit/d7a7a0b982dbafa181b04f984a5f7618fb067c2a))
+
+# [5.19.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.3...v5.19.0-dev.4) (2025-04-02)
+
+
+### Bug Fixes
+
+* **YouTube - Seekbar:** Correctly hide the feed seekbar with target 20.07 ([ddc6e4c](https://github.com/ReVanced/revanced-patches/commit/ddc6e4c34fe35fa34bd859bf34e25645a23dbdc9))
+
+# [5.19.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v5.19.0-dev.2...v5.19.0-dev.3) (2025-04-02)
+
+
+### Features
+
+* **Proton Mail:** Add `Remove 'Sent from' signature` patch ([#4514](https://github.com/ReVanced/revanced-patches/issues/4514)) ([34c14c9](https://github.com/ReVanced/revanced-patches/commit/34c14c9b443092824d035afd77adb678c6f89e3e))
+
+# [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)
 
 

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

@@ -9,6 +9,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -799,4 +800,14 @@ public class Utils {
             builder.getContext().setTheme(editTextDialogStyle);
         }
     }
+
+    /**
+     * Parse a color resource or hex code to an int representation of the color.
+     */
+    public static int getColorFromString(String colorString) throws IllegalArgumentException, Resources.NotFoundException {
+        if (colorString.startsWith("#")) {
+            return Color.parseColor(colorString);
+        }
+        return getResourceColor(colorString);
+    }
 }

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

@@ -86,7 +86,6 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment {
         }
     };
 
-
     /**
      * Initialize this instance, and do any custom behavior.
      * <p>
@@ -95,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);
 

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

@@ -0,0 +1,22 @@
+package app.revanced.extension.spotify.layout.theme;
+
+import android.graphics.Color;
+
+import app.revanced.extension.shared.Logger;
+import app.revanced.extension.shared.Utils;
+
+@SuppressWarnings("unused")
+public final class CustomThemePatch {
+
+    /**
+     * Injection point.
+     */
+    public static long getThemeColor(String colorString) {
+        try {
+            return Utils.getColorFromString(colorString);
+        } catch (Exception ex) {
+            Logger.printException(() -> "Invalid custom color: " + colorString, ex);
+            return Color.BLACK;
+        }
+    }
+}

extensions/spotify/stub/src/main/java/com/spotify/home/evopage/homeapi/proto/Section.java

@@ -0,0 +1,7 @@
+package com.spotify.home.evopage.homeapi.proto;
+
+public final class Section {
+    public static final int VIDEO_BRAND_AD_FIELD_NUMBER = 20;
+    public static final int IMAGE_BRAND_AD_FIELD_NUMBER = 21;
+    public int featureTypeCase_;
+}

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

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

extensions/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/ThemeHelper.java

@@ -45,13 +45,24 @@ public class ThemeHelper {
         return "@color/yt_black3";
     }
 
+    private static int getThemeColor(String resourceName, int defaultColor) {
+        try {
+            return Utils.getColorFromString(resourceName);
+        } catch (Exception ex) {
+            // User entered an invalid custom theme color.
+            // Normally this should never be reached, and no localized strings are needed.
+            Utils.showToastLong("Invalid custom theme color: " + resourceName);
+            return defaultColor;
+        }
+    }
+
     /**
      * @return The dark theme color as specified by the Theme patch (if included),
      *         or the dark mode background color unpatched YT uses.
      */
     public static int getDarkThemeColor() {
         if (darkThemeColor == null) {
-            darkThemeColor = getColorInt(darkThemeResourceName());
+            darkThemeColor = getThemeColor(darkThemeResourceName(), Color.BLACK);
         }
         return darkThemeColor;
     }
@@ -71,18 +82,11 @@ public class ThemeHelper {
      */
     public static int getLightThemeColor() {
         if (lightThemeColor == null) {
-            lightThemeColor = getColorInt(lightThemeResourceName());
+            lightThemeColor = getThemeColor(lightThemeResourceName(), Color.WHITE);
         }
         return lightThemeColor;
     }
 
-    private static int getColorInt(String colorString) {
-        if (colorString.startsWith("#")) {
-            return Color.parseColor(colorString);
-        }
-        return Utils.getResourceColor(colorString);
-    }
-
     public static int getBackgroundColor() {
         return isDarkTheme() ? getDarkThemeColor() : getLightThemeColor();
     }
@@ -96,6 +100,6 @@ public class ThemeHelper {
                 ? "yt_black3"
                 : "yt_white1";
 
-        return getColorInt(colorName);
+        return Utils.getColorFromString(colorName);
     }
 }

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

@@ -2,20 +2,16 @@ package app.revanced.extension.youtube.patches;
 
 import static app.revanced.extension.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote;
 
-import android.graphics.Rect;
 import android.graphics.drawable.ShapeDrawable;
-import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 import app.revanced.extension.shared.Logger;
@@ -60,12 +56,12 @@ public class ReturnYouTubeDislikePatch {
     private static volatile ReturnYouTubeDislike lastLithoShortsVideoData;
 
     /**
-     * Because the litho Shorts spans are created after {@link ReturnYouTubeDislikeFilterPatch}
-     * detects the video ids, after the user votes the litho will update
-     * but {@link #lastLithoShortsVideoData} is not the correct data to use.
-     * If this is true, then instead use {@link #currentVideoData}.
+     * Because litho Shorts spans are created offscreen after {@link ReturnYouTubeDislikeFilterPatch}
+     * detects the video ids, but the current Short can arbitrarily reload the same span,
+     * then use the {@link #lastLithoShortsVideoData} if this value is greater than zero.
      */
-    private static volatile boolean lithoShortsShouldUseCurrentData;
+    @GuardedBy("ReturnYouTubeDislikePatch.class")
+    private static int useLithoShortsVideoDataCount;
 
     /**
      * Last video id prefetched. Field is to prevent prefetching the same video id multiple times in a row.
@@ -83,12 +79,28 @@ public class ReturnYouTubeDislikePatch {
     private static void clearData() {
         currentVideoData = null;
         lastLithoShortsVideoData = null;
-        lithoShortsShouldUseCurrentData = false;
+        synchronized (ReturnYouTubeDislike.class) {
+            useLithoShortsVideoDataCount = 0;
+        }
+
         // Rolling number text should not be cleared,
         // as it's used if incognito Short is opened/closed
         // while a regular video is on screen.
     }
 
+    /**
+     * @return If {@link #useLithoShortsVideoDataCount} was greater than zero.
+     */
+    private static boolean decrementUseLithoDataIfNeeded() {
+        synchronized (ReturnYouTubeDislikePatch.class) {
+            if (useLithoShortsVideoDataCount > 0) {
+                useLithoShortsVideoDataCount--;
+                return true;
+            }
+
+            return false;
+        }
+    }
 
     //
     // Litho player for both regular videos and Shorts.
@@ -152,10 +164,13 @@ public class ReturnYouTubeDislikePatch {
                 return getShortsSpan(original, true);
             }
 
-            if (conversionContextString.contains("|shorts_like_button.eml")
-                    && !Utils.containsNumber(original)) {
-                Logger.printDebug(() -> "Replacing hidden likes count");
-                return getShortsSpan(original, false);
+            if (conversionContextString.contains("|shorts_like_button.eml")) {
+                if (!Utils.containsNumber(original)) {
+                    Logger.printDebug(() -> "Replacing hidden likes count");
+                    return getShortsSpan(original, false);
+                } else {
+                    decrementUseLithoDataIfNeeded();
+                }
             }
         } catch (Exception ex) {
             Logger.printException(() -> "onLithoTextLoaded failure", ex);
@@ -170,7 +185,14 @@ public class ReturnYouTubeDislikePatch {
             return original;
         }
 
-        ReturnYouTubeDislike videoData = lastLithoShortsVideoData;
+        final ReturnYouTubeDislike videoData;
+        if (decrementUseLithoDataIfNeeded()) {
+            // New Short is loading off screen.
+            videoData = lastLithoShortsVideoData;
+        } else {
+            videoData = currentVideoData;
+        }
+
         if (videoData == null) {
             // The Shorts litho video id filter did not detect the video id.
             // This is normal in incognito mode, but otherwise is abnormal.
@@ -178,19 +200,6 @@ public class ReturnYouTubeDislikePatch {
             return original;
         }
 
-        // Use the correct dislikes data after voting.
-        if (lithoShortsShouldUseCurrentData) {
-            if (isDislikesSpan) {
-                lithoShortsShouldUseCurrentData = false;
-            }
-            videoData = currentVideoData;
-            if (videoData == null) {
-                Logger.printException(() -> "currentVideoData is null"); // Should never happen
-                return original;
-            }
-            Logger.printDebug(() -> "Using current video data for litho span");
-        }
-
         return isDislikesSpan
                 ? videoData.getDislikeSpanForShort((Spanned) original)
                 : videoData.getLikeSpanForShort((Spanned) original);
@@ -445,7 +454,10 @@ public class ReturnYouTubeDislikePatch {
         ReturnYouTubeDislike videoData = ReturnYouTubeDislike.getFetchForVideoId(videoId);
         videoData.setVideoIdIsShort(true);
         lastLithoShortsVideoData = videoData;
-        lithoShortsShouldUseCurrentData = false;
+        synchronized (ReturnYouTubeDislikePatch.class) {
+            // Use litho Shorts data for the next like and dislike spans.
+            useLithoShortsVideoDataCount = 2;
+        }
     }
 
     private static boolean videoIdIsSame(@Nullable ReturnYouTubeDislike fetch, @Nullable String videoId) {
@@ -480,13 +492,6 @@ public class ReturnYouTubeDislikePatch {
             for (Vote v : Vote.values()) {
                 if (v.value == vote) {
                     videoData.sendVote(v);
-
-                    if (isNoneHiddenOrMinimized) {
-                        if (lastLithoShortsVideoData != null) {
-                            lithoShortsShouldUseCurrentData = true;
-                        }
-                    }
-
                     return;
                 }
             }

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

@@ -454,16 +454,20 @@ public final class LayoutComponentsFilter extends Filter {
     }
 
     private static boolean hideShelves() {
-        // If the player is opened while library is selected,
-        // then filter any recommendations below the player.
-        if (PlayerType.getCurrent().isMaximizedOrFullscreen()
-                // Or if the search is active while library is selected, then also filter.
-                || NavigationBar.isSearchBarActive()) {
+        // Horizontal shelves are used for music/game links in video descriptions,
+        // such as https://youtube.com/watch?v=W8kI1na3S2M
+        if (PlayerType.getCurrent().isMaximizedOrFullscreen()) {
+            return false;
+        }
+
+        // Must check search bar after player type, since search results
+        // can be in the background behind an open player.
+        if (NavigationBar.isSearchBarActive()) {
             return true;
         }
 
         // Do not hide if the navigation back button is visible,
-        // otherwise the content shelves in the YouTube Movie/Courses pages is hidden.
+        // otherwise the content shelves in the explore/music/courses pages are hidde.
         if (NavigationBar.isBackButtonVisible()) {
             return false;
         }

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

@@ -2,12 +2,25 @@ package app.revanced.extension.youtube.patches.components;
 
 import androidx.annotation.Nullable;
 
+import app.revanced.extension.shared.settings.Setting;
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
 import app.revanced.extension.youtube.settings.Settings;
 import app.revanced.extension.youtube.shared.PlayerType;
 
 @SuppressWarnings("unused")
 public class PlayerFlyoutMenuItemsFilter extends Filter {
 
+    public static final class HideAudioFlyoutMenuAvailability implements Setting.Availability {
+        private static final boolean AVAILABLE_ON_LAUNCH = SpoofVideoStreamsPatch.notSpoofingToAndroid();
+
+        @Override
+        public boolean isAvailable() {
+            // Check conditions of launch and now. Otherwise if spoofing is changed
+            // without a restart the setting will show as available when it's not.
+            return AVAILABLE_ON_LAUNCH && SpoofVideoStreamsPatch.notSpoofingToAndroid();
+        }
+    }
+
     private final ByteArrayFilterGroupList flyoutFilterGroupList = new ByteArrayFilterGroupList();
 
     private final ByteArrayFilterGroup exception;

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

@@ -226,6 +226,7 @@ public final class SeekbarColorPatch {
     }
 
     private static String loadRawResourceAsString(int resourceId) {
+        //noinspection CharsetObjectCanBeUsed
         try (InputStream inputStream = Utils.getContext().getResources().openRawResource(resourceId);
              Scanner scanner = new Scanner(inputStream, StandardCharsets.UTF_8.name()).useDelimiter("\\A")) {
             return scanner.next();
@@ -281,6 +282,20 @@ public final class SeekbarColorPatch {
 
     /**
      * Injection point.
+     * 19.49+
+     */
+    public static int[] getPlayerLinearGradient(int[] original, int x0, int y1) {
+        // This hook is used for both the player and the feed.
+        // Feed usage always has x0 and y1 value of zero, and the player is always non zero.
+        if (HIDE_SEEKBAR_THUMBNAIL_ENABLED && x0 == 0 && y1 == 0) {
+            return HIDDEN_SEEKBAR_GRADIENT_COLORS;
+        }
+        return getPlayerLinearGradient(original);
+    }
+
+    /**
+     * Injection point.
+     * Pre 19.49
      */
     public static int[] getPlayerLinearGradient(int[] original) {
         return SEEKBAR_CUSTOM_COLOR_ENABLED

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

@@ -19,6 +19,7 @@ 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.components.PlayerFlyoutMenuItemsFilter.HideAudioFlyoutMenuAvailability;
 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;
@@ -198,7 +199,7 @@ public class Settings extends BaseSettings {
     // Player flyout menu items
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_ADDITIONAL_SETTINGS = new BooleanSetting("revanced_hide_player_flyout_additional_settings", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_AMBIENT_MODE = new BooleanSetting("revanced_hide_player_flyout_ambient_mode", FALSE);
-    public static final BooleanSetting HIDE_PLAYER_FLYOUT_AUDIO_TRACK = new BooleanSetting("revanced_hide_player_flyout_audio_track", FALSE);
+    public static final BooleanSetting HIDE_PLAYER_FLYOUT_AUDIO_TRACK = new BooleanSetting("revanced_hide_player_flyout_audio_track", FALSE, new HideAudioFlyoutMenuAvailability());
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_CAPTIONS = new BooleanSetting("revanced_hide_player_flyout_captions", FALSE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_HELP = new BooleanSetting("revanced_hide_player_flyout_help", TRUE);
     public static final BooleanSetting HIDE_PLAYER_FLYOUT_LOCK_SCREEN = new BooleanSetting("revanced_hide_player_flyout_lock_screen", FALSE);

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

@@ -0,0 +1,36 @@
+package app.revanced.extension.youtube.settings.preference;
+
+import static app.revanced.extension.shared.StringRef.str;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+
+import app.revanced.extension.shared.spoof.SpoofVideoStreamsPatch;
+
+@SuppressWarnings({"deprecation", "unused"})
+public class HideAudioFlyoutMenuPreference extends SwitchPreference {
+
+    {
+        // Audio menu is not available if spoofing to Android client type.
+        if (!SpoofVideoStreamsPatch.notSpoofingToAndroid()) {
+            String summary = str("revanced_hide_player_flyout_audio_track_not_available");
+            setSummary(summary);
+            setSummaryOn(summary);
+            setSummaryOff(summary);
+        }
+    }
+
+    public HideAudioFlyoutMenuPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+    public HideAudioFlyoutMenuPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    public HideAudioFlyoutMenuPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    public HideAudioFlyoutMenuPreference(Context context) {
+        super(context);
+    }
+}

gradle.properties

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

patches/api/patches.api

@@ -108,6 +108,10 @@ public final class app/revanced/patches/all/misc/shortcut/sharetargets/RemoveSha
 	public static final fun getRemoveShareTargetsPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }
 
+public final class app/revanced/patches/all/misc/targetSdk/SetTargetSdkVersion34Kt {
+	public static final fun getSetTargetSdkVersion34 ()Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
 public abstract interface class app/revanced/patches/all/misc/transformation/IMethodCall {
 	public abstract fun getDefinedClassName ()Ljava/lang/String;
 	public abstract fun getMethodName ()Ljava/lang/String;
@@ -132,6 +136,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;
 }
@@ -268,6 +276,10 @@ public final class app/revanced/patches/messenger/inputfield/DisableTypingIndica
 	public static final fun getDisableTypingIndicatorPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/messenger/navbar/RemoveMetaAITabPatchKt {
+	public static final fun getRemoveMetaAITabPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/mifitness/misc/locale/ForceEnglishLocalePatchKt {
 	public static final fun getForceEnglishLocalePatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -396,6 +408,10 @@ public final class app/revanced/patches/pixiv/ads/HideAdsPatchKt {
 	public static final fun getHideAdsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
+public final class app/revanced/patches/protonmail/signature/RemoveSentFromSignaturePatchKt {
+	public static final fun getRemoveSentFromSignaturePatch ()Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
 public final class app/revanced/patches/rar/misc/annoyances/purchasereminder/HidePurchaseReminderPatchKt {
 	public static final fun getHidePurchaseReminderPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -556,7 +572,9 @@ public final class app/revanced/patches/shared/misc/extension/ExtensionHook {
 }
 
 public final class app/revanced/patches/shared/misc/extension/SharedExtensionPatchKt {
+	public static final fun extensionHook (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lapp/revanced/patcher/Fingerprint;)Lapp/revanced/patches/shared/misc/extension/ExtensionHook;
 	public static final fun extensionHook (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lapp/revanced/patches/shared/misc/extension/ExtensionHook;
+	public static synthetic fun extensionHook$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lapp/revanced/patcher/Fingerprint;ILjava/lang/Object;)Lapp/revanced/patches/shared/misc/extension/ExtensionHook;
 	public static synthetic fun extensionHook$default (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patches/shared/misc/extension/ExtensionHook;
 	public static final fun sharedExtensionPatch (Ljava/lang/String;[Lapp/revanced/patches/shared/misc/extension/ExtensionHook;)Lapp/revanced/patcher/patch/BytecodePatch;
 	public static final fun sharedExtensionPatch ([Lapp/revanced/patches/shared/misc/extension/ExtensionHook;)Lapp/revanced/patcher/patch/BytecodePatch;
@@ -1096,6 +1114,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;
 }
@@ -1499,7 +1525,11 @@ public final class app/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPat
 }
 
 public final class app/revanced/util/BytecodeUtilsKt {
+	public static final fun addInstructionsAtControlFlowLabel (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
+	public static final fun containsLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;D)Z
+	public static final fun containsLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;F)Z
 	public static final fun containsLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;J)Z
+	public static final fun findFreeRegister (Lcom/android/tools/smali/dexlib2/iface/Method;I[I)I
 	public static final fun findInstructionIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)Ljava/util/List;
 	public static final fun findInstructionIndicesReversed (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
 	public static final fun findInstructionIndicesReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/Opcode;)Ljava/util/List;
@@ -1526,9 +1556,17 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun indexOfFirstInstructionReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lkotlin/jvm/functions/Function1;)I
 	public static synthetic fun indexOfFirstInstructionReversedOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lcom/android/tools/smali/dexlib2/Opcode;ILjava/lang/Object;)I
 	public static synthetic fun indexOfFirstInstructionReversedOrThrow$default (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/Integer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)I
+	public static final fun indexOfFirstLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;D)I
+	public static final fun indexOfFirstLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;F)I
 	public static final fun indexOfFirstLiteralInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfFirstLiteralInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;D)I
+	public static final fun indexOfFirstLiteralInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;F)I
 	public static final fun indexOfFirstLiteralInstructionOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfFirstLiteralInstructionReversed (Lcom/android/tools/smali/dexlib2/iface/Method;D)I
+	public static final fun indexOfFirstLiteralInstructionReversed (Lcom/android/tools/smali/dexlib2/iface/Method;F)I
 	public static final fun indexOfFirstLiteralInstructionReversed (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
+	public static final fun indexOfFirstLiteralInstructionReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;D)I
+	public static final fun indexOfFirstLiteralInstructionReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;F)I
 	public static final fun indexOfFirstLiteralInstructionReversedOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun indexOfFirstResourceId (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I
 	public static final fun indexOfFirstResourceIdOrThrow (Lcom/android/tools/smali/dexlib2/iface/Method;Ljava/lang/String;)I

patches/src/main/kotlin/app/revanced/patches/all/misc/targetSdk/SetTargetSdkVersion34.kt

@@ -0,0 +1,48 @@
+package app.revanced.patches.all.misc.targetSdk
+
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.util.getNode
+import org.w3c.dom.Element
+import java.util.logging.Logger
+
+@Suppress("unused")
+val setTargetSdkVersion34 = resourcePatch(
+    name = "Set target SDK version 34",
+    description = "Changes the target SDK to version 34 (Android 14). " +
+            "For devices running Android 15+, this will disable edge-to-edge display.",
+    use = false,
+) {
+    execute {
+        val targetSdkOverride = 34 // Android 14.
+
+        document("AndroidManifest.xml").use { document ->
+            fun getLogger() = Logger.getLogger(this::class.java.name)
+
+            // Ideally, the override should only be applied if the existing target is higher.
+            // But since ApkTool does not add targetSdkVersion to the decompiled AndroidManifest,
+            // there is no way to check targetSdkVersion. Instead, check compileSdkVersion and print a warning.
+            try {
+                val manifestElement = document.getNode("manifest") as Element
+                val compileSdkVersion = Integer.parseInt(
+                    manifestElement.getAttribute("android:compileSdkVersion")
+                )
+                if (compileSdkVersion <= targetSdkOverride) {
+                    getLogger().warning(
+                        "This app does not appear to use a target SDK above $targetSdkOverride: " +
+                                "(compileSdkVersion: $compileSdkVersion)"
+                    )
+                }
+            } catch (_: Exception) {
+                getLogger().warning("Could not check compileSdkVersion")
+            }
+
+            // Change targetSdkVersion to override value.
+            document.getElementsByTagName("manifest").item(0).let {
+                var element = it.ownerDocument.createElement("uses-sdk")
+                element.setAttribute("android:targetSdkVersion", targetSdkOverride.toString())
+
+                it.appendChild(element)
+            }
+        }
+    }
+}

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/googlenews/misc/gms/GmsCoreSupportPatch.kt

@@ -27,4 +27,5 @@ private fun gmsCoreSupportResourcePatch(
     toPackageName = REVANCED_MAGAZINES_PACKAGE_NAME,
     spoofedPackageSignature = "24bb24c05e47e0aefa68a58a766179d9b613a666",
     gmsCoreVendorGroupIdOption = gmsCoreVendorGroupIdOption,
+    addStringResources = false,
 )

patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/gms/GmsCoreSupportPatch.kt

@@ -22,6 +22,7 @@ private fun gmsCoreSupportResourcePatch(
 ) = app.revanced.patches.shared.misc.gms.gmsCoreSupportResourcePatch(
     fromPackageName = PHOTOS_PACKAGE_NAME,
     toPackageName = REVANCED_PHOTOS_PACKAGE_NAME,
+    addStringResources = false,
     spoofedPackageSignature = "24bb24c05e47e0aefa68a58a766179d9b613a600",
     gmsCoreVendorGroupIdOption = gmsCoreVendorGroupIdOption,
 )

patches/src/main/kotlin/app/revanced/patches/googlephotos/misc/preferences/RestoreHiddenBackUpWhileChargingTogglePatch.kt

@@ -3,23 +3,28 @@ package app.revanced.patches.googlephotos.misc.preferences
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
+@Deprecated("This patch no longer works and this code will soon be deleted")
 @Suppress("unused")
 val restoreHiddenBackUpWhileChargingTogglePatch = bytecodePatch(
-    name = "Restore hidden 'Back up while charging' toggle",
-    description = "Restores a hidden toggle to only run backups when the device is charging.",
+    description = "Restores a hidden toggle to only run backups when the device is charging."
 ) {
-    compatibleWith("com.google.android.apps.photos")
+    compatibleWith("com.google.android.apps.photos"("7.11.0.705590205"))
 
     execute {
         // Patches 'backup_prefs_had_backup_only_when_charging_enabled' to always be true.
-        val chargingPrefStringIndex = backupPreferencesFingerprint.stringMatches!!.first().index
-        backupPreferencesFingerprint.method.apply {
-            // Get the register of move-result.
-            val resultRegister = getInstruction<OneRegisterInstruction>(chargingPrefStringIndex + 2).registerA
-            // Insert const after move-result to override register as true.
-            addInstruction(chargingPrefStringIndex + 3, "const/4 v$resultRegister, 0x1")
+        backupPreferencesFingerprint.let {
+            it.method.apply {
+                val index = indexOfFirstInstructionOrThrow(
+                    it.stringMatches!!.first().index,
+                    Opcode.MOVE_RESULT
+                )
+                val register = getInstruction<OneRegisterInstruction>(index).registerA
+                addInstruction(index + 1, "const/4 v$register, 0x1")
+            }
         }
     }
 }

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

@@ -0,0 +1,16 @@
+package app.revanced.patches.messenger.navbar
+
+import app.revanced.patcher.fingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val createTabConfigurationFingerprint = fingerprint {
+    strings("MessengerTabConfigurationCreator.createTabConfiguration")
+    opcodes(
+        Opcode.INVOKE_DIRECT,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_DIRECT,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+    )
+}

patches/src/main/kotlin/app/revanced/patches/messenger/navbar/RemoveMetaAITabPatch.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.messenger.navbar
+
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Suppress("unused")
+val removeMetaAITabPatch = bytecodePatch(
+    name = "Remove Meta AI tab",
+    description = "Removes the 'Meta AI' tab from the navbar.",
+) {
+    compatibleWith("com.facebook.orca")
+
+    execute {
+        createTabConfigurationFingerprint.let {
+            val moveResultIndex = it.patternMatch!!.startIndex + 1
+            val enabledRegister = it.method.getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
+            it.method.replaceInstruction(
+                moveResultIndex,
+                "const/4 v$enabledRegister, 0x0"
+            )
+        }
+    }
+}

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/protonmail/signature/RemoveSentFromSignaturePatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.protonmail.signature
+
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.resourcePatch
+import app.revanced.util.findElementByAttributeValue
+import java.io.File
+
+@Suppress("unused")
+val removeSentFromSignaturePatch = resourcePatch(
+    name = "Remove 'Sent from' signature",
+    description = "Removes the 'Sent from Proton Mail mobile' signature from emails.",
+) {
+    compatibleWith("ch.protonmail.android")
+
+    execute {
+        val stringResourceFiles = mutableListOf<File>()
+
+        get("res").walk().forEach { file ->
+            if (file.isFile && file.name.equals("strings.xml", ignoreCase = true)) {
+                stringResourceFiles.add(file)
+            }
+        }
+
+        var foundString = false
+        stringResourceFiles.forEach { filePath ->
+            document(filePath.absolutePath).use { document ->
+                var node = document.documentElement.childNodes.findElementByAttributeValue(
+                    "name",
+                    "mail_settings_identity_mobile_footer_default_free"
+                )
+
+                // String is not localized in all languages.
+                if (node != null) {
+                    node.textContent = ""
+                    foundString = true
+                }
+            }
+        }
+
+        if (!foundString) throw PatchException("Could not find 'sent from' string in resources")
+    }
+}

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

@@ -41,11 +41,12 @@ fun sharedExtensionPatch(
 
     execute {
         if (classes.none { EXTENSION_CLASS_DESCRIPTOR == it.type }) {
-            throw PatchException(
-                "Shared extension has not been merged yet. This patch can not succeed without merging it.",
-            )
+            throw PatchException("Shared extension is not available. This patch can not succeed without it.")
         }
+    }
 
+    finalize {
+        // The hooks are made in finalize to ensure that the context is hooked before any other patches.
         hooks.forEach { hook -> hook(EXTENSION_CLASS_DESCRIPTOR) }
 
         // Modify Utils method to include the patches release version.
@@ -92,7 +93,7 @@ fun sharedExtensionPatch(
 }
 
 class ExtensionHook internal constructor(
-    private val fingerprint: Fingerprint,
+    internal val fingerprint: Fingerprint,
     private val insertIndexResolver: ((Method) -> Int),
     private val contextRegisterResolver: (Method) -> String,
 ) {
@@ -109,8 +110,14 @@ class ExtensionHook internal constructor(
     }
 }
 
+fun extensionHook(
+    insertIndexResolver: ((Method) -> Int) = { 0 },
+    contextRegisterResolver: (Method) -> String = { "p0" },
+    fingerprint: Fingerprint,
+) = ExtensionHook(fingerprint, insertIndexResolver, contextRegisterResolver)
+
 fun extensionHook(
     insertIndexResolver: ((Method) -> Int) = { 0 },
     contextRegisterResolver: (Method) -> String = { "p0" },
     fingerprintBuilderBlock: FingerprintBuilder.() -> Unit,
-) = ExtensionHook(fingerprint(block = fingerprintBuilderBlock), insertIndexResolver, contextRegisterResolver)
+) = extensionHook(insertIndexResolver, contextRegisterResolver, fingerprint(block = fingerprintBuilderBlock))

patches/src/main/kotlin/app/revanced/patches/shared/misc/gms/GmsCoreSupportPatch.kt

@@ -17,7 +17,6 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.iface.reference.StringReference
 import com.android.tools.smali.dexlib2.immutable.reference.ImmutableStringReference
 import com.android.tools.smali.dexlib2.util.MethodUtil
@@ -110,19 +109,18 @@ fun gmsCoreSupportPatch(
 
         // region Collection of transformations that are applied to all strings.
 
-        fun commonTransform(referencedString: String): String? =
-            when (referencedString) {
-                "com.google",
-                "com.google.android.gms",
-                in PERMISSIONS,
-                in ACTIONS,
-                in AUTHORITIES,
-                -> referencedString.replace("com.google", gmsCoreVendorGroupId!!)
+        fun commonTransform(referencedString: String): String? = when (referencedString) {
+            "com.google",
+            "com.google.android.gms",
+            in PERMISSIONS,
+            in ACTIONS,
+            in AUTHORITIES,
+            -> referencedString.replace("com.google", gmsCoreVendorGroupId!!)
 
-                // No vendor prefix for whatever reason...
-                "subscribedfeeds" -> "$gmsCoreVendorGroupId.subscribedfeeds"
-                else -> null
-            }
+            // No vendor prefix for whatever reason...
+            "subscribedfeeds" -> "$gmsCoreVendorGroupId.subscribedfeeds"
+            else -> null
+        }
 
         fun contentUrisTransform(str: String): String? {
             // only when content:// uri
@@ -205,16 +203,8 @@ fun gmsCoreSupportPatch(
 
         // Verify GmsCore is installed and whitelisted for power optimizations and background usage.
         mainActivityOnCreateFingerprint.method.apply {
-            // Temporary fix for patches with an extension patch that hook the onCreate method as well.
-            val setContextIndex = indexOfFirstInstruction {
-                val reference = getReference<MethodReference>() ?: return@indexOfFirstInstruction false
-
-                reference.toString() == "Lapp/revanced/extension/shared/Utils;->setContext(Landroid/content/Context;)V"
-            }
-
-            // Add after setContext call, because this patch needs the context.
             addInstructions(
-                if (setContextIndex < 0) 0 else setContextIndex + 1,
+                0,
                 "invoke-static/range { p0 .. p0 }, Lapp/revanced/extension/shared/GmsCoreSupport;->" +
                     "checkGmsCore(Landroid/app/Activity;)V",
             )
@@ -510,13 +500,44 @@ private object Constants {
  * @param executeBlock The additional execution block of the patch.
  * @param block The additional block to build the patch.
  */
-fun gmsCoreSupportResourcePatch(
+fun gmsCoreSupportResourcePatch( // This is here only for binary compatibility.
     fromPackageName: String,
     toPackageName: String,
     spoofedPackageSignature: String,
     gmsCoreVendorGroupIdOption: Option<String>,
     executeBlock: ResourcePatchContext.() -> Unit = {},
     block: ResourcePatchBuilder.() -> Unit = {},
+) = gmsCoreSupportResourcePatch(
+    fromPackageName,
+    toPackageName,
+    spoofedPackageSignature,
+    gmsCoreVendorGroupIdOption,
+    true,
+    executeBlock,
+    block
+)
+
+/**
+ * Abstract resource patch that allows Google apps to run without root and under a different package name
+ * by using GmsCore instead of Google Play Services.
+ *
+ * @param fromPackageName The package name of the original app.
+ * @param toPackageName The package name to fall back to if no custom package name is specified in patch options.
+ * @param spoofedPackageSignature The signature of the package to spoof to.
+ * @param gmsCoreVendorGroupIdOption The option to get the vendor group ID of GmsCore.
+ * @param addStringResources If the GmsCore shared strings should be added to the patched app.
+ * @param executeBlock The additional execution block of the patch.
+ * @param block The additional block to build the patch.
+ */
+// TODO: On the next major release make this public and delete the public overloaded constructor.
+internal fun gmsCoreSupportResourcePatch(
+    fromPackageName: String,
+    toPackageName: String,
+    spoofedPackageSignature: String,
+    gmsCoreVendorGroupIdOption: Option<String>,
+    addStringResources: Boolean = true,
+    executeBlock: ResourcePatchContext.() -> Unit = {},
+    block: ResourcePatchBuilder.() -> Unit = {},
 ) = resourcePatch {
     dependsOn(
         changePackageNamePatch,
@@ -526,7 +547,10 @@ fun gmsCoreSupportResourcePatch(
     val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
 
     execute {
-        addResources("shared", "misc.gms.gmsCoreSupportResourcePatch")
+        // Some patches don't use shared String resources so there's no need to add them.
+        if (addStringResources) {
+            addResources("shared", "misc.gms.gmsCoreSupportResourcePatch")
+        }
 
         /**
          * Add metadata to manifest to support spoofing the package name and signature of GmsCore.

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/SpoofVideoStreamsPatch.kt

@@ -14,7 +14,7 @@ import app.revanced.util.findFreeRegister
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.insertFeatureFlagBooleanOverride
+import app.revanced.util.insertLiteralOverride
 import app.revanced.util.returnEarly
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -235,7 +235,7 @@ fun spoofVideoStreamsPatch(
 
         // region Fix iOS livestream current time.
 
-        hlsCurrentTimeFingerprint.method.insertFeatureFlagBooleanOverride(
+        hlsCurrentTimeFingerprint.method.insertLiteralOverride(
             HLS_CURRENT_TIME_FEATURE_FLAG,
             "$EXTENSION_CLASS_DESCRIPTOR->fixHLSCurrentTime(Z)Z"
         )
@@ -245,21 +245,21 @@ fun spoofVideoStreamsPatch(
         // region turn off stream config replacement feature flag.
 
         if (fixMediaFetchHotConfigChanges()) {
-            mediaFetchHotConfigFingerprint.method.insertFeatureFlagBooleanOverride(
+            mediaFetchHotConfigFingerprint.method.insertLiteralOverride(
                 MEDIA_FETCH_HOT_CONFIG_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
             )
         }
 
         if (fixMediaFetchHotConfigAlternativeChanges()) {
-            mediaFetchHotConfigAlternativeFingerprint.method.insertFeatureFlagBooleanOverride(
+            mediaFetchHotConfigAlternativeFingerprint.method.insertLiteralOverride(
                 MEDIA_FETCH_HOT_CONFIG_ALTERNATIVE_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->useMediaFetchHotConfigReplacement(Z)Z"
             )
         }
 
         if (fixParsePlaybackResponseFeatureFlag()) {
-            playbackStartDescriptorFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+            playbackStartDescriptorFeatureFlagFingerprint.method.insertLiteralOverride(
                 PLAYBACK_START_CHECK_ENDPOINT_USED_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->usePlaybackStartFeatureFlag(Z)Z"
             )

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

@@ -1,81 +1,205 @@
-@file:Suppress("NAME_SHADOWING")
-
 package app.revanced.patches.spotify.layout.theme
 
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.fingerprint
+import app.revanced.patcher.patch.booleanOption
+import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.patch.stringOption
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.spotify.misc.extension.IS_SPOTIFY_LEGACY_APP_TARGET
+import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
+import app.revanced.util.*
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import org.w3c.dom.Element
 
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/spotify/layout/theme/CustomThemePatch;"
+
+internal val spotifyBackgroundColor = stringOption(
+    key = "backgroundColor",
+    default = "@android:color/black",
+    title = "Primary background color",
+    description = "The background color. Can be a hex color or a resource reference.",
+    required = true,
+)
+
+internal val overridePlayerGradientColor = booleanOption(
+    key = "overridePlayerGradientColor",
+    default = false,
+    title = "Override player gradient color",
+    description = "Apply primary background color to the player gradient color, which changes dynamically with the song.",
+    required = false
+)
+
+internal val spotifyBackgroundColorSecondary = stringOption(
+    key = "backgroundColorSecondary",
+    default = "#FF121212",
+    title = "Secondary background color",
+    description =
+        "The secondary background color. (e.g. playlist list in home, player artist, song credits). Can be a hex color or a resource reference.",
+    required = true,
+)
+
+internal val spotifyAccentColor = stringOption(
+    key = "accentColor",
+    default = "#FF1ED760",
+    title = "Accent color",
+    description = "The accent color ('Spotify green' by default). Can be a hex color or a resource reference.",
+    required = true,
+)
+
+internal val spotifyAccentColorPressed = stringOption(
+    key = "accentColorPressed",
+    default = "#FF169C46",
+    title = "Pressed dark theme accent color",
+    description =
+        "The color when accented buttons are pressed, by default slightly darker than accent. Can be a hex color or a resource reference.",
+    required = true,
+)
+
+private val customThemeBytecodePatch = bytecodePatch {
+    dependsOn(sharedExtensionPatch)
+
+    execute {
+        if (IS_SPOTIFY_LEGACY_APP_TARGET) {
+            // Bytecode changes are not needed for legacy app target.
+            // Player background color is changed with existing resource patch.
+            return@execute
+        }
+
+        fun MutableMethod.addColorChangeInstructions(literal: Long, colorString: String) {
+            val index = indexOfFirstLiteralInstructionOrThrow(literal)
+            val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+            addInstructions(
+                index + 1,
+                """
+                    const-string v$register, "$colorString"
+                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getThemeColor(Ljava/lang/String;)J
+                    move-result-wide v$register
+                """
+            )
+        }
+
+        val encoreColorsClassName = with(encoreThemeFingerprint.originalMethod) {
+            // "Encore" colors are referenced right before the value of POSITIVE_INFINITY is returned.
+            // Begin the instruction find using the index of where POSITIVE_INFINITY is set into the register.
+            val positiveInfinityIndex = indexOfFirstLiteralInstructionOrThrow(
+                Float.POSITIVE_INFINITY
+            )
+            val encoreColorsFieldReferenceIndex = indexOfFirstInstructionReversedOrThrow(
+                positiveInfinityIndex,
+                Opcode.SGET_OBJECT
+            )
+
+            getInstruction(encoreColorsFieldReferenceIndex)
+                .getReference<FieldReference>()!!.definingClass
+        }
+
+        val encoreColorsConstructorFingerprint = fingerprint {
+            accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+            custom { method, classDef ->
+                classDef.type == encoreColorsClassName &&
+                        method.containsLiteralInstruction(PLAYLIST_BACKGROUND_COLOR_LITERAL)
+            }
+        }
+
+        val backgroundColor by spotifyBackgroundColor
+        val backgroundColorSecondary by spotifyBackgroundColorSecondary
+
+        encoreColorsConstructorFingerprint.method.apply {
+            addColorChangeInstructions(PLAYLIST_BACKGROUND_COLOR_LITERAL, backgroundColor!!)
+            addColorChangeInstructions(SHARE_MENU_BACKGROUND_COLOR_LITERAL, backgroundColorSecondary!!)
+        }
+
+        homeCategoryPillColorsFingerprint.method.addColorChangeInstructions(
+            HOME_CATEGORY_PILL_COLOR_LITERAL,
+            backgroundColorSecondary!!
+        )
+
+        settingsHeaderColorFingerprint.method.addColorChangeInstructions(
+            SETTINGS_HEADER_COLOR_LITERAL,
+            backgroundColorSecondary!!
+        )
+    }
+}
+
 @Suppress("unused")
 val customThemePatch = resourcePatch(
     name = "Custom theme",
-    description = "Applies a custom theme.",
+    description = "Applies a custom theme (defaults to amoled black)",
     use = false,
 ) {
     compatibleWith("com.spotify.music")
 
-    val backgroundColor by stringOption(
-        key = "backgroundColor",
-        default = "@android:color/black",
-        title = "Primary background color",
-        description = "The background color. Can be a hex color or a resource reference.",
-        required = true,
-    )
+    dependsOn(customThemeBytecodePatch)
 
-    val backgroundColorSecondary by stringOption(
-        key = "backgroundColorSecondary",
-        default = "#ff282828",
-        title = "Secondary background color",
-        description = "The secondary background color. (e.g. search box, artist & podcast). Can be a hex color or a resource reference.",
-        required = true,
-    )
-
-    val accentColor by stringOption(
-        key = "accentColor",
-        default = "#ff1ed760",
-        title = "Accent color",
-        description = "The accent color ('Spotify green' by default). Can be a hex color or a resource reference.",
-        required = true,
-    )
-
-    val accentColorPressed by stringOption(
-        key = "accentColorPressed",
-        default = "#ff169c46",
-        title = "Pressed dark theme accent color",
-        description =
-        "The color when accented buttons are pressed, by default slightly darker than accent. " +
-            "Can be a hex color or a resource reference.",
-        required = true,
-    )
+    val backgroundColor by spotifyBackgroundColor()
+    val overridePlayerGradientColor by overridePlayerGradientColor()
+    val backgroundColorSecondary by spotifyBackgroundColorSecondary()
+    val accentColor by spotifyAccentColor()
+    val accentColorPressed by spotifyAccentColorPressed()
 
     execute {
-        val backgroundColor = backgroundColor!!
-        val backgroundColorSecondary = backgroundColorSecondary!!
-        val accentColor = accentColor!!
-        val accentColorPressed = accentColorPressed!!
-
         document("res/values/colors.xml").use { document ->
             val resourcesNode = document.getElementsByTagName("resources").item(0) as Element
 
             val childNodes = resourcesNode.childNodes
             for (i in 0 until childNodes.length) {
                 val node = childNodes.item(i) as? Element ?: continue
+                val name = node.getAttribute("name")
 
-                node.textContent =
-                    when (node.getAttribute("name")) {
-                        "dark_base_background_elevated_base", "design_dark_default_color_background",
-                        "design_dark_default_color_surface", "gray_7", "gray_background", "gray_layer",
-                        "sthlm_blk",
+                // Skip overriding song/player gradient start color if the option is disabled.
+                // Gradient end color should be themed regardless to allow the gradient to connect with
+                // our primary background color.
+                if (name == "bg_gradient_start_color" && !overridePlayerGradientColor!!) {
+                    continue
+                }
+
+                node.textContent = when (name) {
+                    // Gradient next to user photo and "All" in home page.
+                    "dark_base_background_base",
+                    // Main background.
+                    "gray_7",
+                    // Left sidebar background in tablet mode.
+                    "gray_10",
+                    // "Add account", "Settings and privacy", "View Profile" left sidebar background.
+                    "dark_base_background_elevated_base",
+                    // Song/player gradient start/end color.
+                    "bg_gradient_start_color", "bg_gradient_end_color",
+                    // Login screen background and gradient start.
+                    "sthlm_blk", "sthlm_blk_grad_start",
+                    // Misc.
+                    "image_placeholder_color",
                         -> backgroundColor
 
-                        "gray_15" -> backgroundColorSecondary
+                    // Track credits, merch background in song player.
+                    "track_credits_card_bg", "benefit_list_default_color", "merch_card_background",
+                    // Playlist list background in home page.
+                    "opacity_white_10",
+                    // "About the artist" background in song player.
+                    "gray_15",
+                    // "What's New" pills background.
+                    "dark_base_background_tinted_highlight"
+                        -> backgroundColorSecondary
 
-                        "dark_brightaccent_background_base", "dark_base_text_brightaccent", "green_light" -> accentColor
-
-                        "dark_brightaccent_background_press" -> accentColorPressed
-                        else -> continue
-                    }
+                    "dark_brightaccent_background_base", "dark_base_text_brightaccent", "green_light" -> accentColor
+                    "dark_brightaccent_background_press" -> accentColorPressed
+                    else -> continue
+                }
             }
         }
+
+        // Login screen gradient.
+        document("res/drawable/start_screen_gradient.xml").use { document ->
+            val gradientNode = document.getElementsByTagName("gradient").item(0) as Element
+
+            gradientNode.setAttribute("android:startColor", backgroundColor)
+            gradientNode.setAttribute("android:endColor", backgroundColor)
+        }
     }
 }

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

@@ -0,0 +1,30 @@
+package app.revanced.patches.spotify.layout.theme
+
+import app.revanced.patcher.fingerprint
+import app.revanced.util.containsLiteralInstruction
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal val encoreThemeFingerprint = fingerprint {
+    strings("No EncoreLayoutTheme provided")
+}
+
+internal const val PLAYLIST_BACKGROUND_COLOR_LITERAL = 0xFF121212
+internal const val SHARE_MENU_BACKGROUND_COLOR_LITERAL = 0xFF1F1F1F
+internal const val HOME_CATEGORY_PILL_COLOR_LITERAL = 0xFF333333
+internal const val SETTINGS_HEADER_COLOR_LITERAL = 0xFF282828
+
+internal val homeCategoryPillColorsFingerprint = fingerprint{
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    custom { method, _ ->
+        method.containsLiteralInstruction(HOME_CATEGORY_PILL_COLOR_LITERAL) &&
+                method.containsLiteralInstruction(0x33000000)
+    }
+}
+
+internal val settingsHeaderColorFingerprint = fingerprint {
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
+    custom { method, _ ->
+        method.containsLiteralInstruction(SETTINGS_HEADER_COLOR_LITERAL) &&
+                method.containsLiteralInstruction(0)
+    }
+}

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

@@ -1,15 +1,28 @@
 package app.revanced.patches.spotify.misc
 
 import app.revanced.patcher.fingerprint
+import app.revanced.patches.spotify.misc.extension.IS_SPOTIFY_LEGACY_APP_TARGET
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 internal val accountAttributeFingerprint = fingerprint {
-    custom { _, c -> c.endsWith("internal/AccountAttribute;") }
+    custom { _, classDef ->
+        classDef.type == if (IS_SPOTIFY_LEGACY_APP_TARGET) {
+            "Lcom/spotify/useraccount/v1/AccountAttribute;"
+        } else {
+            "Lcom/spotify/remoteconfig/internal/AccountAttribute;"
+        }
+    }
 }
 
 internal val productStateProtoFingerprint = fingerprint {
     returns("Ljava/util/Map;")
     custom { _, classDef ->
-        classDef.endsWith("ProductStateProto;")
+        classDef.type == if (IS_SPOTIFY_LEGACY_APP_TARGET) {
+            "Lcom/spotify/ucs/proto/v0/UcsResponseWrapper${'$'}AccountAttributesResponse;"
+        } else {
+            "Lcom/spotify/remoteconfig/internal/ProductStateProto;"
+        }
     }
 }
 
@@ -21,3 +34,38 @@ internal val contextMenuExperimentsFingerprint = fingerprint {
     parameters("L")
     strings("remove_ads_upsell_enabled")
 }
+
+internal val contextFromJsonFingerprint = fingerprint {
+    opcodes(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC
+    )
+    custom { methodDef, classDef ->
+        methodDef.name == "fromJson" &&
+                classDef.endsWith("voiceassistants/playermodels/ContextJsonAdapter;")
+    }
+}
+
+internal val readPlayerOptionOverridesFingerprint = fingerprint {
+    custom { methodDef, classDef ->
+        methodDef.name == "readPlayerOptionOverrides" &&
+                classDef.endsWith("voiceassistants/playermodels/PreparePlayOptionsJsonAdapter;")
+    }
+}
+
+internal val homeSectionFingerprint = fingerprint {
+    custom { _, classDef -> classDef.endsWith("homeapi/proto/Section;") }
+}
+
+internal val protobufListsFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
+    custom { method, _ -> method.name == "emptyProtobufList" }
+}
+
+internal val homeStructureFingerprint = fingerprint {
+    opcodes(Opcode.IGET_OBJECT, Opcode.RETURN_OBJECT)
+    custom { _, classDef -> classDef.endsWith("homeapi/proto/HomeStructure;") }
+}

patches/src/main/kotlin/app/revanced/patches/spotify/misc/check/CheckEnvironmentPatch.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.spotify.misc.check
+
+import app.revanced.patches.shared.misc.checks.checkEnvironmentPatch
+import app.revanced.patches.spotify.shared.mainActivityOnCreateFingerprint
+import app.revanced.patches.spotify.misc.extension.sharedExtensionPatch
+
+internal val checkEnvironmentPatch = checkEnvironmentPatch(
+    mainActivityOnCreateFingerprint = mainActivityOnCreateFingerprint,
+    extensionPatch = sharedExtensionPatch,
+    "com.spotify.music",
+)

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

@@ -1,5 +1,21 @@
 package app.revanced.patches.spotify.misc.extension
 
+import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.shared.misc.extension.sharedExtensionPatch
+import app.revanced.patches.spotify.shared.SPOTIFY_MAIN_ACTIVITY_LEGACY
 
-val sharedExtensionPatch = sharedExtensionPatch("spotify", spotifyMainActivityOnCreate)
+/**
+ * If patching a legacy 8.x target. This may also be set if patching slightly older/newer app targets,
+ * but the only legacy target of interest is 8.6.98.900 as it's the last version that
+ * supports Spotify integration on Kenwood/Pioneer car stereos.
+ */
+internal var IS_SPOTIFY_LEGACY_APP_TARGET = false
+
+val sharedExtensionPatch = bytecodePatch {
+    dependsOn(sharedExtensionPatch("spotify", mainActivityOnCreateHook))
+
+    execute {
+        IS_SPOTIFY_LEGACY_APP_TARGET = mainActivityOnCreateHook.fingerprint
+            .originalClassDef.type == SPOTIFY_MAIN_ACTIVITY_LEGACY
+    }
+}

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

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

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

@@ -0,0 +1,17 @@
+package app.revanced.patches.spotify.shared
+
+import app.revanced.patcher.fingerprint
+
+private const val SPOTIFY_MAIN_ACTIVITY = "Lcom/spotify/music/SpotifyMainActivity;"
+
+/**
+ * Main activity of target 8.6.98.900.
+ */
+internal const val SPOTIFY_MAIN_ACTIVITY_LEGACY = "Lcom/spotify/music/MainActivity;"
+
+internal val mainActivityOnCreateFingerprint = fingerprint {
+    custom { method, classDef ->
+        method.name == "onCreate" && (classDef.type == SPOTIFY_MAIN_ACTIVITY
+                || classDef.type == SPOTIFY_MAIN_ACTIVITY_LEGACY)
+    }
+}

patches/src/main/kotlin/app/revanced/patches/strava/upselling/DisableSubscriptionSuggestionsPatch.kt

@@ -12,7 +12,7 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 val disableSubscriptionSuggestionsPatch = bytecodePatch(
     name = "Disable subscription suggestions",
 ) {
-    compatibleWith("com.strava"("320.12"))
+    compatibleWith("com.strava")
 
     execute {
         val helperMethodName = "getModulesIfNotUpselling"

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,25 +23,12 @@ val disablePreciseSeekingGesturePatch = bytecodePatch(
         addResourcesPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.47.53",
-            "20.07.39",
-        ),
-    )
-
     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,
@@ -47,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
@@ -62,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,17 +23,6 @@ val enableSeekbarTappingPatch = bytecodePatch(
         addResourcesPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.47.53",
-            "20.07.39",
-        ),
-    )
-
     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,17 +31,6 @@ val enableSlideToSeekPatch = bytecodePatch(
         versionCheckPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.47.53",
-            "20.07.39",
-        ),
-    )
-
     execute {
         addResources("youtube", "interaction.seekbar.enableSlideToSeekPatch")
 
@@ -59,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 {
@@ -70,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
                        """,
                     )
@@ -95,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
                         """,
                     )
@@ -109,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,18 +27,13 @@ val seekbarThumbnailsPatch = bytecodePatch(
         versionCheckPatch,
     )
 
-    compatibleWith(
-        "com.google.android.youtube"(
-            "19.16.39",
-            "19.25.37",
-            "19.34.42",
-            "19.43.41",
-            "19.47.53",
-            "20.07.39",
-        )
-    )
-
     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

@@ -117,7 +117,7 @@ val swipeControlsPatch = bytecodePatch(
         // region patch to enable/disable swipe to change video.
 
         if (is_19_43_or_greater) {
-            swipeChangeVideoFingerprint.method.insertFeatureFlagBooleanOverride(
+            swipeChangeVideoFingerprint.method.insertLiteralOverride(
                 SWIPE_CHANGE_VIDEO_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->allowSwipeChangeVideo(Z)Z"
             )

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

@@ -18,7 +18,7 @@ import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.insertFeatureFlagBooleanOverride
+import app.revanced.util.insertLiteralOverride
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@@ -119,17 +119,17 @@ val navigationButtonsPatch = bytecodePatch(
 
         // Force on/off translucent effect on status bar and navigation buttons.
         if (is_19_25_or_greater) {
-            translucentNavigationStatusBarFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+            translucentNavigationStatusBarFeatureFlagFingerprint.method.insertLiteralOverride(
                 TRANSLUCENT_NAVIGATION_STATUS_BAR_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->useTranslucentNavigationStatusBar(Z)Z",
             )
 
-            translucentNavigationButtonsFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+            translucentNavigationButtonsFeatureFlagFingerprint.method.insertLiteralOverride(
                 TRANSLUCENT_NAVIGATION_BUTTONS_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->useTranslucentNavigationButtons(Z)Z",
             )
 
-            translucentNavigationButtonsSystemFeatureFlagFingerprint.method.insertFeatureFlagBooleanOverride(
+            translucentNavigationButtonsSystemFeatureFlagFingerprint.method.insertLiteralOverride(
                 TRANSLUCENT_NAVIGATION_BUTTONS_SYSTEM_FEATURE_FLAG,
                 "$EXTENSION_CLASS_DESCRIPTOR->useTranslucentNavigationButtons(Z)Z",
             )

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

@@ -130,8 +130,6 @@ val hideLayoutComponentsPatch = bytecodePatch(
             "19.25.37",
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
             "20.07.39",
         ),
@@ -269,7 +267,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
                         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
+                        nop
                     """,
                     ExternalLabel("return_empty_component", returnEmptyComponentInstruction),
                 )

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

@@ -51,7 +51,10 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch(
                     SwitchPreference("revanced_hide_player_flyout_speed"),
                     SwitchPreference("revanced_hide_player_flyout_lock_screen"),
                     SwitchPreference("revanced_hide_player_flyout_more_info"),
-                    SwitchPreference("revanced_hide_player_flyout_audio_track"),
+                    SwitchPreference(
+                        key = "revanced_hide_player_flyout_audio_track",
+                        tag = "app.revanced.extension.youtube.settings.preference.HideAudioFlyoutMenuPreference"
+                    ),
                     SwitchPreference("revanced_hide_player_flyout_watch_in_vr"),
                     SwitchPreference("revanced_hide_player_flyout_sleep_timer"),
                     SwitchPreference("revanced_hide_player_flyout_video_quality_footer"),

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

@@ -1,58 +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.47.53",
-            "20.07.39",
-        ),
-    )
-
-    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/miniplayer/MiniplayerPatch.kt

@@ -168,11 +168,8 @@ val miniplayerPatch = bytecodePatch(
             // 19.30.39 // Modern 3 is less broken when double tap expand is enabled, but cannot swipe to expand when double tap is off.
             // 19.31.36 // All Modern 1 buttons are missing. Unusable.
             // 19.32.36 // 19.32+ and beyond all work without issues.
-            // 19.33.35
             "19.34.42",
             "19.43.41",
-            "19.45.38",
-            "19.46.42",
             "19.47.53",
             "20.07.39",
         ),
@@ -281,7 +278,7 @@ val miniplayerPatch = bytecodePatch(
         fun Fingerprint.insertMiniplayerFeatureFlagBooleanOverride(
             literal: Long,
             extensionMethod: String,
-        ) = method.insertFeatureFlagBooleanOverride(
+        ) = method.insertLiteralOverride(
             literal,
             "$EXTENSION_CLASS_DESCRIPTOR->$extensionMethod(Z)Z"
         )

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

@@ -5,7 +5,7 @@ import app.revanced.patches.youtube.layout.shortsplayer.openShortsInRegularPlaye
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_46_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
-import app.revanced.util.insertFeatureFlagBooleanOverride
+import app.revanced.util.insertLiteralOverride
 
 internal const val EXTENSION_CLASS_DESCRIPTOR =
     "Lapp/revanced/extension/youtube/patches/OpenVideosFullscreenHookPatch;"
@@ -24,7 +24,7 @@ internal val openVideosFullscreenHookPatch = bytecodePatch {
             return@execute
         }
 
-        openVideosFullscreenPortraitFingerprint.method.insertFeatureFlagBooleanOverride(
+        openVideosFullscreenPortraitFingerprint.method.insertLiteralOverride(
             OPEN_VIDEOS_FULLSCREEN_PORTRAIT_FEATURE_FLAG,
             "$EXTENSION_CLASS_DESCRIPTOR->openVideoFullscreenPortrait(Z)Z"
         )

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

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

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

@@ -70,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"),
             ),
         )
@@ -179,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 {

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

@@ -84,31 +84,14 @@ internal val playerLinearGradientFingerprint = fingerprint {
 }
 
 /**
- * 19.46 - 19.47
+ * 19.25 - 19.47
  */
-internal val playerLinearGradientLegacy1946Fingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
-    parameters("I", "I", "I", "I")
+internal val playerLinearGradientLegacyFingerprint = fingerprint {
     returns("V")
     opcodes(
         Opcode.FILLED_NEW_ARRAY,
         Opcode.MOVE_RESULT_OBJECT
     )
-    custom { method, _ ->
-        method.name == "setBounds" && method.containsLiteralInstruction(ytYoutubeMagentaColorId)
-    }
-}
-
-/**
- * 19.25 - 19.45
- */
-internal val playerLinearGradientLegacy1925Fingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
-    parameters("Landroid/content/Context;")
-    opcodes(
-        Opcode.FILLED_NEW_ARRAY,
-        Opcode.MOVE_RESULT_OBJECT
-    )
     literal { ytYoutubeMagentaColorId }
 }
 

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

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.seekbar
 
+import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -27,9 +28,8 @@ import app.revanced.util.findElementByAttributeValueOrThrow
 import app.revanced.util.findInstructionIndicesReversedOrThrow
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
-import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
 import app.revanced.util.inputStreamFromBundledResource
-import app.revanced.util.insertFeatureFlagBooleanOverride
+import app.revanced.util.insertLiteralOverride
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
@@ -228,16 +228,9 @@ val seekbarColorPatch = bytecodePatch(
 
     execute {
         fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
-            val index = indexOfFirstLiteralInstructionOrThrow(resourceId)
-            val insertIndex = indexOfFirstInstructionOrThrow(index, Opcode.MOVE_RESULT)
-            val register = getInstruction<OneRegisterInstruction>(insertIndex).registerA
-
-            addInstructions(
-                insertIndex + 1,
-                """
-                    invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I
-                    move-result v$register
-                """
+            insertLiteralOverride(
+                resourceId,
+                "$EXTENSION_CLASS_DESCRIPTOR->getVideoPlayerSeekbarColor(I)I"
             )
         }
 
@@ -310,14 +303,15 @@ val seekbarColorPatch = bytecodePatch(
             """
         )
 
-        val playerFingerprint =
-            if (is_19_49_or_greater) {
-                playerLinearGradientFingerprint
-            } else if (is_19_46_or_greater) {
-                playerLinearGradientLegacy1946Fingerprint
-            } else {
-                playerLinearGradientLegacy1925Fingerprint
-            }
+        val playerFingerprint: Fingerprint
+        val checkGradientCoordinates: Boolean
+        if (is_19_49_or_greater) {
+            playerFingerprint = playerLinearGradientFingerprint
+            checkGradientCoordinates = true
+        } else {
+            playerFingerprint = playerLinearGradientLegacyFingerprint
+            checkGradientCoordinates = false
+        }
 
         playerFingerprint.let {
             it.method.apply {
@@ -326,10 +320,17 @@ val seekbarColorPatch = bytecodePatch(
 
                 addInstructions(
                     index + 1,
-                    """
-                       invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getPlayerLinearGradient([I)[I
-                       move-result-object v$register
-                    """
+                    if (checkGradientCoordinates) {
+                        """
+                           invoke-static { v$register, p0, p1 }, $EXTENSION_CLASS_DESCRIPTOR->getPlayerLinearGradient([III)[I
+                           move-result-object v$register
+                        """
+                    } else {
+                        """
+                           invoke-static { v$register }, $EXTENSION_CLASS_DESCRIPTOR->getPlayerLinearGradient([I)[I
+                           move-result-object v$register
+                        """
+                    }
                 )
             }
         }
@@ -345,7 +346,7 @@ val seekbarColorPatch = bytecodePatch(
             launchScreenLayoutTypeFingerprint,
             mainActivityOnCreateFingerprint
         ).forEach { fingerprint ->
-            fingerprint.method.insertFeatureFlagBooleanOverride(
+            fingerprint.method.insertLiteralOverride(
                 launchScreenLayoutTypeLotteFeatureFlag,
                 "$EXTENSION_CLASS_DESCRIPTOR->useLotteLaunchSplashScreen(Z)Z"
             )

patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt

@@ -48,6 +48,8 @@ private val sponsorBlockResourcePatch = resourcePatch {
                 key = "revanced_settings_screen_10",
                 titleKey = "revanced_sb_settings_title",
                 summaryKey = null,
+                icon = "@drawable/revanced_settings_screen_10_sb",
+                layout = "@layout/preference_with_icon",
                 intent = newIntent("revanced_sb_settings_intent"),
             ),
         )

patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt

@@ -38,8 +38,6 @@ val disableResumingShortsOnStartupPatch = 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/theme/ThemePatch.kt

@@ -21,7 +21,7 @@ import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.forEachChildElement
-import app.revanced.util.insertFeatureFlagBooleanOverride
+import app.revanced.util.insertLiteralOverride
 import org.w3c.dom.Element
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
@@ -233,7 +233,7 @@ val themePatch = bytecodePatch(
             SwitchPreference("revanced_gradient_loading_screen"),
         )
 
-        useGradientLoadingScreenFingerprint.method.insertFeatureFlagBooleanOverride(
+        useGradientLoadingScreenFingerprint.method.insertLiteralOverride(
             GRADIENT_LOADING_SCREEN_AB_CONSTANT,
             "$EXTENSION_CLASS_DESCRIPTOR->gradientLoadingScreenEnabled(Z)Z"
         )

patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt

@@ -12,6 +12,8 @@ import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.patches.youtube.video.information.videoInformationPatch
@@ -44,6 +46,7 @@ val backgroundPlaybackPatch = bytecodePatch(
         playerTypeHookPatch,
         videoInformationPatch,
         settingsPatch,
+        versionCheckPatch
     )
 
     compatibleWith(
@@ -100,5 +103,13 @@ val backgroundPlaybackPatch = bytecodePatch(
 
         // Force allowing background play for videos labeled for kids.
         kidsBackgroundPlaybackPolicyControllerFingerprint.method.returnEarly()
+
+        // Fix PiP buttons not working after locking/unlocking device screen.
+        if (is_19_34_or_greater) {
+            pipInputConsumerFeatureFlagFingerprint.method.insertLiteralOverride(
+                PIP_INPUT_CONSUMER_FEATURE_FLAG,
+                false
+            )
+        }
     }
 }

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

@@ -83,4 +83,11 @@ internal val shortsBackgroundPlaybackFeatureFlagFingerprint = fingerprint {
     returns("Z")
     parameters()
     literal { 45415425 }
+}
+
+internal const val PIP_INPUT_CONSUMER_FEATURE_FLAG = 45638483L
+
+// Fix 'E/InputDispatcher: Window handle pip_input_consumer has no registered input channel'
+internal val pipInputConsumerFeatureFlagFingerprint = fingerprint {
+    literal { PIP_INPUT_CONSUMER_FEATURE_FLAG}
 }

patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt

@@ -36,8 +36,6 @@ val bypassURLRedirectsPatch = 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/misc/settings/SettingsPatch.kt

@@ -73,7 +73,22 @@ private val settingsResourcePatch = resourcePatch {
         appearanceStringId = resourceMappings["string", "app_theme_appearance_dark"]
 
         arrayOf(
-            ResourceGroup("drawable", "revanced_settings_icon.xml"),
+            ResourceGroup("drawable",
+                "revanced_settings_icon.xml",
+                "revanced_settings_screen_00_about.xml",
+                "revanced_settings_screen_01_ads.xml",
+                "revanced_settings_screen_02_alt_thumbnails.xml",
+                "revanced_settings_screen_03_feed.xml",
+                "revanced_settings_screen_04_general.xml",
+                "revanced_settings_screen_05_player.xml",
+                "revanced_settings_screen_06_shorts.xml",
+                "revanced_settings_screen_07_seekbar.xml",
+                "revanced_settings_screen_08_swipe_controls.xml",
+                "revanced_settings_screen_09_ryd.xml",
+                "revanced_settings_screen_10_sb.xml",
+                "revanced_settings_screen_11_misc.xml",
+                "revanced_settings_screen_12_video.xml",
+            ),
             ResourceGroup("layout", "revanced_settings_with_toolbar.xml"),
         ).forEach { resourceGroup ->
             copyResources("settings", resourceGroup)
@@ -159,6 +174,8 @@ val settingsPatch = bytecodePatch(
         // Add an "about" preference to the top.
         preferences += NonInteractivePreference(
             key = "revanced_settings_screen_00_about",
+            icon = "@drawable/revanced_settings_screen_00_about",
+            layout = "@layout/preference_with_icon",
             summaryKey = null,
             tag = "app.revanced.extension.youtube.settings.preference.ReVancedYouTubeAboutPreference",
             selectable = true,
@@ -170,6 +187,10 @@ val settingsPatch = bytecodePatch(
             )
         }
 
+        PreferenceScreen.GENERAL_LAYOUT.addPreferences(
+            SwitchPreference("revanced_show_menu_icons")
+        )
+
         PreferenceScreen.MISC.addPreferences(
             TextPreference(
                 key = null,
@@ -248,7 +269,7 @@ val settingsPatch = bytecodePatch(
         }
 
         // Add setting to force cairo settings fragment on/off.
-        cairoFragmentConfigFingerprint.method.insertFeatureFlagBooleanOverride(
+        cairoFragmentConfigFingerprint.method.insertLiteralOverride(
             CAIRO_CONFIG_LITERAL_VALUE,
             "$activityHookClassDescriptor->useCairoSettingsFragment(Z)Z"
         )
@@ -277,37 +298,53 @@ object PreferenceScreen : BasePreferenceScreen() {
     val ADS = Screen(
         key = "revanced_settings_screen_01_ads",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_01_ads",
+        layout = "@layout/preference_with_icon",
     )
     val ALTERNATIVE_THUMBNAILS = Screen(
         key = "revanced_settings_screen_02_alt_thumbnails",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_02_alt_thumbnails",
+        layout = "@layout/preference_with_icon",
         sorting = Sorting.UNSORTED,
     )
     val FEED = Screen(
         key = "revanced_settings_screen_03_feed",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_03_feed",
+        layout = "@layout/preference_with_icon",
     )
     val GENERAL_LAYOUT = Screen(
         key = "revanced_settings_screen_04_general",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_04_general",
+        layout = "@layout/preference_with_icon",
     )
     val PLAYER = Screen(
         key = "revanced_settings_screen_05_player",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_05_player",
+        layout = "@layout/preference_with_icon",
     )
 
     val SHORTS = Screen(
         key = "revanced_settings_screen_06_shorts",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_06_shorts",
+        layout = "@layout/preference_with_icon",
     )
 
     val SEEKBAR = Screen(
         key = "revanced_settings_screen_07_seekbar",
         summaryKey = null,
-    )
+        icon = "@drawable/revanced_settings_screen_07_seekbar",
+        layout = "@layout/preference_with_icon",
+        )
     val SWIPE_CONTROLS = Screen(
         key = "revanced_settings_screen_08_swipe_controls",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_08_swipe_controls",
+        layout = "@layout/preference_with_icon",
         sorting = Sorting.UNSORTED,
     )
 
@@ -317,10 +354,14 @@ object PreferenceScreen : BasePreferenceScreen() {
     val MISC = Screen(
         key = "revanced_settings_screen_11_misc",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_11_misc",
+        layout = "@layout/preference_with_icon",
     )
     val VIDEO = Screen(
         key = "revanced_settings_screen_12_video",
         summaryKey = null,
+        icon = "@drawable/revanced_settings_screen_12_video",
+        layout = "@layout/preference_with_icon",
         sorting = Sorting.BY_KEY,
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/CustomPlaybackSpeedPatch.kt

@@ -121,11 +121,11 @@ internal val customPlaybackSpeedPatch = bytecodePatch(
 
         // Override the min/max speeds that can be used.
         speedLimiterFingerprint.method.apply {
-            val limitMinIndex = indexOfFirstLiteralInstructionOrThrow(0.25f.toRawBits().toLong())
-            var limitMaxIndex = indexOfFirstLiteralInstruction(2.0f.toRawBits().toLong())
+            val limitMinIndex = indexOfFirstLiteralInstructionOrThrow(0.25f)
+            var limitMaxIndex = indexOfFirstLiteralInstruction(2.0f)
             // Newer targets have 4x max speed.
             if (limitMaxIndex < 0) {
-                limitMaxIndex = indexOfFirstLiteralInstructionOrThrow(4.0f.toRawBits().toLong())
+                limitMaxIndex = indexOfFirstLiteralInstructionOrThrow(4.0f)
             }
 
             val limitMinRegister = getInstruction<OneRegisterInstruction>(limitMinIndex).registerA

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

@@ -14,6 +14,9 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.misc.mapping.get
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
+import app.revanced.util.InstructionUtils.Companion.branchOpcodes
+import app.revanced.util.InstructionUtils.Companion.returnOpcodes
+import app.revanced.util.InstructionUtils.Companion.writeOpcodes
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.Opcode.*
 import com.android.tools.smali.dexlib2.iface.Method
@@ -43,7 +46,7 @@ import java.util.EnumSet
  * @throws IllegalArgumentException If a branch or conditional statement is encountered
  *                                  before a suitable register is found.
  */
-internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude: Int): Int {
+fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude: Int): Int {
     if (implementation == null) {
         throw IllegalArgumentException("Method has no implementation: $this")
     }
@@ -51,42 +54,6 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
         throw IllegalArgumentException("startIndex out of bounds: $startIndex")
     }
 
-    // All registers used by an instruction.
-    fun Instruction.getRegistersUsed() = when (this) {
-        is FiveRegisterInstruction -> listOf(registerC, registerD, registerE, registerF, registerG)
-        is ThreeRegisterInstruction -> listOf(registerA, registerB, registerC)
-        is TwoRegisterInstruction -> listOf(registerA, registerB)
-        is OneRegisterInstruction -> listOf(registerA)
-        is RegisterRangeInstruction -> (startRegister until (startRegister + registerCount)).toList()
-        else -> emptyList()
-    }
-
-    // Register that is written to by an instruction.
-    fun Instruction.getRegisterWritten() = when (this) {
-        is ThreeRegisterInstruction -> registerA
-        is TwoRegisterInstruction -> registerA
-        is OneRegisterInstruction -> registerA
-        else -> throw IllegalStateException("Not a write instruction: $this")
-    }
-
-    val writeOpcodes = EnumSet.of(
-        NEW_INSTANCE, NEW_ARRAY,
-        MOVE, MOVE_FROM16, MOVE_16, MOVE_WIDE, MOVE_WIDE_FROM16, MOVE_WIDE_16, MOVE_OBJECT,
-        MOVE_OBJECT_FROM16, MOVE_OBJECT_16, MOVE_RESULT, MOVE_RESULT_WIDE, MOVE_RESULT_OBJECT, MOVE_EXCEPTION,
-        IGET, IGET_WIDE, IGET_OBJECT, IGET_BOOLEAN, IGET_BYTE, IGET_CHAR, IGET_SHORT,
-        SGET, SGET_WIDE, SGET_OBJECT, SGET_BOOLEAN, SGET_BYTE, SGET_CHAR, SGET_SHORT,
-    )
-
-    val branchOpcodes = EnumSet.of(
-        GOTO, GOTO_16, GOTO_32,
-        IF_EQ, IF_NE, IF_LT, IF_GE, IF_GT, IF_LE,
-        IF_EQZ, IF_NEZ, IF_LTZ, IF_GEZ, IF_GTZ, IF_LEZ,
-    )
-
-    val returnOpcodes = EnumSet.of(
-        RETURN_VOID, RETURN, RETURN_WIDE, RETURN_OBJECT,
-    )
-
     // Highest 4-bit register available, exclusive. Ideally return a free register less than this.
     val maxRegister4Bits = 16
     var bestFreeRegisterFound: Int? = null
@@ -94,9 +61,12 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
 
     for (i in startIndex until instructions.count()) {
         val instruction = getInstruction(i)
+        val instructionRegisters = instruction.registersUsed
 
-        if (instruction.opcode in returnOpcodes) {
-            // Method returns. Use lowest register that hasn't been encountered.
+        if (instruction.isReturnInstruction) {
+            usedRegisters.addAll(instructionRegisters)
+
+            // Use lowest register that hasn't been encountered.
             val freeRegister = (0 until implementation!!.registerCount).find {
                 it !in usedRegisters
             }
@@ -104,7 +74,7 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
                 return freeRegister
             }
             if (bestFreeRegisterFound != null) {
-                return bestFreeRegisterFound;
+                return bestFreeRegisterFound
             }
 
             // Somehow every method register was read from before any register was wrote to.
@@ -113,37 +83,90 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
                     "$startIndex excluding: $registersToExclude")
         }
 
-        if (instruction.opcode in branchOpcodes) {
+        if (instruction.isBranchInstruction) {
             if (bestFreeRegisterFound != null) {
-                return bestFreeRegisterFound;
+                return bestFreeRegisterFound
             }
             // This method is simple and does not follow branching.
             throw IllegalArgumentException("Encountered a branch statement before a free register could be found")
         }
 
-        if (instruction.opcode in writeOpcodes) {
-            val freeRegister = instruction.getRegisterWritten()
-            if (freeRegister !in usedRegisters) {
-                if (freeRegister < maxRegister4Bits) {
-                    // Found an ideal register.
-                    return freeRegister
-                }
 
-                // Continue searching for a 4-bit register if available.
-                if (bestFreeRegisterFound == null || freeRegister < bestFreeRegisterFound) {
-                    bestFreeRegisterFound = freeRegister
+        val writeRegister = instruction.writeRegister
+        if (writeRegister != null) {
+            if (writeRegister !in usedRegisters) {
+                // Verify the register is only used for write and not also as a parameter.
+                // If the instruction uses the write register once then it's not also a read register.
+                if (instructionRegisters.count { register -> register == writeRegister } == 1) {
+                    if (writeRegister < maxRegister4Bits) {
+                        // Found an ideal register.
+                        return writeRegister
+                    }
+
+                    // Continue searching for a 4-bit register if available.
+                    if (bestFreeRegisterFound == null || writeRegister < bestFreeRegisterFound) {
+                        bestFreeRegisterFound = writeRegister
+                    }
                 }
             }
         }
 
-        usedRegisters.addAll(instruction.getRegistersUsed())
+        usedRegisters.addAll(instructionRegisters)
     }
 
-    // Cannot be reached since a branch or return statement will
-    // be encountered before the end of the method.
-    throw IllegalStateException()
+    // Some methods can have array payloads at the end of the method after a return statement.
+    // But in normal usage this cannot be reached since a branch or return statement
+    // will be encountered before the end of the method.
+    throw IllegalArgumentException("Start index is outside the range of normal control flow: $startIndex")
 }
 
+/**
+ * @return The registers used by this instruction.
+ */
+internal val Instruction.registersUsed: List<Int>
+    get() = when (this) {
+        is FiveRegisterInstruction -> {
+            when (registerCount) {
+                1 -> listOf(registerC)
+                2 -> listOf(registerC, registerD)
+                3 -> listOf(registerC, registerD, registerE)
+                4 -> listOf(registerC, registerD, registerE, registerF)
+                else -> listOf(registerC, registerD, registerE, registerF, registerG)
+            }
+        }
+        is ThreeRegisterInstruction -> listOf(registerA, registerB, registerC)
+        is TwoRegisterInstruction -> listOf(registerA, registerB)
+        is OneRegisterInstruction -> listOf(registerA)
+        is RegisterRangeInstruction -> (startRegister until (startRegister + registerCount)).toList()
+        else -> emptyList()
+    }
+
+/**
+ * @return The register that is written to by this instruction,
+ *         or NULL if this is not a write opcode.
+ */
+internal val Instruction.writeRegister: Int?
+    get() {
+        if (this.opcode !in writeOpcodes) {
+            return null
+        }
+        if (this !is OneRegisterInstruction) {
+            throw IllegalStateException("Not a write instruction: $this")
+        }
+        return registerA
+    }
+
+/**
+ * @return If this instruction is an unconditional or conditional branch opcode.
+ */
+internal val Instruction.isBranchInstruction: Boolean
+    get() = this.opcode in branchOpcodes
+
+/**
+ * @return If this instruction returns or throws.
+ */
+internal val Instruction.isReturnInstruction: Boolean
+    get() = this.opcode in returnOpcodes
 
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -197,7 +220,7 @@ fun MutableMethod.injectHideViewCall(
  * (patch code)
  * (original code)
  */
-internal fun MutableMethod.addInstructionsAtControlFlowLabel(
+fun MutableMethod.addInstructionsAtControlFlowLabel(
     insertIndex: Int,
     instructions: String,
 ) {
@@ -248,7 +271,7 @@ fun Method.indexOfFirstResourceIdOrThrow(resourceName: String): Int {
 }
 
 /**
- * Find the index of the first literal instruction with the given value.
+ * Find the index of the first literal instruction with the given long value.
  *
  * @return the first literal instruction with the value, or -1 if not found.
  * @see indexOfFirstLiteralInstructionOrThrow
@@ -260,14 +283,56 @@ fun Method.indexOfFirstLiteralInstruction(literal: Long) = implementation?.let {
 } ?: -1
 
 /**
- * Find the index of the first literal instruction with the given value,
+ * Find the index of the first literal instruction with the given long value,
  * or throw an exception if not found.
  *
  * @return the first literal instruction with the value, or throws [PatchException] if not found.
  */
 fun Method.indexOfFirstLiteralInstructionOrThrow(literal: Long): Int {
     val index = indexOfFirstLiteralInstruction(literal)
-    if (index < 0) throw PatchException("Could not find literal value: $literal")
+    if (index < 0) throw PatchException("Could not find long literal: $literal")
+    return index
+}
+
+/**
+ * Find the index of the first literal instruction with the given float value.
+ *
+ * @return the first literal instruction with the value, or -1 if not found.
+ * @see indexOfFirstLiteralInstructionOrThrow
+ */
+fun Method.indexOfFirstLiteralInstruction(literal: Float) =
+    indexOfFirstLiteralInstruction(literal.toRawBits().toLong())
+
+/**
+ * Find the index of the first literal instruction with the given float value,
+ * or throw an exception if not found.
+ *
+ * @return the first literal instruction with the value, or throws [PatchException] if not found.
+ */
+fun Method.indexOfFirstLiteralInstructionOrThrow(literal: Float): Int {
+    val index = indexOfFirstLiteralInstruction(literal)
+    if (index < 0) throw PatchException("Could not find float literal: $literal")
+    return index
+}
+
+/**
+ * Find the index of the first literal instruction with the given double value.
+ *
+ * @return the first literal instruction with the value, or -1 if not found.
+ * @see indexOfFirstLiteralInstructionOrThrow
+ */
+fun Method.indexOfFirstLiteralInstruction(literal: Double) =
+    indexOfFirstLiteralInstruction(literal.toRawBits().toLong())
+
+/**
+ * Find the index of the first literal instruction with the given double value,
+ * or throw an exception if not found.
+ *
+ * @return the first literal instruction with the value, or throws [PatchException] if not found.
+ */
+fun Method.indexOfFirstLiteralInstructionOrThrow(literal: Double): Int {
+    val index = indexOfFirstLiteralInstruction(literal)
+    if (index < 0) throw PatchException("Could not find double literal: $literal")
     return index
 }
 
@@ -284,24 +349,80 @@ fun Method.indexOfFirstLiteralInstructionReversed(literal: Long) = implementatio
 } ?: -1
 
 /**
- * Find the index of the last wide literal instruction with the given value,
+ * Find the index of the last wide literal instruction with the given long value,
  * or throw an exception if not found.
  *
  * @return the last literal instruction with the value, or throws [PatchException] if not found.
  */
 fun Method.indexOfFirstLiteralInstructionReversedOrThrow(literal: Long): Int {
     val index = indexOfFirstLiteralInstructionReversed(literal)
-    if (index < 0) throw PatchException("Could not find literal value: $literal")
+    if (index < 0) throw PatchException("Could not find long literal: $literal")
     return index
 }
 
 /**
- * Check if the method contains a literal with the given value.
+ * Find the index of the last literal instruction with the given float value.
+ *
+ * @return the last literal instruction with the value, or -1 if not found.
+ * @see indexOfFirstLiteralInstructionOrThrow
+ */
+fun Method.indexOfFirstLiteralInstructionReversed(literal: Float) =
+    indexOfFirstLiteralInstructionReversed(literal.toRawBits().toLong())
+
+/**
+ * Find the index of the last wide literal instruction with the given float value,
+ * or throw an exception if not found.
+ *
+ * @return the last literal instruction with the value, or throws [PatchException] if not found.
+ */
+fun Method.indexOfFirstLiteralInstructionReversedOrThrow(literal: Float): Int {
+    val index = indexOfFirstLiteralInstructionReversed(literal)
+    if (index < 0) throw PatchException("Could not find float literal: $literal")
+    return index
+}
+
+/**
+ * Find the index of the last literal instruction with the given double value.
+ *
+ * @return the last literal instruction with the value, or -1 if not found.
+ * @see indexOfFirstLiteralInstructionOrThrow
+ */
+fun Method.indexOfFirstLiteralInstructionReversed(literal: Double) =
+    indexOfFirstLiteralInstructionReversed(literal.toRawBits().toLong())
+
+/**
+ * Find the index of the last wide literal instruction with the given double value,
+ * or throw an exception if not found.
+ *
+ * @return the last literal instruction with the value, or throws [PatchException] if not found.
+ */
+fun Method.indexOfFirstLiteralInstructionReversedOrThrow(literal: Double): Int {
+    val index = indexOfFirstLiteralInstructionReversed(literal)
+    if (index < 0) throw PatchException("Could not find double literal: $literal")
+    return index
+}
+
+/**
+ * Check if the method contains a literal with the given long value.
  *
  * @return if the method contains a literal with the given value.
  */
 fun Method.containsLiteralInstruction(literal: Long) = indexOfFirstLiteralInstruction(literal) >= 0
 
+/**
+ * Check if the method contains a literal with the given float value.
+ *
+ * @return if the method contains a literal with the given value.
+ */
+fun Method.containsLiteralInstruction(literal: Float) = indexOfFirstLiteralInstruction(literal) >= 0
+
+/**
+ * Check if the method contains a literal with the given double value.
+ *
+ * @return if the method contains a literal with the given value.
+ */
+fun Method.containsLiteralInstruction(literal: Double) = indexOfFirstLiteralInstruction(literal) >= 0
+
 /**
  * Traverse the class hierarchy starting from the given root class.
  *
@@ -515,7 +636,12 @@ fun Method.findInstructionIndicesReversedOrThrow(opcode: Opcode): List<Int> {
     return instructions
 }
 
-internal fun MutableMethod.insertFeatureFlagBooleanOverride(literal: Long, extensionsMethod: String) {
+/**
+ * Overrides the first move result with an extension call.
+ * Suitable for calls to extension code to override boolean and integer values.
+ */
+internal fun MutableMethod.insertLiteralOverride(literal: Long, extensionMethodDescriptor: String) {
+    // TODO: make this work with objects and wide values.
     val literalIndex = indexOfFirstLiteralInstructionOrThrow(literal)
     val index = indexOfFirstInstructionOrThrow(literalIndex, MOVE_RESULT)
     val register = getInstruction<OneRegisterInstruction>(index).registerA
@@ -529,9 +655,24 @@ internal fun MutableMethod.insertFeatureFlagBooleanOverride(literal: Long, exten
     addInstructions(
         index + 1,
         """
-            $operation, $extensionsMethod
+            $operation, $extensionMethodDescriptor
             move-result v$register
-        """,
+        """
+    )
+}
+
+/**
+ * Overrides a literal value result with a constant value.
+ */
+internal fun MutableMethod.insertLiteralOverride(literal: Long, override: Boolean) {
+    val literalIndex = indexOfFirstLiteralInstructionOrThrow(literal)
+    val index = indexOfFirstInstructionOrThrow(literalIndex, MOVE_RESULT)
+    val register = getInstruction<OneRegisterInstruction>(index).registerA
+    val overrideValue = if (override) "0x1" else "0x0"
+
+    addInstruction(
+        index + 1,
+        "const v$register, $overrideValue"
     )
 }
 
@@ -593,3 +734,58 @@ fun FingerprintBuilder.literal(literalSupplier: () -> Long) {
         method.containsLiteralInstruction(literalSupplier())
     }
 }
+
+private class InstructionUtils {
+    companion object {
+        val branchOpcodes: EnumSet<Opcode> = EnumSet.of(
+            GOTO, GOTO_16, GOTO_32,
+            IF_EQ, IF_NE, IF_LT, IF_GE, IF_GT, IF_LE,
+            IF_EQZ, IF_NEZ, IF_LTZ, IF_GEZ, IF_GTZ, IF_LEZ,
+            PACKED_SWITCH_PAYLOAD, SPARSE_SWITCH_PAYLOAD
+        )
+
+        val returnOpcodes: EnumSet<Opcode> = EnumSet.of(
+            RETURN_VOID, RETURN, RETURN_WIDE, RETURN_OBJECT, RETURN_VOID_NO_BARRIER,
+            THROW
+        )
+
+        val writeOpcodes: EnumSet<Opcode> = EnumSet.of(
+            ARRAY_LENGTH,
+            INSTANCE_OF,
+            NEW_INSTANCE, NEW_ARRAY,
+            MOVE, MOVE_FROM16, MOVE_16, MOVE_WIDE, MOVE_WIDE_FROM16, MOVE_WIDE_16, MOVE_OBJECT,
+            MOVE_OBJECT_FROM16, MOVE_OBJECT_16, MOVE_RESULT, MOVE_RESULT_WIDE, MOVE_RESULT_OBJECT, MOVE_EXCEPTION,
+            CONST, CONST_4, CONST_16, CONST_HIGH16, CONST_WIDE_16, CONST_WIDE_32,
+            CONST_WIDE, CONST_WIDE_HIGH16, CONST_STRING, CONST_STRING_JUMBO,
+            IGET, IGET_WIDE, IGET_OBJECT, IGET_BOOLEAN, IGET_BYTE, IGET_CHAR, IGET_SHORT,
+            IGET_VOLATILE, IGET_WIDE_VOLATILE, IGET_OBJECT_VOLATILE,
+            SGET, SGET_WIDE, SGET_OBJECT, SGET_BOOLEAN, SGET_BYTE, SGET_CHAR, SGET_SHORT,
+            SGET_VOLATILE, SGET_WIDE_VOLATILE, SGET_OBJECT_VOLATILE,
+            AGET, AGET_WIDE, AGET_OBJECT, AGET_BOOLEAN, AGET_BYTE, AGET_CHAR, AGET_SHORT,
+            // Arithmetic and logical operations.
+            ADD_DOUBLE_2ADDR, ADD_DOUBLE, ADD_FLOAT_2ADDR, ADD_FLOAT, ADD_INT_2ADDR,
+            ADD_INT_LIT8, ADD_INT, ADD_LONG_2ADDR, ADD_LONG, ADD_INT_LIT16,
+            AND_INT_2ADDR, AND_INT_LIT8, AND_INT_LIT16, AND_INT, AND_LONG_2ADDR, AND_LONG,
+            DIV_DOUBLE_2ADDR, DIV_DOUBLE, DIV_FLOAT_2ADDR, DIV_FLOAT, DIV_INT_2ADDR,
+            DIV_INT_LIT16, DIV_INT_LIT8, DIV_INT, DIV_LONG_2ADDR, DIV_LONG,
+            DOUBLE_TO_FLOAT, DOUBLE_TO_INT, DOUBLE_TO_LONG,
+            FLOAT_TO_DOUBLE, FLOAT_TO_INT, FLOAT_TO_LONG,
+            INT_TO_BYTE, INT_TO_CHAR, INT_TO_DOUBLE, INT_TO_FLOAT, INT_TO_LONG, INT_TO_SHORT,
+            LONG_TO_DOUBLE, LONG_TO_FLOAT, LONG_TO_INT,
+            MUL_DOUBLE_2ADDR, MUL_DOUBLE, MUL_FLOAT_2ADDR, MUL_FLOAT, MUL_INT_2ADDR,
+            MUL_INT_LIT16, MUL_INT_LIT8, MUL_INT, MUL_LONG_2ADDR, MUL_LONG,
+            NEG_DOUBLE, NEG_FLOAT, NEG_INT, NEG_LONG,
+            NOT_INT, NOT_LONG,
+            OR_INT_2ADDR, OR_INT_LIT16, OR_INT_LIT8, OR_INT, OR_LONG_2ADDR, OR_LONG,
+            REM_DOUBLE_2ADDR, REM_DOUBLE, REM_FLOAT_2ADDR, REM_FLOAT, REM_INT_2ADDR,
+            REM_INT_LIT16, REM_INT_LIT8, REM_INT, REM_LONG_2ADDR, REM_LONG,
+            RSUB_INT_LIT8, RSUB_INT,
+            SHL_INT_2ADDR, SHL_INT_LIT8, SHL_INT, SHL_LONG_2ADDR, SHL_LONG,
+            SHR_INT_2ADDR, SHR_INT_LIT8, SHR_INT, SHR_LONG_2ADDR, SHR_LONG,
+            SUB_DOUBLE_2ADDR, SUB_DOUBLE, SUB_FLOAT_2ADDR, SUB_FLOAT, SUB_INT_2ADDR,
+            SUB_INT, SUB_LONG_2ADDR, SUB_LONG,
+            USHR_INT_2ADDR, USHR_INT_LIT8, USHR_INT, USHR_LONG_2ADDR, USHR_LONG,
+            XOR_INT_2ADDR, XOR_INT_LIT16, XOR_INT_LIT8, XOR_INT, XOR_LONG_2ADDR, XOR_LONG,
+        )
+    }
+}

patches/src/main/resources/addresources/values-af-rZA/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

patches/src/main/resources/addresources/values-am-rET/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">إعادة تعيين إعدادات ReVanced إلى الوضع الافتراضي</string>
   <string name="revanced_settings_import_success">تم استيراد %d إعدادات</string>
   <string name="revanced_settings_import_failure_parse">فشل الاستيراد: %s</string>
+  <string name="revanced_show_menu_icons_title">عرض أيقونات إعدادات ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">يتم عرض أيقونات الإعدادات</string>
+  <string name="revanced_show_menu_icons_summary_off">لا يتم عرض أيقونات الإعدادات</string>
   <string name="revanced_language_title">لغة ReVanced</string>
   <string name="revanced_language_user_dialog_message">"قد تكون الترجمات لبعض اللغات مفقودة أو غير مكتملة.
 
@@ -610,6 +612,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_audio_track_title">إخفاء المقطع الصوتي</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">تم إخفاء قائمة المقطع الصوتي</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">يتم عرض قائمة المقطع الصوتي</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"تم إخفاء قائمة المقطع الصوتي
+
+لعرض قائمة المقطع الصوتي، غيّر 'Spoof Video Streams' إلى iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">إخفاء المشاهدة في VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">تم إخفاء قائمة المشاهدة في الوضع الافتراضي</string>

patches/src/main/resources/addresources/values-as-rIN/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVanced tənzimləmələr standarta təyin edildi</string>
   <string name="revanced_settings_import_success">%d tənzimləmə idxal edildi</string>
   <string name="revanced_settings_import_failure_parse">Uğursuz idxal prosesi: %s</string>
+  <string name="revanced_show_menu_icons_title">ReVanced tənzimləmə nişanların göstər</string>
+  <string name="revanced_show_menu_icons_summary_on">Tənzimləmə nişanları göstərilir</string>
+  <string name="revanced_show_menu_icons_summary_off">Tənzimləmə nişanları göstərilmir</string>
   <string name="revanced_language_title">ReVanced dili</string>
   <string name="revanced_language_user_dialog_message">"Bəzi dillər üçün tərcümələr əskik və ya səhv ola bilər.
 
@@ -610,6 +612,10 @@ Bu seçimi dəyişdirmə işə düşmürsə, Gizli rejimə keçməyə çalışı
   <string name="revanced_hide_player_flyout_audio_track_title">Səs trekini gizlət</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Səs axını menyusu gizlidir</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Səs axını menyusu göstərilir</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Audio trek seçimi gizlədilib
+
+Audio trek seçimin göstərmək üçün \"Video axınları saxtalaşdır\"ı iOS TV-yə dəyiş"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">\"VR-da İzləni\" gizlət</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">VR menyusunda izləmə gizlidir</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Налады ReVanced скінуты да стандартных</string>
   <string name="revanced_settings_import_success">Імпартавана %d налад</string>
   <string name="revanced_settings_import_failure_parse">Памылка імпарту: %s</string>
+  <string name="revanced_show_menu_icons_title">Паказваць значкі налад ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Значкі налад паказваюцца</string>
+  <string name="revanced_show_menu_icons_summary_off">Значкі налад не паказваюцца</string>
   <string name="revanced_language_title">Мова ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Пераклады для некаторых моў могуць быць адсутнымі або няпоўнымі.
 
@@ -610,6 +612,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_audio_track_title">Схаваць гукавую дарожку</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Меню гукавой дарожкі схавана</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Адлюструецца меню гукавой дарожкі</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Меню аўдыядарожкі схавана
+
+Каб паказаць меню аўдыядарожкі, змяніце \"Падробка відэаструменяў\" на iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Схаваць гадзіннік у VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Меню прагляду ў VR схавана</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Настройките на ReVanced бяха нулирани</string>
   <string name="revanced_settings_import_success">Следните настройки бяха импортирани успешно: %d</string>
   <string name="revanced_settings_import_failure_parse">Импортирането беше неуспешно: %s</string>
+  <string name="revanced_show_menu_icons_title">Показване на иконите на настройките на ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Иконите на настройките се показват</string>
+  <string name="revanced_show_menu_icons_summary_off">Иконите на настройките не се показват</string>
   <string name="revanced_language_title">Език на ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Преводите на някои езици може да липсват или да са непълни.
 
@@ -610,6 +612,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_audio_track_title">Избор на Аудио</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Менюто за избор на Аудио е скрито</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Менюто за избор на Аудио се показва</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Менюто за аудио тракове е скрито
+
+За да покажете менюто за аудио тракове, променете \"Подмяна на видео потоци\" на iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Гледайте във VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Менюто за гледане в VR е скрито</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVanced সেটিং ডিফল্ট সেট করা হয়েছে</string>
   <string name="revanced_settings_import_success">%d সেটিং আমদানি হয়েছে</string>
   <string name="revanced_settings_import_failure_parse">আমদানি করা যায়নি: %s</string>
+  <string name="revanced_show_menu_icons_title">ReVanced সেটিং আইকন দেখান</string>
+  <string name="revanced_show_menu_icons_summary_on">সেটিং আইকন দেখানো হয়েছে</string>
+  <string name="revanced_show_menu_icons_summary_off">সেটিং আইকন দেখানো হচ্ছে না</string>
   <string name="revanced_language_title">ReVanced ভাষা</string>
   <string name="revanced_language_user_dialog_message">"কিছু ভাষার জন্য অনুবাদ অনুপস্থিত বা অসম্পূর্ণ হতে পারে।
 
@@ -610,6 +612,10 @@ MicroG-এর জন্য ব্যাটারি অপ্টিমাইজ
   <string name="revanced_hide_player_flyout_audio_track_title">অডিও ট্র্যাক লুকান</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">অডিও ট্র্যাক মেনু লুকানো আছে</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">অডিও ট্র্যাক মেনু দেখানো হয়</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"অডিও ট্র্যাক মেনু লুকানো আছে
+
+অডিও ট্র্যাক মেনু দেখাতে, 'স্পুফ ভিডিও স্ট্রিম' পরিবর্তন করে iOS TV করুন"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">ভিআর-এ ঘড়ি লুকান</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">ভিআর মেনুতে দেখুন লুকানো আছে</string>

patches/src/main/resources/addresources/values-bs-rBA/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">La configuració de ReVanced s\'ha restablert als valors predeterminats</string>
   <string name="revanced_settings_import_success">S\'han importat %d configuracions</string>
   <string name="revanced_settings_import_failure_parse">No s\'ha pogut importar: %s</string>
+  <string name="revanced_show_menu_icons_title">Mostra les icones de configuració de ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Es mostren les icones de configuració</string>
+  <string name="revanced_show_menu_icons_summary_off">No es mostren les icones de configuració</string>
   <string name="revanced_language_title">Llenguatge de ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Les traduccions per a algunes llengües poden faltar o ser incompletes.
 
@@ -610,6 +612,10 @@ Si canviar aquesta opció no té cap efecte, prova a canviar al mode d'incògnit
   <string name="revanced_hide_player_flyout_audio_track_title">Amaga la pista d\'àudio</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">El menú de la pista d\'àudio s\'amaga</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Es mostra el menú de la pista d\'àudio</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"El menú de la pista d'àudio està amagat
+
+Per mostrar el menú de la pista d'àudio, canvieu \"Suplanta els fluxos de vídeo\" a iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Amaga Mira en VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">El menú Mira en VR s\'amaga</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Nastavení ReVanced obnoveno do výchozího stavu</string>
   <string name="revanced_settings_import_success">Importováno %d nastavení</string>
   <string name="revanced_settings_import_failure_parse">Importováni selhalo: %s</string>
+  <string name="revanced_show_menu_icons_title">Zobrazit ikony nastavení ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Ikony nastavení se zobrazují</string>
+  <string name="revanced_show_menu_icons_summary_off">Ikony nastavení se nezobrazují</string>
   <string name="revanced_language_title">Jazyk ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Překlady pro některé jazyky mohou chybět nebo být neúplné.
 
@@ -610,6 +612,10 @@ Pokud změna tohoto nastavení nemá žádný účinek, zkuste přepnout do rež
   <string name="revanced_hide_player_flyout_audio_track_title">Skrýt Zvuková stopa</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Menu Zvuková stopa je skryto</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Menu Zvuková stopa je zobrazeno</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Nabídka zvukové stopy je skrytá.
+
+Chcete-li zobrazit nabídku zvukové stopy, změňte možnost „Zfalšovat streamy videa“ na iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Skrýt Sledovat ve VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Menu Sledovat ve VR je skryto</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVanced-indstillinger nulstillet til standard</string>
   <string name="revanced_settings_import_success">%d indstillinger importeret</string>
   <string name="revanced_settings_import_failure_parse">Import mislykkedes: %s</string>
+  <string name="revanced_show_menu_icons_title">Vis ReVanced-indstillingsikoner</string>
+  <string name="revanced_show_menu_icons_summary_on">Indstillingsikoner vises</string>
+  <string name="revanced_show_menu_icons_summary_off">Indstillingsikoner vises ikke</string>
   <string name="revanced_language_title">ReVanced-sprog</string>
   <string name="revanced_language_user_dialog_message">"Oversættelser for nogle sprog mangler muligvis eller er ufuldstændige.
 
@@ -573,6 +575,10 @@ Hvis ændring af denne indstilling ikke træder i kraft, kan du prøve at skifte
   <string name="revanced_hide_player_flyout_audio_track_title">Skjul lydspor</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Menuen for lydspor er skjult</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Menuen Lydspor vises</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Lydspormenuen er skjult
+
+For at vise lydspormenuen skal du ændre \"Spoof videostream\" til iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Skjul vagt i VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Se i VR-menuen er skjult</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVanced-Einstellungen auf Standardwerte zurückgesetzt</string>
   <string name="revanced_settings_import_success">%d Einstellungen importiert</string>
   <string name="revanced_settings_import_failure_parse">Import fehlgeschlagen: %s</string>
+  <string name="revanced_show_menu_icons_title">ReVanced-Einstellungssymbole anzeigen</string>
+  <string name="revanced_show_menu_icons_summary_on">Einstellungssymbole werden angezeigt</string>
+  <string name="revanced_show_menu_icons_summary_off">Einstellungssymbole werden nicht angezeigt</string>
   <string name="revanced_language_title">ReVanced-Sprache</string>
   <string name="revanced_language_user_dialog_message">"Übersetzungen für einige Sprachen fehlen möglicherweise oder sind unvollständig.
 
@@ -603,6 +605,10 @@ Wenn diese Änderung nicht wirksam wird, versuchen Sie, in den Inkognito-Modus z
   <string name="revanced_hide_player_flyout_audio_track_title">Audiospur ausblenden</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Audiospur-Menü ist ausgeblendet</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Audiospurmenü wird angezeigt</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Das Audiotrack-Menü ist ausgeblendet.
+
+Um das Audiotrack-Menü anzuzeigen, ändere \"Video-Streams fälschen\" zu iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Überwachung in VR ausblenden</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Im VR-Menü beobachten ist ausgeblendet</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Επαναφέρθηκαν οι προεπιλεγμένες ρυθμίσεις ReVanced</string>
   <string name="revanced_settings_import_success">Έγινε εισαγωγή %d ρυθμίσεων</string>
   <string name="revanced_settings_import_failure_parse">Η εισαγωγή απέτυχε: %s</string>
+  <string name="revanced_show_menu_icons_title">Εμφάνιση εικονιδίων στις ρυθμίσεις ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Τα εικονίδια ρυθμίσεων εμφανίζονται</string>
+  <string name="revanced_show_menu_icons_summary_off">Τα εικονίδια ρυθμίσεων δεν εμφανίζονται</string>
   <string name="revanced_language_title">Γλώσσα ρυθμίσεων ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Οι μεταφράσεις για κάποιες γλώσσες ενδέχεται να λείπουν ή να είναι ελλιπείς. 
 
@@ -612,6 +614,10 @@ Second \"item\" text"</string>
   <string name="revanced_hide_player_flyout_audio_track_title">Μενού «Κομμάτι ήχου»</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Κρυμμένο</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Εμφανίζεται</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Το μενού «Κομμάτι ήχου» είναι κρυμμένο
+
+Για να εμφανίζεται το μενού κομματιού ήχου, αλλάξτε την «Παραποίηση ροών βίντεο» σε iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Μενού «Προβολή σε VR»</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Κρυμμένο</string>
@@ -1180,7 +1186,7 @@ Second \"item\" text"</string>
   <string name="revanced_miniplayer_hide_overlay_buttons_summary_on">Κρυμμένα</string>
   <string name="revanced_miniplayer_hide_overlay_buttons_summary_off">Εμφανίζονται</string>
   <string name="revanced_miniplayer_hide_overlay_buttons_legacy_title">Κουμπιά επέκτασης και κλεισίματος</string>
-  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_on">"Τα κουμπιά δεν εμφανίζονται
+  <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_on">"Κρυμμένα
 
 Σύρετε για να αναπτύξετε ή να κλείσετε"</string>
   <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_off">Εμφανίζονται</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Configuración ReVanced restablecida por defecto</string>
   <string name="revanced_settings_import_success">Configuración importada de %d</string>
   <string name="revanced_settings_import_failure_parse">Error de importación: %s</string>
+  <string name="revanced_show_menu_icons_title">Mostrar iconos de configuración de ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Se muestran los iconos de configuración</string>
+  <string name="revanced_show_menu_icons_summary_off">No se muestran los iconos de configuración</string>
   <string name="revanced_language_title">Idioma de ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Las traducciones para algunos idiomas pueden faltar o estar incompletas.
 
@@ -607,6 +609,10 @@ Si cambiar este ajuste no tiene efecto, intenta cambiar al modo incógnito."</st
   <string name="revanced_hide_player_flyout_audio_track_title">Ocultar pista de audio</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">El menú de pista de audio está oculto</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">El menú de pista de audio se muestra</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"El menú de la pista de audio está oculto.
+
+Para mostrar el menú de la pista de audio, cambia \"Suplantar transmisiones de video\" a iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Ocultar reloj en VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Ver en el menú VR está oculto</string>
@@ -699,7 +705,7 @@ Si cambiar este ajuste no tiene efecto, intenta cambiar al modo incógnito."</st
   <string name="revanced_hide_shorts_location_label_summary_on">Etiqueta de ubicación oculta</string>
   <string name="revanced_hide_shorts_location_label_summary_off">Etiqueta de ubicación mostrada</string>
   <string name="revanced_hide_shorts_save_sound_button_title">Ocultar el botón Guardar música</string>
-  <string name="revanced_hide_shorts_save_sound_button_summary_on">Guardar botón de música está oculto</string>
+  <string name="revanced_hide_shorts_save_sound_button_summary_on">El botón Guardar música está oculto</string>
   <string name="revanced_hide_shorts_save_sound_button_summary_off">Mostrar el botón de guardar música</string>
   <string name="revanced_hide_shorts_use_template_button_title">Ocultar el botón Usar plantilla</string>
   <string name="revanced_hide_shorts_use_template_button_summary_on">Botón de plantilla de uso está oculto</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVancedi seaded on lähtestatud</string>
   <string name="revanced_settings_import_success">Imporditi %d seadet</string>
   <string name="revanced_settings_import_failure_parse">Importimine ebaõnnestus: %s</string>
+  <string name="revanced_show_menu_icons_title">Näita ReVancedi seadete ikoone</string>
+  <string name="revanced_show_menu_icons_summary_on">Seadete ikoonid on näidatud</string>
+  <string name="revanced_show_menu_icons_summary_off">Seadete ikoonid ei ole nähtavad</string>
   <string name="revanced_language_title">Revancedi keel</string>
   <string name="revanced_language_user_dialog_message">"Mõnede keelte tõlked võivad olla puudulikud või ebatäielikud.
 
@@ -610,6 +612,10 @@ Kui selle sätte muutmine ei avalda mõju, proovige lülituda Inkognito režiimi
   <string name="revanced_hide_player_flyout_audio_track_title">Peida Helitraek</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Helitraekide menüü on peidetud</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Helitraekide menüü on nähtav</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Heliriba menüü on peidetud
+
+Heliriba menüü kuvamiseks muutke valikut „Võltsitud videovoogedastus“ väärtuseks iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Peida Vaata VR-is</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Vaata VR-is menüü on peidetud</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -127,6 +126,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Revanced-asetukset nollattiin</string>
   <string name="revanced_settings_import_success">%d asetusta tuotiin</string>
   <string name="revanced_settings_import_failure_parse">Tuonti epäonnistui: %s</string>
+  <string name="revanced_show_menu_icons_title">Näytä ReVanced-asetuskuvakkeet</string>
+  <string name="revanced_show_menu_icons_summary_on">Asetuskuvakkeet näytetään</string>
+  <string name="revanced_show_menu_icons_summary_off">Asetuskuvakkeita ei näytetä</string>
   <string name="revanced_language_title">ReVancedin kieli</string>
   <string name="revanced_language_user_dialog_message">"Joidenkin kielten käännökset saattavat puuttua tai olla puutteellisia.
 
@@ -226,6 +228,9 @@ Et saa ilmoituksia odottamattomista tapahtumista."</string>
   <string name="revanced_hide_artist_cards_title">Piilota artistikortit</string>
   <string name="revanced_hide_artist_cards_summary_on">Artistikortit on piilotettu</string>
   <string name="revanced_hide_artist_cards_summary_off">Artistikortit näytetään</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_title">Piilota \"tekoälyn luoma videoyhteenveto\"</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_on">Videon yhteenveto-osio on piilotettu</string>
+  <string name="revanced_hide_ai_generated_video_summary_section_summary_off">Videon yhteenveto-osio näytetään</string>
   <string name="revanced_hide_attributes_section_title">Piilota Määritteet</string>
   <string name="revanced_hide_attributes_section_summary_on">Esitellyt paikat, Pelit, Musiikki ja Mainitut ihmiset -osiot on piilotettu</string>
   <string name="revanced_hide_attributes_section_summary_off">Esitellyt paikat, Pelit, Musiikki ja Mainitut ihmiset -osiot näytetään</string>
@@ -262,8 +267,12 @@ Et saa ilmoituksia odottamattomista tapahtumista."</string>
   <string name="revanced_hide_filter_bar_feed_in_related_videos_summary_off">Näytetään liittyvissä videoissa</string>
   <string name="revanced_comments_screen_title">Kommentit</string>
   <string name="revanced_comments_screen_summary">Piilota tai näytä kommenttiosion osia</string>
+  <string name="revanced_hide_comments_ai_chat_summary_title">Piilota tekoälyn luoma chat-yhteenveto</string>
   <string name="revanced_hide_comments_ai_chat_summary_summary_on">Chat-yhteenveto on piilotettu</string>
   <string name="revanced_hide_comments_ai_chat_summary_summary_off">Chat-yhteenveto näytetään</string>
+  <string name="revanced_hide_comments_ai_summary_title">Piilota tekoälyn luoma kommenttiyhteenveto</string>
+  <string name="revanced_hide_comments_ai_summary_summary_on">Kommenttien yhteenveto on piilotettu</string>
+  <string name="revanced_hide_comments_ai_summary_summary_off">Kommenttien yhteenveto näytetään</string>
   <string name="revanced_hide_comments_by_members_header_title">Piilota \"Jäsenten kommentit\" -ylätunniste</string>
   <string name="revanced_hide_comments_by_members_header_summary_on">Jäsenten kommentit -ylätunniste on piilotettu</string>
   <string name="revanced_hide_comments_by_members_header_summary_off">Jäsenten kommentit -ylätunniste näytetään</string>
@@ -423,6 +432,9 @@ Tämä ominaisuus on käytettävissä vain vanhemmilla laitteilla"</string>
   <string name="revanced_disable_precise_seeking_gesture_summary_off">Ele on käytössä</string>
   </patch>
   <patch id="interaction.seekbar.enableSeekbarTappingPatch">
+  <string name="revanced_seekbar_tapping_title">Ota kelaus napauttamalla käyttöön</string>
+  <string name="revanced_seekbar_tapping_summary_on">Kelaus napauttamalla on käytössä</string>
+  <string name="revanced_seekbar_tapping_summary_off">Kelaus napauttamalla ei ole käytössä</string>
   </patch>
   <patch id="interaction.swipecontrols.swipeControlsResourcePatch">
   <string name="revanced_swipe_brightness_title">Ota kirkkauden ele käyttöön</string>
@@ -435,6 +447,9 @@ Säädä kirkkautta pyyhkäisemällä pystysuoraan näytön vasemmalla puolella"
 
 Säädä äänenvoimakkuutta pyyhkäisemällä pystysuoraan näytön oikealta puolella"</string>
   <string name="revanced_swipe_volume_summary_off">Koko näytön äänenvoimakkuuden pyyhkäisy ei ole käytössä</string>
+  <string name="revanced_swipe_press_to_engage_title">Ota pyyhkäise painamalla -ele käyttöön</string>
+  <string name="revanced_swipe_press_to_engage_summary_on">Pyyhkäise painamalla -ele on käytössä</string>
+  <string name="revanced_swipe_press_to_engage_summary_off">Pyyhkäise painamalla -ele ei ole käytössä</string>
   <string name="revanced_swipe_haptic_feedback_title">Ota haptinen palaute käyttöön</string>
   <string name="revanced_swipe_haptic_feedback_summary_on">Haptinen palaute on käytössä</string>
   <string name="revanced_swipe_haptic_feedback_summary_off">Haptinen palaute ei ole käytössä</string>
@@ -542,6 +557,7 @@ Jos tämän asetuksen muuttaminen ei tule voimaan, kokeile vaihtaa Incognito-til
   <string name="revanced_disable_translucent_status_bar_title">Poista läpikuultava tilapalkki käytöstä</string>
   <string name="revanced_disable_translucent_status_bar_summary_on">Tilapalkki on läpinäkymätön</string>
   <string name="revanced_disable_translucent_status_bar_summary_off">Tilapalkki on läpinäkymätön tai läpikuultava</string>
+  <string name="revanced_disable_translucent_status_bar_user_dialog_message">Joillakin laitteilla tämän ominaisuuden käyttöönotto voi muuttaa järjestelmän navigointipalkin läpinäkyväksi.</string>
   <string name="revanced_disable_translucent_navigation_bar_light_title">Poista vaalea läpikuultava palkki käytöstä</string>
   <string name="revanced_disable_translucent_navigation_bar_light_summary_on">Vaalean tilan navigointipalkki on läpinäkymätön</string>
   <string name="revanced_disable_translucent_navigation_bar_light_summary_off">Vaalean tilan navigointipalkki on läpinäkymätön tai läpikuultava</string>
@@ -596,6 +612,10 @@ Jos tämän asetuksen muuttaminen ei tule voimaan, kokeile vaihtaa Incognito-til
   <string name="revanced_hide_player_flyout_audio_track_title">Piilota Ääniraita</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Ääniraitavalikko on piilotettu</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Ääniraitavalikko näytetään</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Ääniraitavalikko on piilotettu
+
+Jos haluat nähdä sen, aseta \"Naamioi videovirrat\" iOS TV:ksi"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Piilota Katso VR-tilassa</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Katso VR-tilassa -valinta on piilotettu</string>
@@ -1161,6 +1181,9 @@ Minisoitin voidaan vetää mihin tahansa näytön kulmaan"</string>
 
 Minisoitin voidaan vetää pois näytöltä vasemmalle tai oikealle"</string>
   <string name="revanced_miniplayer_horizontal_drag_summary_off">Vaakasuuntainen vetoele ei ole käytössä</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_title">Piilota peittokuvan painikkeet</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_summary_on">Peittokuvan painikkeet on piilotettu</string>
+  <string name="revanced_miniplayer_hide_overlay_buttons_summary_off">Peittokuvan painikkeet näytetään</string>
   <string name="revanced_miniplayer_hide_overlay_buttons_legacy_title">Piilota laajenna- ja sulje-painikkeet</string>
   <string name="revanced_miniplayer_hide_overlay_buttons_legacy_summary_on">"Painikkeet piilotetaan
 

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">I-reset ang mga ReVanced na setting sa default</string>
   <string name="revanced_settings_import_success">Na-import ang %d na mga setting</string>
   <string name="revanced_settings_import_failure_parse">Nabigo ang pag-import: %s</string>
+  <string name="revanced_show_menu_icons_title">Ipakita ang mga icon ng setting ng ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Ipinapakita ang mga icon ng setting</string>
+  <string name="revanced_show_menu_icons_summary_off">Hindi ipinapakita ang mga icon ng setting</string>
   <string name="revanced_language_title">Wika ng ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Ang mga pagsasalin para sa ilang mga wika ay maaaring nawawala o hindi kumpleto.
 
@@ -608,6 +610,10 @@ Tandaan: Ang pagpapagana nito ay nagtatago rin ng mga ad ng video"</string>
   <string name="revanced_hide_player_flyout_audio_track_title">Itago ang Audio track</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Nakatago ang menu ng audio track</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Ipinapakita ang menu ng audio track</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Nakatago ang menu ng audio track
+
+Upang ipakita ang menu ng Audio track, baguhin ang 'Spoof video streams' sa iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Itago ang Panoorin sa VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Nakatago ang panonood sa VR menu</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Paramètres ReVanced réinitialisés aux valeurs par défaut</string>
   <string name="revanced_settings_import_success">%d paramètres importés</string>
   <string name="revanced_settings_import_failure_parse">Importation échouée : %s</string>
+  <string name="revanced_show_menu_icons_title">Afficher les icônes des paramètres ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Les icônes des paramètres sont affichées</string>
+  <string name="revanced_show_menu_icons_summary_off">Les icônes des paramètres ne sont pas affichées</string>
   <string name="revanced_language_title">Langue de ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Il se peut que les traductions dans certaines langues soient manquantes ou incomplètes.
 
@@ -610,6 +612,10 @@ Si la modification de ce paramètre ne prend pas effet, essayez de passer en mod
   <string name="revanced_hide_player_flyout_audio_track_title">Masquer \"Piste audio\"</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Le menu Piste audio est masqué</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Le menu Piste audio est affiché</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Le menu Piste audio est masqué
+
+Pour afficher le menu Piste audio, définissez \"Falsifier les flux vidéo\" sur iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Masquer \"Regarder en RV\"</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Le menu Regarder en RV est masqué</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Athshocraigh socruithe ReVanced go réamhshocrú</string>
   <string name="revanced_settings_import_success">Iompórtáladh %d socruithe</string>
   <string name="revanced_settings_import_failure_parse">Theip ar allmhairiú: %s</string>
+  <string name="revanced_show_menu_icons_title">Taispeáin deilbhíní socruithe ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Taispeántar deilbhíní socruithe</string>
+  <string name="revanced_show_menu_icons_summary_off">Ní thaispeántar deilbhíní socraithe</string>
   <string name="revanced_language_title">Teanga ReVanced</string>
   <string name="revanced_language_user_dialog_message">"D'fhéadfadh aistriúcháin do roinnt teangacha a bheith ar iarraidh nó mí-iomlán.
 
@@ -610,6 +612,10 @@ Mura dtagann aon athrú ar an socrú seo, bain triail as mód Incognito a chur a
   <string name="revanced_hide_player_flyout_audio_track_title">Folaigh Rian Fuaime</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Tá roghchlár rian fuaime i bhfolach</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Taispeántar roghchlár rian fuaime</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Tá roghchlár na rian fuaime i bhfolach
+
+Chun roghchlár na rian fuaime a thaispeáint, athraigh 'Srutháin físeáin bhréige' go iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Folaigh Watch i VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Tá faire i roghchlár VR i bhfolach</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

patches/src/main/resources/addresources/values-gu-rIN/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

patches/src/main/resources/addresources/values-hi-rIN/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

patches/src/main/resources/addresources/values-hr-rHR/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">A ReVanced beállítások visszaállnak az alapértelmezettre</string>
   <string name="revanced_settings_import_success">%d beállítás importálva</string>
   <string name="revanced_settings_import_failure_parse">Sikertelen importálás: %s</string>
+  <string name="revanced_show_menu_icons_title">ReVanced beállításikonok megjelenítése</string>
+  <string name="revanced_show_menu_icons_summary_on">A beállításikonok láthatók</string>
+  <string name="revanced_show_menu_icons_summary_off">A beállítások ikonjai nem jelennek meg</string>
   <string name="revanced_language_title">ReVanced nyelve</string>
   <string name="revanced_language_user_dialog_message">"A fordítások hiányozhatnak vagy hiányosak lehetnek néhány nyelven.
 
@@ -610,6 +612,10 @@ Ha a beállítás módosítása nem lép életbe, próbáljon meg Inkognitó mó
   <string name="revanced_hide_player_flyout_audio_track_title">Hangsáv elrejtése</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">A hangsáv menü el van rejtve</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">A hangsáv menü megjelenik</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Az audiosáv menü rejtett
+
+Az audiosáv menü megjelenítéséhez módosítsa a \"Videófolyamok hamisítása\" beállítást iOS TV-re"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">\"Megtekintés VR-módban\" elrejtése</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">A megtekintés VR-módban menü el van rejtve</string>

patches/src/main/resources/addresources/values-hy-rAM/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">ReVanced կարգավորումները վերադրվել են դեֆոլտային</string>
   <string name="revanced_settings_import_success">Import %d կարգավորում</string>
   <string name="revanced_settings_import_failure_parse">Import-ը ձախողվել է։ %s</string>
+  <string name="revanced_show_menu_icons_title">Ցուցադրել ReVanced-ի կարգավորումների պատկերակները</string>
+  <string name="revanced_show_menu_icons_summary_on">Կարգավորումների պատկերակները ցուցադրվում են</string>
+  <string name="revanced_show_menu_icons_summary_off">Կարգավորումների պատկերակները ցուցադրված չեն</string>
   <string name="revanced_language_title">ReVanced լեզվի</string>
   <string name="revanced_language_user_dialog_message">"Որոշ լեզուների թարգմանությունները կարող են լինել բացակայուն կամ անավարտ:
 
@@ -610,6 +612,10 @@ MicroG-ի համար մարտկոցի օպտիմալացումը անջատել
   <string name="revanced_hide_player_flyout_audio_track_title">Աուդիո ձայնագրությունը թաքցնել</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Աուդիո ձայնագրման մենյուը թաքցված է</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Աուդիո ձայնագրման մենյուը երևում է</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Աուդիո ուղու ընտրացանկը թաքնված է:
+
+Աուդիո ուղու ընտրացանկը ցուցադրելու համար փոխեք «Կեղծել տեսահոսքերը»-ը iOS TV-ի"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Դիտել VR-ով թաքցնել</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">VR-ով դիտել մենյուը թաքցված է</string>

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

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -43,6 +42,9 @@ Second \"item\" text"</string>
   <string name="revanced_settings_import_reset">Pengaturan ReVanced diatur ke setelan awal</string>
   <string name="revanced_settings_import_success">Mengimpor setelan %d</string>
   <string name="revanced_settings_import_failure_parse">Impor gagal: %s</string>
+  <string name="revanced_show_menu_icons_title">Tampilkan ikon pengaturan ReVanced</string>
+  <string name="revanced_show_menu_icons_summary_on">Ikon pengaturan ditampilkan</string>
+  <string name="revanced_show_menu_icons_summary_off">Ikon pengaturan tidak ditampilkan</string>
   <string name="revanced_language_title">Bahasa ReVanced</string>
   <string name="revanced_language_user_dialog_message">"Terjemahan untuk beberapa bahasa mungkin hilang atau tidak lengkap.
 
@@ -610,6 +612,10 @@ Jika mengubah setelan ini tidak berpengaruh, coba beralih ke mode Penyamaran."</
   <string name="revanced_hide_player_flyout_audio_track_title">Sembunyikan trek Audio</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_on">Menu trek audio disembunyikan</string>
   <string name="revanced_hide_player_flyout_audio_track_summary_off">Menu trek audio ditampilkan</string>
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
+  <string name="revanced_hide_player_flyout_audio_track_not_available">"Menu trek audio disembunyikan
+
+Untuk menampilkan menu trek Audio, ubah 'Spoof aliran video' ke iOS TV"</string>
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   <string name="revanced_hide_player_flyout_watch_in_vr_title">Sembunyikan Tonton di VR</string>
   <string name="revanced_hide_player_flyout_watch_in_vr_summary_on">Menu tonton di VR disembunyikan</string>

patches/src/main/resources/addresources/values-is-rIS/strings.xml

@@ -4,7 +4,6 @@
     All strings must have a unique path, even if the same string is declared in two different apps.
     This is because Crowdin requires temporarily flattening this file and removing the <app> and <patch> elements.
 
-
     Strings with new lines must be raw strings where they're wrapped in quotes and new lines are not encoded.
     Raw strings still requires escaping embedded double quotes but escaping embedded single quotes is optional.
 
@@ -107,6 +106,7 @@ Second \"item\" text"</string>
                  This menu only appears for some videos. Translate the name normally if the menu cannot be found. -->
   <!-- 'Lock screen' should be translated using the same localized wording YouTube displays for the menu item. -->
   <!-- 'Audio track' should be translated using the same localized wording YouTube displays for the menu item. -->
+  <!-- 'Spoof video streams' should be the same translation used for revanced_spoof_video_streams_screen_title -->
   <!-- 'Watch in VR' should be translated using the same localized wording YouTube displays for the menu item. -->
   </patch>
   <patch id="layout.buttons.overlay.hidePlayerOverlayButtonsPatch">