fix(Spotify): Apply accent colour in more places #5039

LavaDesu · 2025-05-26T11:05:07Z

Apply the accent colour in more places by patching:

A method that converts ARGB colours into RGB. This method is used with every hardcoded colour I could find
A method that parses Lottie JSONs for solid colours
A method that parses Lottie animated colours.

Lottie animations are used in places like the "add to" buttons (you can see a small animation when clicking it) and the animated waves when playing a playlist on your homepage.

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

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

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

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

LisoUseInAIKyrios · 2025-05-26T14:58:16Z

For future reference:

If the Spotify Lottie animations always use the same theme colors for all animation files (and all usage of that color should be replaced), it's probably better to use what's here and replace the colors in the parser.

But if more fine grained replacement is desired, the colors could be replaced in the Lottie animations JSON before the animation is parsed. Then some animations can be ignored and/or animation colors can be selectively replaced.

ReVanced YouTube does this for the animated launch splash screen. Only the red seekbar color is replaced, but the identical red YouTube play icon in the same animation is not changed.

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

Line 356 in b1b2b80

mainActivityOnCreateFingerprint.method.apply {

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

Line 172 in b1b2b80

    
           public static void setSplashAnimationLottie(LottieAnimationView view, int resourceId) {

LavaDesu · 2025-05-27T01:08:34Z

@LisoUseInAIKyrios Interesting! I did look into patching the JSON text directly instead of during parsing, but it quickly starting getting long and complex because of the amount of files that needed to be replaced and the code associated with it.

I went with doing it this way because it is far more simple and also probably more futureproof if Spotify decides to convert more of its buttons into animations. The default green accent is a pretty unique brand colour so it shouldn't affect much unintended areas.

Good to know though in case we want to exclude some icons later. The technique to call obfuscated methods from extensions in there is pretty sweet.

LavaDesu · 2025-05-27T01:48:34Z

Is #4812 within the scope of this PR or not?

No, this PR only deals with accent colours for now.

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

Nuckyz · 2025-05-27T11:26:01Z

Do resource colors pass through this function which converts ARGB to RGB too? If yes, then the resource patches can likely be moved to this new approach which would also caught colors we should be patching but aren't

LisoUseInAIKyrios · 2025-05-27T11:39:38Z

If all the colors can be replaced at runtime, then it opens the possibility changing the theme color in app (and not specify theme colors at patch time). But that also requires adding an in app settings menu which currently does not exist.

Nuckyz · 2025-05-27T11:44:00Z

If all the colors can be replaced at runtime, then it opens the possibility changing the theme color in app (and not specify theme colors at patch time). But that also requires adding an in app settings menu which currently does not exist.

Replacing at runtime also allows us to fix more hardcoded colors which are present all over the app

LavaDesu · 2025-05-27T11:54:01Z

Do resource colors pass through this function which converts ARGB to RGB too? If yes, then the resource patches can likely be moved to this new approach which would also caught colors we should be patching but aren't

Unfortunately I don't think the resource colours pass through this function at all.

Replacing at runtime also allows us to fix more hardcoded colors which are present all over the app

The patch does intercept and replace hardcoded colours at runtime, but it's only configurable at build time for now.

Nuckyz · 2025-05-27T12:10:47Z

Do resource colors pass through this function which converts ARGB to RGB too? If yes, then the resource patches can likely be moved to this new approach which would also caught colors we should be patching but aren't

Unfortunately I don't think the resource colours pass through this function at all.

Resource colors are ARGB too, and if the app is converting hardcoded ARGB to RGB then perhaps it also does for resource colors with a different function?

Replacing at runtime also allows us to fix more hardcoded colors which are present all over the app

The patch does intercept and replace hardcoded colours at runtime, but it's only configurable at build time for now.

Colors being configurable only at build time is fine for now

LavaDesu · 2025-05-27T13:15:51Z

Resource colors are ARGB too, and if the app is converting hardcoded ARGB to RGB then perhaps it also does for resource colors with a different function?

I went digging and couldn't find anything worthwhile. context.getColor is called in various different places, and doesn't pass through any one function. But I guess we could make some fingerprint that matches all invocations of it and loop through them? If we wanna manage colours at runtime. It could then be a shared patch too.

I think keeping it a resource patch is fine tho. And also, it supports Material 3 dynamic colours as well since we fetch colours from resources. So I don't think there's going to be a big audience of people who like to change their accent colours super often.

FWIW, Material 3 colours:

Colour	Value (A12-13)	Value (A14+)
Background	`@android:color/m3_ref_palette_dynamic_neutral_variant6`	`@android:color/system_background_dark`
Background Secondary	`@android:color/m3_ref_palette_dynamic_neutral_variant17`	`@android:color/system_surface_container_high_dark`
Accent	`@android:color/system_accent1_200`	`@android:color/system_primary_dark`
Accent Pressed	`@android:color/system_accent1_600`	`@android:color/system_primary_light`

extensions/spotify/build.gradle.kts

Review resolved

oSumAtrIX · 2025-05-30T19:27:12Z

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

@@ -125,6 +126,38 @@ private val customThemeBytecodePatch = bytecodePatch {
            SETTINGS_HEADER_COLOR_LITERAL,
            backgroundColorSecondary!!
        )
+
+        // Hijacks a util method that removes alpha to replace hardcoded accent colors


Comments end with punctuation

Suggested change

// Hijacks a util method that removes alpha to replace hardcoded accent colors

// Hijacks a util method that removes alpha to replace hardcoded accent colors.

oSumAtrIX · 2025-05-30T19:27:36Z

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

+            addInstructions(0, """
+                invoke-static { p0, p1 }, $EXTENSION_CLASS_DESCRIPTOR->replaceColor(J)J
+                move-result-wide p0
+            """)


Should be formatted like this

Suggested change

addInstructions(0, """

invoke-static { p0, p1 }, $EXTENSION_CLASS_DESCRIPTOR->replaceColor(J)J

move-result-wide p0

""")

addInstructions(

0,

"""

invoke-static { p0, p1 }, $EXTENSION_CLASS_DESCRIPTOR->replaceColor(J)J

move-result-wide p0

"""

)

oSumAtrIX · 2025-05-30T19:27:55Z

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

+        // Lottie JSON parser method
+        // It's a gigantic method that parses each value, including the solid color
+        parseLottieJsonFingerprint.method.apply {
+            val invokeIdx = indexOfFirstInstructionOrThrow {


Variables names should not be shortened

Suggested change

val invokeIdx = indexOfFirstInstructionOrThrow {

val invokeIndex = indexOfFirstInstructionOrThrow {

oSumAtrIX · 2025-05-30T19:28:06Z

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

+        // It's a gigantic method that parses each value, including the solid color
+        parseLottieJsonFingerprint.method.apply {
+            val invokeIdx = indexOfFirstInstructionOrThrow {
+                val ref = this.getReference<MethodReference>()


Explicit receiver not needed

Suggested change

val ref = this.getReference<MethodReference>()

val ref = getReference<MethodReference>()

oSumAtrIX · 2025-05-30T19:28:26Z

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

+        // Lottie JSON parser method
+        // It's a gigantic method that parses each value, including the solid color
+        parseLottieJsonFingerprint.method.apply {
+            val invokeIdx = indexOfFirstInstructionOrThrow {


I dont remember but isnt there a helper function for this codeblock?

I don't think for a situation like this. There is a helper for overriding constants passed into methods, but not quite this.

fix(Spotify): Apply accent colour in more places

8bef601

LisoUseInAIKyrios requested a review from Nuckyz May 26, 2025 11:15

LisoUseInAIKyrios reviewed May 26, 2025

View reviewed changes

LisoUseInAIKyrios linked an issue May 26, 2025 that may be closed by this pull request

bug(Spotify): Inconsistencies with Spotify theme patch #1891

Open

3 tasks

refactor(Spotify): simplify theme extension, and style changes

c421856

LisoUseInAIKyrios reviewed May 26, 2025

View reviewed changes

...ions/spotify/src/main/java/app/revanced/extension/spotify/layout/theme/CustomThemePatch.java Outdated Show resolved Hide resolved

LavaDesu added 4 commits May 26, 2025 22:25

refactor(Spotify): make extension fields private

5c1cb32

refactor(Spotify): Simplify bytecode patch

f8268d9

fix(Spotify): Simplify extension, and replace more colours

cdffa2d

refactor(Spotify): remove unused import

f4ad553

This comment was marked as resolved.

Sign in to view

drobotk previously requested changes May 27, 2025

View reviewed changes

patches/src/main/kotlin/app/revanced/patches/spotify/layout/theme/Fingerprints.kt Outdated Show resolved Hide resolved

LavaDesu added 3 commits May 27, 2025 22:58

refactor(Spotify): use consistent parameter names in fingerprint

a69a5e1

refactor(Spotify): Generalise colour replacement

0b8d2f4

refactor(Spotify): Remove redundant call

84002c9

LisoUseInAIKyrios reviewed May 27, 2025

View reviewed changes

extensions/spotify/build.gradle.kts Outdated Show resolved Hide resolved

fix(Spotify): Retain jdk11 compatibility

5928693

oSumAtrIX reviewed May 30, 2025

View reviewed changes

LisoUseInAIKyrios removed the request for review from Nuckyz May 30, 2025 19:30

	// Hijacks a util method that removes alpha to replace hardcoded accent colors
	// Hijacks a util method that removes alpha to replace hardcoded accent colors.

	val invokeIdx = indexOfFirstInstructionOrThrow {
	val invokeIndex = indexOfFirstInstructionOrThrow {

	val ref = this.getReference<MethodReference>()
	val ref = getReference<MethodReference>()

Uh oh!

fix(Spotify): Apply accent colour in more places #5039

Are you sure you want to change the base?

fix(Spotify): Apply accent colour in more places #5039

Conversation

LavaDesu commented May 26, 2025 • edited by LisoUseInAIKyrios Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LisoUseInAIKyrios commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

LavaDesu commented May 27, 2025

Uh oh!

LavaDesu commented May 27, 2025

Uh oh!

Uh oh!

Nuckyz commented May 27, 2025

Uh oh!

LisoUseInAIKyrios commented May 27, 2025

Uh oh!

Nuckyz commented May 27, 2025

Uh oh!

LavaDesu commented May 27, 2025

Uh oh!

Nuckyz commented May 27, 2025

Uh oh!

LavaDesu commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

oSumAtrIX May 30, 2025

Choose a reason for hiding this comment

Uh oh!

oSumAtrIX May 30, 2025

Choose a reason for hiding this comment

Uh oh!

oSumAtrIX May 30, 2025

Choose a reason for hiding this comment

Uh oh!

oSumAtrIX May 30, 2025

Choose a reason for hiding this comment

Uh oh!

oSumAtrIX May 30, 2025

Choose a reason for hiding this comment

Uh oh!

LisoUseInAIKyrios May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

LavaDesu commented May 26, 2025 •

edited by LisoUseInAIKyrios

Loading

LisoUseInAIKyrios commented May 26, 2025 •

edited

Loading

LavaDesu commented May 27, 2025 •

edited

Loading