Skip to content

Liquid Glass and Apple Music touches for the Spotify iOS app. A GPL-3.0 fork of spoti.pw 0.21.1.

C

feat: Lyrics for every track is on by default

My-Name-Is-Jefff4fe287559a8
diff --git a/tweak/Sources/Shared/Lyrics/LyricsSettings.m b/tweak/Sources/Shared/Lyrics/LyricsSettings.m
index 2c8f1c80..13141bd1 100644
--- a/tweak/Sources/Shared/Lyrics/LyricsSettings.m
+++ b/tweak/Sources/Shared/Lyrics/LyricsSettings.m
@@ -21,7 +21,7 @@ SGModSection *SGLyricsSourcesSection(BOOL namingSource) {
return count ? @(count).stringValue : @"None";
};
NSMutableArray<SGModRow *> *rows = [NSMutableArray arrayWithObjects:sources, imported,
- SGOptionRow(@"Lyrics for every track", @"Even where Spotify has none", SGKeyLyricsAllTracks), SGSpicyLyricsKeyRow(), nil];
+ SGSwitchRow(@"Lyrics for every track", @"Even where Spotify has none", SGKeyLyricsAllTracks), SGSpicyLyricsKeyRow(), nil];
// Spicy Lyrics' terms ask for its credit wherever its lines show (Shared/LyricsSources/SpicyLyrics.m), so the switch
// says so, or its credit under the lyrics reads as the switch not working (issue #20).
if (namingSource) [rows addObject:SGOptionRow(@"Show source", @"Spicy Lyrics is always credited after the last line: its terms ask for it", SGKeyLyricsCredit)];
diff --git a/tweak/Sources/Shared/LyricsSources/LyricsHook.x b/tweak/Sources/Shared/LyricsSources/LyricsHook.x
index 7981ffa8..a7e8ee18 100644
--- a/tweak/Sources/Shared/LyricsSources/LyricsHook.x
+++ b/tweak/Sources/Shared/LyricsSources/LyricsHook.x
@@ -607,7 +607,7 @@ static void completed(id delegate, NSURLSession *session, NSURLSessionTask *task
SGLyricsMigrateLegacyKeys();
if (!SGLyricsEnabled()) return;
%init(SGLyricsReplies);
- BOOL everyTrack = SGFlag(SGKeyLyricsAllTracks, NO);
+ BOOL everyTrack = SGEnabled(SGKeyLyricsAllTracks);
if (everyTrack) {
// The generator gives a class that only inherits the method an override of its own, which would
// put a second hook in front of NSURLSession's.