Liquid Glass and Apple Music touches for the Spotify iOS app. A GPL-3.0 fork of spoti.pw 0.21.1.
C
fix: immersive lyrics wait for sheets and keep their clock and Karaoke mic
My-Name-Is-Jeffeaa205f689f5
diff --git a/harness/player/README.md b/harness/player/README.mdindex 28347eb5..a2e26d47 100644--- a/harness/player/README.md+++ b/harness/player/README.md@@ -49,8 +49,11 @@ come late, out of order, or not at all.- `immersive` opens the lyrics and waits past the rest: only the bottom stack under the title row(progress bar, buttons, volume row, footer) fades, the lines grow down only, a touch where the buttonswere lands on the lines, the thumbnail takes its own, and the lines' tap is off. Then the tap that- wakes them (fired in code), a scroll that hides them again and the thumbnail closing the lyrics. The- log ends with `immersive checks: n of 10 right -- PASS` or `FAIL`.+ wakes them (fired in code), a scroll that hides them again and the thumbnail closing the lyrics. Then,+ opened again, a sheet over the player keeps the controls up past the rest and they fade once it has+ gone, Sing's mic stays with the lines and takes its own touch, and a finger held on the player (its+ touch watcher driven in code) keeps the controls up until it lifts. The log ends with+ `immersive checks: n of 15 right -- PASS` or `FAIL`.- `badge` shows the hold's 2× badge on the cover by hand, holds again while it fades out and lets go.The log ends with `badge checks: n of 3 right -- PASS` or `FAIL`.diff --git a/harness/player/main.m b/harness/player/main.mindex ee5a68bf..7409b2b3 100644--- a/harness/player/main.m+++ b/harness/player/main.m@@ -1225,7 +1225,51 @@ static BOOL linesSeek(SGRKaraokeView *lyrics) {check(@"the thumbnail closes the lyrics while alone", !SGRPlayerLyricsOpen() && lowerShown() && !wake.enabled,[NSString stringWithFormat:@"lyrics %@, controls %.0f", SGRPlayerLyricsOpen() ? @"up" : @"down", duration.alpha]);});- after(11, ^{+ // A sheet over the player keeps the controls up past the rest, and the clock runs again behind it, so+ // they fade within a rest of the sheet going.+ after(11.5, ^{ SGRPlayerToggleLyrics(); });+ __block UIViewController *sheet = nil;+ after(12, ^{+ sheet = [UIViewController new];+ sheet.view.backgroundColor = UIColor.darkGrayColor;+ [self.window.rootViewController presentViewController:sheet animated:NO completion:nil];+ });+ after(17, ^{+ check(@"a sheet keeps the controls up", SGRPlayerLyricsOpen() && lowerShown(), [NSString stringWithFormat:@"controls %.0f", duration.alpha]);+ [sheet dismissViewControllerAnimated:NO completion:nil];+ });+ after(22, ^{+ check(@"they fade once the sheet has gone", lowerHidden(), [NSString stringWithFormat:@"controls %.0f", duration.alpha]);+ // Sing's mic stays with the lines on their own, and takes its own touch.+ UIView *mic = nil;+ for (UIView *view in lines().subviews) {+ if ([NSStringFromClass(view.class) isEqualToString:@"SGRSingButton"]) mic = view;+ }+ CGPoint onMic = [host convertPoint:CGPointMake(CGRectGetMidX(mic.bounds), CGRectGetMidY(mic.bounds)) fromView:mic];+ UIView *hit = [host hitTest:onMic withEvent:nil];+ CGRect drawn = [host convertRect:mic.bounds fromView:mic];+ check(@"the mic stays and takes its touch", mic && ![[mic valueForKey:@"tucked"] boolValue] && mic.userInteractionEnabled && [hit isDescendantOfView:mic]+ && CGRectGetMaxY(drawn) > CGRectGetMaxY(withControls),+ [NSString stringWithFormat:@"mic %@ at %@, hit %@", mic ? @"there" : @"missing", NSStringFromCGRect(drawn), NSStringFromClass(hit.class)]);+ NSLog(@"[harness] immersive: screenshot the mic alone now");+ });+ after(28, ^{ [wake sgr_woke]; });+ // A finger held on the player (Sing's slider) holds the clock, and lifting it starts the clock over.+ __block UIGestureRecognizer *watcher = nil;+ after(28.5, ^{+ for (UIGestureRecognizer *recognizer in host.gestureRecognizers) {+ if ([NSStringFromClass(recognizer.class) isEqualToString:@"SGRPlayerTouchWatcher"]) watcher = recognizer;+ }+ [watcher touchesBegan:[NSSet set] withEvent:[UIEvent new]];+ });+ after(34, ^{+ check(@"a finger held keeps the controls up", watcher && lowerShown(), [NSString stringWithFormat:@"controls %.0f", duration.alpha]);+ [watcher reset];+ });+ after(39, ^{+ check(@"lifted, the clock runs out", lowerHidden(), [NSString stringWithFormat:@"controls %.0f", duration.alpha]);+ });+ after(40, ^{NSLog(@"[harness] immersive checks: %lu of %lu right -- %@", (unsigned long)right, (unsigned long)checks, right == checks ? @"PASS" : @"FAIL");});}diff --git a/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.h b/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.hindex 31dcabd4..036a6bb2 100644--- a/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.h+++ b/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.h@@ -16,6 +16,10 @@- (void)syncSiblings;// Called as a finger starts to scroll the lines, for a host that hides its controls then.@property (nonatomic, copy) void (^browsingBegan)(void);-// The pronunciation and translation button goes with the host's controls when they are hidden.+// The pronunciation and translation button goes with the host's controls when they are hidden, and Sing's+// mic with it unless keepsSing is set.@property (nonatomic) BOOL extrasHidden;+// The mic stays when the extras go, for a host that lets it take its own touches while its controls are+// hidden (the player's lines on their own, Redesigned/Player/PlayerLyrics.x), so Sing is always in reach.+@property (nonatomic) BOOL keepsSing;@enddiff --git a/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.m b/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.mindex efc229a1..deed49ad 100644--- a/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.m+++ b/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.m@@ -1449,7 +1449,7 @@ typedef struct {_extras.alpha = hidden ? 0 : 1;_extrasBox.userInteractionEnabled = !hidden;}- _sing.tucked = hidden;+ _sing.tucked = hidden && !_keepsSing;}- (void)scrollViewDidScroll:(UIScrollView *)scrollView {diff --git a/tweak/Sources/Redesigned/Player/PlayerLyrics.x b/tweak/Sources/Redesigned/Player/PlayerLyrics.xindex 980a0c2e..a4985ecd 100644--- a/tweak/Sources/Redesigned/Player/PlayerLyrics.x+++ b/tweak/Sources/Redesigned/Player/PlayerLyrics.x@@ -28,6 +28,9 @@#import "Core/SGCore.h"#import "Redesigned/Kit/SGRKit.h"#import "Redesigned/Lyrics/SGRKaraokeView.h"+#import "Redesigned/Lyrics/SGRSingButton.h"+#import "Settings/SGPageStyle.h"+#import "Shared/Sing/Sing.h"#import "Shared/Lyrics/Lyrics.h"#import "Shared/LocalFiles/LocalFiles.h"#import "Player.h"@@ -60,6 +63,7 @@ static __weak UIViewController *sg_info, *sg_duration, *sg_floating;static __weak UIView *sg_titleElement; // the arranged element view holding the title and the artiststatic __weak UIViewController *sg_player; // NowPlayingViewController, whose units the controls arestatic BOOL sg_alone; // the lines have the player to themselves+static BOOL sg_touching; // a finger is on the player, which holds the clock (SGRPlayerTouchWatcher)static NSTimer *sg_rest;static __weak UIGestureRecognizer *sg_wake; // on the player, on while alone: the tap that brings the controls back@@ -130,6 +134,8 @@ static __weak UIGestureRecognizer *sg_wake; // on the player, on while alone: thif (!_lyrics) {_lyrics = [[SGRKaraokeView alloc] initWithFrame:_stage.bounds];_lyrics.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;+ // Sing's mic stays while the lines are on their own, moving down with them (setAlone).+ _lyrics.keepsSing = YES;}if (_lyrics.superview != _stage) [_stage addSubview:_lyrics];_lyrics.frame = _stage.bounds;@@ -306,7 +312,8 @@ static CGFloat thumbRadius(SGRLyricsLayout l, BOOL open) {// the title row stay, so the song playing is still named, and stay Spotify's and the thumbnail's to touch.// The lines scroll as they always do and leave the controls hidden; a tap brings them back and is not a// seek. A pause brings them back and keeps them; VoiceOver, a sheet over the player and the app in the-// background keep them up. A scroll through the lines hides them at once.+// background keep them up. A scroll through the lines hides them at once. Sing's mic stays with the lines,+// and a touch on it is the mic's: it does not bring the controls back.//// The tap is a recognizer on the player that recognizes with any other, so the thumbnail's tap closes the// lyrics the same time it brings the controls back, and a button takes its own tap: UIKit gives a control@@ -384,42 +391,96 @@ static void letLinesSeek(SGRPlayerLyricsOverlay *overlay, BOOL seek) {static void setAlone(BOOL alone, BOOL animated);-static BOOL mayRest(void) {+// A sheet, a menu or an alert over the player: the top controller on screen is not one the player is drawn+// in. The queue, devices and ⋯ sheets can be presented from the player's topmost parent rather than the+// player, which the player's own presentedViewController would miss, and Sing's explanation is an alert on+// the top controller (SGRSingButton.m).+static BOOL coveredBySheet(void) {+ UIViewController *top = SGTopController();+ UIView *host = sg_host;+ if (!top.viewIfLoaded || !host || [host isDescendantOfView:top.viewIfLoaded]) return NO;+ static NSUInteger logged;+ if (logged++ < 3) SGLog(@"redesign player: %@ over the player keeps the controls up", NSStringFromClass(top.class));+ return YES;+}++// Whether the clock runs: the lines up with the controls, the song playing with the app in front, no finger+// on the player and VoiceOver off (which keeps the controls up, and starts the clock again when it goes).+static BOOL mayCount(void) {SPTPlayerState *state = SGPlayerState();UIView *host = sg_host;- return SGEnabled(SGRKeyLyricsAutoHide) && sg_open && !sg_alone && host.window && state && !state.isPaused+ return SGEnabled(SGRKeyLyricsAutoHide) && sg_open && !sg_alone && !sg_touching && host.window && state && !state.isPaused&& !UIAccessibilityIsVoiceOverRunning()- && UIApplication.sharedApplication.applicationState == UIApplicationStateActive- && !sg_player.presentedViewController;+ && UIApplication.sharedApplication.applicationState == UIApplicationStateActive;}-// The clock starts again at every touch, and stops for anything that keeps the controls up.+// Whether the controls may fade as it runs out: not under a sheet, nor while Sing gets ready.+static BOOL mayRest(void) {+ return mayCount() && !coveredBySheet() && SGSingCurrentState() != SGSingStatePreparing;+}++// The clock starts again at every touch. Run out while something keeps the controls up (a sheet, Sing getting+// ready, lines still being measured), it starts over, so they fade once that has gone.static void restartRest(void) {[sg_rest invalidate];sg_rest = nil;- if (!mayRest()) return;+ if (!mayCount()) return;sg_rest = [NSTimer scheduledTimerWithTimeInterval:kRest repeats:NO block:^(NSTimer *timer) {sg_rest = nil;if (mayRest()) setAlone(YES, YES);+ if (!sg_alone) restartRest();}];}-@interface SGRPlayerTouchWatcher : UIGestureRecognizer+@interface SGRPlayerTouchWatcher : UIGestureRecognizer <UIGestureRecognizerDelegate>@end-// Sees every touch on the player and takes none: it fails at once, so nothing under it loses one.+// Sees every touch on the player and takes none. It never recognizes: it holds the clock while a finger is+// down, so a hold on Sing's slider that runs past the rest fades nothing under it, and starts the clock once+// the last finger lifts. Nothing can end its watch early, or a scroll or a hold that recognized would start+// the clock under the finger.@implementation SGRPlayerTouchWatcher- (instancetype)init {if (!(self = [super initWithTarget:nil action:nil])) return nil;+ self.delegate = self;self.cancelsTouchesInView = NO;self.delaysTouchesBegan = NO;self.delaysTouchesEnded = NO;return self;}+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)recognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)other {+ return YES;+}+- (BOOL)canBePreventedByGestureRecognizer:(UIGestureRecognizer *)other {+ return NO;+}+- (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)other {+ return NO;+}- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {- if (!sg_alone) restartRest();+ sg_touching = YES;+ [sg_rest invalidate];+ sg_rest = nil;+}+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {+ [self lifted:event];+}+- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {+ [self lifted:event];+}+- (void)lifted:(UIEvent *)event {+ for (UITouch *touch in [event touchesForGestureRecognizer:self]) {+ if (touch.phase != UITouchPhaseEnded && touch.phase != UITouchPhaseCancelled) return;+ }self.state = UIGestureRecognizerStateFailed;}+// After the last finger, or the watch ended any other way.+- (void)reset {+ [super reset];+ if (!sg_touching) return;+ sg_touching = NO;+ if (!sg_alone) restartRest();+}@end@interface SGRPlayerWake : UITapGestureRecognizer <UIGestureRecognizerDelegate>@@ -439,6 +500,13 @@ static void restartRest(void) {- (BOOL)gestureRecognizer:(UIGestureRecognizer *)recognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)other {return YES;}+// Sing's mic and its slider stay while the lines are alone, and a touch on them is theirs alone.+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)recognizer shouldReceiveTouch:(UITouch *)touch {+ for (UIView *v = touch.view; v; v = v.superview) {+ if ([v isKindOfClass:SGRSingButton.class]) return NO;+ }+ return YES;+}- (void)sgr_woke {setAlone(NO, YES);restartRest();@@ -527,7 +595,7 @@ static void setOpen(BOOL open, BOOL animated) {overlay.stage.transform = entering;// Not under VoiceOver, which keeps the controls up, nor under a sheet.overlay.lyrics.browsingBegan = ^{- if (!UIAccessibilityIsVoiceOverRunning() && !sg_player.presentedViewController) setAlone(YES, YES);+ if (!UIAccessibilityIsVoiceOverRunning() && !coveredBySheet()) setAlone(YES, YES);};// Spotify's cover goes the moment the redesign's own takes its place: the same picture at the// same size with the same corners, so there is nothing to see in the swap. Coming back it waits