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

fix: the player's device glyph stays centered and takes only its own touches

My-Name-Is-Jeffc86b8ccfe490
diff --git a/harness/player/build.sh b/harness/player/build.sh
index ac4aafca..86a3311d 100755
--- a/harness/player/build.sh
+++ b/harness/player/build.sh
@@ -13,7 +13,7 @@ done
SDK=$(xcrun --sdk iphonesimulator --show-sdk-path)
xcrun -sdk iphonesimulator clang -target arm64-apple-ios17.0-simulator -fobjc-arc -g -O0 \
- -I"$SRC" -I"$SRC/Redesigned/Player" -I"$SRC/Redesigned/Kit" -I"$OUT/gen" -isysroot "$SDK" \
+ -I"$SRC" -I"$SRC/Redesigned/Player" -I"$SRC/Redesigned/Kit" -I"$OUT/gen" -I"$(dirname "$0")" -isysroot "$SDK" \
-Wno-deprecated-declarations \
"$(dirname "$0")/main.m" "$(dirname "$0")/../scene.m" "$(dirname "$0")/stubs.m" "$(dirname "$0")/../tabbar/touch.m" \
"$OUT"/gen/*.m \
diff --git a/harness/player/stubs.m b/harness/player/stubs.m
index dd9eb425..dbacc772 100644
--- a/harness/player/stubs.m
+++ b/harness/player/stubs.m
@@ -1,3 +1,4 @@
+#import "substrate.h"
// What the player harness does not compile: the Kit's hooks (SGRAccent.x, SGRRepaint.x), the rest of
// the player's hooks, the lyrics store and the haptics. Everything here answers the way the phone would
// for one track with lyrics, so the redesign's own code is what is being looked at. The player itself
@@ -234,3 +235,12 @@ void SGRRefreshTabBar(void) {}
// the ⋯, and with no button of the mod's over it the ⋯'s own touches press its circle.
void SGRPlayerMenuWatch(UIView *button) {}
UIControl *SGRSystemMenuFront(UIView *button) { return nil; }
+
+// Cydia Substrate's hook (substrate.h here), as the runtime does it: the class gets its own copy of an inherited
+// method, so its superclass is left alone.
+void MSHookMessageEx(Class _class, SEL message, IMP hook, IMP *old) {
+ Method method = class_getInstanceMethod(_class, message);
+ if (!method) return;
+ if (old) *old = method_getImplementation(method);
+ if (!class_addMethod(_class, message, hook, method_getTypeEncoding(method))) method_setImplementation(method, hook);
+}
diff --git a/harness/player/substrate.h b/harness/player/substrate.h
new file mode 100644
index 00000000..b17027ed
--- /dev/null
+++ b/harness/player/substrate.h
@@ -0,0 +1,3 @@
+// What PlayerFooter.x takes from Cydia Substrate, for the simulator: stubs.m swaps the method itself.
+#import <objc/runtime.h>
+void MSHookMessageEx(Class _class, SEL message, IMP hook, IMP *old);
diff --git a/tweak/Sources/Redesigned/Player/PlayerFooter.x b/tweak/Sources/Redesigned/Player/PlayerFooter.x
index dce5ca23..8619d3a4 100644
--- a/tweak/Sources/Redesigned/Player/PlayerFooter.x
+++ b/tweak/Sources/Redesigned/Player/PlayerFooter.x
@@ -5,7 +5,8 @@
// trailing edge. Connect and the queue stay Spotify's controls (the device sheet, the remote device
// tint, the Jam avatars) and are only moved, by a translation of the arranged view that holds each: a
// transform survives the stack view laying them out again, and moving the holder keeps its touches
-// inside its own bounds. The device name goes transparent, since the glyph alone sits in the middle.
+// inside its own bounds. The device name goes transparent, since the glyph alone sits in the middle, and
+// Connect's holder takes touches only in a square over the glyph (coverConnect).
// Spotify has no lyrics control down here, so that one is the Kit's glyph button, and it turns the
// lyrics in the player on and off (PlayerLyrics.x): filled while they are up, dimmed and dead for a
// track that has none.
@@ -19,6 +20,7 @@
// (a 19x19 UIImageView glyph and a MarqueeLabel with the device name), a spacer, a hidden media trimmer,
// ElementView > EncoreButton id=ShareButtonNowPlayingView 44x44, ElementView > Queue control
// id=QueueButtonNowPlaying 47x32.
+#import <substrate.h>
#import "Core/SGCore.h"
#import "Redesigned/Kit/SGRKit.h"
#import "Player.h"
@@ -110,6 +112,33 @@ static UIView *connectGlyphIn(UIView *holder) {
return glyph;
}
+// Connect is Spotify's control as wide as the device's name, with the glyph near its leading edge. With the
+// name hidden and the glyph in the middle, its touches would reach far past the glyph, over the queue, and
+// hardly before it. So the row's view that holds it takes touches only in a square over the glyph, the size
+// of the row's other two; Spotify's own views inside still handle them. The square is kept on that view, and
+// its class answers from it, as it does for every other view of the class.
+static char kConnectHitKey;
+static BOOL (*sg_origPointInside)(UIView *, SEL, CGPoint, UIEvent *);
+
+static BOOL connectPointInside(UIView *self, SEL _cmd, CGPoint point, UIEvent *event) {
+ NSValue *square = objc_getAssociatedObject(self, &kConnectHitKey);
+ if (square) return CGRectContainsPoint(square.CGRectValue, point);
+ return sg_origPointInside(self, _cmd, point, event);
+}
+
+static void coverConnect(UIView *arranged, UIView *glyph) {
+ if (!arranged || !glyph) return;
+ static Class hooked;
+ if (!hooked) {
+ hooked = arranged.class;
+ MSHookMessageEx(hooked, @selector(pointInside:withEvent:), (IMP)connectPointInside, (IMP *)&sg_origPointInside);
+ }
+ if (arranged.class != hooked) return;
+ CGRect drawn = [glyph convertRect:glyph.bounds toView:arranged];
+ CGRect square = CGRectMake(CGRectGetMidX(drawn) - 22, CGRectGetMidY(drawn) - 22, 44, 44);
+ objc_setAssociatedObject(arranged, &kConnectHitKey, [NSValue valueWithCGRect:square], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
#pragma mark - lower down
// Moved down, the row is drawn partly below the bottom stack it is arranged in, and UIKit does not look
@@ -216,19 +245,30 @@ static void lowerRow(UIView *row) {
SGRPlayerLyricsChanged();
UIView *connect = SGRFindByIdentifier(host, @"Components.ConnectButtonOutputSwitcher", &kConnectKey);
+ // The unit lays out before Connect has sized its glyph, the first time the player opens: Connect is laid
+ // out first so the glyph is there to move to the middle. Should it still be missing, Connect stays where
+ // Spotify put it, since centring the whole control would leave the glyph well off the middle, and the unit
+ // looks again on the next turn of the run loop.
+ [connect layoutIfNeeded];
UIView *glyph = connectGlyphIn(connect);
- for (UIView *view = glyph.superview; view && view != connect; view = view.superview) {
- for (UIView *sibling in view.subviews) {
- if ([NSStringFromClass(sibling.class) containsString:@"MarqueeLabel"]) SGRPlayerVanish(sibling);
- }
+ static NSUInteger lookedAgain; // a Connect with no glyph at all is left alone after this many
+ if (glyph) lookedAgain = 0;
+ if (connect && !glyph && lookedAgain++ < 20) {
+ __weak UIView *weakHost = host;
+ dispatch_async(dispatch_get_main_queue(), ^{ [weakHost setNeedsLayout]; });
}
- UIView *pinned = glyph ?: connect;
- CGFloat connectFrom = moveTo(arrangedAround(connect, host), pinned, CGPointMake(CGRectGetMidX(pinned.bounds), CGRectGetMidY(pinned.bounds)), host, round(width * kMiddle));
+ // The name is a MarqueeLabel on the phone's speaker and a plain Encore label on AirPods; Connect holds
+ // nothing else that draws text.
+ SGForEachView(connect, ^(UIView *view) {
+ if ([view isKindOfClass:UILabel.class] || [NSStringFromClass(view.class) containsString:@"MarqueeLabel"]) SGRPlayerVanish(view);
+ });
+ CGFloat connectFrom = glyph ? moveTo(arrangedAround(connect, host), glyph, CGPointMake(CGRectGetMidX(glyph.bounds), CGRectGetMidY(glyph.bounds)), host, round(width * kMiddle)) : -1;
UIView *queue = SGRFindByIdentifier(host, @"QueueButtonNowPlaying", &kQueueKey);
CGFloat queueFrom = moveTo(arrangedAround(queue, host), queue, CGPointMake(CGRectGetMidX(queue.bounds), CGRectGetMidY(queue.bounds)), host, round(width * (rtl ? kLeading : kTrailing)));
lowerRow(host);
+ coverConnect(arrangedAround(connect, host), glyph);
static dispatch_once_t once;
dispatch_once(&once, ^{