original lyrics colors when possible

whoeevee · May 30, 2024 · f98b019 · f98b019
1 parent 1f0bc4f
commit f98b019
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Sources/EeveeSpotify/DataLoaderServiceHooks.x.swift b/Sources/EeveeSpotify/DataLoaderServiceHooks.x.swift
@@ -85,7 +85,9 @@ class SPTDataLoaderServiceHook: ClassHook<NSObject> {
                 orig.URLSession(
                     session,
                     dataTask: task,
-                    didReceiveData: try getCurrentTrackLyricsData()
+                    didReceiveData: try getCurrentTrackLyricsData(
+                        originalLyrics: try? Lyrics(serializedData: data)
+                    )
                 )
 
                 orig.URLSession(session, task: task, didCompleteWithError: nil)

diff --git a/Sources/EeveeSpotify/Lyrics/CustomLyrics.x.swift b/Sources/EeveeSpotify/Lyrics/CustomLyrics.x.swift
@@ -28,7 +28,7 @@ class EncoreButtonHook: ClassHook<UIButton> {
     }
 }
 
-func getCurrentTrackLyricsData() throws -> Data {
+func getCurrentTrackLyricsData(originalLyrics: Lyrics? = nil) throws -> Data {
 
     guard let track = HookedInstances.currentTrack else {
         throw LyricsError.NoCurrentTrack
@@ -67,7 +67,7 @@ func getCurrentTrackLyricsData() throws -> Data {
     }
 
     let lyrics = try Lyrics.with {
-        $0.colors = LyricsColors.with {
+        $0.colors = originalLyrics?.colors ?? LyricsColors.with {
             $0.backgroundColor = Color(hex: track.extractedColorHex()).normalized.uInt32
             $0.lineColor = Color.black.uInt32
             $0.activeLineColor = Color.white.uInt32