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: the tour ends with an Easy to miss card

My-Name-Is-Jeff739d14f21e09
diff --git a/docs/tweaks.md b/docs/tweaks.md
index 0f827ec9..2e6f0936 100644
--- a/docs/tweaks.md
+++ b/docs/tweaks.md
@@ -586,7 +586,10 @@ App:
Mod Settings for a free Apple ID's week) and the Mod page with the reset
Onboarding/ the welcome page over Home on the first launch, opening on the logo in glass, with Redesigned UI and
a No ads switch that sets Hide ads, Hide upsells and Spoof Premium together (off leaves each as it is;
- on, like a changed look, ends the tour in a restart, as all are read at launch);
+ on, like a changed look, ends the tour in a restart, as all are read at launch), and under "Easy to miss"
+ a card of pointers, each what it is and where in Mod Settings: Split Tabs (with the redesign picked),
+ Lyrics (sources, lyrics for every track, the redesign's live preview with it picked) and AirPods
+ gestures with the Live Activity (iOS 17 on);
on the first launch of a new version instead, What's new (WhatsNew.m), this version's section of
CHANGELOG.md, which scripts/whats-new.sh writes into a gitignored header at each make (a section
that came over from upstream is left out, so a build without its own has no sheet). The Mod
diff --git a/tweak/Sources/App/Onboarding/Onboarding.h b/tweak/Sources/App/Onboarding/Onboarding.h
index 163ed127..b80e6953 100644
--- a/tweak/Sources/App/Onboarding/Onboarding.h
+++ b/tweak/Sources/App/Onboarding/Onboarding.h
@@ -1,7 +1,8 @@
// Onboarding: a welcome page over Home the first time this build runs, in glass: Vitrine's logo landing,
// then a pick between the redesign (offered first on iOS 26) and Spotify's own look, a No ads switch that
-// turns Hide ads, Hide upsells and Spoof Premium on together (off leaves them alone), and a line on
-// holding Home for Mod Settings. The look and those switches are read at launch, so a changed pick ends the
+// turns Hide ads, Hide upsells and Spoof Premium on together (off leaves them alone), pointers to what people
+// miss in Mod Settings (Split Tabs, Lyrics, AirPods gestures and the Live Activity), and a line on holding
+// Home for Mod Settings. The look and those switches are read at launch, so a changed pick ends the
// welcome in a restart. After an update instead, a What's new sheet lists what the version brought. The Mod page
// offers both again.
#import <UIKit/UIKit.h>
diff --git a/tweak/Sources/App/Onboarding/Tour.m b/tweak/Sources/App/Onboarding/Tour.m
index 43f93036..308773e5 100644
--- a/tweak/Sources/App/Onboarding/Tour.m
+++ b/tweak/Sources/App/Onboarding/Tour.m
@@ -42,24 +42,8 @@ UIButton *SGOnboardingButton(NSString *title) {
#pragma mark - the choice
-// One of the two looks, as a glass card: symbol, name, a line on what it brings, and a check
-// when it is the one picked. With an accessory instead, the card is a row for it (the ads switch).
-@interface SGLookCard : UIControl
-- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle;
-- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle accessory:(UIView *)accessory;
-@end
-
-@implementation SGLookCard {
- SGGlassView *_glass;
- UIImageView *_check;
-}
-
-- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle {
- return [self initWithSymbol:symbol title:title subtitle:subtitle accessory:nil];
-}
-
-- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle accessory:(UIView *)accessory {
- if (!(self = [super initWithFrame:CGRectZero])) return nil;
+// A card's row: a symbol on a dim square, a name over a line of small gray text, and an accessory at the end.
+static UIStackView *cardRow(NSString *symbol, NSString *title, NSString *subtitle, UIView *accessory) {
UIImageView *icon = SGSymbolView(symbol, 17, UIImageSymbolWeightSemibold, 36);
icon.tintColor = UIColor.whiteColor;
icon.backgroundColor = [UIColor colorWithWhite:1 alpha:0.10];
@@ -79,15 +63,61 @@ UIButton *SGOnboardingButton(NSString *title) {
text.axis = UILayoutConstraintAxisVertical;
text.spacing = 2;
- if (!accessory) _check = SGSymbolView(@"circle", 22, UIImageSymbolWeightRegular, 26);
-
- UIStackView *row = [[UIStackView alloc] initWithArrangedSubviews:@[icon, text, accessory ?: _check]];
- row.alignment = UIStackViewAlignmentCenter;
+ UIStackView *row = [[UIStackView alloc] initWithArrangedSubviews:accessory ? @[icon, text, accessory] : @[icon, text]];
+ row.alignment = accessory ? UIStackViewAlignmentCenter : UIStackViewAlignmentTop;
row.spacing = 14;
- row.userInteractionEnabled = NO;
- row.translatesAutoresizingMaskIntoConstraints = NO;
[text setContentHuggingPriority:UILayoutPriorityDefaultLow - 1 forAxis:UILayoutConstraintAxisHorizontal];
[text setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh - 1 forAxis:UILayoutConstraintAxisHorizontal];
+ [NSLayoutConstraint activateConstraints:@[
+ [icon.widthAnchor constraintEqualToConstant:36],
+ [icon.heightAnchor constraintEqualToConstant:36],
+ ]];
+ return row;
+}
+
+// A glass card of rows, in the look cards' shape, that only points somewhere: the tips at the end of the tour.
+static UIView *tipsCard(NSArray<UIView *> *rows) {
+ SGGlassView *card = [SGGlassView new];
+ card.radius = kCardRadius;
+ card.clipsToBounds = YES;
+ card.layer.cornerRadius = kCardRadius;
+ card.layer.cornerCurve = kCACornerCurveContinuous;
+ UIStackView *column = [[UIStackView alloc] initWithArrangedSubviews:rows];
+ column.axis = UILayoutConstraintAxisVertical;
+ column.spacing = 16;
+ column.translatesAutoresizingMaskIntoConstraints = NO;
+ [card addSubview:column];
+ [NSLayoutConstraint activateConstraints:@[
+ [column.leadingAnchor constraintEqualToAnchor:card.leadingAnchor constant:16],
+ [column.trailingAnchor constraintEqualToAnchor:card.trailingAnchor constant:-16],
+ [column.topAnchor constraintEqualToAnchor:card.topAnchor constant:16],
+ [column.bottomAnchor constraintEqualToAnchor:card.bottomAnchor constant:-16],
+ ]];
+ return card;
+}
+
+// One of the two looks, as a glass card: symbol, name, a line on what it brings, and a check
+// when it is the one picked. With an accessory instead, the card is a row for it (the ads switch).
+@interface SGLookCard : UIControl
+- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle;
+- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle accessory:(UIView *)accessory;
+@end
+
+@implementation SGLookCard {
+ SGGlassView *_glass;
+ UIImageView *_check;
+}
+
+- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle {
+ return [self initWithSymbol:symbol title:title subtitle:subtitle accessory:nil];
+}
+
+- (instancetype)initWithSymbol:(NSString *)symbol title:(NSString *)title subtitle:(NSString *)subtitle accessory:(UIView *)accessory {
+ if (!(self = [super initWithFrame:CGRectZero])) return nil;
+ if (!accessory) _check = SGSymbolView(@"circle", 22, UIImageSymbolWeightRegular, 26);
+ UIStackView *row = cardRow(symbol, title, subtitle, accessory ?: _check);
+ row.userInteractionEnabled = NO;
+ row.translatesAutoresizingMaskIntoConstraints = NO;
_glass = [SGGlassView new];
_glass.radius = kCardRadius;
@@ -104,8 +134,6 @@ UIButton *SGOnboardingButton(NSString *title) {
[_glass.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
[_glass.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
[_glass.trailingAnchor constraintEqualToAnchor:self.trailingAnchor],
- [icon.widthAnchor constraintEqualToConstant:36],
- [icon.heightAnchor constraintEqualToConstant:36],
[row.leadingAnchor constraintEqualToAnchor:self.leadingAnchor constant:16],
[row.trailingAnchor constraintEqualToAnchor:self.trailingAnchor constant:-16],
[row.topAnchor constraintEqualToAnchor:self.topAnchor constant:16],
@@ -284,7 +312,7 @@ static const CGFloat kLogoRadius = 22;
#pragma mark - the tour
// One page, the two choices worth making now under Vitrine's logo: the redesign or Spotify's own look, and
-// Spotify without its ads. Everything else waits in Mod Settings.
+// Spotify without its ads. Everything else waits in Mod Settings; a card of pointers names what people miss there.
@interface SGOnboardingController : UIViewController
@end
@@ -315,6 +343,8 @@ static BOOL adFree(void) {
SGLookCard *_redesigned, *_legacy, *_adsCard;
UISwitch *_ads;
UIStackView *_column;
+ UIView *_splitTip; // the redesign's; the lyrics tip's line changes with the look too
+ UILabel *_lyricsTip;
UIView *_note;
UIImageView *_noteIcon;
UILabel *_noteText;
@@ -374,6 +404,29 @@ static BOOL adFree(void) {
_note.hidden = _redesigned.selected && !untested;
// The ads card stands apart from the look's cards and its note, whichever of those comes last.
[_column setCustomSpacing:_note.hidden ? 32 : 12 afterView:_legacy];
+ // The tips of the picked look: Split Tabs is the redesign's bar's, and the lyrics preview the redesign's page's.
+ _splitTip.hidden = !_redesigned.selected;
+ _lyricsTip.text = [(_redesigned.selected ? @"A live preview of the look, the sources in order, and lyrics even where Spotify has none."
+ : @"The sources in order, and lyrics even where Spotify has none.")
+ stringByAppendingString:@"\nMod Settings > Lyrics"];
+}
+
+// What people miss in Mod Settings, as pointers only: the tour has no way into a page but holding Home.
+- (UIView *)tipsView {
+ UIStackView *split = cardRow(@"rectangle.split.2x1", @"Split Tabs",
+ @"Any tab, Queue for one, on a bar of its own at the trailing end.\nMod Settings > Tab bar > Split Tabs", nil);
+ _splitTip = split;
+ UIStackView *lyrics = cardRow(@"quote.bubble", @"Lyrics", @"", nil);
+ // The row's text stack is its last arranged view, the gray line that stack's; updateNote writes the look's.
+ _lyricsTip = (UILabel *)((UIStackView *)lyrics.arrangedSubviews.lastObject).arrangedSubviews.lastObject;
+ BOOL liveActivity = NO;
+ if (@available(iOS 17.0, *)) liveActivity = YES;
+ UIStackView *airPods = cardRow(@"airpods.pro", liveActivity ? @"AirPods gestures, Live Activity" : @"AirPods gestures",
+ liveActivity ? @"Nod twice or shake your head to control the music, with a chime; and the track on the "
+ @"lock screen. Either look.\nMod Settings > AirPods gestures, Live Activity"
+ : @"Nod twice or shake your head to control the music, with a chime. Either look."
+ @"\nMod Settings > AirPods gestures", nil);
+ return tipsCard(@[split, lyrics, airPods]);
}
- (void)viewDidLoad {
@@ -428,13 +481,20 @@ static BOOL adFree(void) {
adsNote.layoutMargins = UIEdgeInsetsMake(4, 4, 0, 4);
adsNote.layoutMarginsRelativeArrangement = YES;
- _column = [[UIStackView alloc] initWithArrangedSubviews:@[strip, heading, _redesigned, _legacy, _note, _adsCard, adsNote]];
+ UILabel *tipsHeading = [UILabel new];
+ tipsHeading.text = @"Easy to miss";
+ tipsHeading.font = [UIFont systemFontOfSize:17 weight:UIFontWeightSemibold];
+ tipsHeading.textColor = UIColor.whiteColor;
+ UIView *tips = [self tipsView];
+
+ _column = [[UIStackView alloc] initWithArrangedSubviews:@[strip, heading, _redesigned, _legacy, _note, _adsCard, adsNote, tipsHeading, tips]];
UIStackView *column = _column;
column.axis = UILayoutConstraintAxisVertical;
column.spacing = 12;
[column setCustomSpacing:28 afterView:strip];
[column setCustomSpacing:24 afterView:heading];
[column setCustomSpacing:32 afterView:_note];
+ [column setCustomSpacing:32 afterView:adsNote];
column.translatesAutoresizingMaskIntoConstraints = NO;
[self updateNote];
@@ -483,7 +543,7 @@ static BOOL adFree(void) {
[self refresh];
// The tour opens on the logo alone; the page waits under it until the reeds land.
- _page = @[heading, _redesigned, _legacy, _note, _adsCard, adsNote, _primary, footer];
+ _page = @[heading, _redesigned, _legacy, _note, _adsCard, adsNote, tipsHeading, tips, _primary, footer];
[_logo prepare];
BOOL reduce = UIAccessibilityIsReduceMotionEnabled();
for (UIView *view in _page) {