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: Mod Settings' main page has new groups and icons

My-Name-Is-Jeff31db7aedc342
diff --git a/docs/tweaks.md b/docs/tweaks.md
index 0d943957..f0762769 100644
--- a/docs/tweaks.md
+++ b/docs/tweaks.md
@@ -708,9 +708,10 @@ page. It sorts every
setting by the part of Spotify it changes, so a part's glass, its hide switches and its flags sit on
one page, the mod's own rows first and Spotify's flags below them or on a sub page named after what
they change. Its main page groups the rows by what they are, in cards with no headings as Settings has its own,
-under the signing and environment warnings: Redesigned UI, Appearance and Tab bar; Player, Lyrics and Albums &
-artists (Home & Library in the native look); Karaoke, Spatial voice (where the iPhone reads headphone motion), Audio
-effects, Vibrations, Live Activity, AirPods gestures and Listening stats; Lock screen and Premium, ads & privacy; Labs and All flags; Mod. It is checked in the simulator
+under the signing and environment warnings: Redesigned UI, Appearance and Tab bar, with a restart note; Home & Library
+(in the native look), Player, Lyrics, Albums and Artists; Karaoke, Spatial voice (where the iPhone reads headphone
+motion), Audio effects, Live Activity, AirPods gestures and Listening stats; Lock screen, Vibrations and Premium, ads &
+privacy; Labs and All flags; Mod. It is checked in the simulator
against harness/mod-settings/. The Appearance page has, in the native look, AMOLED (the redesign is always black), then the stored look's Accent color
preset, a pull-down of Spotify, Apple Music and Custom read off the color stored (a color set before the presets
existed reads as Custom, Apple Music's red as Apple Music), and Accent color, the hex and a swatch of the color in
diff --git a/tweak/Sources/App/ModSettings.x b/tweak/Sources/App/ModSettings.x
index d1f38808..9b9c5a9e 100644
--- a/tweak/Sources/App/ModSettings.x
+++ b/tweak/Sources/App/ModSettings.x
@@ -1,9 +1,9 @@
// Settings: a Mod Settings row at the end of Spotify's settings list opens the mod's own page, its rows
// grouped by what they are as the system Settings app groups its own, in cards with no headings: what the
// app looks like (Redesigned UI's switch, Appearance, Tab bar), the screens a page of its own changes
-// (Player, Lyrics, and Albums & artists or, in the native look, Home & Library), the features that work
-// under either look (Sing, Spatial voice, Audio effects, Vibrations, Live Activity, AirPods gestures, Listening stats),
-// the system's side (Lock screen; Premium, ads & privacy), the advanced pages (Labs, All flags, a
+// (Home & Library in the native look, Player, Lyrics, and Albums and Artists in the redesign), the features
+// that work under either look (Sing, Spatial voice, Audio effects, Live Activity, AirPods gestures, Listening
+// stats), the system's side (Lock screen, Vibrations; Premium, ads & privacy), the advanced pages (Labs, All flags, a
// searchable list of every flag with an override per flag) and Mod, the build, its updates and links. The
// same row leads the side drawer's list (trees/test6.txt), above Your plan, so the page is a tap from
// Home, and holding Home on the tab bar opens it too. The tweaks read the switches when they run, so a
@@ -59,59 +59,59 @@ static UIViewController *modSettingsPage(void) {
BOOL (^redesigned)(void) = ^BOOL { return SGRedesignedUIStored(); };
BOOL (^native)(void) = ^BOOL { return !SGRedesignedUIStored(); };
- [sections addObject:SGSection(nil, @[
+ // The tile colors are the system palette's, in dark mode except where SGColorRGB gives a lighter or deeper shade.
+ [sections addObject:SGNotedSection(nil, @[
SGRedesignedUIRow(),
- pageRow(@"Appearance", @"paintpalette", UIColor.systemBlueColor, ^UIViewController *{ return SGAppearancePage(); }),
- pageRow(@"Tab bar", @"dock.rectangle", UIColor.systemIndigoColor, ^UIViewController *{ return SGNavbarPage(); }),
- ])];
+ pageRow(@"Appearance", @"paintpalette.fill", UIColor.systemPurpleColor, ^UIViewController *{ return SGAppearancePage(); }),
+ pageRow(@"Tab bar", @"rectangle.bottomthird.inset.filled", UIColor.systemGrayColor, ^UIViewController *{ return SGNavbarPage(); }),
+ ], SGRestartNote)];
// Home & Library holds only the native look's switches; the redesign has its album and artist pages instead.
- SGModRow *albums = pageRow(@"Albums", @"square.stack", UIColor.systemCyanColor, ^UIViewController *{ return SGRAlbumSettingsPage(); });
+ SGModRow *albums = pageRow(@"Albums", @"square.stack.fill", SGColorRGB(0x34C759), ^UIViewController *{ return SGRAlbumSettingsPage(); });
albums.visible = redesigned;
- // Not music.mic: Karaoke's tile below carries it.
- SGModRow *artists = pageRow(@"Artists", @"guitars", UIColor.systemCyanColor, ^UIViewController *{ return SGRArtistSettingsPage(); });
+ SGModRow *artists = pageRow(@"Artists", @"music.mic", SGColorRGB(0x30B0C7), ^UIViewController *{ return SGRArtistSettingsPage(); });
artists.visible = redesigned;
- SGModRow *home = pageRow(@"Home & Library", @"house", UIColor.systemCyanColor, ^UIViewController *{ return SGHomeSettingsPage(); });
+ SGModRow *home = pageRow(@"Home & Library", @"house.fill", UIColor.systemBrownColor, ^UIViewController *{ return SGHomeSettingsPage(); });
home.visible = native;
[sections addObject:SGSection(nil, @[
- pageRow(@"Player", @"play.circle", UIColor.systemPinkColor, ^UIViewController *{ return SGPlayerSettingsPage(); }),
- pageRow(@"Lyrics", @"quote.bubble", UIColor.systemPurpleColor, ^UIViewController *{ return SGLyricsSettingsPage(); }),
+ home,
+ pageRow(@"Player", @"play.fill", UIColor.systemPinkColor, ^UIViewController *{ return SGPlayerSettingsPage(); }),
+ pageRow(@"Lyrics", @"quote.bubble.fill", UIColor.systemOrangeColor, ^UIViewController *{ return SGLyricsSettingsPage(); }),
albums,
artists,
- home,
])];
// Sing and the audio effects work on the sound, so both looks have them; Audio effects says how many are on.
- SGModRow *sing = pageRow(@"Karaoke", @"music.mic", UIColor.systemRedColor, ^UIViewController *{ return SGSingSettingsPage(); });
- SGModRow *audioEffects = pageRow(@"Audio effects", @"slider.vertical.3", UIColor.systemOrangeColor, ^UIViewController *{ return SGDSPSettingsPage(); });
+ SGModRow *sing = pageRow(@"Karaoke", @"mic.fill", SGColorRGB(0x8C42B3), ^UIViewController *{ return SGSingSettingsPage(); });
+ SGModRow *audioEffects = pageRow(@"Audio effects", @"slider.vertical.3", UIColor.systemRedColor, ^UIViewController *{ return SGDSPSettingsPage(); });
audioEffects.value = ^NSString *{ return SGDSPSummary(); };
// Spatial voice is Sing's too, and shows where the iPhone reads headphone motion, as on Sing's page.
- SGModRow *spatial = pageRow(@"Spatial voice", @"person.wave.2", UIColor.systemIndigoColor, ^UIViewController *{ return SGSpatialVoiceSettingsPage(); });
+ SGModRow *spatial = pageRow(@"Spatial voice", @"person.wave.2.fill", SGColorRGB(0x5856D6), ^UIViewController *{ return SGSpatialVoiceSettingsPage(); });
spatial.visible = ^BOOL { return SGSingSpatialAvailable(); };
- // Vibrations hook Spotify's own controls and its audio, so they answer under either look.
- SGModRow *vibrations = pageRow(@"Vibrations", @"iphone.radiowaves.left.and.right", UIColor.systemPinkColor, ^UIViewController *{ return SGVibrationsSettingsPage(); });
- NSMutableArray<SGModRow *> *features = [NSMutableArray arrayWithObjects:sing, spatial, audioEffects, vibrations, nil];
+ NSMutableArray<SGModRow *> *features = [NSMutableArray arrayWithObjects:sing, spatial, audioEffects, nil];
// The Live Activity works under both looks, where ActivityKit's card does.
if (@available(iOS 17.0, *)) {
- SGModRow *liveActivity = pageRow(@"Live Activity", @"platter.filled.top.iphone", UIColor.systemTealColor, ^UIViewController *{ return SGLiveActivitySettingsPage(); });
+ SGModRow *liveActivity = pageRow(@"Live Activity", @"iphone", UIColor.systemOrangeColor, ^UIViewController *{ return SGLiveActivitySettingsPage(); });
[features addObject:liveActivity];
}
[features addObjectsFromArray:@[
- pageRow(@"AirPods gestures", @"airpods.pro", UIColor.systemGrayColor, ^UIViewController *{ return SGHeadGesturesSettingsPage(); }),
- pageRow(@"Listening stats", @"chart.bar", UIColor.systemGreenColor, ^UIViewController *{ return SGListeningStatsPage(); }),
+ pageRow(@"AirPods gestures", @"airpods", UIColor.systemCyanColor, ^UIViewController *{ return SGHeadGesturesSettingsPage(); }),
+ pageRow(@"Listening stats", @"chart.bar.fill", UIColor.systemBlueColor, ^UIViewController *{ return SGListeningStatsPage(); }),
]];
[sections addObject:SGSection(nil, features)];
- SGModRow *mod = pageRow(@"Mod", @"info.circle", UIColor.systemGrayColor, ^UIViewController *{ return SGAboutPage(); });
+ SGModRow *mod = pageRow(@"Mod", @"info.circle", SGColorRGB(0x7D7D81), ^UIViewController *{ return SGAboutPage(); });
mod.value = ^NSString *{ return @(SG_VERSION); };
[sections addObjectsFromArray:@[
SGSection(nil, @[
- pageRow(@"Lock screen", @"lock", UIColor.systemGrayColor, ^UIViewController *{ return SGLockScreenWidgetPage(); }),
- pageRow(@"Premium, ads & privacy", @"crown", UIColor.systemBlueColor, ^UIViewController *{ return SGAdsSettingsPage(); }),
+ pageRow(@"Lock screen", @"lock.iphone", SGColorRGB(0x32ADE6), ^UIViewController *{ return SGLockScreenWidgetPage(); }),
+ // Vibrations hook Spotify's own controls and its audio, so they answer under either look.
+ pageRow(@"Vibrations", @"waveform", UIColor.systemGreenColor, ^UIViewController *{ return SGVibrationsSettingsPage(); }),
+ pageRow(@"Premium, ads & privacy", @"hand.raised.fill", UIColor.systemBlueColor, ^UIViewController *{ return SGAdsSettingsPage(); }),
]),
SGSection(nil, @[
- pageRow(@"Labs", @"testtube.2", UIColor.systemMintColor, ^UIViewController *{ return SGLabsPage(); }),
- pageRow(@"All flags", @"flag", UIColor.systemGrayColor, ^UIViewController *{ return SGAllFlagsPage(); }),
+ pageRow(@"Labs", @"testtube.2", UIColor.systemGreenColor, ^UIViewController *{ return SGLabsPage(); }),
+ pageRow(@"All flags", @"flag.fill", UIColor.systemOrangeColor, ^UIViewController *{ return SGAllFlagsPage(); }),
]),
SGSection(nil, @[mod]),
]];
diff --git a/tweak/Sources/App/Pages.m b/tweak/Sources/App/Pages.m
index 9e714af3..396e3ac5 100644
--- a/tweak/Sources/App/Pages.m
+++ b/tweak/Sources/App/Pages.m
@@ -73,7 +73,7 @@ static SGModRow *untestedRow(void) {
}]];
[SGTopController() presentViewController:alert animated:YES completion:nil];
};
- return SGWithTile(row, @"sparkles", UIColor.systemPurpleColor);
+ return SGWithTile(row, @"sparkles", UIColor.systemIndigoColor);
}
SGModRow *SGRedesignedUIRow(void) {
@@ -85,7 +85,7 @@ SGModRow *SGRedesignedUIRow(void) {
SGSetRedesignedUI(on);
offerRestart(on);
};
- return SGWithTile(redesign, @"sparkles", UIColor.systemPurpleColor);
+ return SGWithTile(redesign, @"sparkles", UIColor.systemIndigoColor);
}
// The stored look's own rows, then the font and the app icon, which work under either look on any iOS.