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

# [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)) ([628d184](628d18489c))

CHANGELOG.md

@@ -1,3 +1,31 @@
+# [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)
 
 

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/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/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/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

gradle.properties

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

patches/api/patches.api

@@ -400,6 +400,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;
 }

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/spotify/layout/theme/CustomThemeBytecodePatch.kt

@@ -0,0 +1,75 @@
+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.bytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+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
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/spotify/layout/theme/CustomThemePatch;"
+
+internal val customThemeByteCodePatch = bytecodePatch {
+    dependsOn(sharedExtensionPatch)
+
+    val backgroundColor by spotifyBackgroundColor
+    val backgroundColorSecondary by spotifyBackgroundColorSecondary
+
+    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) {
+            // Find index of the first static get found after the string constant.
+            val encoreColorsFieldReferenceIndex = originalMethod.indexOfFirstInstructionOrThrow(
+                stringMatches!!.first().index,
+                Opcode.SGET_OBJECT
+            )
+
+            originalMethod.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)
+            }
+        }
+
+        encoreColorsConstructorFingerprint.method.apply {
+            // Playlist song list background color.
+            addColorChangeInstructions(PLAYLIST_BACKGROUND_COLOR_LITERAL, backgroundColor!!)
+
+            // Share menu background color.
+            addColorChangeInstructions(SHARE_MENU_BACKGROUND_COLOR_LITERAL, backgroundColorSecondary!!)
+        }
+
+        homeCategoryPillColorsFingerprint.method.apply {
+            // Home category pills background color.
+            addColorChangeInstructions(HOME_CATEGORY_PILL_COLOR_LITERAL, backgroundColorSecondary!!)
+        }
+
+        settingsHeaderColorFingerprint.method.apply {
+            // Settings header background color.
+            addColorChangeInstructions(SETTINGS_HEADER_COLOR_LITERAL, backgroundColorSecondary!!)
+        }
+    }
+}

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

@@ -1,59 +1,24 @@
-@file:Suppress("NAME_SHADOWING")
-
 package app.revanced.patches.spotify.layout.theme
 
 import app.revanced.patcher.patch.resourcePatch
-import app.revanced.patcher.patch.stringOption
 import org.w3c.dom.Element
 
 @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 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
 
@@ -61,20 +26,37 @@ val customThemePatch = resourcePatch(
             for (i in 0 until childNodes.length) {
                 val node = childNodes.item(i) as? Element ?: continue
 
-                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",
+                node.textContent = when (node.getAttribute("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 background
+                    "bg_gradient_start_color", "bg_gradient_end_color",
+                    // Login screen
+                    "sthlm_blk", "sthlm_blk_grad_start", "stockholm_black",
+                    // Misc
+                    "image_placeholder_color",
                         -> backgroundColor
 
-                        "gray_15" -> backgroundColorSecondary
+                    // Track credits, merch in song player
+                    "track_credits_card_bg", "benefit_list_default_color", "merch_card_background",
+                    // Playlist list background in home page
+                    "opacity_white_10",
+                    // About 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
+                }
             }
         }
     }

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("Encore theme was not provided.") // Partial string match.
+}
+
+internal const val SETTINGS_HEADER_COLOR_LITERAL = 0xFF282828
+internal const val HOME_CATEGORY_PILL_COLOR_LITERAL = 0xFF333333
+internal const val PLAYLIST_BACKGROUND_COLOR_LITERAL = 0xFF121212
+internal const val SHARE_MENU_BACKGROUND_COLOR_LITERAL = 0xFF1F1F1F
+
+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/layout/theme/Options.kt

@@ -0,0 +1,36 @@
+package app.revanced.patches.spotify.layout.theme
+
+import app.revanced.patcher.patch.stringOption
+
+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 spotifyBackgroundColorSecondary = stringOption(
+    key = "backgroundColorSecondary",
+    default = "#FF121212",
+    title = "Secondary background color",
+    description = "The secondary background color. (e.g. playlist list, player arist, 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,
+)

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

@@ -1,16 +1,16 @@
 package app.revanced.patches.spotify.misc
 
 import app.revanced.patcher.fingerprint
+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.endsWith("internal/AccountAttribute;") }
 }
 
 internal val productStateProtoFingerprint = fingerprint {
     returns("Ljava/util/Map;")
-    custom { _, classDef ->
-        classDef.endsWith("ProductStateProto;")
-    }
+    custom { _, classDef -> classDef.endsWith("ProductStateProto;") }
 }
 
 internal val buildQueryParametersFingerprint = fingerprint {
@@ -21,3 +21,17 @@ internal val contextMenuExperimentsFingerprint = fingerprint {
     parameters("L")
     strings("remove_ads_upsell_enabled")
 }
+
+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/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
@@ -310,14 +311,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 +328,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
+                        """
+                    }
                 )
             }
         }

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

@@ -53,7 +53,15 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
 
     // All registers used by an instruction.
     fun Instruction.getRegistersUsed() = when (this) {
-        is FiveRegisterInstruction -> listOf(registerC, registerD, registerE, registerF, registerG)
+        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)
@@ -62,15 +70,15 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
     }
 
     // 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")
+    fun Instruction.getWriteRegister() : Int {
+        // Two and three register instructions extend OneRegisterInstruction.
+        if (this is OneRegisterInstruction) return registerA
+        throw IllegalStateException("Not a write instruction: $this")
     }
 
     val writeOpcodes = 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,
@@ -140,7 +148,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.
@@ -151,14 +159,14 @@ internal fun Method.findFreeRegister(startIndex: Int, vararg registersToExclude:
 
         if (instruction.opcode in branchOpcodes) {
             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 writeRegister = instruction.getRegisterWritten()
+            val writeRegister = instruction.getWriteRegister()
 
             if (writeRegister !in usedRegisters) {
                 // Verify the register is only used for write and not also as a parameter.