Liquid Glass and Apple Music touches for the Spotify iOS app. A GPL-3.0 fork of spoti.pw 0.21.1.
C
chore: the UI and documentation use American English
My-Name-Is-Jeff72a583d7ff34
diff --git a/AGENTS.md b/AGENTS.mdindex e7d8ea78..07404db2 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -8,12 +8,12 @@ A Theos tweak (Objective-C + Logos) injected into the decrypted Spotify iOS app.**Redesigned UI** (the first row of Mod Settings) picks one of two looks, read once at launch:- **Native**: Spotify's own screens with the mod's tweaks on them (hide switches, glass header buttons,- Home gradient, AMOLED switch, accent colour...).+ Home gradient, AMOLED switch, accent color...).- **Redesigned**: the mod's own Liquid Glass look, from a clean sheet. It includes the glass tab bar,search field and now playing bar, the redesigned player and lyrics page with Apple Music style lyricsalways on, a decluttered Home, Search's categories on tinted glass, a Library with one large title, theplaylist, album and artist pages the way the Music app lays them out with one pinned ⋯ over each, black- throughout, and its own accent colour. No native tweak runs.+ throughout, and its own accent color. No native tweak runs.Anything that doesn't draw on Spotify's screens works the same under both: ads, privacy, lyricssources, gestures, blocked artists, flags, Vibrations, Speed and pitch, and the Live Activity. Those@@ -31,7 +31,7 @@ Spotify 9.1.78's own.| Layer | What | Gate at the top of every `%ctor` ||---|---|---|-| `Shared/` | behaviour and data, either look | none |+| `Shared/` | behavior and data, either look | none || `Native/` | Spotify's screens tweaked | `if (!SGNativeUI()) return;` || `Redesigned/` | the redesign (`Kit/` + parts) | `if (!SGRedesignedUI()) return;` || `App/` | Mod Settings root and combined pages, Mod page, tour | none |@@ -44,7 +44,7 @@ Rules:violation. Don't work around it.- Change one look without touching the other. When both need the same thing, each side keeps its owncopy under its own names (`SG…` native, `SGR…` redesign) and its own keys. Examples are the tab bar- composition and editor, AMOLED and the accent colour. Don't merge copies back into+ composition and editor, AMOLED and the accent color. Don't merge copies back intoa shared file.- A lower layer that needs something from a higher one gets it through a registry in `Core`(forced flags: `Core/SGFlagForce.h`) or a function declared low and defined high.diff --git a/docs/cleanroom/motion-catalog.md b/docs/cleanroom/motion-catalog.mdindex 65cae2a9..ab35fdac 100644--- a/docs/cleanroom/motion-catalog.md+++ b/docs/cleanroom/motion-catalog.md@@ -25,7 +25,7 @@ It may use:Every `done` block runs on the main queue, exactly once.-## Behaviour+## Behavior### Name keysdiff --git a/docs/parity.md b/docs/parity.mdindex 732a9e4a..bb1f50e4 100644--- a/docs/parity.md+++ b/docs/parity.md@@ -63,7 +63,7 @@ fixed in the commits that follow `956e65c`.|---|---|| 73, 74 | AirPods gestures: double nod likes, shake skips, learns your motion || 97 | Music Haptics through iOS in the background and on the lock screen |-| 90, 105 | Live Activity: the cover, its colour, progress, centred and translated lyrics, and a small layout on Apple Watch and CarPlay from iOS 18 |+| 90, 105 | Live Activity: the cover, its color, progress, centered and translated lyrics, and a small layout on Apple Watch and CarPlay from iOS 18 || 89 | Listening stats, with Spotify's export imported || 79, 98 | Apple Music red accent, one font for the whole app || 17 | Beta builds update to the next beta, then the release. Mod > Include betas lets a release build opt in |@@ -84,7 +84,7 @@ fixed in the commits that follow `956e65c`.| 21, 33, 68, 132, 133 | Tab bar minimizes on scroll, the now playing bar in its row || 14, 113, 128, 44 | Add a tab sheet, own names and SF Symbol or Encore icons, Split tabs || 45, 59 | Fades under the tab bar |-| 41, 43, 34, 134 | Pages come in whole, cover colour, owner pictures, section cards |+| 41, 43, 34, 134 | Pages come in whole, cover color, owner pictures, section cards || 71, 119 | Album track rows drop the artist line that repeats the album's || 101 | Save turns into download on someone else's playlist, for accounts that can download || 62 | Playlist Mix can be turned off again |@@ -93,16 +93,16 @@ fixed in the commits that follow `956e65c`.| 48, 58, 118, 126 | Lyrics fixes || 57 | No freeze with EeveeSpotify's lyrics on || 95 | Mod Settings in the system Settings' style, Appearance on its own page |-| 70 | A dependent setting greys out instead of vanishing |+| 70 | A dependent setting grays out instead of vanishing || 72 | What's new sheet (empty until the fork's first release) || 116, 117, 37 | Tour: glass logo, redesign below iOS 26 after a warning || 25, 26 | Say when EeveeSpotify is injected, or Spotify's version differs || 127, 135, 52 | Settings fixes || 66 | Less main-thread work for the flags Spotify reads at launch |-### Beta gaps (0.23.0-beta, described by behaviour)+### Beta gaps (0.23.0-beta, described by behavior)-A separate describer compared upstream's beta branch with Vitrine by behaviour only (local notes, not in the+A separate describer compared upstream's beta branch with Vitrine by behavior only (local notes, not in therepo). Rounds 3 and 4 closed most of it: Spicy Lyrics' key, credit, pronunciations and back-off; the paused cover;the clip's pause, Spotify's video, late Canvas, next-track fetch and give-up; the lyrics left alone; tap to seek;the lock screen's Canvas shape, late Canvas and Canvas service; the lit custom tab; the update check; EeveeSpotify@@ -131,7 +131,7 @@ Not gaps: Hide social proof (both flags ship off), recvmsg (Spotify 9.1.78 does### From upstream pull requests-Rebuilt from behaviour-only descriptions; each commit credits the PR's author.+Rebuilt from behavior-only descriptions; each commit credits the PR's author.| PR | Item ||---|---|diff --git a/docs/tweaks.md b/docs/tweaks.mdindex 85b5d2c6..7d6a97cc 100644--- a/docs/tweaks.md+++ b/docs/tweaks.md@@ -9,7 +9,7 @@tweak/Sources/Headers/ reverse-engineered Spotify classes, one header each, only the selectors usedtweak/Sources/Settings/ the Mod Settings framework: SGPage (a page on Spotify's stack), SGModPage (sectionsof rows: switches, choices, sliders, links, rows shown only while a choice- asks for them, and rows greyed out while the switch they wait on is off, a tap+ asks for them, and rows grayed out while the switch they wait on is off, a tapon one nudging that switch), SGPageStyle (the system Settings look), SGGlowSwitch,SGMarquee (a title that glides side to side when it is too long, for every layer)tweak/Sources/Shared/ what works the same with either look, see Layers below@@ -61,7 +61,7 @@ is left alone on iOS 26, so a phone that updates gets its redesign back.The two looks never run together, so each hooks the same Spotify class in its own way, and a part ofthe look is edited on its own side without touching the other: where both need the same thing, eachhas its own copy (the tab bar's composition and its editor, the lyrics page's glass, the soft top edge,-AMOLED, the accent colour), under its own names (SG… native, SGR… redesign) and its own keys. The imports run+AMOLED, the accent color), under its own names (SG… native, SGR… redesign) and its own keys. The imports runone way, Core <- Settings <- Shared <- Native | Redesigned <- App, and `scripts/check-layers.sh`, runby tweak/Makefile before every build, fails on any other. A layer below that needs something from oneabove takes it through a registry in Core (forced flags, SGFlagForce.h) or a function declared low and@@ -219,7 +219,7 @@ Shared:AudioEffects/ the audio effects on Spotify's sound (AudioEffects.h has the keys and the page's calls): a rendernotify on the music's RemoteIO unit (SGPlayerMusicOutput, Shared/Player) runs each finished buffer through the mod's own engine, re-blocked to 1024 frames one block late,in place (AudioEffects.x, SGDSPEngine.m), then hands it, mixed to mono, to one reader that only- reads it, switch on or off (SGAudioSetOutputReader: the player's Visualiser). The buffers are in the unit's output format, the+ reads it, switch on or off (SGAudioSetOutputReader: the player's Visualizer). The buffers are in the unit's output format, thehardware's, not the client format Spotify sets. The effects are the SGDSP*.m files, on Accelerate,Apple's Reverb2 unit, libbs2b and EEL2 (vendor/audio). Settings apply as they change, on a queue ofits own; the file effects read their files from Documents/Vitrine/Audio effects@@ -320,13 +320,13 @@ Shared:the mod's own (Player/SleepTimer.m: 15 min, 30 min, 1 hour, End of track, End of album) that fadesthe sound out and pauses Spotify, and stays set when the card is switched off (LiveActivity.h lists its files): a timer polls the player andsends a new state only when what the view shows changes, local updates only, no push. The card- is tinted with the cover's colour and shows the cover itself, a JPEG of a few dozen pixels inside+ is tinted with the cover's color and shows the cover itself, a JPEG of a few dozen pixels insidethe state, which ActivityKit caps at 4 KB (the bridge sends it without the cover when it would- not fit); the colour is darkened to a luminance of 0.04 at most, so the white text keeps 4.5:1 on any+ not fit); the color is darkened to a luminance of 0.04 at most, so the white text keeps 4.5:1 on anycover, and the cover is read only once the now playing title is the new track's. The page's optionsride in the state too, read on every tick, so they apply within a tick: the lines' alignment, what thelyrics view shows on a track with no timed lyrics (a note under the track, or the track large), the- colours (Spotify's green; Artwork, the cover's colour lightened to about the green's luminance in its+ colors (Spotify's green; Artwork, the cover's color lightened to about the green's luminance in itsplace; Plain, white on the system's own background), and the progress bar. Artwork off sends nocover at all. The page's preview (SGLiveActivityPreview.m) is a mock of the card in UIKit, not thewidget, checked in the simulator against harness/live-activity-page/. Taps are@@ -362,7 +362,7 @@ Shared:Native:- Appearance/ AMOLED (Amoled.x), the accent colour (Accent.x), the soft top edge (EdgeEffect.x), and Repaint.x, which+ Appearance/ AMOLED (Amoled.x), the accent color (Accent.x), the soft top edge (EdgeEffect.x), and Repaint.x, whichkeeps what the native tweaks stripped transparentNavbar/ Spotify's tab bar composed (Navbar.x, NavbarLayout.m, hooked from TabBarHooks.x), the Navbar and Add a tab pagesNowPlayingBar/ the device button hidden, the bar's flags@@ -386,8 +386,8 @@ Redesigned:Kit/ what the redesign builds on (SGRKit.h lists it), the flags it forces (SGRedesign.h, SGRGlassDesign.x forSpotify's own glass design), its repaint hook (SGRRepaint.x), soft top edge, AMOLED black (always on,- SGRAmoled.x) and its own accent colour (SGRAccent.x, stored apart from the native look's). The- playlist, album and artist pages take their field's colour from the cover's main colour (checked on+ SGRAmoled.x) and its own accent color (SGRAccent.x, stored apart from the native look's). The+ playlist, album and artist pages take their field's color from the cover's main color (checked onthe Mac by harness/palette/), and come in whole: a black veil over the page until the cover hasbeen read, at most SGRFieldHoldLimit (1 s), then faded away (SGRField.h)Navbar/ the glass tab bar (TabBar.x) over its own composition (Navbar.x, NavbarLayout.m) and editor, the glass search field.@@ -421,7 +421,7 @@ Redesigned:from the presented controller's viewWillAppear: on, and the menu comes from an invisible buttoninside the ⋯ that takes touches only while it is up, opened with -performPrimaryAction (elseUIContextMenuInteraction's private _presentMenuAtLocation:). Spotify's rows, read off the sheet's- cells (words, glyph, greyed out), and the mod's own rows in its header and footer (Sort, Mix, Edit+ cells (words, glyph, grayed out), and the mod's own rows in its header and footer (Sort, Mix, Editinfo) are fired on the hidden sheet once the menu is gone, through the row's own control (scrolledto when it is below the fold); a row that pushes a page shows the sheet on that page, one thatpresents a sheet of its own (Sleep timer) leaves that sheet as Spotify's and the card goes unseen,@@ -439,7 +439,7 @@ Redesigned:from the seam under the controls and over the whole clip behind the lyrics. The clip and the covercross over as one comes and the other goes, the clip from its poster frame before the video hasdecoded one, and the Fluid field under a clip holds still and, once the clip has faded in, is hidden- (SGRArtworkField's covered); the menu switches between Animated, Fluid and the Visualiser without+ (SGRArtworkField's covered); the menu switches between Animated, Fluid and the Visualizer withouta restart. The clip holds its frame while the song is paused, goes whileSpotify's music video shows, is given up when it has drawn nothing in 5 s on screen, and on a skipstays a moment for the next track's to cross over it. Under Reduce Motion and in Low Power Mode no@@ -447,9 +447,9 @@ Redesigned:percentile of the linear luminance of three frames), so white text keeps 4.5:1 (7:1 with IncreaseContrast), from 0.10 to 0.80 and 0.15 more behind the lyrics. A track that changes while the playercannot be seen (no window, or the app not in front) takes the last clip away at once. Checked in the simulator against- harness/player/ (`motion`). The Visualiser+ harness/player/ (`motion`). The Visualizer(PlayerVisualiser.m) draws two soft hills of the song's spectrum across the foot of the player in the- cover's flow colours, over the Fluid field held still, blurred behind the lyrics: the audio effects'+ cover's flow colors, over the Fluid field held still, blurred behind the lyrics: the audio effects'render notify on the music's output hands what it plays, mixed to mono, to one reader (SGAudioSetOutputReader), andSGRSpectrum.m cuts it into 24 bands with Accelerate's FFT on the render thread, without allocating orlocking, and publishes them atomically; a display link of at most 60 Hz (30 behind the lyrics, 15@@ -463,7 +463,7 @@ Redesigned:that breathe and fill over its length on a Core Animation timeline laid against the song's clock; anda line's pronunciation (under the words it spells) and translation, switched on from a glass button inthe lyrics' corner that shows only for a song that has them, in the order of sizes the Lyrics page sets- (LyricsText.h). With the Lyrics page's Romanised lyrics on, a line in another alphabet has the same+ (LyricsText.h). With the Lyrics page's Romanized lyrics on, a line in another alphabet has the sameagain in Latin letters right under its words (the source's own pronunciation where it is hidden, nonewhere it shows), before the translation, at the pronunciation's size, lit with its line but never swept.A word held 0.9 s or more glows and its letters rise in a wave as the sweep reaches@@ -478,7 +478,7 @@ Redesigned:frames and the hooks' time (Home.h lists its files)Search/ the Browse page decluttered to its category cards (an allow list of the list's cells: the watch feedcarousels and promos collapse, and the cards move up by the spacing they leave), the header the way Home- has it without the camera, and each card as Liquid Glass tinted by its own colour, read off the Box's+ has it without the camera, and each card as Liquid Glass tinted by its own color, read off the Box'sshape layer (Search.h lists its files)Library/ Your Library the way Home and Search have their headers: a large title at the leading edge, the avatarat the trailing edge with the search and create buttons before it, the header's scrim gone, each row's@@ -489,7 +489,7 @@ Redesigned:system's own glassPlaylist/ the playlist page (Liked Songs and one's own too, all three being the same page) the way the Musicapp lays one out: the cover full bleed across the top dissolving into the page's field with no seam,- the title, the creator and the length centred under it, one row of glass controls (shuffle, a+ the title, the creator and the length centered under it, one row of glass controls (shuffle, aprominent Play capsule taking its glyph and its word from Spotify's own button, add), the find barand the curation pills gone, and the track rows on the field with a hairline between them(Playlist.h lists its files). Sort and Mix, the two of those pills the ⋯ menu does not already offer,@@ -499,7 +499,7 @@ Redesigned:playlist's, so it shares nothing with Playlist/ but the Kit: the cover full bleed dissolving into thefield (Apple Music's animated cover over it where the album has one, fading in once its first frameis decoded and moving only in front of the app with Reduce Motion and Low Power Mode off and Auto-Play- Video Previews on), the title, the artist and the kind and date centred under it, and the same row of glass+ Video Previews on), the title, the artist and the kind and date centered under it, and the same row of glasscontrols -- play and shuffle float over the album page outside its header, so they are concealedthere and the row carries the Kit's stand-ins, which draw their glyph and fire them. A track's artist linegoes where it only repeats the album's artist (with the guests the title names after "feat." and the@@ -536,7 +536,7 @@ which makes every unset switch read off, so a reset is stock Spotify whatever swA hook reads its switch when it runs (`SGEnabled`, `SGHidden`, `SGFlag` from Core/SGPrefs.h), so achange shows after Spotify restarts; the tab editor on the Navbar page is the exception and applies as soon as the bar lays-out again, as are the Home gradient's colour, strength and height, but not the switch that turns it on, and Vibrations+out again, as are the Home gradient's color, strength and height, but not the switch that turns it on, and Vibrationsand Live Activity. The root page in `App/ModSettings.x` links the Appearance page and the page of each part of Spotify, and only the stored look's.## Make targets@@ -596,7 +596,7 @@ the simulator by harness/driver/.Mod Settings, opened by holding Home on the tab bar or from the first row of the side drawer and thelast row of Spotify's Settings, looks like the system Settings app in its dark appearance under either look:cards of #1C1C1E on black, 17pt rows that follow Dynamic Type up to xxxLarge and the app font, each part of-Spotify behind a symbol on a tile of its own colour, grey chevrons and footnote headers. It has no account+Spotify behind a symbol on a tile of its own color, gray chevrons and footnote headers. It has no accountpage. It sorts everysetting by the part of Spotify it changes, so a part's glass, its hide switches and its flags sit onone page, the mod's own rows first and Spotify's flags below them or on a sub page named after what@@ -604,10 +604,10 @@ they change. Its main page groups the rows by what they are, in cards with no heunder 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), Audioeffects, 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-against harness/mod-settings/. The Appearance page has, in the native look, AMOLED (the redesign is always black), then the stored look's Accent colour-preset, a pull-down of Spotify, Apple Music and Custom read off the colour stored (a colour set before the presets-existed reads as Custom, Apple Music's red as Apple Music), and Accent colour, the hex and a swatch of the colour in-effect, which opens the system picker in a sheet that stores only from its checkmark, as Custom. The custom colour is+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+effect, which opens the system picker in a sheet that stores only from its checkmark, as Custom. The custom color iskept aside while a preset is in place, so Custom brings it back. Last come the Font, under either look and on anyiOS, below 26 too, a page of its own with each choice drawn in itself: Default (Spotify's), San Francisco, SFRounded, New York and SF Mono; More fonts, the families iOS carries of a fixed few (Avenir Next to American@@ -623,7 +623,7 @@ Albums & artists as it is flipped. Tab bar: the tab editor of the stored look, eits own list of tabs. Lyrics, on the main page of its own: in the redesign a live preview of the lyrics first, with the presets of their lookunder it and their sliders in a sheet (Text size, Line spacing, Blur, Glow, Wave), applying at once; then Karaoke, then the ordered list of lyrics sources,lyrics for every track, naming the source in the redesign, the lock screen, and glass lyrics in the native look; in-the redesign also which of the lyrics, their pronunciation and their translation is set largest, Romanised lyrics+the redesign also which of the lyrics, their pronunciation and their translation is set largest, Romanized lyrics(applied at once), and the translation's language. Karaoke, under either look, on the main page and as Lyrics' first row, the row reading out On,Off or how far the voice model's download has come, kept up to date while the page shows: Karaoke's switch, which turnsthe mic on and off at once, a card at its top (SGSingCard.m: the song, what Karaoke is doing, a tap saying more, the vocals@@ -645,13 +645,13 @@ PlayerSettings.m): the background chosen edge to edge, and over its foot the covfor Animated while the player has no clip, the card looks the playing track's up itself while it is on screen(SGMotionClipFor, the player's sources, size and Low Data Mode, into the store the player reads), Fluid until itis in, then the clip over it, poster first (harness/player/ `preview`);-under it a segmented control of the five backgrounds (Still, Colours, Fluid, Animated, Visualiser, changing the card at once)+under it a segmented control of the five backgrounds (Still, Colors, Fluid, Animated, Visualizer, changing the card at once)with a note on what the one picked does, Artwork sources and Download in Low Data Mode while Animated is chosen,and Mini player: Apple Music style (the tab bar's minimize on scroll), Device button (the now playing bar keepsSpotify's device button in that minimized row, off by default) and the device button hidden on the full bar,checked in the simulator against harness/player/ (`settings`). Vibrations, a page of its own under eitherlook opened from the main page (the row reads out which of the two are on), leads with a preview (Shared/Haptics/SGVibrationsPreview.m): rings of dots that a tap sends a crest across, out-from the middle in the accent colour, higher and further the stronger the Strength, while the first of Controls and+from the middle in the accent color, higher and further the stronger the Strength, while the first of Controls andMusic Haptics that is on plays its own tap through its own path (Controls' add tap, or one kick of Music Haptics'with its rumble unless it follows Beat), the line under it naming which, or saying why there is none. While the pageshows, each tap Music Haptics plays sends a low crest too. Nothing runs between crests, and with Reduce Motion the@@ -660,9 +660,9 @@ Controls (on until switched off) and one for Music Haptics, which holds two switeach with an ⓘ: Music Haptics, the mod's own from the sound while Spotify is in front, and In the Background(left out below iOS 18), the song named to iOS's own Music Haptics. The one choice of before moves to them once(Generated to Music Haptics, Native iOS to In the Background, None to neither). Controls-has its Strength under it, greyed out while the switch is off (10 to 100%, a tap at the new strength with each step);+has its Strength under it, grayed out while the switch is off (10 to 100%, a tap at the new strength with each step);Music Haptics its Strength (20 to 200%, 100% being how it first shipped, a kick at the new strength with each step) and-Follows, greyed out the same way, Everything (a tap on each kick and snare and a rumble under the bass), Beat (the+Follows, grayed out the same way, Everything (a tap on each kick and snare and a rumble under the bass), Beat (thetaps without the rumble) or Bass (the kicks' taps and the rumble); In the Background a Status row (Paused, Waiting,Checking, Ready, Playing or Unavailable) while it is on, or, while Music Haptics is off in Settings > Accessibility, arow saying so whose tap opens its ⓘ, all applying straight away. Live Activity, on iOS 17 and up under either look: its switch and which view it@@ -679,7 +679,7 @@ output playing now> keeping the pick for that output and the remembered outputsturns the effects on, then a card per effect, each opening out into its sliders, choices, curve or file librarywhile its switch is on (Reverb has its Room and its Amount, the amount the player's ⋯ menu also sets), everythingapplying as it changes; the row reads out Off, On or how many effects are on. Home & Library, in the native look only:-the Gradient page (the wash behind the top of Home in one of eight colours, at three strengths and+the Gradient page (the wash behind the top of Home in one of eight colors, at three strengths andfour heights) and the Home flags, the parts of Home to hide including the DJ button and badge, theplaylist header, buttons and pills to hide, and the Library flags. Then Premium, ads & privacy(EeveeSpotify's Hide ads and Hide upsells, in the native look hiding the video carousel in Search, anddiff --git a/extension/LiveActivity/LiveActivityWidget.swift b/extension/LiveActivity/LiveActivityWidget.swiftindex a9e415e2..b977a005 100644--- a/extension/LiveActivity/LiveActivityWidget.swift+++ b/extension/LiveActivity/LiveActivityWidget.swift@@ -643,7 +643,7 @@ private struct ChipButton: View {let symbol: Stringlet label: Stringvar lit = false- // What VoiceOver and Voice Control say, where the short label on the chip would read wrong: "15m" as 15 metres.+ // What VoiceOver and Voice Control say, where the short label on the chip would read wrong: "15m" as 15 meters.var spoken: String?@Environment(\.accent) private var accentdiff --git a/harness/addtab/README.md b/harness/addtab/README.mdindex b8beb6dd..af06bf6e 100644--- a/harness/addtab/README.md+++ b/harness/addtab/README.md@@ -1,6 +1,6 @@# Add a Tab harness-The Add a Tab sheet (`Shared/Navigation/AddTabSheet.m`) and the icon catalogues (`TabIcons.m`) run for+The Add a Tab sheet (`Shared/Navigation/AddTabSheet.m`) and the icon catalogs (`TabIcons.m`) run forreal in the simulator, over a stand-in for Spotify's `SPTEncoreIcon` (eight glyphs drawn as SF Symbols,plus class methods that are not glyphs) and `SPTEncoreIconView`. `Links.x` is compiled as it is; with nolink dispatcher every route is "unknown", which lets a link through as it does before Spotify sets thediff --git a/harness/album/README.md b/harness/album/README.mdindex e440a045..56365842 100644--- a/harness/album/README.md+++ b/harness/album/README.md@@ -13,7 +13,7 @@ on the Mac without the phone.real `Core/` and `Redesigned/Kit/` sources; `stubs.m` stands in for the two hook files the harnessdoes not compile (`SGRAccent.x`, `SGRRepaint.x`).-The mock is the page as Spotify builds it: the colour wash behind the header, the header itself down+The mock is the page as Spotify builds it: the color wash behind the header, the header itself downits four stack views, the metadata row as a real collection view with its own cells, the action row ofexplore, add, download and more, the two controls Spotify floats over the page outside the scroll(shuffle and play), and a list of track cells followed by the footer Spotify sends — the album's own@@ -64,10 +64,10 @@ The track rows carry Spotify's explicit badge on some of them and two guests thein the title with no "feat.", one not at all). At 2.5 s the log says, row by row, whether its artist line wasdropped, how far the title moved and where the badge was drawn against the end of the title's text; at 4 s the firstrow is prepared for reuse and has to come back as Spotify drew it, then be dropped again by its next pass. At 3 s-the log also says the first card of each carousel, painted the base surface, was cleared and the grey one was not.+the log also says the first card of each carousel, painted the base surface, was cleared and the gray one was not.The artist row's picture (an `Encore.ImageView`) gets its image at 1.5 s, after the header has laid out. At 2.2 s the-log says where the redesign drew it: a round picture a line high just before the name, the two centred together+log says where the redesign drew it: a round picture a line high just before the name, the two centered together(`{{139, 368}, {21, 21}}` and the name at `{{168, 368}, {96, 21}}` on an iPhone 17 Pro).`stubs.m` also stands in for `SGRegisterCustomFont`, which `Shared/Fonts/Fonts.x` calls and which lives in a filediff --git a/harness/album/main.m b/harness/album/main.mindex 0f41b7e9..b5eb9c3a 100644--- a/harness/album/main.m+++ b/harness/album/main.m@@ -229,10 +229,10 @@ static NSString *trailingLabel(UIView *root) {UIView *page = box(root.view, _TtC28CreativeWorkPlatform_PageKit24CreativeWorkTemplateView.class,CGRectMake(0, 0, W, H), @"CreativeWorkPlatform.CreativeWorkTemplateView");- // Spotify's colour wash behind the header, the height of the header at rest.+ // Spotify's color wash behind the header, the height of the header at rest.UIView *wash = box(page, _TtCO19LegacyUI_ECMCoreKit5Views10HeaderView.class, CGRectMake(0, 0, W, 486.67), nil);UIView *gradient = box(wash, _TtC19LegacyUI_ECMCoreKit12GradientView.class, wash.bounds, nil);- // The colour Spotify read off the whole cover, down to its base surface.+ // The color Spotify read off the whole cover, down to its base surface.((CAGradientLayer *)gradient.layer).colors = @[(id)[UIColor colorWithRed:0.29 green:0.22 blue:0.62 alpha:1].CGColor,(id)[UIColor colorWithRed:0.07 green:0.07 blue:0.07 alpha:1].CGColor];@@ -505,8 +505,8 @@ static NSString *trailingLabel(UIView *root) {NSLog(@"[harness] the episode page's paint: %@ %@ %@, and the card inside a cell %@",episodePaints[0].backgroundColor ?: @"clear", episodePaints[1].backgroundColor ?: @"clear",episodePaints[2].backgroundColor ?: @"clear", card.backgroundColor ?: @"clear");- // The base-surface album card cleared, the one painted grey left alone.- NSLog(@"[harness] album cards: base surface a=%.0f, grey a=%.2f",+ // The base-surface album card cleared, the one painted gray left alone.+ NSLog(@"[harness] album cards: base surface a=%.0f, gray a=%.2f",CGColorGetAlpha(self->_baseCard.layer.backgroundColor), CGColorGetAlpha(self->_greyCard.layer.backgroundColor));});diff --git a/harness/appearance-page/README.md b/harness/appearance-page/README.mdindex 1a0fd87d..fd132940 100644--- a/harness/appearance-page/README.md+++ b/harness/appearance-page/README.md@@ -2,7 +2,7 @@Mod Settings > Appearance as `App/Pages.m` builds it: either look's accent rows (`Native/Appearance/AppearanceSettings.m`,`Redesigned/Kit/SGRAppearanceSettings.m`), the Font rows and their import (`Shared/Fonts/FontImport.m`) and the real-Settings/ framework (the pull-down menu row, the swatch, the colour sheet), with `stubs.m` reading the accent and+Settings/ framework (the pull-down menu row, the swatch, the color sheet), with `stubs.m` reading the accent andfont keys the way the Logos files do../build.sh@@ -12,12 +12,12 @@ font keys the way the Logos files do.Make a simulator of your own (`xcrun simctl create`) and address it by UDID. `main.m` lists the setup words(`redesign`, `accent=`, `raccent=`, `font=`, `keep`) and the actions: a menu item picked, a row tapped, the-colour sheet moved, confirmed or closed, a font file handed to the import as Files would, and `dump`, which logs the-stored keys, the colour in effect, what the launch would register for the font and what every row reads.+color sheet moved, confirmed or closed, a font file handed to the import as Files would, and `dump`, which logs the+stored keys, the color in effect, what the launch would register for the font and what every row reads.2026-10-05, iPhone 17 Pro on iOS 27.0: an old Apple Music red reads Apple Music, an old #123456 reads Custom, nothingstored reads Spotify (native) or Custom #37F200 (redesign); Custom → Spotify → Custom brings #123456 back; the sheet's-close keeps the colour, its checkmark stores it as Custom; a text file named .ttf is refused with nothing stored;+close keeps the color, its checkmark stores it as Custom; a text file named .ttf is refused with nothing stored;Chalkduster.ttf (a face iOS already has) and then a Noto .otf import, the second replacing the first, and a deletedfile registers nothing.diff --git a/harness/appearance-page/stubs.m b/harness/appearance-page/stubs.mindex 4753c07e..8085c610 100644--- a/harness/appearance-page/stubs.m+++ b/harness/appearance-page/stubs.m@@ -1,4 +1,4 @@-// What the Logos files hold for the page: the accent colours as Accent.x and SGRAccent.x read them, and the+// What the Logos files hold for the page: the accent colors as Accent.x and SGRAccent.x read them, and the// font choice as Fonts.x reads it.#import "Core/SGCore.h"#import "Native/Appearance/Appearance.h"diff --git a/harness/artist/main.m b/harness/artist/main.mindex 9844768d..f3719c51 100644--- a/harness/artist/main.m+++ b/harness/artist/main.m@@ -71,7 +71,7 @@@end@implementation MockRequestToken- (void)cancel {- NSLog(@"[harness] collection subscription cancelled");+ NSLog(@"[harness] collection subscription canceled");if (self.onCancel) self.onCancel();}@enddiff --git a/harness/audio-effects-page/README.md b/harness/audio-effects-page/README.mdindex 723b0158..fbea1de2 100644--- a/harness/audio-effects-page/README.md+++ b/harness/audio-effects-page/README.md@@ -2,7 +2,7 @@Mod Settings > Audio effects (`tweak/Sources/Shared/AudioEffects/`) in a navigation controller, the way ModSettings pushes it: the real page, curve and file pages, the real `Settings/` framework,-`AudioEffectsSettings.m` and the engine's curve maths (`SGDSPFilters.m`), with `stubs.m` standing in for the+`AudioEffectsSettings.m` and the engine's curve math (`SGDSPFilters.m`), with `stubs.m` standing in for therest of the engine (a made-up status that changes every three seconds, fake libraries in the app's temporarydirectory, and an error for any chosen file with "broken" in its name).diff --git a/harness/audio-effects-page/build.sh b/harness/audio-effects-page/build.shindex d91f0920..563093ef 100755--- a/harness/audio-effects-page/build.sh+++ b/harness/audio-effects-page/build.sh@@ -1,6 +1,6 @@#!/bin/sh# Builds the Audio effects page harness for the simulator: Shared/AudioEffects' page, the Settings/ framework,-# AudioEffectsSettings.m and the engine's curve maths (SGDSPFilters.m) as they are in the tweak, stubs.m for+# AudioEffectsSettings.m and the engine's curve math (SGDSPFilters.m) as they are in the tweak, stubs.m for# the rest of the engine.set -eSRC=$(cd "$(dirname "$0")/../../tweak/Sources" && pwd)diff --git a/harness/audio-effects/README.md b/harness/audio-effects/README.mdindex 7a74fd4d..d02a6c9f 100644--- a/harness/audio-effects/README.md+++ b/harness/audio-effects/README.md@@ -47,7 +47,7 @@ switch on and -12 dB, a Liveprog script from the library swapping the channels,source stops, a file missing from the library and its error, then a 16-bit interleaved client at 48 kHz, then asecond chain at 44.1 kHz started beside it: the effects move to the second chain and the first plays untouched,and when the second stops they move back. SpeedPitch.x is compiled in, since it names the output the effects-follow. At each step the output's reader (`SGAudioSetOutputReader`, the player's Visualiser's tap) is checked too:+follow. At each step the output's reader (`SGAudioSetOutputReader`, the player's Visualizer's tap) is checked too:the mono mix it gets is the measured level 6 dB down, the sine being in one channel, at the output's rate.THEOS=$HOME/theos ./build-sim.shdiff --git a/harness/audio-effects/main.m b/harness/audio-effects/main.mindex 0146e14e..1cdc1ede 100644--- a/harness/audio-effects/main.m+++ b/harness/audio-effects/main.m@@ -839,7 +839,7 @@ static void checkCrossfeed(void) {}static void checkTube(void) {- printf("\nanalog modelling\n");+ printf("\nanalog modeling\n");SGDSPEngine *engine = SGDSPEngineCreate(kRate);allOff(engine);SGDSPEngineSetTube(engine, true, 6);diff --git a/harness/download-mock.h b/harness/download-mock.hindex 25b0f936..990bb366 100644--- a/harness/download-mock.h+++ b/harness/download-mock.h@@ -8,7 +8,7 @@// properties the runtime lists by name. The mock has the same names and the same layout.//// Shuffle marks "on" with a 4pt round view under its glyph that it hides while off (trees/continuous/1.txt),-// and draws its glyph grey while off, green while on.+// and draws its glyph gray while off, green while on.//// `download` on the launch line runs downloadScript(): none, waiting, downloading 0 to 100%, downloaded,// shuffle on, removed and shuffle off, error -- each held a few seconds and logged, for screenshots.diff --git a/harness/fluid-clip/main.m b/harness/fluid-clip/main.mindex 26565817..37bcd01e 100644--- a/harness/fluid-clip/main.m+++ b/harness/fluid-clip/main.m@@ -15,7 +15,7 @@ static void check(BOOL ok, NSString *what) {if (!ok) failures++;}-// A stand-in cover: two coloured halves and a light disc in the middle.+// A stand-in cover: two colored halves and a light disc in the middle.static CGImageRef newCover(void) {CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);CGContextRef context = CGBitmapContextCreate(NULL, 640, 640, 8, 0, space, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little);@@ -78,7 +78,7 @@ static double difference(CGImageRef a, CGImageRef b, CGFloat fromY, CGFloat toY,return count ? sum / count : 255;}-// The colour at a point, given as shares from the top left.+// The color at a point, given as shares from the top left.static void colourAt(CGImageRef image, CGFloat sx, CGFloat sy, int rgb[3]) {size_t w, h;NSData *data = pixelsOf(image, &w, &h);diff --git a/harness/glass/README.md b/harness/glass/README.mdindex 46519738..9e37d843 100644--- a/harness/glass/README.md+++ b/harness/glass/README.md@@ -2,7 +2,7 @@Spotify's round header button mocked as what the trees show it to be -- a 48x48 control whose glyph is asubview of its own (`trees/clean/player/01.txt:103`) -- with the real `SGRGlassInside` behind it, over a-colour field, so what the glass does to the glyph can be looked at on the Mac.+color field, so what the glass does to the glyph can be looked at on the Mac.THEOS=$HOME/theos ./build.shxcrun simctl install booted build/GlassHarness.app@@ -21,5 +21,5 @@ put behind the button:**What it does not cover: the bug it was written for.** Issue #39 is a glyph that comes out as a soft ghostseen through the glass with nothing crisp over it, which is glass taking the glyph into its backdrop. Thesimulator's glass does not refract, so all three rows look right here and only a phone tells them apart. The-harness is worth keeping for what it does prove: that the shape still lands centred and behind the glyph, in+harness is worth keeping for what it does prove: that the shape still lands centered and behind the glyph, ineach arrangement, so a change to the ordering can be seen not to have moved anything.diff --git a/harness/glass/main.m b/harness/glass/main.mindex 1543edf7..ba165468 100644--- a/harness/glass/main.m+++ b/harness/glass/main.m@@ -48,7 +48,7 @@ static UIView *mockButton(NSString *symbol) {UIView *page = root.view;page.backgroundColor = UIColor.blackColor;- // Something with colour and detail under the glass, so a shape that is refracting the page reads as glass+ // Something with color and detail under the glass, so a shape that is refracting the page reads as glass// rather than as a flat disc. The player's field is artwork blurred behind the header the same way.CAGradientLayer *field = [CAGradientLayer layer];field.frame = CGRectMake(0, 0, page.bounds.size.width, 420);diff --git a/harness/haptics-page/README.md b/harness/haptics-page/README.mdindex 6b42de11..805bd032 100644--- a/harness/haptics-page/README.md+++ b/harness/haptics-page/README.md@@ -32,8 +32,8 @@ fading in under a switch (`slow`); Controls at 40%, Music Haptics at 150% then 1under their keys and read back by the hooks. The Audio effects page and an SGModPage without shown-while rows(`harness/audio-effects-page`, `push=reference`) draw the same pixels as before the slider and visibility were added.-2026-10-05, iPhone 17 Pro on iOS 27.0: with `controls-off` the Strength row stays under Controls, greyed (`dump` marks-it), `select=2.1` on it leans the Controls switch 6pt towards on and springs it back, and `toggle=2.0` brings+2026-10-05, iPhone 17 Pro on iOS 27.0: with `controls-off` the Strength row stays under Controls, grayed (`dump` marks+it), `select=2.1` on it leans the Controls switch 6pt toward on and springs it back, and `toggle=2.0` bringsStrength back to full strength without a row moving.What it does not cover: a real finger on the slider, and how any strength feels, which only a phone can tell.@@ -41,7 +41,7 @@ What it does not cover: a real finger on the slider, and how any strength feels,2026-10-06, iPhone 17 Pro on iOS 27.0: the page opens on the preview, its line reading Tap to feel Controls, Tap tofeel Music Haptics (`controls-off music`), the Native iOS note (`controls-off native`, now `controls-off background`) or what to turn on(`controls-off`), and Tap to feel Controls again once `toggle=0.0` turns Controls on; with `slow tap`, six shots-1.3 s apart show the middle dipping and one lit ring travelling out to the edge and the field settling back to+1.3 s apart show the middle dipping and one lit ring traveling out to the edge and the field settling back torest; with Reduce Motion on (`simctl spawn <udid> defaults write com.apple.Accessibility ReduceMotionEnabled -booltrue`) every ring lights at once and fades, nothing moving. With Generated, `tap` asks the engine for its preview kickat the stored strength with the rumble, and each step of `slide=1.1:150` asks again at the new strength. The line@@ -51,7 +51,7 @@ Not covered here: how the taps feel, whether the preview kick reaches a runningmusic's pulses with real music playing (`pulse` stands in for them).2026-10-06, iPhone 17 Pro on iOS 27.0, the two switches: with nothing stored both read off, Strength and Follows-greyed under Music Haptics and In the Background below them. `mode=0`, `mode=1`, `mode=2` and `mode=7`, each with+grayed under Music Haptics and In the Background below them. `mode=0`, `mode=1`, `mode=2` and `mode=7`, each with`expect=` and `dump`, move the old choice to off/off, on/off, off/on and off/off and leave it unstored. `background`shows Status under In the Background; with `ios-off` the row "Music Haptics is off in iOS" takes its place, `ios=on`and `ios=off` swap them while the page shows, and `select=1.4 alert` opens In the Background's ⓘ from it. `toggle=1.0`diff --git a/harness/haptics-page/main.m b/harness/haptics-page/main.mindex f3354244..d85d69a7 100644--- a/harness/haptics-page/main.m+++ b/harness/haptics-page/main.m@@ -160,7 +160,7 @@ static void findViews(UIView *root, Class kind, NSMutableArray *found) {NSMutableArray<UILabel *> *labels = [NSMutableArray array];if (!title) findViews(cell.contentView, UILabel.class, labels);[rows addObject:[NSString stringWithFormat:@"%@ (%.0fpt%@)", title ?: labels.firstObject.text ?: @"?", [table rectForRowAtIndexPath:[NSIndexPath indexPathForRow:row inSection:section]].size.height,- cell.contentView.alpha < 1 ? @", greyed" : @""]];+ cell.contentView.alpha < 1 ? @", grayed" : @""]];}NSLog(@"[harness] section %ld: %@", (long)section, [rows componentsJoinedByString:@", "]);}diff --git a/harness/haptics/README.md b/harness/haptics/README.mdindex c758d405..01a26920 100644--- a/harness/haptics/README.md+++ b/harness/haptics/README.md@@ -29,13 +29,13 @@ and the vocals.The rumble is over its start level 76% of the time in Everything and Bass, and never plays in Beat.A Vocals choice was tried and left out. Without a separation model the one cheap handle on a voice is that it is-mixed in the middle: per FFT bin (2048 at 44.1 kHz, hops of 512) the centre was kept by L/R similarity, 250 Hz to+mixed in the middle: per FFT bin (2048 at 44.1 kHz, hops of 512) the center was kept by L/R similarity, 250 Hz to4 kHz, broadband rises (a drum lifts every bin at once) held down, onsets picked from SuperFlux-style flux,causally. Against the onsets of demucs' vocal stem it scored, at its best, precision 0.53 and recall 0.59 on`song.mp3` (3.4 taps a second; at random 0.26 and 0.29), 0.35 / 0.55 on a sung line (`say -v Cellos` over abeat; at random 0.19) and 0.66 / 0.65 on a spoken one; the same picker on the vocal stem alone scores 0.72 / 0.74,so what fails is the separation, not the picking. Of the taps that hit no syllable, 47% fell where nobody sings,-and no cheap cue told those stretches apart (the best, the share of the sound in the centre, AUC 0.6). It needs+and no cheap cue told those stretches apart (the best, the share of the sound in the center, AUC 0.6). It needsa real separation model.## The hook in the simulator (`sim/`)diff --git a/harness/head-gestures/sim/main.m b/harness/head-gestures/sim/main.mindex e616fcc7..526c5b2e 100644--- a/harness/head-gestures/sim/main.m+++ b/harness/head-gestures/sim/main.m@@ -245,7 +245,7 @@ static NSInteger sg_nodBefore;return ((UILabel *)[self teachValue:key]).text;}-// The ring's dot and its centre, in the ring's own coordinates, and one tick's light: 0 is the top, 15 the+// The ring's dot and its center, in the ring's own coordinates, and one tick's light: 0 is the top, 15 the// right, 30 the bottom, 45 the left.- (CGPoint)ringDot {return ((CALayer *)[[self teachValue:@"dial"] valueForKey:@"dot"]).position;@@ -438,7 +438,7 @@ static Step waitFor(double seconds) {waitFor(0.4),^BOOL {CGPoint dot = [self ringDot], centre = [self ringCentre];- check(dot.y > centre.y + 30 && fabs(dot.x - centre.x) < 4, [NSString stringWithFormat:@"a nod's dip takes the dot down: %.0f, %.0f from the centre", dot.x - centre.x, dot.y - centre.y]);+ check(dot.y > centre.y + 30 && fabs(dot.x - centre.x) < 4, [NSString stringWithFormat:@"a nod's dip takes the dot down: %.0f, %.0f from the center", dot.x - centre.x, dot.y - centre.y]);check([self tick:30] > 0.4 && [self tick:0] == 0 && [self tick:15] == 0,[NSString stringWithFormat:@"the ticks below light, not above or beside: below %.2f, above %.2f, right %.2f", [self tick:30], [self tick:0], [self tick:15]]);hold(1.5);@@ -523,7 +523,7 @@ static Step waitFor(double seconds) {check([sg_calls isEqualToArray:@[@"add spotify:track:4uLU6hMCjMI75M1A2tKUQC toast"]],[NSString stringWithFormat:@"the smallest taught nod likes the song: %@", [sg_calls componentsJoinedByString:@", "]]);[sg_calls removeAllObjects];- // Teaching again, cancelled after one nod: the stored nod stays, and the motion stops.+ // Teaching again, canceled after one nod: the stored nod stays, and the motion stops.[self setPlaying:NO];self.feeds = [@[^{ doubleNod(0.2, 0.45); }, ^{}] mutableCopy];[self tapRow:0 section:2];@@ -547,7 +547,7 @@ static Step waitFor(double seconds) {^BOOL {self.feeds = nil;check(SGInt(SGKeyHeadNod, 0) == sg_nodBefore, [NSString stringWithFormat:@"Cancel keeps the nod %ld: %ld", (long)sg_nodBefore, (long)SGInt(SGKeyHeadNod, 0)]);- check(!sg_active, @"cancelled, paused: stopped");+ check(!sg_active, @"canceled, paused: stopped");[self tapRow:3 section:2];return YES;},diff --git a/harness/lyrics-clip/main.m b/harness/lyrics-clip/main.mindex c9111528..319a0386 100644--- a/harness/lyrics-clip/main.m+++ b/harness/lyrics-clip/main.m@@ -13,7 +13,7 @@ static void check(BOOL ok, NSString *what) {if (!ok) failures++;}-// A stand-in cover: two coloured halves and a light disc, so the blur and the darkening show.+// A stand-in cover: two colored halves and a light disc, so the blur and the darkening show.static CGImageRef newCover(void) {CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);CGContextRef context = CGBitmapContextCreate(NULL, 640, 640, 8, 0, space, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little);diff --git a/harness/lyrics-page/main.m b/harness/lyrics-page/main.mindex 26a467e4..1658eac3 100644--- a/harness/lyrics-page/main.m+++ b/harness/lyrics-page/main.m@@ -4,7 +4,7 @@// Launch arguments (NSUserDefaults' argument domain):// -preset N stores preset N before the page opens (0 Apple Music, 1 Large, 2 Compact, 3 Calm, 4 Vivid)// -sheet S opens the sliders' sheet S seconds in, as a tap on its button would-// -check 1 asserts the page's behaviour (see runChecks), prints PASS and FAIL lines and quits with the+// -check 1 asserts the page's behavior (see runChecks), prints PASS and FAIL lines and quits with the// number of failures#import <UIKit/UIKit.h>#import "Settings/SGModPage.h"diff --git a/harness/lyrics-sources/check.m b/harness/lyrics-sources/check.mindex 7e717033..6d37bfc9 100644--- a/harness/lyrics-sources/check.m+++ b/harness/lyrics-sources/check.m@@ -110,7 +110,7 @@ int main(int argc, char **argv) {NSArray<SGKaraokeWord *> *thai = piecesOf(@"ฉันรักเธอมากกว่าสิ่งใดในโลกนี้");CHECK(!thai[0].joined && thai[1].joined);- // The keys the two catalogues are matched by.+ // The keys the two catalogs are matched by.CHECK([SGLyricsMatchKey(@"晴天(Live版)") isEqualToString:SGLyricsMatchKey(@"晴天 (Live版)")]);CHECK([SGLyricsMatchKey(@"Hello, World!") isEqualToString:@"helloworld"]);CHECK([SGLyricsMatchKey(@"《稻香》") isEqualToString:@"稻香"]);diff --git a/harness/lyrics/README.md b/harness/lyrics/README.mdindex 2a8ad14c..8b5efb16 100644--- a/harness/lyrics/README.md+++ b/harness/lyrics/README.md@@ -5,7 +5,7 @@ harness's own, so lines sung over each other, instrumental breaks, pronunciationbe looked at on the Mac without the phone. The songs are TTML read by the real `SGTTML.m`, or LRC timedby the real estimate in `KaraokeTiming.m`.- ./build.sh # this checkout; ./build.sh old builds HEAD's for a before and after, OPT=-O2 optimised+ ./build.sh # this checkout; ./build.sh old builds HEAD's for a before and after, OPT=-O2 optimizedxcrun simctl install <udid> build/new/LyricsHarness.appxcrun simctl launch <udid> com.vojta.lyricsharness.new -song duet -at 114000 -pauseAt 117600xcrun simctl io <udid> screenshot shot.png@@ -42,7 +42,7 @@ A real file goes in with `-file /path/song.ttml`: the simulator reads the Mac's`-perf LABEL` logs the view's per frame cost (its display link's `tick`) every 240 frames; run with`simctl launch --console` to read it. `-dump 1` prints the lines as read, with their pronunciations,-translations and romanised readings, and quits. `-romanise 1` asserts the romanised readings+translations and romanized readings, and quits. `-romanise 1` asserts the romanized readings(`Shared/Lyrics/Romanise.m`) and quits with the number that failed. `-openMenu 3` opens the pronunciation and translation menu three seconds in,`-toggleAt 3` switches both over as the menu would, and `-light 1` puts the window in light mode.diff --git a/harness/lyrics/main.m b/harness/lyrics/main.mindex 4f52f849..c81b1175 100644--- a/harness/lyrics/main.m+++ b/harness/lyrics/main.m@@ -5,7 +5,7 @@// Launch arguments (the argument domain of NSUserDefaults, so a setting's key works as one too):// -song NAME fixtures/NAME.ttml, .lrc, .json (Spotify's own) or .txt (plain) in the app, or rtl,// built here (default duet); scripts (built here) is a line in each of many alphabets-// and two in English, the second line of each script translated, for romanised lyrics+// and two in English, the second line of each script translated, for romanized lyrics// -file PATH a TTML or LRC file on the Mac instead// -at MS where the clock starts (default 0)// -rate X how fast it runs (default 1)@@ -15,7 +15,7 @@// -light 1 the window in light mode, for the glass's appearance// -perf LABEL logs the cost of the view's frames every 240 of them, under LABEL// -dump 1 prints the lines as read, with their pronunciations and translations, and quits-// -romanise 1 asserts romanised lyrics' readings (Shared/Lyrics/Romanise.m), prints PASS and FAIL+// -romanise 1 asserts romanized lyrics' readings (Shared/Lyrics/Romanise.m), prints PASS and FAIL// lines and quits with the number of failures// -openMenu S opens the pronunciation and translation menu S seconds in, as a tap on its button would// -toggleAt S switches the pronunciation and the translation over S seconds in, as the menu would@@ -101,7 +101,7 @@ static NSArray<SGKaraokeLine *> *rightToLeftSongWithExtras(void) {return lines;}-// A line in each of the alphabets romanised lyrics reads, among English ones, written here: every+// A line in each of the alphabets romanized lyrics reads, among English ones, written here: every// other one translated, to see the order of the three; a Hebrew and an Arabic line keep their edge.static NSArray<SGKaraokeLine *> *scriptsSong(void) {NSArray<NSArray<NSString *> *> *texts = @[diff --git a/harness/menu/main.m b/harness/menu/main.mindex 0562257e..f1d62054 100644--- a/harness/menu/main.m+++ b/harness/menu/main.m@@ -12,7 +12,7 @@// contentSize by KVO, a loading spinner) and hands it its rows only 4 s after it is up, as Spotify does// once its item factories have answered; `stuck` never hands them over. `open` opens the block on a first// menu, closes it, and brings up a second one with the block open, as it stays for the session. Every frame of the first second the block is on screen-// is checked for a colour of the system tint on anything it draws, and what the sheet shows is reported.+// is checked for a color of the system tint on anything it draws, and what the sheet shows is reported.// `animated` offers the redesign's Animated artwork switch: it is flipped, then the block opened and// closed, and where the switch's row sits is reported each time.#import <UIKit/UIKit.h>@@ -243,7 +243,7 @@ static NSArray<UISlider *> *sliders(UIView *root) {#pragma mark - the tint check-// A colour is the system tint's when it resolves, in the view's own traits, to the system blue.+// A color is the system tint's when it resolves, in the view's own traits, to the system blue.static BOOL isTint(UIColor *color, UIView *view) {if (!color) return NO;UIColor *resolved = [color resolvedColorWithTraitCollection:view.traitCollection];@@ -253,7 +253,7 @@ static BOOL isTint(UIColor *color, UIView *view) {return a > 0.05 && fabs(r - br) < 0.08 && fabs(g - bg) < 0.08 && fabs(b - bb) < 0.08;}-// Everything the block draws in a colour of its own: labels' text, buttons' titles, and whatever takes the+// Everything the block draws in a color of its own: labels' text, buttons' titles, and whatever takes the// tint (templated glyphs, sliders' thumbs and tracks).static void tintedViews(UIView *view, NSMutableArray<NSString *> *out) {if (view.isHidden || view.alpha < 0.01) return;@@ -262,7 +262,7 @@ static void tintedViews(UIView *view, NSMutableArray<NSString *> *out) {if ([view isKindOfClass:UIImageView.class]) {UIImage *image = ((UIImageView *)view).image;// Drawn in the tint when templated, or left automatic on a symbol; a bitmap left automatic keeps- // its own colours (the sliders' end images).+ // its own colors (the sliders' end images).BOOL templated = image.renderingMode == UIImageRenderingModeAlwaysTemplate|| (image.renderingMode == UIImageRenderingModeAutomatic && image.isSymbolImage);if (templated && isTint(view.tintColor, view)) [out addObject:[name stringByAppendingString:@" glyph"]];diff --git a/harness/mod-settings/main.m b/harness/mod-settings/main.mindex 5a55e040..e08195a7 100644--- a/harness/mod-settings/main.m+++ b/harness/mod-settings/main.m@@ -139,7 +139,7 @@ static UIViewController *gatedPage(void) {[self.nav pushViewController:gatedPage() animated:NO];} else if ([verb isEqualToString:@"rows"]) {// The row ModSettings.x adds to Spotify's settings list and to the side drawer's list, each emptied of its- // subviews afterwards as Spotify can do, then laid out again.+ // subviews afterward as Spotify can do, then laid out again.NSUInteger (^count)(UIView *) = ^NSUInteger(UIView *list) {NSUInteger n = 0;for (UIView *sub in list.subviews) n += [NSStringFromClass(sub.class) isEqualToString:@"SGModSettingsRow"];diff --git a/harness/mod-settings/stubs.m b/harness/mod-settings/stubs.mindex 0d0a4a3a..66f9c092 100644--- a/harness/mod-settings/stubs.m+++ b/harness/mod-settings/stubs.m@@ -45,7 +45,7 @@ NSArray<SGModRow *> *SGEnvironmentWarningRows(void) {if (!SGHarnessWarning) return @[];return @[SGWarningRow(@"EeveeSpotify is injected too", @"Tap to see what that changes", ^{})];}-// The Lyrics page's Romanised lyrics row (Shared/Lyrics/Romanise.m).-SGModRow *SGLyricsRomanisedRow(void) { return SGOptionRow(@"Romanised lyrics", nil, @"spotifyglass.harness.romanised"); }+// The Lyrics page's Romanized lyrics row (Shared/Lyrics/Romanise.m).+SGModRow *SGLyricsRomanisedRow(void) { return SGOptionRow(@"Romanized lyrics", nil, @"spotifyglass.harness.romanised"); }// The lock screen's source order row (MotionSources.m), for AnimatedArtworkSettings.m.SGModRow *SGMotionSourcesRow(void) { return SGStatRow(@"Sources", ^NSString *{ return @"Canvas, Apple Music"; }); }diff --git a/harness/morph/README.md b/harness/morph/README.mdindex ec4101ca..5d2c3df1 100644--- a/harness/morph/README.md+++ b/harness/morph/README.md@@ -20,4 +20,4 @@ A recording shows the move: `xcrun simctl io booted recordVideo -f run.mp4`, the`ffmpeg -ss T -t 0.5 -i run.mp4 -vf "fps=24,scale=160:-1,tile=8x1" -frames:v 1 strip.png`.What it does not cover: Spotify's real player and list, the tab bar's stand-in, the bar's glass on the-closing stand-in (`BarTransition.x`), a drag, and the field's colour (the sheet is black here).+closing stand-in (`BarTransition.x`), a drag, and the field's color (the sheet is black here).diff --git a/harness/motion/README.md b/harness/motion/README.mdindex b54f852f..b908e738 100644--- a/harness/motion/README.md+++ b/harness/motion/README.md@@ -2,7 +2,7 @@`SGMotionClip.m`, the steps of moving artwork that need no phone, run on the Mac: the size of the cutfor each shape, a 9:16 stand-in Canvas cut to 3:4 and read back (720 x 960, every frame, its length, and-by the colour of its bands that it was cut about its middle, not squeezed), the same Canvas stored on its+by the color of its bands that it was cut about its middle, not squeezed), the same Canvas stored on itsside, the request for Spotify's Canvas service and its replies (a still then a video, each video type,a GIF, empty and foreign replies), and when a Canvas that turned up late is asked for, for each order ofthe sources.diff --git a/harness/motion/main.m b/harness/motion/main.mindex e68f6e3d..522643c0 100644--- a/harness/motion/main.m+++ b/harness/motion/main.m@@ -83,7 +83,7 @@ static int framesIn(NSURL *file) {return count;}-// The colour at `y`, a share of the shown picture's height, in its middle column: 'r', 'g', 'b' or '?'.+// The color at `y`, a share of the shown picture's height, in its middle column: 'r', 'g', 'b' or '?'.static char colourAt(NSURL *file, double y) {AVAssetImageGenerator *generator = [AVAssetImageGenerator assetImageGeneratorWithAsset:[AVURLAsset assetWithURL:file]];generator.appliesPreferredTrackTransform = YES;diff --git a/harness/native-player/README.md b/harness/native-player/README.mdindex e3932fbf..d0d87490 100644--- a/harness/native-player/README.md+++ b/harness/native-player/README.md@@ -18,7 +18,7 @@ It checks, a line each with `ok` or `WRONG`:at its end, at a cancel and when the slider leaves the window, a pan off already left off, and a sidewayslist between the slider and the player's list left alone.- the cover's room (issue #77): with Lyrics preview shown nothing moves; with it hidden the preview takes- no room and the cover is the centred square of the view it sits in, again after a later pass of+ no room and the cover is the centered square of the view it sits in, again after a later pass ofSpotify's; a small cover and a tilt view outside the player's cover cell are left alone.The log ends with `native player checks: n of 11 right -- PASS` or `FAIL`. On main before the fixes itdiff --git a/harness/native-player/main.m b/harness/native-player/main.mindex 6aec8d2c..b26e0653 100644--- a/harness/native-player/main.m+++ b/harness/native-player/main.m@@ -6,7 +6,7 @@// while it tracks, back at its end, at a cancel and when the slider leaves the window, a pan// that was off already left off, and a sideways list between them left alone// cover Spotify's layout for a track with lyrics, a smaller cover over the preview (issue #77):-// untouched with Lyrics preview shown, the cover a centred square of its room with it hidden,+// untouched with Lyrics preview shown, the cover a centered square of its room with it hidden,// and a small cover and a tilt view outside the cover cell untouched#import <UIKit/UIKit.h>#import "Native/Player/NowPlaying.h"diff --git a/harness/palette/README.md b/harness/palette/README.mdindex f41497ff..e23fb57e 100644--- a/harness/palette/README.md+++ b/harness/palette/README.md@@ -3,6 +3,6 @@./build.sh && build/palette-checkruns `Redesigned/Kit/SGRPalette.m` on the Mac (as Mac Catalyst, for UIKit): a blue cover with a pale border along-its foot, read once by its bottom edge (the player's field) and once by its main colour (a playlist, album or-artist page, `mainColor`). The edge has to come out grey and the main colour blue. It prints PASS or FAIL; the exit+its foot, read once by its bottom edge (the player's field) and once by its main color (a playlist, album or+artist page, `mainColor`). The edge has to come out gray and the main color blue. It prints PASS or FAIL; the exitstatus is the number of failures.diff --git a/harness/palette/check.m b/harness/palette/check.mindex 723cc22a..bf7809ac 100644--- a/harness/palette/check.m+++ b/harness/palette/check.m@@ -1,5 +1,5 @@-// The field colour a page takes from its cover: the main colour, not the bottom edge. A blue cover with a-// pale scanner border along its foot, which read by the edge turned the album page grey (device, 2026-09-18).+// The field color a page takes from its cover: the main color, not the bottom edge. A blue cover with a+// pale scanner border along its foot, which read by the edge turned the album page gray (device, 2026-09-18).#import <UIKit/UIKit.h>#import "Redesigned/Kit/SGRPalette.h"@@ -25,7 +25,7 @@ int main(void) {CGFloat r, g, b, a;[palette.fieldColor getRed:&r green:&g blue:&b alpha:&a];BOOL blue = b > r + 0.05 && b > g;- printf("%s: field %.3f %.3f %.3f, %s\n", main ? "main colour" : "bottom edge", r, g, b, blue ? "blue" : "grey");+ printf("%s: field %.3f %.3f %.3f, %s\n", main ? "main color" : "bottom edge", r, g, b, blue ? "blue" : "gray");if (blue != (BOOL)main) fails++;done++;}];diff --git a/harness/player/README.md b/harness/player/README.mdindex 286a11ce..ebb2983a 100644--- a/harness/player/README.md+++ b/harness/player/README.md@@ -16,7 +16,7 @@ sources, for example an older commit, to see a bug before its fix.`build.sh` runs `logos.pl -c generator=internal` over `PlayerLyrics.x`, `PlayerArtwork.x`,`PlayerControls.x`, `PlayerFooter.x`, `PlayerScroll.x`, `PlayerField.x`, `PlayerHeader.x` (the glass circles ofthe down arrow and the ⋯, in a mocked `HeaderElementsUnit`, and their press) and the Kit's `SGRBridges.x`, and links them with-the real `Core/`, `Redesigned/Kit/`, `SGRKaraokeView`, `Settings/`, the Player page and the Visualiser (`PlayerVisualiser.m`, `SGRSpectrum.m`). `stubs.m` stands in for the hooks the harness+the real `Core/`, `Redesigned/Kit/`, `SGRKaraokeView`, `Settings/`, the Player page and the Visualizer (`PlayerVisualiser.m`, `SGRSpectrum.m`). `stubs.m` stands in for the hooks the harnessdoes not compile (the Kit's accent and repaint, the rest of the player, the lyrics store, the haptics,Sing's mic) and plays a mock player: `SGRHarnessSetTrack` reports a track, with the image ids Spotify'smetadata carries, to every state observer. A song of ten timed lines plays on from launch. `main.m` also answers@@ -31,7 +31,7 @@ come late, out of order, or not at all.it logs whether touches on the lowered footer row (issue #54) still reach it.- `artwork` is issue #58. Tracks change while the covers on screen lag behind (3.5 s late, past theKit's last look), two skips come in a row with the older picture answering last, and one track plays- offline. Each step checks by colour that the Kit and the field show that track's picture, and the log+ offline. Each step checks by color that the Kit and the field show that track's picture, and the logends with `artwork checks: n of 4 right -- PASS` or `FAIL`. Before the fix it read 1 of 4.- `landscape` turns the lyrics sideways at 3 s, puts a line's meanings over them (the real`MeaningSheet.m`) at 4 s and takes them away at 9, then pauses at 14.5 and resumes at 15.5. Each step@@ -45,7 +45,7 @@ come late, out of order, or not at all.cancel and when the slider leaves the window, and a pan that was off already left off. The log endswith `scrub checks: ... -- PASS` or `FAIL`.- `cover` is issue #77. The cover is checked untouched first, then given Spotify's layout for a track with- lyrics, a smaller cover over the lyric preview, and must take its room back as a centred square the+ lyrics, a smaller cover over the lyric preview, and must take its room back as a centered square theKit also reports. The log ends with `cover checks: n of 4 right -- PASS` or `FAIL`.- `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 buttons@@ -84,7 +84,7 @@ come late, out of order, or not at all.player at 3 s, with the clip of `motion` in. It checks the card leads the page with the five backgrounds'segmented control under it, every name whole, the Mini player section's three rows are on the page, and then,as the control picks each in turn, that the card shows Animated (the clip, the sources and Low Data Mode's rows- in), Fluid, Colours, Still, Visualiser (the hills over Fluid held still) and Animated again, with a note for+ in), Fluid, Colors, Still, Visualizer (the hills over Fluid held still) and Animated again, with a note foreach and the header the same height throughout. The log ends with `settings checks: n of 8 right -- PASS` or`FAIL`.- `preview` opens the Player page with the background Still at launch, so the player looks up no clip, and picks@@ -99,11 +99,11 @@ come late, out of order, or not at all.long title (gliding), its cover from the picture server and a Canvas of the run's own (`HARNESS_CANVAS_FILE`).`HARNESS_BACKGROUND` is the background's index, Fluid if unset. For screenshots: 2026-10-06 on an iPhone 17 Pro,iOS 27.0, the card read Not Playing over a dim green field, and Holocene with its cover over Fluid.-- `visualiser` plays the Visualiser background, fed by `stubs.m`'s stand-in for the audio effects' reader: a song+- `visualiser` plays the Visualizer background, fed by `stubs.m`'s stand-in for the audio effects' reader: a songof its own at 120 beats a minute, handed over in buffers of 1024 at 48 kHz. It checks the hills stand on theFluid field held still with the reader on and the link at up to 60 fps, blur behind the lyrics with the link at30, settle and stop with the reader off on a pause, come back on play, and go and come back through the ⋯- menu's switch to Fluid and back. The log ends with `visualiser checks: n of 7 right -- PASS` or `FAIL`.+ menu's switch to Fluid and back. The log ends with `visualizer checks: n of 7 right -- PASS` or `FAIL`.- `header` is the glass circles' press (`PlayerHeader.x`): a finger (`../tabbar/touch.m`) held half a second onthe down arrow and then on the ⋯, each a `UIControl` under Spotify's identifier. It checks each has a 44pt glassdiff --git a/harness/player/main.m b/harness/player/main.mindex aaca5447..3fd3ade1 100644--- a/harness/player/main.m+++ b/harness/player/main.m@@ -13,7 +13,7 @@// immersive the lyrics left alone: what fades, where the lines go, the tap that brings the controls// back, a scroll and the thumbnail; the log says PASS or FAIL// artwork issue #58: tracks change while the covers on screen and the picture server lag behind,-// checked by colour at the end of each step; the log says PASS or FAIL+// checked by color at the end of each step; the log says PASS or FAIL// landscape the landscape lyrics at 3 s, a line's meanings over them, a pause and a resume; each// step logs whether the controls are up and what a touch on the lines lands on// motion Animated artwork: a clip (HARNESS_CANVAS_FILE, an mp4) that comes in before the player has@@ -22,16 +22,16 @@// catalog Apple Music's catalog behind a stub: the search term without the edition, the album of the same// name first, and the pause after a 429; the log says PASS or FAIL// settings the redesign's Player page (PlayerSettings.m) over the player with the clip of `motion`: the-// card over Animated, then Fluid, Colours, Still and Visualiser as the segmented control picks+// card over Animated, then Fluid, Colors, Still and Visualizer as the segmented control picks// them, and Animated again, the note under it changing and the rows under the header holding// still; each step checked, the log ends with settings checks n of m right -- PASS or FAIL// preview the Player page's card picking Animated while the player has no clip (the background Still at// launch): the card looks the track's clip up itself, shows Fluid until it comes in 2 s late, then// the clip; the clip is in the store for the player, and asked for only while the page shows;// the log ends with preview checks n of m right -- PASS or FAIL-// visualiser the Visualiser background (PlayerVisualiser.m) fed a song of the harness's own (stubs.m):+// visualiser the Visualizer background (PlayerVisualiser.m) fed a song of the harness's own (stubs.m):// the hills moving, blurred behind the lyrics, settling and stopping on a pause, back on play,-// and the ⋯ menu's switch to Fluid and back; the log ends with visualiser checks n of m right+// and the ⋯ menu's switch to Fluid and back; the log ends with visualizer checks n of m right// -- PASS or FAIL// HARNESS_VOLUME=0 leaves out the volume row the phone has (trees/clean/player/01.txt has none).#import <AVFoundation/AVFoundation.h>@@ -122,7 +122,7 @@ static void serve(NSString *imageURI, UIImage *image, NSTimeInterval delay, BOOLif ([self.request.URL.host isEqualToString:@"canvas.harness"]) {const char *file = getenv("HARNESS_CANVAS_FILE"), *delay = getenv("HARNESS_CANVAS_DELAY");NSData *data = file ? [NSData dataWithContentsOfFile:@(file)] : nil;- // HARNESS_CANVAS_FAILS=n: the first n requests for it fail on the way, as a download iOS cancelled.+ // HARNESS_CANVAS_FAILS=n: the first n requests for it fail on the way, as a download iOS canceled.static int failing = -1;if (failing < 0) failing = getenv("HARNESS_CANVAS_FAILS") ? atoi(getenv("HARNESS_CANVAS_FAILS")) : 0;if (failing > 0) {@@ -187,7 +187,7 @@ static UIImage *solid(UIColor *color) {}];}-// The colour a picture is, by the pixel in its middle, named the way the checks name them.+// The color a picture is, by the pixel in its middle, named the way the checks name them.static NSString *colorName(UIImage *image) {if (!image.CGImage) return @"none";uint8_t px[4] = {0};@@ -1223,7 +1223,7 @@ static UIView *firstOfClass(UIView *root, NSString *name) {UISegmentedControl *segments = control();CGRect card = view.frame, header = table().tableHeaderView.frame;BOOL shaped = view.window && card.size.width > card.size.height && card.size.width > header.size.width - 48;- // Every segment's title whole: the widest, Visualiser's, is not cut short.+ // Every segment's title whole: the widest, Visualizer's, is not cut short.BOOL whole = YES;for (UILabel *label in [self labelsIn:segments]) whole = whole && label.intrinsicContentSize.width <= label.bounds.size.width + 0.5;[self expect:shaped && segments.numberOfSegments == 5 && whole && CGRectGetMinY(segments.frame) > CGRectGetMaxY(card)@@ -1237,11 +1237,11 @@ static UIView *firstOfClass(UIView *root, NSString *name) {pick(2);});after(5, ^{ expectBackground(@"Fluid", YES, NO, NO, NO); pick(1); });- after(6, ^{ expectBackground(@"Colours", NO, YES, NO, NO); pick(0); });+ after(6, ^{ expectBackground(@"Colors", NO, YES, NO, NO); pick(0); });after(7, ^{ expectBackground(@"Still", NO, NO, NO, NO); pick(4); });after(8, ^{- expectBackground(@"Visualiser", YES, NO, NO, YES);- NSLog(@"[harness] settings: screenshot the Visualiser card now");+ expectBackground(@"Visualizer", YES, NO, NO, YES);+ NSLog(@"[harness] settings: screenshot the Visualizer card now");});// Held a little longer, so the screenshot catches it.after(10, ^{ pick(3); });@@ -1321,7 +1321,7 @@ static UIView *firstOfClass(UIView *root, NSString *name) {return labels;}-#pragma mark - the Visualiser+#pragma mark - the VisualizerBOOL SGRHarnessReading(void);@@ -1349,7 +1349,7 @@ static CGFloat hillHeight(UIView *view, NSString *ivar) {detail:[NSString stringWithFormat:@"hills %@, field fluid %d held %d, link %@ at up to %.0f fps, reader %@, front %.0f pt, back %.0f pt",hills ? @"on the field" : @"missing", SGRPlayerField().fluid, SGRPlayerField().motionHeld, link ? @"running" : @"stopped",link.preferredFrameRateRange.maximum, SGRHarnessReading() ? @"on" : @"off", front, back]];- NSLog(@"[harness] visualiser: screenshot the hills now");+ NSLog(@"[harness] visualizer: screenshot the hills now");});after(4, ^{ SGRPlayerToggleLyrics(); });after(5.5, ^{@@ -1359,7 +1359,7 @@ static CGFloat hillHeight(UIView *view, NSString *ivar) {[self expect:SGRPlayerLyricsOpen() && blur.effect && link.preferredFrameRateRange.maximum == 30 step:@"behind the lyrics"detail:[NSString stringWithFormat:@"lyrics %@, blur %@, link at up to %.0f fps", SGRPlayerLyricsOpen() ? @"up" : @"down",blur.effect ? @"on" : @"off", link.preferredFrameRateRange.maximum]];- NSLog(@"[harness] visualiser: screenshot the lyrics now");+ NSLog(@"[harness] visualizer: screenshot the lyrics now");});after(6.5, ^{ SGRPlayerToggleLyrics(); });after(7.5, ^{ SGRHarnessSetTrack(@"spotify:track:harnessA", imageURI(@"aaaa"), YES); });@@ -1374,7 +1374,7 @@ static CGFloat hillHeight(UIView *view, NSString *ivar) {CGFloat front = hillHeight(hills, @"_frontShape");[self expect:!link && !SGRHarnessReading() && front < 15 step:@"paused, settled"detail:[NSString stringWithFormat:@"link %@, reader %@, front %.0f pt", link ? @"running" : @"stopped", SGRHarnessReading() ? @"on" : @"off", front]];- NSLog(@"[harness] visualiser: screenshot the paused hills now");+ NSLog(@"[harness] visualizer: screenshot the paused hills now");SGRHarnessSetTrack(@"spotify:track:harnessA", imageURI(@"aaaa"), NO);});after(13.5, ^{@@ -1395,7 +1395,7 @@ static CGFloat hillHeight(UIView *view, NSString *ivar) {[self expect:hills && SGRPlayerField().motionHeld && SGRHarnessReading() && hillHeight(hills, @"_frontShape") > 40 step:@"back from the menu"detail:[NSString stringWithFormat:@"hills %@, field %@, front %.0f pt", hills ? @"on the field" : @"missing",SGRPlayerField().motionHeld ? @"held" : @"moving", hillHeight(hills, @"_frontShape")]];- NSLog(@"[harness] visualiser checks: %lu of %lu right -- %@", (unsigned long)(self->_checks - self->_failures), (unsigned long)self->_checks,+ NSLog(@"[harness] visualizer checks: %lu of %lu right -- %@", (unsigned long)(self->_checks - self->_failures), (unsigned long)self->_checks,self->_failures ? @"FAIL" : @"PASS");});}diff --git a/harness/playlist/README.md b/harness/playlist/README.mdindex 449fb359..d4815efe 100644--- a/harness/playlist/README.md+++ b/harness/playlist/README.md@@ -20,7 +20,7 @@ The page opens mid load, with the cover smaller and the block higher than they spicture has to grow to its final height and then hold it. Then it plays the three states the header is ever in, with the frames Spotify sets in each(`trees/continuous/1.txt`, `2.txt` and `4.txt`): at rest at 4 s, collapsed at 8 s, pulled down past thetop at 12 s (block moved down and grown, as on the phone). Each logs where the hero landed in the window; collapsed it belongs off the top of the-screen, not pinned to it. At 16 s it fades Spotify's cover square and colour wash back in the way a+screen, not pinned to it. At 16 s it fades Spotify's cover square and color wash back in the way ascroll does, with nothing laid out, and reports what the redesign's scroll pass made of them.Back at rest the hero must be the height it had at 4 s: a hero that kept its pulled height is clipped by the plane and loses its dissolve.@@ -67,7 +67,7 @@ a plain UICollectionViewCell straight in the list: "plain heading a=0" once theThe owner's picture is an image view inside the creator button's facepile, filled at 1.5 s, after the header haslaid out. At 2.2 s the log line "owner picture" says where the redesign drew it: round, a line high, just before-the name, the two centred together. "none" means the late image was missed.+the name, the two centered together. "none" means the late image was missed."whole page" lines, in every mode: just after launch the page is under the field's veil, below the pinned ⋯, and at3 s there is "no veil". The redesign's own line says why it lifted (`log stream`, "page shown whole"): "its artworkdiff --git a/harness/playlist/main.m b/harness/playlist/main.mindex 2b683b2c..3c4db0d9 100644--- a/harness/playlist/main.m+++ b/harness/playlist/main.m@@ -97,7 +97,7 @@@interface MockElementContentView : UICollectionViewCell @end@implementation MockElementContentView @end-// A card inside a carousel: a cell too, but its own width, and its own colour to keep.+// A card inside a carousel: a cell too, but its own width, and its own color to keep.@interface MockCardCell : UICollectionViewCell @end@implementation MockCardCell @end@@ -142,7 +142,7 @@@implementation MockRightHost- (void)layoutSubviews {[super layoutSubviews];- // As Auto Layout does it: centre and bounds, never the frame or the transform.+ // As Auto Layout does it: center and bounds, never the frame or the transform.self.subviews.firstObject.bounds = CGRectMake(0, 0, 48, 48);self.subviews.firstObject.center = CGPointMake(76, 24);}@@ -209,8 +209,8 @@ static UIView *actionButton(UIView *row, CGRect frame, NSString *identifier, NSSUIImageView *glyph = [[UIImageView alloc] initWithFrame:CGRectInset(button.bounds, 12, 12)];NSDictionary *glyphs = @{@"Components.UI.AddToButton": @"plus", @"Components.UI.ContextMenuButton": @"ellipsis",@"DownloadButton.Granular.None": @"arrow.down.circle", @"Components.UI.WatchFeedEntityExplorerButton": @"play.rectangle"};- // Encore bakes the colour into what it draws, and ⋯ sits in a Tertiary button, which draws it grey- // (device 2026-09-20): drawn as an image of that colour, not as a template to be tinted.+ // Encore bakes the color into what it draws, and ⋯ sits in a Tertiary button, which draws it gray+ // (device 2026-09-20): drawn as an image of that color, not as a template to be tinted.BOOL tertiary = [identifier isEqualToString:@"Components.UI.ContextMenuButton"];UIImage *symbol = [UIImage systemImageNamed:glyphs[identifier] ?: @"circle"];if (tertiary) {@@ -444,7 +444,7 @@ static void buildLikedSongs(UIViewController *page, CGFloat W) {badge.backgroundColor = UIColor.blackColor;badge.layer.cornerRadius = 13;- // A card in a carousel: a cell of its own inside the row, narrower than the page, whose colour is its own+ // A card in a carousel: a cell of its own inside the row, narrower than the page, whose color is its own// and stays.UIView *card = box(extenderRow, MockCardCell.class, CGRectMake(16, 8, 140, 48), @"PlaylistExtender.Card");card.layer.backgroundColor = UIColor.blackColor.CGColor;@@ -522,8 +522,8 @@ static void buildLikedSongs(UIViewController *page, CGFloat W) {}dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{- // Cleared means an alpha of 0, whether the colour was taken off the layer or the view: the clear- // colour lands on both and reads back with no alpha at all.+ // Cleared means an alpha of 0, whether the color was taken off the layer or the view: the clear+ // color lands on both and reads back with no alpha at all.CGFloat (^alpha)(UIView *) = ^(UIView *v) {return v.layer.backgroundColor ? CGColorGetAlpha(v.layer.backgroundColor) : 0;};@@ -812,7 +812,7 @@ static void buildLikedSongs(UIViewController *page, CGFloat W) {});}- // Spotify fading its cover square and its colour wash back in as the header opens, which it does on the+ // Spotify fading its cover square and its color wash back in as the header opens, which it does on the// scroll itself with nothing laid out: only the hook on that scroll sees it.dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(16 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{setState(@"rest");diff --git a/harness/sleep-timer/main.m b/harness/sleep-timer/main.mindex bacada92..0867f659 100644--- a/harness/sleep-timer/main.m+++ b/harness/sleep-timer/main.m@@ -204,7 +204,7 @@ int main(void) {SGSleepTimerAdd(15 * 60);CHECK(fabs(SGSleepTimerEnd().timeIntervalSinceNow - 930) < 1 && sg_gain == 1, "15 minutes more: the end moves on and the gain is back");SGSetSleepTimer(SGSleepTimerOff, 0);- CHECK(SGSleepTimerCurrentMode() == SGSleepTimerOff && sg_gain == 1, "cancelled");+ CHECK(SGSleepTimerCurrentMode() == SGSleepTimerOff && sg_gain == 1, "canceled");SGSleepTimerAdd(15 * 60);CHECK(fabs(SGSleepTimerEnd().timeIntervalSinceNow - 900) < 1, "15 minutes more with none set: 15 minutes from now");SGSetSleepTimer(SGSleepTimerOff, 0);@@ -302,7 +302,7 @@ int main(void) {SGSetSleepTimer(SGSleepTimerAtTime, 15);CHECK(near(sg_gain, SGSleepTimerGain(15, 30)) && near(sg_gain, 0.0316f), "a time, 30 s fade, 15 s to go: 30 dB down");SGSetSleepTimer(SGSleepTimerOff, 0);- CHECK(sg_gain == 1, "cancelled: full volume");+ CHECK(sg_gain == 1, "canceled: full volume");// Spotify's own timer (SpotifySleepTimer.m), read off the state; the core pauses, never the mod.CHECK(sg_observer != nil, "Spotify's timer: an observer of the player's state is added at load");@@ -324,7 +324,7 @@ int main(void) {CHECK(sg_gain < 0.1f, "Spotify's 15 s on: 30 dB down or so");sg_player.state.sleepTimer = nil;runFor(0.4);- CHECK(sg_gain == 1, "Spotify's cancelled mid fade: the gain is back at once");+ CHECK(sg_gain == 1, "Spotify's canceled mid fade: the gain is back at once");sg_player.state.sleepTimer = spotifyTimer(1, 1.5);runFor(0.4);@@ -415,10 +415,10 @@ int main(void) {CHECK(sg_gain == 1, "the mod's own timer running (300 s): it has the gain, Spotify's is not faded");SGSetSleepTimer(SGSleepTimerOff, 0);runFor(0.4);- CHECK(sg_gain < 0.1f, "the mod's own cancelled: Spotify's, 10 s on, is faded");+ CHECK(sg_gain < 0.1f, "the mod's own canceled: Spotify's, 10 s on, is faded");sg_player.state.sleepTimer = nil;runFor(0.4);- CHECK(sg_gain == 1 && sg_player.pauses == pauses, "and cancelled: full volume; the mod sent no pause for Spotify's");+ CHECK(sg_gain == 1 && sg_player.pauses == pauses, "and canceled: full volume; the mod sent no pause for Spotify's");}printf("%s\n", sg_failures ? "FAILED" : "all held");return sg_failures ? 1 : 0;diff --git a/harness/spatial-page/main.m b/harness/spatial-page/main.mindex f006900e..a0bd73bd 100644--- a/harness/spatial-page/main.m+++ b/harness/spatial-page/main.m@@ -8,7 +8,7 @@// Setup: keep (the stored Sing keys stay; otherwise they are cleared first), on (spatial voice on), allowed or// denied (what Motion & Fitness answers; unasked otherwise, so the preview never listens), head=sweep (the head// turning 45 degrees each way every 6 s), head=<degrees> (still, then turned that far left at 2 s and held), width=<points>-// (the window that narrow, centred), slow (animations at a tenth of their speed).+// (the window that narrow, centered), slow (animations at a tenth of their speed).// Actions: spatial (the Spatial voice row tapped), toggle=<section>.<row> (that row's switch flipped the way a tap// does), pop, dump (the rows, the header's height and what VoiceOver reads on the preview, to the log), lag (how far// the disc on screen trails the head over the next 3 s, to the log), lines (how the Sing card's lines move over thediff --git a/harness/system-menu/README.md b/harness/system-menu/README.mdindex 6ed04a6f..1db7fcb0 100644--- a/harness/system-menu/README.md+++ b/harness/system-menu/README.md@@ -34,7 +34,7 @@ sheet is the player's, and that the sheet is in the mod's window under the app's- `timing`: ten taps, each closed again; logs the time from the touch down to the menu view in the hierarchy(UIKit presents it inside the touch's delivery, so 2 to 4 ms warm), and the median, best and worst of the lastnine (the first pays for UIKit's menu classes loading).-- `rows`: More holds Go to album, the greyed-out Lyrics and Sleep timer (below the sheet's fold), not the rows+- `rows`: More holds Go to album, the grayed-out Lyrics and Sleep timer (below the sheet's fold), not the rowsthe quick row has; picking Go to album taps Spotify's row and the sheet goes.- `loading`: the first menu ever, its rows 1.5 s late: More shows the system's loading row, then the rows comeinto the open More, and Go to album fires.diff --git a/harness/system-menu/main.m b/harness/system-menu/main.mindex eb6c70d0..0d42c146 100644--- a/harness/system-menu/main.m+++ b/harness/system-menu/main.m@@ -68,7 +68,7 @@ void SGPlayerMenuSetAnimatedArtwork(BOOL on) { sg_animated = on; NSLog(@"[harnesstatic NSUInteger sg_marked;void SGPlayerMenuMarkPlayers(void) { sg_marked++; }// The player's background (Redesigned/Player/Player.h's SGRPlayerBackgroundKind): Fluid, so the menu offers-// Animated and the Visualiser; Show Animated Artwork switches it on.+// Animated and the Visualizer; Show Animated Artwork switches it on.NSInteger SGRPlayerBackground(void) { return sg_background; }void SGRPlayerMenuSetBackground(NSInteger kind) { sg_background = kind; SGPlayerMenuSetAnimatedArtwork(kind == 3); }@class SPTPlayerState;@@ -217,7 +217,7 @@ static SGHarnessPlayer *sg_player;[control addSubview:glyph];UILabel *title = [[UILabel alloc] initWithFrame:CGRectMake(56, 0, 280, 64)];title.text = row[1];- // Lyrics greyed out, as for a track no source has them for.+ // Lyrics grayed out, as for a track no source has them for.title.textColor = [row[1] isEqualToString:@"Lyrics"] ? [UIColor colorWithWhite:1 alpha:0.3] : UIColor.whiteColor;[control addSubview:title];[cell.contentView addSubview:control];@@ -495,7 +495,7 @@ static NSArray<NSString *> *quickTitles(void) {check(self.arrowTaps == 1, @"the arrow's action did not run again");// The finger lifted 0.08 s after the touch down; the press holds while the menu is up.after(0.5, ^{- check(self.frontUps == 0, [NSString stringWithFormat:@"with the menu up the press holds: no touch up yet (cancelled %lu)", (unsigned long)self.frontCancels]);+ check(self.frontUps == 0, [NSString stringWithFormat:@"with the menu up the press holds: no touch up yet (canceled %lu)", (unsigned long)self.frontCancels]);[self.front.contextMenuInteraction dismissMenu];waitFor(^BOOL { return self.frontUps > 0; }, 2, ^{check(self.frontUps == 1, [NSString stringWithFormat:@"the menu's end lets the press go (%lu)", (unsigned long)self.frontUps]);diff --git a/harness/tabbar/README.md b/harness/tabbar/README.mdindex 4003e620..70241b15 100644--- a/harness/tabbar/README.md+++ b/harness/tabbar/README.md@@ -48,7 +48,7 @@ picked at 3.5 s, which forgets the lit tab, and the selection at 4.5 s should be`mini` minimizes the bar at 1 s through `SGRSetTabBarMinimized`, logs at 2.5 s and expands it again at 3.5 s,logging at 5 s. Minimized, the platters should be two 62 pt circles 21 pt in from each side, the card-between them 8 pt from each, centred on them, and a touch at the card's middle should land in the now+between them 8 pt from each, centered on them, and a touch at the card's middle should land in the nowplaying bar (through the hook on the page's `TouchPassthroughView`); expanded again, all as `none` hasit. Every report also gives the frame of the fade under the bars. The mock card's labels have fixedframes, so how Spotify's own content takes the narrower card is not shown here.@@ -97,7 +97,7 @@ stretches run one after another and time their turns from their own start: dispatenth of its delay late, so steps timed from the launch, as `names` times its quick turns and `tap` its tap andthe report after it, can fall together (one `tap` run in three reported the bar before the tap's touch-up).A critically damped spring moving the platter's 298 pt peaks at some 50 pt a frame over 0.34 s; more is a jump.-A single sample off its neighbours at a turn is one read in the turn's own run loop pass, before its animations+A single sample off its neighbors at a turn is one read in the turn's own run loop pass, before its animationsare committed.2026-10-06, iPhone 17 Pro on iOS 27.0. Before the fix, every minimize laid the circle's one item out in the@@ -113,7 +113,7 @@ com.apple.Accessibility ReduceMotionEnabled` in the simulator) the bar and the ccc -I../../tweak/Sources/Redesigned/Navbar minimize-check.c -o build/minimize-check && build/minimize-check`jam` plays a Jam: a strip under the class name of Spotify's (a SwiftUI hosting view of-`Jam_AttachmentsImpl.JamHatElement`, 44 pt) over the card, both in a view painted the album colour too,+`Jam_AttachmentsImpl.JamHatElement`, 44 pt) over the card, both in a view painted the album color too,the bar 44 pt taller, and the strip gone again at 3.5 s. The log then lists the bar's glass panes. Thecard's glass should be the track card's (386x56), the strip's pane 36 pt above it with a 4 pt gap, andonce the Jam is over the card's glass should still be 386x56 and the strip's pane should have no effect.diff --git a/harness/tabbar/main.m b/harness/tabbar/main.mindex 26a4c59b..e71a5fc7 100644--- a/harness/tabbar/main.m+++ b/harness/tabbar/main.m@@ -59,7 +59,7 @@ static __weak UIView *sgJamStrip;host.backgroundColor = album;[self.view addSubview:host];}- // The card, 386x56 at {8,0} with the album colour, the artwork, two lines and the progress line+ // The card, 386x56 at {8,0} with the album color, the artwork, two lines and the progress line// (trees/clean/home/01.txt, SPTNowPlayingBar).UIView *card = [UIView new];card.accessibilityIdentifier = @"SPTNowPlayingBar";@@ -180,7 +180,7 @@ static __weak UIView *sgJamStrip;- (UIView *)tabBarView { return self.bar; }- (void)setSelectedViewController:(UIViewController *)controller {}-// A tap on a mock item does what Spotify's does to the bar: its label goes white and the others grey.+// A tap on a mock item does what Spotify's does to the bar: its label goes white and the others gray.+ (void)tapped:(UITapGestureRecognizer *)tap {for (UIView *item in tap.view.superview.subviews) {for (UIView *sub in item.subviews) {diff --git a/harness/visualiser/README.md b/harness/visualiser/README.mdindex b88f5c6b..9e079f17 100644--- a/harness/visualiser/README.md+++ b/harness/visualiser/README.md@@ -1,15 +1,15 @@-# Visualiser harness+# Visualizer harness-The player's Visualiser background reads Spotify's sound through `Redesigned/Player/SGRSpectrum.m`. `main.m`+The player's Visualizer background reads Spotify's sound through `Redesigned/Player/SGRSpectrum.m`. `main.m`runs it on the Mac as the tweak compiles it, fed in IO buffers of 1024 the way `PlayerVisualiser.x` is fed by`AudioEffects.x`'s reader:./build.sh && build/spectrum-It checks that nothing is analysed before the tables are made, that a full scale 1 kHz sine reads 0 dB in its band+It checks that nothing is analyzed before the tables are made, that a full scale 1 kHz sine reads 0 dB in its band(and a tenth of it -20 dB) with every band more than one away at least 30 dB under, that 56 Hz and 10 kHz land inthe lowest band and the last but one at 48 and 44.1 kHz, that silence reads the floor, that white noise rises-about 3 dB an octave over the bands, and that it analyses about 47 times a second at 48 kHz. The log ends with+about 3 dB an octave over the bands, and that it analyzes about 47 times a second at 48 kHz. The log ends with`spectrum checks: n of 11 right -- PASS` or `FAIL`.The view itself is laid out in the player harness (`harness/player`, scenario `visualiser`).diff --git a/harness/visualiser/build.sh b/harness/visualiser/build.shindex fd90a584..612ce704 100755--- a/harness/visualiser/build.sh+++ b/harness/visualiser/build.sh@@ -1,5 +1,5 @@#!/bin/sh-# Builds the Visualiser's spectrum check for the Mac: SGRSpectrum.m as the tweak compiles it, under main.m.+# Builds the Visualizer's spectrum check for the Mac: SGRSpectrum.m as the tweak compiles it, under main.m.set -ecd "$(dirname "$0")"mkdir -p builddiff --git a/harness/visualiser/main.m b/harness/visualiser/main.mindex 89cd0961..5c539f40 100644--- a/harness/visualiser/main.m+++ b/harness/visualiser/main.m@@ -1,4 +1,4 @@-// The Visualiser's spectrum (Redesigned/Player/SGRSpectrum.m, as the tweak compiles it) on the Mac: tones and+// The Visualizer's spectrum (Redesigned/Player/SGRSpectrum.m, as the tweak compiles it) on the Mac: tones and// noise handed over in IO buffers of 1024 at an output's rate, the way PlayerVisualiser.x gets them through// AudioEffects.x's reader, and each check printed with ok or WRONG.//@@ -38,7 +38,7 @@ static uint64_t feed(double hz, float amplitude, double rate, double seconds) {}// The loudest band, its level, and the loudest more than one band away from it (a tone near an edge spills into-// its neighbour).+// its neighbor).static int loudest(const float *levels, float *level, float *outside) {int best = 0;for (int i = 1; i < SGRSpectrumBands; i++) if (levels[i] > levels[best]) best = i;@@ -61,7 +61,7 @@ static void tone(double hz, float amplitude, double rate, int band, float expectint main(void) {@autoreleasepool {float levels[SGRSpectrumBands];- check(feed(1000, 1, 48000, 0.5) == 0, @"nothing analysed before SGRSpectrumPrepare");+ check(feed(1000, 1, 48000, 0.5) == 0, @"nothing analyzed before SGRSpectrumPrepare");SGRSpectrumPrepare();SGRSpectrumPrepare();SGRSpectrumRead(levels);@@ -82,7 +82,7 @@ int main(void) {SGRSpectrumRead(levels);float loudestSilence = SGRSpectrumFloor;for (int i = 0; i < SGRSpectrumBands; i++) loudestSilence = fmaxf(loudestSilence, levels[i]);- check(after > before && loudestSilence == SGRSpectrumFloor, @"silence: still analysed, every band at the floor");+ check(after > before && loudestSilence == SGRSpectrumFloor, @"silence: still analyzed, every band at the floor");// White noise has as much power per hertz, so a band's level rises with its width: about 3 dB an octave,// and bands 8 to 20 span about 3.9 octaves. One analysis of noise over a narrow band swings by a few dB,diff --git a/icons/source/reeded-light.html b/icons/source/reeded-light.htmlindex efc86297..3d78b063 100644--- a/icons/source/reeded-light.html+++ b/icons/source/reeded-light.html@@ -546,7 +546,7 @@const e = Math.exp(-(dx * dx + dy * dy) / (L.r * L.r) * 1.7) * L.k;r += L.c[0] * e; g += L.c[1] * e; b += L.c[2] * e;}- // The disc: a warm face shading to the first colour at its edge, cut by grooves+ // The disc: a warm face shading to the first color at its edge, cut by grooves// around a plain label, with a halo past its rim.const dx = u - ox, dy = v - oy;const d = Math.sqrt(dx * dx + dy * dy) / orbR;diff --git a/icons/source/reeded-light.md b/icons/source/reeded-light.mdindex 7f8dc9f6..7a18fb89 100644--- a/icons/source/reeded-light.md+++ b/icons/source/reeded-light.md@@ -5,15 +5,15 @@ glass's account of it: bent, sliced and lit along its edges. Reeded Light is a gthat account. It never draws the thing on show. It draws a field of light, sets fluted glass in front ofit, and lets refraction decide the picture.-The process starts as an invisible scene: a few soft sources of coloured light, placed by the seed, their+The process starts as an invisible scene: a few soft sources of colored light, placed by the seed, theirshapes slowly warped by layered noise so that no two glows share an edge. Among them rests one brighter-disc, set off the centre at the golden section, its surface cut with grooves too fine to see directly.+disc, set off the center at the golden section, its surface cut with grooves too fine to see directly.This scene is computed once, in full, and kept out of sight. Everything the viewer sees is a reading ofit through glass.The glass is a row of cylindrical flutes, each one a small lens. A flute gathers a strip of the scenewider than itself, turns it over and squeezes it into its own width, so a soft glow becomes a set of-sharp bands and the hidden disc breaks into a stack of bright staves. Each colour channel is bent by a+sharp bands and the hidden disc breaks into a stack of bright staves. Each color channel is bent by aslightly different amount, so dispersion fringes every flute's edge with the spectrum, the way real glassdoes when light crosses it at an angle. The ridges darken where the curve turns away and carry a thinspecular line where it faces the light. The pane is inset from the frame like glass in a cabinet, its rimdiff --git a/scripts/record-session.py b/scripts/record-session.pyindex 6275df55..d610dab9 100755--- a/scripts/record-session.py+++ b/scripts/record-session.py@@ -108,7 +108,7 @@ CHECKLIST = """Before recording, the phone needs:1. the FLEX build of the mod on it: make install FLEX=1 (only that build serves the tree)2. stock Spotify: Mod Settings → Mod → Export settings (keep the file), then Reset all settings.Spotify restarts with every switch off; close the welcome tour if it comes up.- Afterwards, Mod Settings → Mod → Import settings brings your settings back.+ Afterward, Mod Settings → Mod → Import settings brings your settings back.3. Spotify open in the foreground, the phone unlocked and on USB."""HELP = """ Enter save a snapshot of what the phone showsdiff --git a/scripts/record-trees.py b/scripts/record-trees.pyindex b5a0a615..81dd5839 100755--- a/scripts/record-trees.py+++ b/scripts/record-trees.py@@ -68,7 +68,7 @@ def pages_in(text):def describe(text):- return f"{text.count(chr(10))} lines, pages: {', '.join(pages_in(text)) or 'none recognised'}"+ return f"{text.count(chr(10))} lines, pages: {', '.join(pages_in(text)) or 'none recognized'}"def write_tree(name, text, source, messages=None, folder=TREES):diff --git a/tweak/Sources/App/About/UpdatePage.m b/tweak/Sources/App/About/UpdatePage.mindex 9f4e0ee7..b023bf68 100644--- a/tweak/Sources/App/About/UpdatePage.m+++ b/tweak/Sources/App/About/UpdatePage.m@@ -315,7 +315,7 @@ static NSArray<SGUpdateRelease *> *releasesToShow(void) {[table deselectRowAtIndexPath:path animated:YES];SGUpdateRow *row = [self rowAt:path];if (row.action) row.action();- // Check now goes grey to "checking…" the moment it is tapped rather than on the next tick.+ // Check now goes gray to "checking…" the moment it is tapped rather than on the next tick.if (row.value) [self readStatus];}diff --git a/tweak/Sources/App/ModSettings.x b/tweak/Sources/App/ModSettings.xindex d535ad38..1f8318e4 100644--- a/tweak/Sources/App/ModSettings.x+++ b/tweak/Sources/App/ModSettings.x@@ -11,9 +11,9 @@// out again.//// Tree (trees/settings.txt): SettingsListViewController.view > SettingsListCollectionView of-// Element_List cells 402x56: 24pt icon at x 12, 13pt white title and 11pt grey subtitle at+// Element_List cells 402x56: 24pt icon at x 12, 13pt white title and 11pt gray subtitle at// x 48, 12pt chevron on the right. A pushed page (trees/settings notifications opened.txt) is a-// UITableView bg #121212: header with an 11pt grey description at (16, 24), 53pt cells with the+// UITableView bg #121212: header with an 11pt gray description at (16, 24), 53pt cells with the#import "Core/SGCore.h"#import "Settings/SGPage.h"#import "Settings/SGPageStyle.h"@@ -36,7 +36,7 @@static const CGFloat kRowHeight = 56;static char kRowKey, kInsetKey;-// Each part of Spotify on a tile of its own colour, as Settings lists its own, so a row is found by its colour.+// Each part of Spotify on a tile of its own color, as Settings lists its own, so a row is found by its color.static SGModRow *pageRow(NSString *title, NSString *symbol, UIColor *color, UIViewController *(^page)(void)) {return SGWithTile(SGPageRow(title, page), symbol, color);}diff --git a/tweak/Sources/App/Onboarding/WhatsNew.m b/tweak/Sources/App/Onboarding/WhatsNew.mindex eeed2b10..b87f3274 100644--- a/tweak/Sources/App/Onboarding/WhatsNew.m+++ b/tweak/Sources/App/Onboarding/WhatsNew.m@@ -72,7 +72,7 @@ static UILabel *label(NSString *text, UIFontTextStyle style, UIFontWeight weight- (void)viewDidLoad {[super viewDidLoad];- // iOS 26 gives a sheet its own material; before it the sheet takes the mod's page colour.+ // iOS 26 gives a sheet its own material; before it the sheet takes the mod's page color.if (@available(iOS 26.0, *)) {} else self.view.backgroundColor = SGPageBackground();UILabel *title = label(@"What's New in Vitrine", UIFontTextStyleLargeTitle, UIFontWeightBold, UIColor.whiteColor);diff --git a/tweak/Sources/App/Pages.m b/tweak/Sources/App/Pages.mindex 30b86862..78356625 100644--- a/tweak/Sources/App/Pages.m+++ b/tweak/Sources/App/Pages.m@@ -23,7 +23,7 @@#import "Redesigned/NowPlayingBar/NowPlayingBar.h"#import "Redesigned/Kit/SGRAccent.h"-NSString *const SGRedesignedUIInfo = @"The newest version of Vitrine, leaning towards Apple Music's style. It is not compatible with the legacy look's settings.\n\nThe legacy look gives you more freedom, yet still looks like Spotify.";+NSString *const SGRedesignedUIInfo = @"The newest version of Vitrine, leaning toward Apple Music's style. It is not compatible with the legacy look's settings.\n\nThe legacy look gives you more freedom, yet still looks like Spotify.";// Below iOS 26 the redesign also needs SGKeyRedesignUntested (Core/SGUIMode.h): whoever calls this has// shown the warning. Turning it off takes that back, so turning it on again warns again.@@ -102,7 +102,7 @@ UIViewController *SGNavbarPage(void) {return SGRedesignedUIStored() ? SGRNavbarSettingsPage() : SGNavbarSettingsPage();}-// Pronunciation, romanised lines, translation, word sweeping and line meanings exist only in the redesign's lyrics view.+// Pronunciation, romanized lines, translation, word sweeping and line meanings exist only in the redesign's lyrics view.static UIViewController *lyricsPage(void) {BOOL redesigned = SGRedesignedUIStored();NSMutableArray<SGModRow *> *more = [NSMutableArray arrayWithObject:SGLockScreenLyricsRow()];diff --git a/tweak/Sources/Core/SGBackdrop.h b/tweak/Sources/Core/SGBackdrop.hindex 2bf7c3dd..4195cd60 100644--- a/tweak/Sources/Core/SGBackdrop.h+++ b/tweak/Sources/Core/SGBackdrop.h@@ -1,5 +1,5 @@// The cover art as a background: shrunk until no shape of it survives, blurred, under a scrim-// darkening towards the bottom. Native/Player/Player.x puts one behind the player, Native/Playlist/Playlist.x+// darkening toward the bottom. Native/Player/Player.x puts one behind the player, Native/Playlist/Playlist.x// behind the playlist header.#import <UIKit/UIKit.h>diff --git a/tweak/Sources/Core/SGBackdrop.m b/tweak/Sources/Core/SGBackdrop.mindex 263eb54c..b8591ee4 100644--- a/tweak/Sources/Core/SGBackdrop.m+++ b/tweak/Sources/Core/SGBackdrop.m@@ -1,7 +1,7 @@#import "SGBackdrop.h"// Small enough that no shape of the cover survives the scaling back up, large enough to keep the-// colours where they were in it.+// colors where they were in it.static const CGFloat kCoverSample = 48;@interface SGScrimView : UIViewdiff --git a/tweak/Sources/Core/SGGlass.m b/tweak/Sources/Core/SGGlass.mindex 39096964..05d70831 100644--- a/tweak/Sources/Core/SGGlass.m+++ b/tweak/Sources/Core/SGGlass.m@@ -1,7 +1,7 @@#import "SGGlass.h"#import "SGRuntime.h"-// +effectWithStyle: is the only initialiser UIGlassEffect has; a bare -init leaves the material+// +effectWithStyle: is the only initializer UIGlassEffect has; a bare -init leaves the material// unresolved and the pane renders as a plain blur, while the capsule shape, which is the view's// own property, still comes out right. Spotify's own Reprise glass builds its effect the same way.UIVisualEffect *SGGlassEffect(void) {diff --git a/tweak/Sources/Core/SGPrefs.h b/tweak/Sources/Core/SGPrefs.hindex f139ec69..c63f3e01 100644--- a/tweak/Sources/Core/SGPrefs.h+++ b/tweak/Sources/Core/SGPrefs.h@@ -32,7 +32,7 @@ void SGMigrateKey(NSString *from, NSString *to);// Quits Spotify so the hooks read the switches afresh on the next launch; the writes reach cfprefsd first.void SGRestartSpotify(void);-// Apple Music's red, 0xRRGGBB, offered under either look's accent colour.+// Apple Music's red, 0xRRGGBB, offered under either look's accent color.#define SGAppleMusicRed 0xFA2D48// Spotify's own green, the token either look's accent replaces.#define SGSpotifyGreen 0x1ED760diff --git a/tweak/Sources/Core/SGViewTree.h b/tweak/Sources/Core/SGViewTree.hindex dc4d1325..596f6c17 100644--- a/tweak/Sources/Core/SGViewTree.h+++ b/tweak/Sources/Core/SGViewTree.h@@ -11,7 +11,7 @@ UIStackView *SGRowIn(UIView *host);// Whether any view under `root` has `marker` in its class name.BOOL SGHasClass(UIView *root, NSString *marker);-// Artwork, glyphs, text and thin lines (progress bar) keep their colour, everything else goes clear.+// Artwork, glyphs, text and thin lines (progress bar) keep their color, everything else goes clear.BOOL SGKeepsColor(UIView *view);void SGStripBackgrounds(UIView *view);BOOL SGIsVisibleColor(CGColorRef color);diff --git a/tweak/Sources/Core/SGViewTree.m b/tweak/Sources/Core/SGViewTree.mindex 1714a25c..18f46e71 100644--- a/tweak/Sources/Core/SGViewTree.m+++ b/tweak/Sources/Core/SGViewTree.m@@ -67,7 +67,7 @@ BOOL SGIsLightColor(CGColorRef color) {return YES;}-// Lighter greys (#1F1F1F placeholders, #292929 cards) and translucent paint stay.+// Lighter grays (#1F1F1F placeholders, #292929 cards) and translucent paint stay.BOOL SGIsBaseSurface(CGColorRef color) {if (!color || CFGetTypeID(color) != CGColorGetTypeID() || CGColorGetAlpha(color) < 0.95) return NO;const CGFloat *c = CGColorGetComponents(color);diff --git a/tweak/Sources/Diagnostics/PlayerState.x b/tweak/Sources/Diagnostics/PlayerState.xindex 7c2b497f..bf63dec0 100644--- a/tweak/Sources/Diagnostics/PlayerState.x+++ b/tweak/Sources/Diagnostics/PlayerState.x@@ -1,5 +1,5 @@// Temporary diagnostics (debug builds only): what the player core says about the track it is on,-// for the reports that songs cannot be paused or scrubbed while podcasts can. Spotify greys its+// for the reports that songs cannot be paused or scrubbed while podcasts can. Spotify grays its// pause button and its scrubber from the state's restrictions, and nothing about them reaches the// system log, so the state object is read out here: every property and object ivar of it, the// restrictions inside it one level deeper, and the track's metadata, which names an ad.@@ -102,7 +102,7 @@ id SGDiagnosticsPlayer(void) {}%end-// Who greys the button out: Encore draws it disabled at half alpha, and the caller says which of+// Who grays the button out: Encore draws it disabled at half alpha, and the caller says which of// Spotify's units decided it.%hook _TtC28EncoreConsumerMobile_BaseKit14PlayButtonView- (void)setEnabled:(BOOL)enabled {diff --git a/tweak/Sources/Headers/SPTEncoreIconView.h b/tweak/Sources/Headers/SPTEncoreIconView.hindex 14b09ff8..2567215e 100644--- a/tweak/Sources/Headers/SPTEncoreIconView.h+++ b/tweak/Sources/Headers/SPTEncoreIconView.h@@ -1,4 +1,4 @@-// Spotify's glyph view, from SpotifyShared.framework. It bakes its colour into what it draws, so+// Spotify's glyph view, from SpotifyShared.framework. It bakes its color into what it draws, so// tintColor never reaches it and setForegroundColor: is the way in.#import <UIKit/UIKit.h>diff --git a/tweak/Sources/Native/Appearance/Accent.x b/tweak/Sources/Native/Appearance/Accent.xindex 9efc76dc..f3fa5bda 100644--- a/tweak/Sources/Native/Appearance/Accent.x+++ b/tweak/Sources/Native/Appearance/Accent.x@@ -1,7 +1,7 @@-// Accent colour: Spotify's green, #1ED760, is one token. Its three components occur once in the+// Accent color: Spotify's green, #1ED760, is one token. Its three components occur once in the// whole binary, and every green the app draws, from the play button to the "Zobrazit vše" links// and the progress bar, is that token or a state blended from it. So it is swapped where it is-// born, in the UIColor initialiser, and the blends follow. Lottie animations carry their own green+// born, in the UIColor initializer, and the blends follow. Lottie animations carry their own green// and are caught at the layer, below. Image assets with green baked in, the logo above all, are// out of reach.#import "Core/SGCore.h"@@ -66,10 +66,10 @@ static BOOL swap(CGFloat *r, CGFloat *g, CGFloat *b) {}%end-// Lottie draws its animations, the play indicator and the checkmarks among them, from colours-// in the animation file straight onto shape layers, or into colour keyframes, never through+// Lottie draws its animations, the play indicator and the checkmarks among them, from colors+// in the animation file straight onto shape layers, or into color keyframes, never through// UIColor. The same swap goes on the CGColor. Layers get set off the main thread too, so the-// copy is made with CoreGraphics alone; NULL when the colour is not one of the greens.+// copy is made with CoreGraphics alone; NULL when the color is not one of the greens.static CGColorRef swappedCopy(CGColorRef color) {if (!color || CFGetTypeID(color) != CGColorGetTypeID() || CGColorGetNumberOfComponents(color) != 4) return NULL;const CGFloat *c = CGColorGetComponents(color);diff --git a/tweak/Sources/Native/Appearance/Amoled.x b/tweak/Sources/Native/Appearance/Amoled.xindex bd1296b3..be8777a7 100644--- a/tweak/Sources/Native/Appearance/Amoled.x+++ b/tweak/Sources/Native/Appearance/Amoled.x@@ -1,5 +1,5 @@-// AMOLED background: Spotify paints its base surface #121212; with the switch on, that grey and-// the gradients fading into it go pure black. Lighter greys stay (#1F1F1F placeholders, #292929+// AMOLED background: Spotify paints its base surface #121212; with the switch on, that gray and+// the gradients fading into it go pure black. Lighter grays stay (#1F1F1F placeholders, #292929// cards), so elevated surfaces still read against the black.//// Trees: #121212 sits on the Home, Search, Library and settings scroll views, on list rows, the@@ -52,7 +52,7 @@ static CGColorRef copyBlack(CGColorRef color) {%end// Spotify's settings list paints nothing of its own and shows whatever sits under it, which is not-// the base grey the hooks above turn black. The list is the top surface, so it takes the black.+// the base gray the hooks above turn black. The list is the top surface, so it takes the black.%hook _TtC21Settings_PlatformImpl26SettingsListViewController- (void)viewDidLayoutSubviews {%orig;diff --git a/tweak/Sources/Native/Appearance/Appearance.h b/tweak/Sources/Native/Appearance/Appearance.hindex 5b170d99..185d3933 100644--- a/tweak/Sources/Native/Appearance/Appearance.h+++ b/tweak/Sources/Native/Appearance/Appearance.h@@ -1,15 +1,15 @@-// The native look's appearance: the AMOLED background (Amoled.x), the accent colour in place of+// The native look's appearance: the AMOLED background (Amoled.x), the accent color in place of// Spotify's green (Accent.x), the soft top edge (EdgeEffect.x) and Repaint.x, which keeps what the// native tweaks stripped transparent when Spotify repaints it. The switches are off until asked for.#import <UIKit/UIKit.h>#define SGKeyAmoled @"spotifyglass.amoled"#define SGKeyAccent @"spotifyglass.accent" // 0xRRGGBB; unset or negative keeps Spotify's own green-// The last colour picked, kept while a preset is in place so Custom brings it back.+// The last color picked, kept while a preset is in place so Custom brings it back.#define SGKeyAccentCustom @"spotifyglass.accent.custom"UIColor *SGAccentColor(void); // nil while Spotify's own green is kept-NSInteger SGAccentRGB(void); // the colour in effect, 0xRRGGBB, Spotify's green included+NSInteger SGAccentRGB(void); // the color in effect, 0xRRGGBB, Spotify's green included@class SGModRow;-NSArray<SGModRow *> *SGNativeAppearanceRows(void); // AMOLED and the accent colour, for the Appearance page+NSArray<SGModRow *> *SGNativeAppearanceRows(void); // AMOLED and the accent color, for the Appearance pagediff --git a/tweak/Sources/Native/Appearance/AppearanceSettings.m b/tweak/Sources/Native/Appearance/AppearanceSettings.mindex 6276fa10..a8a8584b 100644--- a/tweak/Sources/Native/Appearance/AppearanceSettings.m+++ b/tweak/Sources/Native/Appearance/AppearanceSettings.m@@ -3,9 +3,9 @@#import "Settings/SGPageStyle.h"#import "Appearance.h"-// The preset is read off the colour stored, so the hooks keep the one key they read and a colour set before-// presets existed stays in effect: Apple Music's red reads as Apple Music, any other colour as Custom, none-// as Spotify. The custom colour is put aside while a preset is in place, so Custom brings it back.+// The preset is read off the color stored, so the hooks keep the one key they read and a color set before+// presets existed stays in effect: Apple Music's red reads as Apple Music, any other color as Custom, none+// as Spotify. The custom color is put aside while a preset is in place, so Custom brings it back.static NSArray<NSString *> *presets(void) {return @[@"Spotify", @"Apple Music", @"Custom"];}@@ -23,13 +23,13 @@ static void choosePreset(NSInteger index) {SGSetInt(SGKeyAccent, index == 0 ? -1 : index == 1 ? SGAppleMusicRed : custom);}-// The native look's rows of the Appearance page (App/Pages.m): the preset from a menu, then the colour in-// effect, which opens the picker; a colour stored from there is Custom.+// The native look's rows of the Appearance page (App/Pages.m): the preset from a menu, then the color in+// effect, which opens the picker; a color stored from there is Custom.NSArray<SGModRow *> *SGNativeAppearanceRows(void) {- SGModRow *menu = SGMenuRow(@"Accent colour preset", presets(), ^NSString *{ return presets()[(NSUInteger)preset()]; },+ SGModRow *menu = SGMenuRow(@"Accent color preset", presets(), ^NSString *{ return presets()[(NSUInteger)preset()]; },^(NSInteger index) { choosePreset(index); });- SGModRow *colour = SGStatActionRow(@"Accent colour", nil, ^NSString *{ return [NSString stringWithFormat:@"#%06lX", (long)SGAccentRGB()]; }, ^{- SGPickColor(@"Accent colour", SGAccentRGB(), ^(NSInteger rgb) {+ SGModRow *colour = SGStatActionRow(@"Accent color", nil, ^NSString *{ return [NSString stringWithFormat:@"#%06lX", (long)SGAccentRGB()]; }, ^{+ SGPickColor(@"Accent color", SGAccentRGB(), ^(NSInteger rgb) {SGSetInt(SGKeyAccent, rgb);SGSetInt(SGKeyAccentCustom, rgb);});diff --git a/tweak/Sources/Native/Appearance/Repaint.x b/tweak/Sources/Native/Appearance/Repaint.xindex 605456d0..3bfd7231 100644--- a/tweak/Sources/Native/Appearance/Repaint.x+++ b/tweak/Sources/Native/Appearance/Repaint.x@@ -15,7 +15,7 @@ __weak UIView *sg_npvBackdropRoot = nil;if (SGIsInside(view, sg_lyricsCardRoot) || SGIsInside(view, sg_lyricsPageRoot)) {color = NULL;} else if (SGIsInside(view, sg_npvBackdropRoot)) {- // The album colour arrives on the plane per track, outside any layout pass.+ // The album color arrives on the plane per track, outside any layout pass.color = NULL;} else if (SGIsBaseSurface(color) && SGIsInside(view, sg_homeRoot)) {// Home keeps its cards and its placeholders; only the base surface the gradientdiff --git a/tweak/Sources/Native/Home/Home.h b/tweak/Sources/Native/Home/Home.hindex 9fad65ad..c564ce3c 100644--- a/tweak/Sources/Native/Home/Home.h+++ b/tweak/Sources/Native/Home/Home.h@@ -15,8 +15,8 @@// names the Gradient page offers, the key it is stored under and the one it falls back to, so a// name and what it does cannot drift apart.typedef NS_ENUM(NSInteger, SGHomeChoice) {- SGHomeChoiceTint, // which colour it fades- SGHomeChoiceStrength, // how far up or down that colour is taken+ SGHomeChoiceTint, // which color it fades+ SGHomeChoiceStrength, // how far up or down that color is takenSGHomeChoiceHeight, // how far down the page it reachesSGHomeChoiceCount,};diff --git a/tweak/Sources/Native/Home/HomeGradient.x b/tweak/Sources/Native/Home/HomeGradient.xindex 0862549c..c7e4ac98 100644--- a/tweak/Sources/Native/Home/HomeGradient.x+++ b/tweak/Sources/Native/Home/HomeGradient.x@@ -1,10 +1,10 @@// Home gradient: a wash behind the top of the Home tab, strongest under the avatar and the pills// and out by the second shelf, like the gradient Spotify's own Home used to have. The wash is a// layer inside the page's scroll view, under its content, so it scrolls away with the shelves; the-// base grey the page and the shelves paint over it goes clear in Native/Appearance/Repaint.x, and-// Spotify's own scrim behind the header goes with it, since it would only mute the colour.+// base gray the page and the shelves paint over it goes clear in Native/Appearance/Repaint.x, and+// Spotify's own scrim behind the header goes with it, since it would only mute the color.//-// Which colour it fades, how strong it is and how far down it reaches come from the choice tables+// Which color it fades, how strong it is and how far down it reaches come from the choice tables// in HomeGradientChoices.m, read on every layout pass, so all three apply without restarting// Spotify. The switch itself is read once, in the %ctor, and still needs a restart.//@@ -18,7 +18,7 @@#import "Native/Appearance/Repaint.h"#import "Home.h"-// Colour level behind the header before it starts to go, and colour above the content as well, for+// Color level behind the header before it starts to go, and color above the content as well, for// the rubber band of an overscroll to pull down into.static const CGFloat kLevelHeight = 52;static const CGFloat kOverscroll = 600;@@ -27,7 +27,7 @@ static const CGFloat kOverscroll = 600;// that list of names.//// Sampled off the design: #0B4110 at the top of the screen, level behind the header, gone by 390pt,-// which is Medium at Medium. The other seven colours are that one taken around the wheel.+// which is Medium at Medium. The other seven colors are that one taken around the wheel.static const uint32_t kTints[] = {0x0B4110, 0x0B4138, 0x0B2B41, 0x160B41, 0x330B41, 0x410B2E, 0x410B10, 0x412A0B};static const CGFloat kStrengths[] = {0.62, 1.0, 1.45};// 0 stands for the whole screen, which is only known once the page has been laid out.@@ -49,7 +49,7 @@ static UIColor *unpacked(uint32_t rgb) {alpha:1];}-// Strength is the colour itself taken up or down rather than its alpha, so that Subtle stays as+// Strength is the color itself taken up or down rather than its alpha, so that Subtle stays as// saturated as Bold instead of washing out into the page behind it.static uint32_t strengthened(uint32_t rgb, CGFloat factor) {uint32_t out = 0;@@ -75,7 +75,7 @@ static uint32_t strengthened(uint32_t rgb, CGFloat factor) {return CAGradientLayer.class;}-// The page lays out on every scroll, so a pass that changes neither the colour nor how far it+// The page lays out on every scroll, so a pass that changes neither the color nor how far it// reaches leaves the layer alone.- (void)paintColor:(uint32_t)color span:(CGFloat)span {if (color == _color && span == _span) return;diff --git a/tweak/Sources/Native/Home/HomeSettings.m b/tweak/Sources/Native/Home/HomeSettings.mindex 1680a955..737a2bc3 100644--- a/tweak/Sources/Native/Home/HomeSettings.m+++ b/tweak/Sources/Native/Home/HomeSettings.m@@ -16,7 +16,7 @@ UIViewController *SGHomeGradientPage(void) {sections:@[SGSection(@"Gradient", @[SGOptionRow(@"Show", nil, SGKeyHomeGradient),- choiceRow(@"Colour", nil, SGHomeChoiceTint),+ choiceRow(@"Color", nil, SGHomeChoiceTint),choiceRow(@"Strength", nil, SGHomeChoiceStrength),choiceRow(@"Height", nil, SGHomeChoiceHeight),]),@@ -38,7 +38,7 @@ static UIViewController *libraryPage(void) {}UIViewController *SGHomeSettingsPage(void) {- // The row reads its own state out, so the section says which colour is set without being opened.+ // The row reads its own state out, so the section says which color is set without being opened.SGModRow *gradient = SGPageRow(@"Gradient", ^UIViewController *{ return SGHomeGradientPage(); });gradient.value = ^NSString *{if (!SGFlag(SGKeyHomeGradient, NO)) return @"Off";diff --git a/tweak/Sources/Native/LocalFiles/LocalLyricsPage.m b/tweak/Sources/Native/LocalFiles/LocalLyricsPage.mindex 15bd844d..dbecdde5 100644--- a/tweak/Sources/Native/LocalFiles/LocalLyricsPage.m+++ b/tweak/Sources/Native/LocalFiles/LocalLyricsPage.m@@ -1,5 +1,5 @@// The lyrics page for a local file in the native look (LocalLyrics.h): the title and the artist, then-// the lines on black, the one being sung white and a little larger, the rest grey, scrolled to keep it+// the lines on black, the one being sung white and a little larger, the rest gray, scrolled to keep it// in the middle. Read four times a second from the player's state, which is plenty for lines; the clock// stops when the page goes. A new track while it is open brings its lines, or says it has none.#import "Core/SGCore.h"@@ -10,7 +10,7 @@static const NSTimeInterval kTick = 0.25;static const CGFloat kSide = 24;-// The line being sung grows this much; the rest are dimmed to grey, #808080 on black, 5.3:1.+// The line being sung grows this much; the rest are dimmed to gray, #808080 on black, 5.3:1.static const CGFloat kCurrentScale = 1.06, kOtherAlpha = 0.5;@interface SGLocalLyricsViewer : UIViewControllerdiff --git a/tweak/Sources/Native/Lyrics/LyricsPage.x b/tweak/Sources/Native/Lyrics/LyricsPage.xindex a544e9ca..c93e6153 100644--- a/tweak/Sources/Native/Lyrics/LyricsPage.x+++ b/tweak/Sources/Native/Lyrics/LyricsPage.x@@ -4,9 +4,9 @@// Page (trees/lyrics.txt): a page of its own, presented over the player by a// _UIOverFullscreenPresentationController, which is why the card's glass stops at the card's edge.// Tome_PageTemplateImpl paints the template view #121212 and FullscreenView paints itself the-// album colour on top, both opaque; clearing them lets the player's blurred artwork through.+// album color on top, both opaque; clearing them lets the player's blurred artwork through.//-// The album colour is the stubborn one: it arrives per track, after the page has laid out, and it+// The album color is the stubborn one: it arrives per track, after the page has laid out, and it// comes back through a path Native/Appearance/Repaint.x never sees, so a sweep at layout time loses the race.// FullscreenView is asked not to keep it at all instead. The pane goes inside FullscreenView, in// front of whatever that view still fills itself with, rather than behind the whole page.@@ -33,7 +33,7 @@ static UIView *clearAncestors(UIView *view) {}%hook _TtC32Lyrics_FullscreenElementPageImpl14FullscreenView-// A colour kept here is re-applied whenever UIKit feels like it, so it is refused outright.+// A color kept here is re-applied whenever UIKit feels like it, so it is refused outright.- (void)setBackgroundColor:(UIColor *)color {static dispatch_once_t once;dispatch_once(&once, ^{ SGLog(@"lyrics page paints itself %@ through UIView", color); });diff --git a/tweak/Sources/Native/Navbar/Navbar.x b/tweak/Sources/Native/Navbar/Navbar.xindex cda157e8..fb1b05d9 100644--- a/tweak/Sources/Native/Navbar/Navbar.x+++ b/tweak/Sources/Native/Navbar/Navbar.x@@ -28,7 +28,7 @@ static char kCustomKey, kOrderKey;static const CGFloat kSplitGap = 10;// Where Spotify's own items keep their icon and label, read off one of them every pass, so an item of-// the mod's own sits on the same line as its neighbours.+// the mod's own sits on the same line as its neighbors.static CGRect sg_iconBox = {{0, kIconTop}, {kIconSize, kIconSize}};static CGRect sg_labelBox = {{0, kLabelTop}, {0, kLabelHeight}};@@ -89,8 +89,8 @@ static UIView *iconView(NSDictionary *entry) {[self addSubview:_icon];}-// Both boxes come off a neighbour, so whatever Spotify does to the row's line-up is copied rather than-// guessed at; only the horizontal centring is the item's own.+// Both boxes come off a neighbor, so whatever Spotify does to the row's line-up is copied rather than+// guessed at; only the horizontal centering is the item's own.- (void)layoutSubviews {[super layoutSubviews];CGFloat width = self.bounds.size.width;@@ -240,8 +240,8 @@ void SGComposeTabBar(UIView *tabBar) {}// Spotify placed the icon and the label for the width it measured (trees/test5.txt: x 28 in a-// 134pt slot, the centre of the 80pt it had with five tabs) and lays the item out no further-// once the slot changes. Assigning the centres back sends them through the hooks below.+// 134pt slot, the center of the 80pt it had with five tabs) and lays the item out no further+// once the slot changes. Assigning the centers back sends them through the hooks below.static void centreContents(UIView *item) {SGForEachView(item, ^(UIView *v) {if ([v isKindOfClass:%c(SPTEncoreIconView)] || [v isKindOfClass:%c(SPTEncoreLabel)]) v.center = v.center;@@ -278,7 +278,7 @@ static void placeRow(UIStackView *stack) {// Spotify's element layout places the icon and the label from the width it measured, not from// the slot above (trees/test5.txt: x 38 in a 134pt element in a 126pt slot), and a view placed by// its parent gets no layout pass of its own. So the placement itself is bent: on the bar, whatever-// x Spotify sets, the view lands centred on its slot.+// x Spotify sets, the view lands centered on its slot.static CGFloat slotCentreX(UIView *view) {UIStackView *row = sg_row;if (!row) return NAN;diff --git a/tweak/Sources/Native/Player/LyricsCard.x b/tweak/Sources/Native/Player/LyricsCard.xindex 8e196b80..d35c79f2 100644--- a/tweak/Sources/Native/Player/LyricsCard.x+++ b/tweak/Sources/Native/Player/LyricsCard.x@@ -29,7 +29,7 @@ static UIView *cellAround(UIView *view) {UIView *cell = cellAround((UIView *)self);// A card PlayerDeclutter.x collapsed reports no height; leave it alone.if (!cell || cell.bounds.size.height < 40) return;- // Spotify repaints the card with the album colour when the track changes, which is no layout+ // Spotify repaints the card with the album color when the track changes, which is no layout// pass of its own; Native/Appearance/Repaint.x keeps it clear in between.sg_lyricsCardRoot = cell;SGStripBackgrounds(cell);diff --git a/tweak/Sources/Native/Player/Player.x b/tweak/Sources/Native/Player/Player.xindex cb2d2462..42178614 100644--- a/tweak/Sources/Native/Player/Player.x+++ b/tweak/Sources/Native/Player/Player.x@@ -1,4 +1,4 @@-// Full screen player: glass where Liquid Glass belongs and nowhere else, and the album colour+// Full screen player: glass where Liquid Glass belongs and nowhere else, and the album color// behind it traded for the cover art.//// Glass is the navigation layer floating over content, so only the header's two round buttons get@@ -11,10 +11,10 @@// Tree (trees/now-playing.txt): NowPlaying_ModesImpl units, each a child controller whose view// holds one UIStackView row; the header row is chevron 48x48, playlist name 110x48, more 48x48.//-// The background is one plane the size of the screen painted the album colour, Spotify's gradients+// The background is one plane the size of the screen painted the album color, Spotify's gradients// on top of it, and it is NPVBackgroundViewController's own view. Glass over a flat fill samples// that same flat fill back, which is why the header panes cannot be made out on it; white text and-// Spotify's green both sit badly on saturated colour as well. SGKeyPlayerBackdrop strips the plane+// Spotify's green both sit badly on saturated color as well. SGKeyPlayerBackdrop strips the plane// and puts the cover behind the player instead, shrunk until none of the picture is left in it,// blurred, under a scrim ending near black so the cards scrolled up from below meet it. The switch// covers what that field changes around it too: the artwork takes corners and a shadow so it sitsdiff --git a/tweak/Sources/Native/Player/PlayerDeclutter.x b/tweak/Sources/Native/Player/PlayerDeclutter.xindex a0172325..b2229e41 100644--- a/tweak/Sources/Native/Player/PlayerDeclutter.x+++ b/tweak/Sources/Native/Player/PlayerDeclutter.x@@ -1,7 +1,7 @@// Player declutter: hides parts of the full screen player, one switch each on the Player page. Cards// under the player are Element_List cells; a hidden one reports zero height when the list sizes it,// so the list closes up around it (the 24pt gap between cards stays). Player buttons go invisible but-// keep their place, so their row stays centred. A hidden lyric preview gives its room to the cover.+// keep their place, so their row stays centered. A hidden lyric preview gives its room to the cover.//// Trees (trees/now-playing*.txt): every card is a CollectionViewCell whose content view names the// page (NowPlaying_ScrollAPI) and whose subtree names the card. Player rows are the UIStackView of each NowPlaying_ModesImpl unit: playback controls@@ -147,8 +147,8 @@ static void finish(UIViewController *unit, BOOL changed) {// The bar's cover has a tilt view of its own, 40pt; the player's is about 354.static const CGFloat kCoverMinWidth = 200;-// The tilt view takes the largest square of the plain view it sits in with the preview, centred on whole-// points, the way the Music app's cover fills its square. Bounds and a centre, not a frame, since the tilt+// The tilt view takes the largest square of the plain view it sits in with the preview, centered on whole+// points, the way the Music app's cover fills its square. Bounds and a center, not a frame, since the tilt// view carries Spotify's tilt while the cover is inspected. A square under kCoverMinWidth is left alone.static void fillRoom(UIView *tilt) {CGRect room = tilt.superview.bounds;diff --git a/tweak/Sources/Native/Playlist/Playlist.x b/tweak/Sources/Native/Playlist/Playlist.xindex d9f7a259..7c7ff266 100644--- a/tweak/Sources/Native/Playlist/Playlist.x+++ b/tweak/Sources/Native/Playlist/Playlist.x@@ -139,7 +139,7 @@ static void collapseCover(UIViewController *headerVC, UIView *layout, UIView *costatic char kBackdropKey, kSourceKey;-// The cover blurred behind the header in place of Spotify's colour wash. The header's background+// The cover blurred behind the header in place of Spotify's color wash. The header's background// (trees/test6.txt) is a HeaderView under _backgroundViewContainer holding the wash, then a black// view that fades in as the page scrolls; the backdrop goes between them so the scroll still darkens// it, and its scrim ends in the black of the rows below. No cover, no backdrop: the wash stays.diff --git a/tweak/Sources/Redesigned/Album/Album.h b/tweak/Sources/Redesigned/Album/Album.hindex bdb44c7a..f3419e6c 100644--- a/tweak/Sources/Redesigned/Album/Album.h+++ b/tweak/Sources/Redesigned/Album/Album.h@@ -54,13 +54,13 @@ UIView *SGRAlbumPageOf(UIView *view);// AlbumField.x. The field belongs to the page `view` is on, found by walking up from it, so two album pages// on the navigation stack keep a field each.//-// The colour the page's field is showing, SGRNeutralField() before one has been read: what the header's+// The color the page's field is showing, SGRNeutralField() before one has been read: what the header's// cover has to dissolve into for there to be no seam.UIColor *SGRAlbumFieldColor(UIView *view);-// The cover of the page `view` is on, for its field to take its colour from. The same image again is a no-op.+// The cover of the page `view` is on, for its field to take its color from. The same image again is a no-op.void SGRAlbumSetArtwork(UIView *view, UIImage *image);-// The colour Spotify picked for the album, read off the wash it paints behind the header: the field shows it-// until the cover's own main colour has been read, and not after.+// The color Spotify picked for the album, read off the wash it paints behind the header: the field shows it+// until the cover's own main color has been read, and not after.void SGRAlbumSetSpotifyColor(UIView *view, UIColor *color);// The page comes in whole once its cover has been read (Kit/SGRField.h). Called from the album header's pass// only, so a podcast's episode page, the same template with no cover for the field to read, is never held.diff --git a/tweak/Sources/Redesigned/Album/AlbumField.x b/tweak/Sources/Redesigned/Album/AlbumField.xindex 759cd323..6f171091 100644--- a/tweak/Sources/Redesigned/Album/AlbumField.x+++ b/tweak/Sources/Redesigned/Album/AlbumField.x@@ -1,23 +1,23 @@// Album redesign: the artwork field behind the whole page, and what the switch forces.//// Tree (trees/clean/album/01.txt:22). The page is CreativeWorkPlatform.CreativeWorkTemplateView, and it-// holds, in this order: the header's colour wash (a LegacyUI HeaderView the height of the header, with+// holds, in this order: the header's color wash (a LegacyUI HeaderView the height of the header, with// Spotify's GradientView in it), CreativeWorkPlatform.Tab with the scrolling list inside it, the sticky// HeaderNavigationBar, and the two controls Spotify floats over the page, shuffle and play. Nothing of it// scrolls except what is inside the Tab, so a field put behind the lot stays still while the cover at the-// top of the header slides up over it -- which is what the Music app does with the page colour.+// top of the header slides up over it -- which is what the Music app does with the page color.//// So the field is the page's bottom-most view, the size of the view and bleeding past it, with no backdrop// of its own: the sharp cover at the top of the header is the picture, and AlbumHeader.x fades it into-// exactly this field's colour, and conceals Spotify's wash so the field is what shows. What Spotify paints+// exactly this field's color, and conceals Spotify's wash so the field is what shows. What Spotify paints// over the field -- the list and every row, all of them the base surface -- is kept clear by the Kit's// repaint hook while sgr_albumRoot is this page, and by the list's own pass below, which paints itself// rather than through a layer the repaint hook would hear about.//-// The colour is the cover's main colour, as the playlist's and the artist's are. Read off the bottom edge-// it was a scanned cover's pale border, which turned the field grey where the cover is blue (device,-// 2026-09-18); for a while Spotify's own colour, read off the wash it paints behind the header, won over-// it for that reason. That colour is now only what shows until the cover has been read (AlbumHeader.x+// The color is the cover's main color, as the playlist's and the artist's are. Read off the bottom edge+// it was a scanned cover's pale border, which turned the field gray where the cover is blue (device,+// 2026-09-18); for a while Spotify's own color, read off the wash it paints behind the header, won over+// it for that reason. That color is now only what shows until the cover has been read (AlbumHeader.x// hands it over as it conceals the wash), and before either the field is the neutral one.//// The page is the album's by its identifier, which is how Native/Album/Album.x has told it apart since it@@ -128,7 +128,7 @@ static SGRArtworkField *fieldIn(UIView *page) {// An album card of a discovery section switched back on (More by, You might also like) paints the base surface// behind its caption, a black box on the field. Only the card's own paint goes: its artwork, badges and-// placeholder are views of their own. Spotify paints it before the card is attached, so no colour hook hears it;+// placeholder are views of their own. Spotify paints it before the card is attached, so no color hook hears it;// it is cleared on the pass of the cell it is in, which a card has to itself when it is reused.static void clearCards(UIView *cell) {SGForEachView(cell, ^(UIView *v) {diff --git a/tweak/Sources/Redesigned/Album/AlbumHeader.x b/tweak/Sources/Redesigned/Album/AlbumHeader.xindex 897ac5cf..b0d91c9f 100644--- a/tweak/Sources/Redesigned/Album/AlbumHeader.x+++ b/tweak/Sources/Redesigned/Album/AlbumHeader.x@@ -1,6 +1,6 @@// Album redesign: the header the Music app gives an album (iOS 26.4), the same one the playlist redesign// gives a playlist. The cover runs full bleed across the top of the page and dissolves into the page's-// colour; the title, the artist and the kind and date are centred on the bottom of that dissolve; and under+// color; the title, the artist and the kind and date are centered on the bottom of that dissolve; and under// them one row -- shuffle, a white Play capsule, and add.//// Tree (trees/clean/album/01.txt:39-152). The header is one element of the page's scrolling stack,@@ -114,11 +114,11 @@ static void watch(UIView *view, const void *key, void (^laidOut)(UIView *view))// The picture across the top of the page with the field showing through the bottom of it. Two gradients// rather than a mask or a blur: a scrim over the top for the status bar, and under it a fade from the-// picture to the very colour the page's field is drawing, so the two meet with nothing to see.+// picture to the very color the page's field is drawing, so the two meet with nothing to see.@interface SGRAlbumHero : UIView@property (nonatomic, readonly) UIImageView *picture;@property (nonatomic, copy) UIColor *fieldColor;-// The cover in Spotify's artwork view, and every cover it puts there afterwards: the hero keeps itself+// The cover in Spotify's artwork view, and every cover it puts there afterward: the hero keeps itself// right, rather than being handed a picture on each of the header's passes and staying empty between them.- (void)followCover:(UIImageView *)source;// Apple Music's animated cover over the picture, where the album has one. The same album again is a no-op.@@ -157,7 +157,7 @@ static void *kReadyContext = &kReadyContext;_dissolve.zPosition = 2;[self.layer addSublayer:_dissolve];self.fieldColor = SGRNeutralField();- // The colour is read off the main thread, so it can land after the last layout pass of the page.+ // The color is read off the main thread, so it can land after the last layout pass of the page.NSNotificationCenter *center = NSNotificationCenter.defaultCenter;[center addObserver:self selector:@selector(sgr_fieldColorDidChange) name:SGRFieldColorDidChangeNotification object:nil];for (NSNotificationName name in @[UIApplicationDidBecomeActiveNotification, UIApplicationWillResignActiveNotification,@@ -180,8 +180,8 @@ static void *kReadyContext = &kReadyContext;- (void)setFieldColor:(UIColor *)color {if (!color || [_fieldColor isEqual:color]) return;_fieldColor = [color copy];- // The clear end is the same colour with no alpha rather than +clearColor, so the fade keeps its hue- // instead of going through grey.+ // The clear end is the same color with no alpha rather than +clearColor, so the fade keeps its hue+ // instead of going through gray.[CATransaction begin];[CATransaction setDisableActions:YES];_dissolve.colors = @[(id)[color colorWithAlphaComponent:0].CGColor,@@ -306,7 +306,7 @@ static void *kReadyContext = &kReadyContext;UIImage *image = source.image;if (!image || source.bounds.size.width < kMinCover || _picture.image == image) return;_picture.image = image;- // The page's field takes its colour from the same picture.+ // The page's field takes its color from the same picture.SGRAlbumSetArtwork(self, image);static BOOL logged;if (late && !logged) {@@ -332,7 +332,7 @@ static UIImageView *coverImageIn(UIView *cover) {}// The picture runs from the top of the header down past where its text begins, so the title and the artist-// sit on the bottom of its dissolve; below that the page's field is already drawing the very colour the+// sit on the bottom of its dissolve; below that the page's field is already drawing the very color the// picture dissolves into, so there is no seam to see.//// `bottom` is taken from the header at rest, never from where it is mid scroll, and only ever grows: a header@@ -484,9 +484,9 @@ static void maskOut(UIView *view) {view.accessibilityElementsHidden = YES;}-// The colour Spotify painted the wash in: the first opaque colour of the gradient layer it draws with,+// The color Spotify painted the wash in: the first opaque color of the gradient layer it draws with,// whether that is the view's own layer or one under it. nil when it draws some other way, or has-// no colour yet.+// no color yet.static UIColor *washColorOf(UIView *gradient) {NSMutableArray<CALayer *> *layers = [NSMutableArray arrayWithObject:gradient.layer];[layers addObjectsFromArray:gradient.layer.sublayers ?: @[]];@@ -495,7 +495,7 @@ static UIColor *washColorOf(UIView *gradient) {for (id value in ((CAGradientLayer *)layer).colors) {CGColorRef cg = (__bridge CGColorRef)value;if (CFGetTypeID(cg) != CGColorGetTypeID() || CGColorGetAlpha(cg) < 0.5) continue;- // The page's base surface is what a wash is before Spotify has a colour for it, not a colour.+ // The page's base surface is what a wash is before Spotify has a color for it, not a color.if (SGIsBaseSurface(cg)) return nil;return [UIColor colorWithCGColor:cg];}@@ -503,8 +503,8 @@ static UIColor *washColorOf(UIView *gradient) {return nil;}-// Spotify's colour wash behind the header goes, so the page's field shows through, and the colour it was-// painted in goes to the field, to show until the cover's own main colour has been read.+// Spotify's color wash behind the header goes, so the page's field shows through, and the color it was+// painted in goes to the field, to show until the cover's own main color has been read.//// The navigation bar's gradient goes too. Hidden at rest, it is shown as the page scrolls under the// title, and over the field it was a flat dark band across the top (device, 2026-09-18). What keeps the@@ -522,7 +522,7 @@ static void applyWash(UIView *page) {static BOOL logged;if (!logged) {logged = YES;- SGLog(@"redesign album: Spotify's wash %@ on %@, colour %@", NSStringFromClass(v.class),+ SGLog(@"redesign album: Spotify's wash %@ on %@, color %@", NSStringFromClass(v.class),NSStringFromClass(v.layer.class), color ?: @"not found");}SGRAlbumSetSpotifyColor(page, color);diff --git a/tweak/Sources/Redesigned/Album/AlbumRows.x b/tweak/Sources/Redesigned/Album/AlbumRows.xindex c1d9ccf9..21fe9e20 100644--- a/tweak/Sources/Redesigned/Album/AlbumRows.x+++ b/tweak/Sources/Redesigned/Album/AlbumRows.x@@ -9,7 +9,7 @@// where the text starts.//// The row's paint is cleared here rather than left to the Kit's repaint hook, which only hears about a-// colour when Spotify sets it and not when a reused cell already carries one.+// color when Spotify sets it and not when a reused cell already carries one.//// Spotify's type and its spacing are left alone: the row is 56pt for a title of 13pt, and a larger font of// the Kit's would be cut off by the box the element framework measured for it.@@ -97,7 +97,7 @@ static UILabel *onlyLabel(UIView *view) {return count == 1 ? found : nil;}-// The badge as it draws, rendered the moment before it goes: an unplayable row's is greyed, so it is not cached.+// The badge as it draws, rendered the moment before it goes: an unplayable row's is grayed, so it is not cached.static UIImage *pictureOf(UIView *badge) {UIGraphicsImageRendererFormat *format = [UIGraphicsImageRendererFormat formatForTraitCollection:badge.traitCollection];UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:badge.bounds.size format:format];diff --git a/tweak/Sources/Redesigned/Artist/Artist.h b/tweak/Sources/Redesigned/Artist/Artist.hindex aa033a8c..332f8dd9 100644--- a/tweak/Sources/Redesigned/Artist/Artist.h+++ b/tweak/Sources/Redesigned/Artist/Artist.h@@ -27,9 +27,9 @@ UIView *SGRArtistPageOf(UIView *view);// ArtistField.x. The field belongs to the page `view` is on.//-// The colour the page's field is showing, SGRNeutralField() before one has been read.+// The color the page's field is showing, SGRNeutralField() before one has been read.UIColor *SGRArtistFieldColor(UIView *view);-// The artist's photo, for the page's field to take its colour from. The same image again is a no-op.+// The artist's photo, for the page's field to take its color from. The same image again is a no-op.void SGRArtistSetArtwork(UIView *view, UIImage *image);// ArtistFollow.x. YES once Spotify's collection has said whether the user follows the page's artist, withdiff --git a/tweak/Sources/Redesigned/Artist/ArtistField.x b/tweak/Sources/Redesigned/Artist/ArtistField.xindex cacb2da3..68d5c32a 100644--- a/tweak/Sources/Redesigned/Artist/ArtistField.x+++ b/tweak/Sources/Redesigned/Artist/ArtistField.x@@ -57,7 +57,7 @@ static SGRArtworkField *fieldIn(UIView *page) {if (field) return field;field = [[SGRArtworkField alloc] initWithFrame:page.bounds];field.bleed = kBleed;- // The photo's main colour, not its bottom edge, which on a portrait is the artist's shirt.+ // The photo's main color, not its bottom edge, which on a portrait is the artist's shirt.field.mainColor = YES;objc_setAssociatedObject(page, &kFieldKey, field, OBJC_ASSOCIATION_RETAIN_NONATOMIC);SGLog(@"redesign artist: field on the page %.0fx%.0f", page.bounds.size.width, page.bounds.size.height);diff --git a/tweak/Sources/Redesigned/Artist/ArtistHeader.x b/tweak/Sources/Redesigned/Artist/ArtistHeader.xindex 11141cd1..7ccdddea 100644--- a/tweak/Sources/Redesigned/Artist/ArtistHeader.x+++ b/tweak/Sources/Redesigned/Artist/ArtistHeader.x@@ -1,5 +1,5 @@// Artist redesign: the header the playlist and album pages have. The photo runs full bleed across the top-// of the page and dissolves into the page's colour; the name and the monthly listeners are centred on the+// of the page and dissolves into the page's color; the name and the monthly listeners are centered on the// bottom of that dissolve; and under them one row -- shuffle, a white Play capsule, and Follow.//// Tree (trees/clean/artist/01.txt:37-170). The header is TemplateKit's HeaderContainer, 568pt, the first view@@ -101,11 +101,11 @@ static UIView *containerOf(UIView *header) {#pragma mark - the photo, full bleed// The picture across the top of the page with the field showing through the bottom of it: a scrim over the-// top for the status bar, and under it a fade to the very colour the page's field is drawing.+// top for the status bar, and under it a fade to the very color the page's field is drawing.@interface SGRArtistHero : UIView@property (nonatomic, readonly) UIImageView *picture;@property (nonatomic, copy) UIColor *fieldColor;-// The photo in Spotify's artwork view, and every photo it puts there afterwards: the hero keeps itself+// The photo in Spotify's artwork view, and every photo it puts there afterward: the hero keeps itself// right, rather than being handed a picture on each of the header's passes and staying empty between them.// The same view again only re-reads it.- (void)followArtwork:(UIImageView *)source;@@ -137,7 +137,7 @@ static UIView *containerOf(UIView *header) {_dissolve.zPosition = 2;[self.layer addSublayer:_dissolve];self.fieldColor = SGRNeutralField();- // The colour is read off the main thread, so it can land after the last layout pass of the page.+ // The color is read off the main thread, so it can land after the last layout pass of the page.[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(sgr_fieldColorDidChange)name:SGRFieldColorDidChangeNotification object:nil];return self;@@ -154,7 +154,7 @@ static UIView *containerOf(UIView *header) {- (void)setFieldColor:(UIColor *)color {if (!color || [_fieldColor isEqual:color]) return;_fieldColor = [color copy];- // The clear end is the same colour with no alpha, so the fade keeps its hue instead of going through grey.+ // The clear end is the same color with no alpha, so the fade keeps its hue instead of going through gray.[CATransaction begin];[CATransaction setDisableActions:YES];_dissolve.colors = @[(id)[color colorWithAlphaComponent:0].CGColor,@@ -191,7 +191,7 @@ static UIView *containerOf(UIView *header) {UIImage *image = source.image;if (!image || _picture.image == image) return;_picture.image = image;- // The page's field takes its colour from the same picture.+ // The page's field takes its color from the same picture.SGRArtistSetArtwork(self, image);static BOOL logged;if (late && !logged) {diff --git a/tweak/Sources/Redesigned/ContextMenu/ContextMenu.x b/tweak/Sources/Redesigned/ContextMenu/ContextMenu.xindex 4b3d3a3d..6bd5c169 100644--- a/tweak/Sources/Redesigned/ContextMenu/ContextMenu.x+++ b/tweak/Sources/Redesigned/ContextMenu/ContextMenu.x@@ -134,7 +134,7 @@ static NSString *identifierIn(UIView *root) {return found;}-// The row's glyph as a template, for the menu to draw in its own colour: an image view's picture, else the+// The row's glyph as a template, for the menu to draw in its own color: an image view's picture, else the// small view at the row's leading edge drawn into one (Encore draws its icons into a view of its own,// Redesigned/Playlist/PlaylistMenu.x).static UIImage *glyphIn(UIView *root) {@@ -160,7 +160,7 @@ static UIImage *glyphIn(UIView *root) {return [picture imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];}-// Spotify greys a row out (lyrics for a track no source has them for) rather than leaving it out.+// Spotify grays a row out (lyrics for a track no source has them for) rather than leaving it out.static BOOL rowEnabled(UITableView *table, NSIndexPath *path, UITableViewCell *cell, UILabel *title) {if (!cell.userInteractionEnabled) return NO;id<UITableViewDelegate> delegate = table.delegate;@@ -322,7 +322,7 @@ static UIMenu *inlineGroup(NSArray<UIMenuElement *> *children) {// completion never ran), so every pick and close waited out a 3 s limit with the hidden sheet over the// player. The pick fires a turn later, which the sheet takes while the menu is still fading.[session menuEnded];- // The player's ⋯ is pressed for as long as its menu is up (the touch that opened it was cancelled at once,+ // The player's ⋯ is pressed for as long as its menu is up (the touch that opened it was canceled at once,// as the menu came): its targets for the press (PlayerHeader.x's circle) are told now that it is let go.if ([self isKindOfClass:SGRMenuFront.class]) [self sendActionsForControlEvents:UIControlEventTouchUpOutside];}@@ -353,7 +353,7 @@ static UIMenu *inlineGroup(NSArray<UIMenuElement *> *children) {}// UIKit cancels the touch as the menu comes up, and the press holds until the menu ends (willEndForConfiguration:).-// A touch cancelled with no menu up is a touch let go.+// A touch canceled with no menu up is a touch let go.- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {[super touchesCancelled:touches withEvent:event];if (!self.session) [self sendActionsForControlEvents:UIControlEventTouchUpOutside];@@ -765,7 +765,7 @@ static NSString *storedKey(NSString *kind) {}];if (row && !row.enabled) action.attributes = UIMenuElementAttributesDisabled;[actions addObject:action];- [shown appendFormat:@"%@%@; ", quick, row && !row.enabled ? @" (greyed out)" : @""];+ [shown appendFormat:@"%@%@; ", quick, row && !row.enabled ? @" (grayed out)" : @""];}_quickShown = shown;if (!actions.count) return nil;diff --git a/tweak/Sources/Redesigned/Home/HomeTiles.m b/tweak/Sources/Redesigned/Home/HomeTiles.mindex c0227995..fe60f5b4 100644--- a/tweak/Sources/Redesigned/Home/HomeTiles.m+++ b/tweak/Sources/Redesigned/Home/HomeTiles.m@@ -1,6 +1,6 @@// Home redesign: a shortcut tile the way an Apple list row holds artwork. The cover sits inset from the tile's-// edges with its own corners, the title follows it in, and the tile is a dark surface tinted faintly towards the-// cover's dominant colour (Kit/SGRPalette.h, +tintForImage:), so the grid is not one grey and white text always+// edges with its own corners, the title follows it in, and the tile is a dark surface tinted faintly toward the+// cover's dominant color (Kit/SGRPalette.h, +tintForImage:), so the grid is not one gray and white text always// reads. Until the cover has loaded, the tile is the untinted surface.//// The surface sits behind Spotify's stack, over the tile's own fill, so the title, the playing indicator and@@ -72,7 +72,7 @@ static UIView *surfaceIn(UIView *tile, UIView *fill) {return surface;}-// The square scaled about its centre so it clears the tile's edges by kInset, and everything after it in the+// The square scaled about its center so it clears the tile's edges by kInset, and everything after it in the// row moved in by what that took off its trailing side.static void inset(UIView *square) {CGFloat side = square.bounds.size.height;diff --git a/tweak/Sources/Redesigned/Kit/SGRAccent.h b/tweak/Sources/Redesigned/Kit/SGRAccent.hindex 42b058ee..0981caf5 100644--- a/tweak/Sources/Redesigned/Kit/SGRAccent.h+++ b/tweak/Sources/Redesigned/Kit/SGRAccent.h@@ -1,15 +1,15 @@-// The redesign's accent colour in place of Spotify's green (SGRAccent.x), chosen apart from the native+// The redesign's accent color in place of Spotify's green (SGRAccent.x), chosen apart from the native// look's and stored under its own key; unset is #37F200, negative keeps Spotify's own green.#import <UIKit/UIKit.h>#define SGRKeyAccent @"spotifyglass.redesign.accent" // 0xRRGGBB-// The last colour picked, kept while a preset is in place so Custom brings it back.+// The last color picked, kept while a preset is in place so Custom brings it back.#define SGRKeyAccentCustom @"spotifyglass.redesign.accent.custom"// The redesign's own green until another is picked; Spotify's is a pick of its own, stored as -1.#define SGRDefaultAccent 0x37F200UIColor *SGRAccentColor(void); // nil while Spotify's own green is kept-NSInteger SGRAccentRGB(void); // the colour in effect, 0xRRGGBB, Spotify's green included+NSInteger SGRAccentRGB(void); // the color in effect, 0xRRGGBB, Spotify's green included@class SGModRow;-NSArray<SGModRow *> *SGRAppearanceRows(void); // the accent colour, for the Appearance page+NSArray<SGModRow *> *SGRAppearanceRows(void); // the accent color, for the Appearance pagediff --git a/tweak/Sources/Redesigned/Kit/SGRAccent.x b/tweak/Sources/Redesigned/Kit/SGRAccent.xindex 0b29f78d..6f169f2d 100644--- a/tweak/Sources/Redesigned/Kit/SGRAccent.x+++ b/tweak/Sources/Redesigned/Kit/SGRAccent.x@@ -1,8 +1,8 @@-// The redesign's accent colour, chosen apart from the native look's: its copy of Native/Appearance/Accent.x.-// Accent colour: Spotify's green, #1ED760, is one token. Its three components occur once in the+// The redesign's accent color, chosen apart from the native look's: its copy of Native/Appearance/Accent.x.+// Accent color: Spotify's green, #1ED760, is one token. Its three components occur once in the// whole binary, and every green the app draws, from the play button to the "Zobrazit vše" links// and the progress bar, is that token or a state blended from it. So it is swapped where it is-// born, in the UIColor initialiser, and the blends follow. Lottie animations carry their own green+// born, in the UIColor initializer, and the blends follow. Lottie animations carry their own green// and are caught at the layer, below. Image assets with green baked in, the logo above all, are// out of reach.#import "Core/SGCore.h"@@ -67,10 +67,10 @@ static BOOL swap(CGFloat *r, CGFloat *g, CGFloat *b) {}%end-// Lottie draws its animations, the play indicator and the checkmarks among them, from colours-// in the animation file straight onto shape layers, or into colour keyframes, never through+// Lottie draws its animations, the play indicator and the checkmarks among them, from colors+// in the animation file straight onto shape layers, or into color keyframes, never through// UIColor. The same swap goes on the CGColor. Layers get set off the main thread too, so the-// copy is made with CoreGraphics alone; NULL when the colour is not one of the greens.+// copy is made with CoreGraphics alone; NULL when the color is not one of the greens.static CGColorRef swappedCopy(CGColorRef color) {if (!color || CFGetTypeID(color) != CGColorGetTypeID() || CGColorGetNumberOfComponents(color) != 4) return NULL;const CGFloat *c = CGColorGetComponents(color);diff --git a/tweak/Sources/Redesigned/Kit/SGRActionRow.h b/tweak/Sources/Redesigned/Kit/SGRActionRow.hindex 25380bdc..8ec10598 100644--- a/tweak/Sources/Redesigned/Kit/SGRActionRow.h+++ b/tweak/Sources/Redesigned/Kit/SGRActionRow.h@@ -16,10 +16,10 @@@interface SGRPlayCapsule : UIControl// Spotify's play button, the one the capsule reads and fires. Set by -feedFrom:.@property (nonatomic, weak, readonly) UIView *source;-// A solid capsule of this colour instead of the prominent glass, the Music app's white Play (the playlist).+// A solid capsule of this color instead of the prominent glass, the Music app's white Play (the playlist).// nil, the default, is the glass. Set before the capsule is first laid out.@property (nonatomic, copy) UIColor *fillColor;-// The glyph's and the word's colour; nil is the accent.+// The glyph's and the word's color; nil is the accent.@property (nonatomic, copy) UIColor *contentColor;// Takes the glyph, the word and the language from `source`, and follows the glyph as Spotify swaps it// (play becoming pause) without the header laying out again. Cheap to call again on every pass.@@ -34,24 +34,24 @@@property (nonatomic, weak, readonly) UIView *source;// Drawn, in white, when Spotify's button has no image view to copy (a glyph it draws itself).@property (nonatomic, strong) UIImage *fallbackGlyph;-// The colour to draw the mirrored glyph in, whatever colour Spotify drew it. nil, the default, keeps-// Spotify's -- which is what a glyph that says something by its colour needs (shuffle turns the accent-// colour while it is on). Set it for a glyph whose colour is only the weight Spotify gave the control it-// sat in: Encore bakes the colour into the image it draws, so this re-renders the copy as a template.+// The color to draw the mirrored glyph in, whatever color Spotify drew it. nil, the default, keeps+// Spotify's -- which is what a glyph that says something by its color needs (shuffle turns the accent+// color while it is on). Set it for a glyph whose color is only the weight Spotify gave the control it+// sat in: Encore bakes the color into the image it draws, so this re-renders the copy as a template.@property (nonatomic, copy) UIColor *glyphColor;-// The colour the glyph takes while Spotify's button is on, and glyphColor while it is off, for a button that+// The color the glyph takes while Spotify's button is on, and glyphColor while it is off, for a button that// says it is on with the small dot Encore puts under its glyph (shuffle: trees/continuous/1.txt, a 4pt round-// view, hidden while off). Spotify's own off grey read as a disabled button beside the white download-// (issue #65). A button with no such dot keeps Spotify's colours. nil, the default, reads no dot.+// view, hidden while off). Spotify's own off gray read as a disabled button beside the white download+// (issue #65). A button with no such dot keeps Spotify's colors. nil, the default, reads no dot.@property (nonatomic, copy) UIColor *onGlyphColor;// For a button that shows its state only as a word in the app's language (the artist's Follow): YES with// whether it is on once the state is known, from wherever the page reads it. The button then draws-// stateOffSymbol, or stateOnSymbol in the accent colour, and nothing while it answers NO. Set before the+// stateOffSymbol, or stateOnSymbol in the accent color, and nothing while it answers NO. Set before the// first -feedFrom:; call -feedFrom: again when the state changes.@property (nonatomic, copy) BOOL (^readState)(BOOL *on);@property (nonatomic, copy) NSString *stateOffSymbol;@property (nonatomic, copy) NSString *stateOnSymbol;-// Takes the glyph, its colour and the label from `source`, and follows the glyph as Spotify swaps it+// Takes the glyph, its color and the label from `source`, and follows the glyph as Spotify swaps it// (shuffle turning on). Cheap to call again on every pass.//// Spotify's download button (SGRDownload.h) is drawn by Lottie, with nothing to copy: for it the buttondiff --git a/tweak/Sources/Redesigned/Kit/SGRActionRow.m b/tweak/Sources/Redesigned/Kit/SGRActionRow.mindex d87e466d..10f028b4 100644--- a/tweak/Sources/Redesigned/Kit/SGRActionRow.m+++ b/tweak/Sources/Redesigned/Kit/SGRActionRow.m@@ -3,7 +3,7 @@// Both are drawn from what Spotify's own button shows, and neither keeps state of its own. The glyph is// looked for past what is hidden behind it -- a play button's glow ring is a hidden view holding an image// of its own, and taken for the glyph it put a soft green ring in the capsule (device, 2026-09-17) -- and-// it is watched afterwards, because Spotify swaps play for pause without laying the header out again.+// it is watched afterward, because Spotify swaps play for pause without laying the header out again.#import "Core/SGCore.h"#import "SGRActionRow.h"#import "SGRGlass.h"@@ -264,7 +264,7 @@ static BOOL indicatorOn(UIView *button, BOOL *found) {return YES;}-// Draws `offSymbol`, or `onSymbol` in the accent colour, switching between them in place.+// Draws `offSymbol`, or `onSymbol` in the accent color, switching between them in place.- (void)sgr_showOn:(BOOL)on off:(NSString *)offSymbol on:(NSString *)onSymbol source:(UIView *)source {if (_stateShown != on) {UIImage *image = [UIImage systemImageNamed:on ? onSymbol : offSymbol];@@ -279,7 +279,7 @@ static BOOL indicatorOn(UIView *button, BOOL *found) {} else {_glyph.image = image;}- // On is saved or followed, in the accent colour, as downloaded is.+ // On is saved or followed, in the accent color, as downloaded is._glyph.tintColor = on ? SGRAccent() : SGRPrimary();if (first) [self setNeedsLayout];}@@ -321,8 +321,8 @@ static BOOL indicatorOn(UIView *button, BOOL *found) {_downloadTimer.tolerance = interval * 0.2;}-// The glyph is taken as Spotify drew it, colour and all: the shuffle button turns its own glyph the accent-// colour while shuffle is on, and a copy rendered as a template would lose that.+// The glyph is taken as Spotify drew it, color and all: the shuffle button turns its own glyph the accent+// color while shuffle is on, and a copy rendered as a template would lose that.- (void)feedFrom:(UIView *)source {if (!source) return;_source = source;@@ -346,8 +346,8 @@ static BOOL indicatorOn(UIView *button, BOOL *found) {UIImageView *glyph = glyphIn(source, 0);NSString *word = source.accessibilityLabel ?: wordIn(source);if (word && ![self.accessibilityLabel isEqualToString:word]) self.accessibilityLabel = word;- // A button that says "on" with its dot is drawn in our colours, on and off. One expected to have a dot- // and found without keeps Spotify's colours, which are then all that tells on from off.+ // A button that says "on" with its dot is drawn in our colors, on and off. One expected to have a dot+ // and found without keeps Spotify's colors, which are then all that tells on from off.BOOL hasDot = NO;BOOL on = self.onGlyphColor && indicatorOn(source, &hasDot);UIColor *ownColor = !self.onGlyphColor ? self.glyphColor@@ -362,7 +362,7 @@ static BOOL indicatorOn(UIView *button, BOOL *found) {}UIColor *tint = ownColor ?: (glyph ? glyph.tintColor : SGRPrimary());if (tint && ![_glyph.tintColor isEqual:tint]) {- // Turning on or off is a moment of its own: the colour fades across rather than jumping.+ // Turning on or off is a moment of its own: the color fades across rather than jumping.BOOL fade = self.window && _glyph.tintColor && hasDot;if (fade) {[UIView transitionWithView:_glyph duration:0.2 options:UIViewAnimationOptionTransitionCrossDissolve@@ -454,7 +454,7 @@ SGRMirrorButton *SGRPinnedMore(UIView *page, const void *key, UIView *source) {if (!button) {button = [[SGRMirrorButton alloc] initWithFrame:CGRectZero];button.fallbackGlyph = [UIImage systemImageNamed:@"ellipsis"];- // ⋯ sits in an Encore Tertiary button in Spotify's own row, which draws it grey; in the corner of+ // ⋯ sits in an Encore Tertiary button in Spotify's own row, which draws it gray; in the corner of// the page it is the one control there and reads white, like the back button opposite it.button.glyphColor = SGRPrimary();// Held by the button, which is held by the page, so the recorder lives exactly as long as both.diff --git a/tweak/Sources/Redesigned/Kit/SGRAmoled.x b/tweak/Sources/Redesigned/Kit/SGRAmoled.xindex f6696f36..cb469b96 100644--- a/tweak/Sources/Redesigned/Kit/SGRAmoled.x+++ b/tweak/Sources/Redesigned/Kit/SGRAmoled.x@@ -1,6 +1,6 @@// The redesign's AMOLED background, always on: its copy of Native/Appearance/Amoled.x without the switch.-// AMOLED background: Spotify paints its base surface #121212; with the switch on, that grey and-// the gradients fading into it go pure black. Lighter greys stay (#1F1F1F placeholders, #292929+// AMOLED background: Spotify paints its base surface #121212; with the switch on, that gray and+// the gradients fading into it go pure black. Lighter grays stay (#1F1F1F placeholders, #292929// cards), so elevated surfaces still read against the black.//// Trees: #121212 sits on the Home, Search, Library and settings scroll views, on list rows, the@@ -52,7 +52,7 @@ static CGColorRef copyBlack(CGColorRef color) {%end// Spotify's settings list paints nothing of its own and shows whatever sits under it, which is not-// the base grey the hooks above turn black. The list is the top surface, so it takes the black.+// the base gray the hooks above turn black. The list is the top surface, so it takes the black.%hook _TtC21Settings_PlatformImpl26SettingsListViewController- (void)viewDidLayoutSubviews {%orig;diff --git a/tweak/Sources/Redesigned/Kit/SGRAppearanceSettings.m b/tweak/Sources/Redesigned/Kit/SGRAppearanceSettings.mindex 7681bd25..c69edc4d 100644--- a/tweak/Sources/Redesigned/Kit/SGRAppearanceSettings.m+++ b/tweak/Sources/Redesigned/Kit/SGRAppearanceSettings.m@@ -3,9 +3,9 @@#import "Settings/SGPageStyle.h"#import "SGRAccent.h"-// The preset is read off the colour stored, so the hooks keep the one key they read and a colour set before+// The preset is read off the color stored, so the hooks keep the one key they read and a color set before// presets existed stays in effect: Apple Music's red reads as Apple Music, Spotify's own (-1) as Spotify, and-// any other colour as Custom, the redesign's own green when nothing is stored among them. The custom colour+// any other color as Custom, the redesign's own green when nothing is stored among them. The custom color// is put aside while a preset is in place, so Custom brings it back.static NSArray<NSString *> *presets(void) {return @[@"Spotify", @"Apple Music", @"Custom"];@@ -24,13 +24,13 @@ static void choosePreset(NSInteger index) {SGSetInt(SGRKeyAccent, index == 0 ? -1 : index == 1 ? SGAppleMusicRed : custom);}-// The redesign's rows of the Appearance page (App/Pages.m): the preset from a menu, then the colour in effect,-// which opens the picker; a colour stored from there is Custom. AMOLED has no row: the redesign is always black.+// The redesign's rows of the Appearance page (App/Pages.m): the preset from a menu, then the color in effect,+// which opens the picker; a color stored from there is Custom. AMOLED has no row: the redesign is always black.NSArray<SGModRow *> *SGRAppearanceRows(void) {- SGModRow *menu = SGMenuRow(@"Accent colour preset", presets(), ^NSString *{ return presets()[(NSUInteger)preset()]; },+ SGModRow *menu = SGMenuRow(@"Accent color preset", presets(), ^NSString *{ return presets()[(NSUInteger)preset()]; },^(NSInteger index) { choosePreset(index); });- SGModRow *colour = SGStatActionRow(@"Accent colour", nil, ^NSString *{ return [NSString stringWithFormat:@"#%06lX", (long)SGRAccentRGB()]; }, ^{- SGPickColor(@"Accent colour", SGRAccentRGB(), ^(NSInteger rgb) {+ SGModRow *colour = SGStatActionRow(@"Accent color", nil, ^NSString *{ return [NSString stringWithFormat:@"#%06lX", (long)SGRAccentRGB()]; }, ^{+ SGPickColor(@"Accent color", SGRAccentRGB(), ^(NSInteger rgb) {SGSetInt(SGRKeyAccent, rgb);SGSetInt(SGRKeyAccentCustom, rgb);});diff --git a/tweak/Sources/Redesigned/Kit/SGRDownload.m b/tweak/Sources/Redesigned/Kit/SGRDownload.mindex 1067816a..9d2b75a8 100644--- a/tweak/Sources/Redesigned/Kit/SGRDownload.m+++ b/tweak/Sources/Redesigned/Kit/SGRDownload.m@@ -142,7 +142,7 @@ static UIImage *symbolFor(SGRDownloadState state) {return [[UIImage systemImageNamed:name withConfiguration:config] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];}-// Downloaded is the one state that is "on", so it takes the accent colour, as shuffle does while it is on.+// Downloaded is the one state that is "on", so it takes the accent color, as shuffle does while it is on.static UIColor *tintFor(SGRDownloadState state) {return state == SGRDownloadDownloaded ? SGRAccent() : SGRPrimary();}diff --git a/tweak/Sources/Redesigned/Kit/SGRField.h b/tweak/Sources/Redesigned/Kit/SGRField.hindex 258a0cc3..fc812013 100644--- a/tweak/Sources/Redesigned/Kit/SGRField.h+++ b/tweak/Sources/Redesigned/Kit/SGRField.h@@ -1,10 +1,10 @@-// The artwork field: one continuous colour taken from the artwork (SGRPalette.h) behind a whole+// The artwork field: one continuous color taken from the artwork (SGRPalette.h) behind a whole// redesigned page, with no card and no seam anywhere. The player's field also carries the-// artwork itself at the top, blurred and dimmed and dissolving into the colour (showsBackdrop).+// artwork itself at the top, blurred and dimmed and dissolving into the color (showsBackdrop).//-// Nothing is blurred live and nothing is masked: the view draws a solid colour layer, a black gradient-// layer (the redesign is AMOLED throughout, fading the colour to black down the page) and at most one-// bitmap layer rendered off the main thread, so it costs a few composited layers while the page moves. A new colour or bitmap crossfades over+// Nothing is blurred live and nothing is masked: the view draws a solid color layer, a black gradient+// layer (the redesign is AMOLED throughout, fading the color to black down the page) and at most one+// bitmap layer rendered off the main thread, so it costs a few composited layers while the page moves. A new color or bitmap crossfades over// SGRCrossfade; the same image again is a no-op.//// Ownership: the screen that installs a field owns it (usually retained by its superview and an@@ -12,16 +12,16 @@// Threading: main thread only; the palette work it starts runs off it.#import <UIKit/UIKit.h>-// Posted on the main thread by a field whose colour changed, with the field as the object and the-// new colour under "color".+// Posted on the main thread by a field whose color changed, with the field as the object and the+// new color under "color".extern NSNotificationName const SGRFieldColorDidChangeNotification;@interface SGRArtworkField : UIView-// Where the colour, the fade to black and the backdrop reach past the bounds (overscroll, a plane+// Where the color, the fade to black and the backdrop reach past the bounds (overscroll, a plane// that does not clip): positive values draw outside. The field never clips.@property (nonatomic) UIEdgeInsets bleed;@property (nonatomic) BOOL showsBackdrop;-// The player's moving field instead of the still backdrop (SGRFlow.h): the artwork's colours drifting+// The player's moving field instead of the still backdrop (SGRFlow.h): the artwork's colors drifting// over the whole of the bounds, with no fade to black. It moves only while the field is in a window,// the app is in front, the player is not opening or closing, Reduce Motion and Low Power Mode are off// and nothing holds it (motionHeld); otherwise it stays still where it was.@@ -38,15 +38,15 @@ extern NSNotificationName const SGRFieldColorDidChangeNotification;@property (nonatomic) BOOL covered;// The backdrop's height in points from the top of the bounds; 0 is the window's height.@property (nonatomic) CGFloat backdropHeight;-// SGRNeutralField until a colour arrives.+// SGRNeutralField until a color arrives.@property (nonatomic, readonly) UIColor *fieldColor;-// The colour from the artwork's main colour rather than its bottom edge (SGRPaletteRequest's mainColor): a+// The color from the artwork's main color rather than its bottom edge (SGRPaletteRequest's mainColor): a// playlist, album or artist page, whose cover dissolves into the field. The player keeps the edge, where its-// backdrop meets the colour. Set before the first artwork.+// backdrop meets the color. Set before the first artwork.@property (nonatomic) BOOL mainColor;-// A colour Spotify already has for the page (the player's background colour, the album's wash), made fit+// A color Spotify already has for the page (the player's background color, the album's wash), made fit// to be a field and shown until the first artwork has been read; ignored after that.- (void)setProvisionalColor:(UIColor *)color;// Reads the artwork off the main thread and crossfades the result in (without animation when@@ -57,7 +57,7 @@ extern NSNotificationName const SGRFieldColorDidChangeNotification;// A page that comes in whole rather than a piece at a time: until the field has read its first artwork, a veil// of the neutral field lies over everything `page` holds but its pinned ⋯ (SGRPinnedMore), and then fades away-// at once, with the cover, the colour and the text that arrived under it. The back button is the navigation+// at once, with the cover, the color and the text that arrived under it. The back button is the navigation// bar's, outside the page, and stays. A page whose artwork never comes is shown after SGRFieldHoldLimit, and// one that knows it has none releases itself (-showPage). Called from the page's own pass, which keeps the// veil on top; nothing once the page has been shown, so a page coming back is never held again.diff --git a/tweak/Sources/Redesigned/Kit/SGRField.m b/tweak/Sources/Redesigned/Kit/SGRField.mindex 3d9ef846..13bcb80a 100644--- a/tweak/Sources/Redesigned/Kit/SGRField.m+++ b/tweak/Sources/Redesigned/Kit/SGRField.m@@ -10,7 +10,7 @@ NSNotificationName const SGRFieldColorDidChangeNotification = @"spotifyglass.redstatic const CGFloat kFallbackHeight = 874; // a window-less field sizes for an iPhone 17 Pro-// Where the colour starts fading to black and where it is black, as shares of the window's height:+// Where the color starts fading to black and where it is black, as shares of the window's height:// the redesign is AMOLED throughout (SGRAmoled.x).static const CGFloat kBlackFrom = 0.55, kBlackTo = 1;@@ -20,7 +20,7 @@ static CGFloat windowHeight(UIView *view) {}// The field paints on sublayers of its own rather than on the view's layer: a repaint hook only clears-// the paint of a view's own layer, so the neutral colour cannot be taken for Spotify's base surface.+// the paint of a view's own layer, so the neutral color cannot be taken for Spotify's base surface.static NSDictionary *noActions(void) {static NSDictionary *none;static dispatch_once_t once;@@ -33,7 +33,7 @@ static NSDictionary *noActions(void) {const NSTimeInterval SGRFieldHoldLimit = 1.0;-// The veil over a held page: black, the redesign's field before a colour arrives (SGRAmoled.x), painted on a+// The veil over a held page: black, the redesign's field before a color arrives (SGRAmoled.x), painted on a// sublayer for the reason the field is, so the repaint hook does not take it for Spotify's base surface.@interface SGRFieldVeil : UIView@end@@ -245,7 +245,7 @@ const NSTimeInterval SGRFieldHoldLimit = 1.0;if (animated && from) {CABasicAnimation *fade = [CABasicAnimation animationWithKeyPath:@"backgroundColor"];fade.fromValue = from;- // Read back rather than the colour asked for: SGRAmoled.x may have swapped it for black.+ // Read back rather than the color asked for: SGRAmoled.x may have swapped it for black.fade.toValue = (__bridge id)_solid.backgroundColor;fade.duration = SGRCrossfade;fade.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];@@ -319,13 +319,13 @@ const NSTimeInterval SGRFieldHoldLimit = 1.0;- (void)applyPalette:(SGRPalette *)palette animated:(BOOL)animated {_read = YES;- // Under the veil the colour goes in at once, and the page fades in with it.+ // Under the veil the color goes in at once, and the page fades in with it.if (_veil) animated = NO;if (_flows && palette.flowColors) {[_flow setColors:palette.flowColors animated:animated && !_flow.hidden];_flow.hidden = NO;[self updateMotion];- // Past the moving field's edges (the pull that dismisses the player) the colour under it goes on.+ // Past the moving field's edges (the pull that dismisses the player) the color under it goes on.[self applyColor:_flow.baseColor animated:animated];return;}diff --git a/tweak/Sources/Redesigned/Kit/SGRFlow.h b/tweak/Sources/Redesigned/Kit/SGRFlow.hindex 973095df..8e39d5dc 100644--- a/tweak/Sources/Redesigned/Kit/SGRFlow.h+++ b/tweak/Sources/Redesigned/Kit/SGRFlow.h@@ -1,7 +1,7 @@-// A moving field of the artwork's colours, the Music app's animated background behind its player-// (issue #59): five soft discs of colour, one for each quarter of the artwork and one for the whole of-// it, each drifting on a slow loop of its own and breathing in size, over the artwork's main colour and-// under a shade that deepens towards the bottom, where the controls are.+// A moving field of the artwork's colors, the Music app's animated background behind its player+// (issue #59): five soft discs of color, one for each quarter of the artwork and one for the whole of+// it, each drifting on a slow loop of its own and breathing in size, over the artwork's main color and+// under a shade that deepens toward the bottom, where the controls are.//// All of it is Core Animation: radial gradient layers moved by repeating animations that the render// server plays, so the app itself does no work per frame -- no display link, no timer, nothing redrawn@@ -16,10 +16,10 @@#import <UIKit/UIKit.h>@interface SGRFlowLayer : CALayer-// Five colours, as -[SGRPalette flowColors] gives them: top left, top right, bottom left, bottom right,+// Five colors, as -[SGRPalette flowColors] gives them: top left, top right, bottom left, bottom right,// the whole artwork's. Animated, they blend into the new ones where the discs are.- (void)setColors:(NSArray<UIColor *> *)colors animated:(BOOL)animated;-// The colour under the discs, darker than the artwork's main one; nil before any colours are set.+// The color under the discs, darker than the artwork's main one; nil before any colors are set.@property (nonatomic, readonly) UIColor *baseColor;// Drifting, or held still where it is. Off to begin with.@property (nonatomic) BOOL moving;diff --git a/tweak/Sources/Redesigned/Kit/SGRFlow.m b/tweak/Sources/Redesigned/Kit/SGRFlow.mindex 74359735..ef8277e1 100644--- a/tweak/Sources/Redesigned/Kit/SGRFlow.m+++ b/tweak/Sources/Redesigned/Kit/SGRFlow.m@@ -20,10 +20,10 @@ static const SGRDisc kDisc[kDiscs] = {{0.78, 0.84, 0.80, 0.26, 0.09, 41, YES, 11},{0.50, 0.50, 0.75, 0.18, 0.14, 53, YES, 23},};-// How far a breath takes a disc's size either way, and how long new colours take to blend in.+// How far a breath takes a disc's size either way, and how long new colors take to blend in.static const CGFloat kBreathSmall = 0.85, kBreathLarge = 1.18;static const CFTimeInterval kRecolor = 1.2;-// The colour under the discs is the artwork's main colour at this share of its light.+// The color under the discs is the artwork's main color at this share of its light.static const CGFloat kBaseShade = 0.55;// The shade over everything: clear down to this share of the height, then this much black at the bottom.static const CGFloat kShadeFrom = 0.45, kShadeBottom = 0.35;@@ -74,7 +74,7 @@ static NSArray *discColors(UIColor *color) {disc.endPoint = CGPointMake(1, 1);disc.locations = @[@0, @0.45, @1];disc.colors = discColors(UIColor.clearColor);- // The whole artwork's colour lies under the four quarters', so it fills between them rather than over them.+ // The whole artwork's color lies under the four quarters', so it fills between them rather than over them.if (i == kDiscs - 1) [self insertSublayer:disc above:_base];else [self addSublayer:disc];_discs[i] = disc;@@ -127,7 +127,7 @@ static NSArray *discColors(UIColor *color) {CGPoint rest = [self restOf:i];CGFloat rx = size.width * kDisc[i].driftX, ry = size.height * kDisc[i].driftY;CGMutablePathRef path = CGPathCreateMutable();- // Round about a centre one radius to the side, so the loop starts and ends at the resting place.+ // Round about a center one radius to the side, so the loop starts and ends at the resting place.CGPathAddArc(path, NULL, 0, 0, 1, M_PI, M_PI + (kDisc[i].clockwise ? -2 : 2) * M_PI, kDisc[i].clockwise);CGAffineTransform place = CGAffineTransformMake(rx, 0, 0, ry, rest.x + rx, rest.y);CGPathRef loop = CGPathCreateCopyByTransformingPath(path, &place);@@ -190,7 +190,7 @@ static NSArray *discColors(UIColor *color) {}}-#pragma mark - colours+#pragma mark - colors- (void)setColors:(NSArray<UIColor *> *)colors animated:(BOOL)animated {if (colors.count < kDiscs) return;diff --git a/tweak/Sources/Redesigned/Kit/SGRFluid.h b/tweak/Sources/Redesigned/Kit/SGRFluid.hindex 9ccff2bc..5ca2b450 100644--- a/tweak/Sources/Redesigned/Kit/SGRFluid.h+++ b/tweak/Sources/Redesigned/Kit/SGRFluid.h@@ -1,5 +1,5 @@// Fluid artwork: the cover itself, blurred and slowly warped behind the player. Four copies of a-// blurred, saturated cover, each far larger than the screen, turn about different centres at different+// blurred, saturated cover, each far larger than the screen, turn about different centers at different// speeds, two each way; where they overlap the picture seems to flow. A shade over the bottom keeps the// controls legible.//diff --git a/tweak/Sources/Redesigned/Kit/SGRFluid.m b/tweak/Sources/Redesigned/Kit/SGRFluid.mindex a1b6ada2..5de05790 100644--- a/tweak/Sources/Redesigned/Kit/SGRFluid.m+++ b/tweak/Sources/Redesigned/Kit/SGRFluid.m@@ -3,7 +3,7 @@#import "SGRFluid.h"#import "SGRTokens.h"-// Each copy: its side as a share of the visible rect's longer side, its centre as shares of that rect, and+// Each copy: its side as a share of the visible rect's longer side, its center as shares of that rect, and// one turn's length in seconds (negative turns the other way).static const struct { CGFloat side, x, y; CFTimeInterval turn; } kCopy[] = {{2.2, 0.25, 0.20, 46},diff --git a/tweak/Sources/Redesigned/Kit/SGRGlyph.m b/tweak/Sources/Redesigned/Kit/SGRGlyph.mindex 6bcb61c8..49a4c966 100644--- a/tweak/Sources/Redesigned/Kit/SGRGlyph.m+++ b/tweak/Sources/Redesigned/Kit/SGRGlyph.m@@ -94,7 +94,7 @@ static const CGFloat kMinTouch = 44, kPressAlpha = 0.5, kPressScale = 0.9, kDisa_glyph.center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds));}-// However small the frame it is given, a touch 44pt around its centre counts.+// However small the frame it is given, a touch 44pt around its center counts.- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {CGRect bounds = self.bounds;CGFloat dx = MAX(0, (kMinTouch - bounds.size.width) / 2), dy = MAX(0, (kMinTouch - bounds.size.height) / 2);diff --git a/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.h b/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.hindex f29e7aa7..6cb7dfd5 100644--- a/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.h+++ b/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.h@@ -1,5 +1,5 @@// The text and the controls of a redesigned page's header, under its full bleed picture, the way the Music-// app (iOS 26.4) sets a playlist or an album: the title, the creator and the length centred, one row of+// app (iOS 26.4) sets a playlist or an album: the title, the creator and the length centered, one row of// shuffle, a white Play capsule and one more round button, and the description under the row.//// A page conceals what Spotify draws in its header and puts this in its place, so nothing of Spotify's lays@@ -24,11 +24,11 @@ extern const CGFloat SGRHeaderInfoTitleRise; // 56, of the content over the pic- (BOOL)showTitle:(NSString *)title creator:(NSString *)creator length:(NSString *)length about:(NSString *)about;// Spotify's own control behind the creator line -- the album's artist row, the playlist's collaborators// button -- so a tap on the line opens whoever made it, and several of them open Spotify's own picker.-// The line keeps its colour: it is the page's one piece of secondary text, not a link to be tinted. nil+// The line keeps its color: it is the page's one piece of secondary text, not a link to be tinted. nil// leaves it as text.- (void)showCreatorLink:(UIView *)control;// The picture of whoever made it -- the album's artist, the playlist's owner -- drawn round, a line high, before-// the creator's name, the two centred together, as Spotify's own facepile sat beside the name. `source` is the+// the creator's name, the two centered together, as Spotify's own facepile sat beside the name. `source` is the// image view Spotify draws it in (SGRCreatorPicture), followed as Spotify fills it, so a picture that lands// after the page has laid out still shows. With no picture in it, or nil, the name stands alone.- (void)showCreatorPicture:(UIImageView *)source;@@ -40,7 +40,7 @@ extern const CGFloat SGRHeaderInfoTitleRise; // 56, of the content over the pic- (void)trailingStateChanged;// Spotify's controls, each drawn from and fired; nil hides that button. Play stays in the middle of the// page whether the other two are there or not. `trailingFallback` is drawn when Spotify's trailing control-// has no image to copy. `playColor` is the colour of the capsule's glyph and word.+// has no image to copy. `playColor` is the color of the capsule's glyph and word.- (void)showShuffle:(UIView *)shuffle play:(UIView *)play trailing:(UIView *)trailingtrailingFallback:(UIImage *)trailingFallback playColor:(UIColor *)playColor;// A picture drawn in the title's place, such as an artist's logo; the title stays its spoken name. nildiff --git a/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.m b/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.mindex 6c11ceb9..8f39a4df 100644--- a/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.m+++ b/tweak/Sources/Redesigned/Kit/SGRHeaderInfo.m@@ -84,7 +84,7 @@ UIImageView *SGRCreatorPicture(UIView *root) {_shuffle = [[SGRMirrorButton alloc] initWithFrame:CGRectZero];_shuffle.fallbackGlyph = [UIImage systemImageNamed:@"shuffle"];- // White like the buttons beside it while off -- Spotify's off grey read as a disabled button next to the+ // White like the buttons beside it while off -- Spotify's off gray read as a disabled button next to the// white download (issue #65) -- and the accent while on, so its state still shows._shuffle.glyphColor = SGRPrimary();_shuffle.onGlyphColor = SGRAccent();@@ -172,7 +172,7 @@ UIImageView *SGRCreatorPicture(UIView *root) {return changed;}-// The creator line, tappable. The label is as wide as the view and centred, so the target is narrowed to+// The creator line, tappable. The label is as wide as the view and centered, so the target is narrowed to// the text itself -- a tap either side of a short name belongs to the page under it, which a pull down// starts on. Spotify's own control stays concealed where it is and only fires.- (void)showCreatorLink:(UIView *)control {@@ -290,7 +290,7 @@ UIImageView *SGRCreatorPicture(UIView *root) {CGFloat height = ceil(size.height);label.frame = CGRectMake(kSide, y, text, height);// The name at its own width, so a tap beside it is the page's (-sgr_creatorHit:), and before it the- // picture, a line high so the line keeps its height, the two centred together. The picture leads, so it+ // picture, a line high so the line keeps its height, the two centered together. The picture leads, so it// is on the right in a right-to-left language.if (label == _creator) {CGFloat picture = _picture.hidden ? 0 : height + kPictureGap;diff --git a/tweak/Sources/Redesigned/Kit/SGRKit.h b/tweak/Sources/Redesigned/Kit/SGRKit.hindex 4dff3906..51c3bdeb 100644--- a/tweak/Sources/Redesigned/Kit/SGRKit.h+++ b/tweak/Sources/Redesigned/Kit/SGRKit.h@@ -2,10 +2,10 @@// one look and nothing is hand-rolled per screen. A screen imports this and Core/SGCore.h.//// SGRedesign.h Redesigned UI, the one switch, and the flags the redesigned screens force-// SGRTokens.h colours, type, spacing, radii, motion, the accessibility settings-// SGRPalette.h the artwork's edge colour, the field colour and the pre-blurred bitmaps+// SGRTokens.h colors, type, spacing, radii, motion, the accessibility settings+// SGRPalette.h the artwork's edge color, the field color and the pre-blurred bitmaps// SGRField.h the artwork field behind a page-// SGRFlow.h the player's moving field of the artwork's colours+// SGRFlow.h the player's moving field of the artwork's colors// SGRGlass.h glass inside Spotify's round controls// SGRGlyph.h bare glyph overlays and glyph buttons// SGRActionRow.h the Play capsule and the stand-in button of a page's action row@@ -15,7 +15,7 @@// controls, taking a list cell's paint off the field// SGRBridges.h player state, now playing artwork, the player's open and close// SGRRepaint.h the areas the redesign keeps transparent when Spotify repaints them-// SGRAccent.h the redesign's accent colour; its AMOLED black is SGRAmoled.x, always on+// SGRAccent.h the redesign's accent color; its AMOLED black is SGRAmoled.x, always on// Settings/SGMarquee.h a title that glides when it is too long, every layer's, imported here for the screens//// Every hook file of the redesign starts its %ctor with `if (!SGRedesignedUI()) return;` and every onediff --git a/tweak/Sources/Redesigned/Kit/SGRPalette.h b/tweak/Sources/Redesigned/Kit/SGRPalette.hindex c5ee14d9..fa59ddaa 100644--- a/tweak/Sources/Redesigned/Kit/SGRPalette.h+++ b/tweak/Sources/Redesigned/Kit/SGRPalette.h@@ -1,8 +1,8 @@// What a redesigned page takes from its artwork, worked out off the main thread in one pass: the-// colour along the artwork's bottom edge, the field colour made from it (or from the artwork's main-// colour, for a page), and the blurred bitmaps the field (SGRField.h) draws instead of a live blur.+// color along the artwork's bottom edge, the field color made from it (or from the artwork's main+// color, for a page), and the blurred bitmaps the field (SGRField.h) draws instead of a live blur.//-// The field colour is the edge or main colour with its saturation held to 0.55 and its relative luminance to+// The field color is the edge or main color with its saturation held to 0.55 and its relative luminance to// 0.07 (0.04 with Increase Contrast). On anything that dark white text is past 8:1 and SGRSecondary// (white 65%) past 4.5:1, WCAG AA, whatever the hue.//@@ -13,16 +13,16 @@typedef struct {// The area a backdrop bitmap covers, in points; CGSizeZero when none is wanted. The bitmap is the// artwork filling that area, blurred, dimmed from 0.25 black at the top to 0.45 (0.55 with- // AMOLED) at 55% of the height, and transparent from 55% down to the bottom, so the field colour+ // AMOLED) at 55% of the height, and transparent from 55% down to the bottom, so the field color// under it shows through with no edge.CGSize backdropSize;// A blurred copy at the artwork's own aspect, transparent down to 55% of its height and opaque// from 85%, to lay over the sharp picture with the same aspect fill.BOOL dissolve;BOOL amoled;- // The colours of a moving field (SGRFlow.h): the artwork's main colour in each quarter and overall.+ // The colors of a moving field (SGRFlow.h): the artwork's main color in each quarter and overall.BOOL flow;- // The field colour from the artwork's main colour (the one +tintForImage: finds) rather than its bottom+ // The field color from the artwork's main color (the one +tintForImage: finds) rather than its bottom// edge: for a page, whose cover dissolves into the field across its whole width, where the bottom edge// is a scanned cover's pale border or whatever strip happens to sit at the foot of the picture.BOOL mainColor;@@ -34,21 +34,21 @@ typedef struct {@property (nonatomic, readonly) UIImage *backdrop; // nil unless asked for, at most 160px wide@property (nonatomic, readonly) UIImage *dissolve; // nil unless asked for, 96px wide// nil unless asked for: top left, top right, bottom left, bottom right, then the whole artwork's, each-// the dominant colour there, its saturation lifted a little and its luminance held between+// the dominant color there, its saturation lifted a little and its luminance held between// kFlowLuminanceMin and kFlowLuminanceMax, so white text keeps better than 5.5:1 on any of them.@property (nonatomic, readonly) NSArray<UIColor *> *flowColors;// nil to the completion when the image has no bitmap to read (a symbol, a CIImage).+ (void)paletteForImage:(UIImage *)image request:(SGRPaletteRequest)request completion:(void (^)(SGRPalette *palette))completion;-// `surface` tinted a little towards the artwork's dominant colour (brought down to a luminance of 0.05, then-// 35% of it mixed in), so a tile or row on the surface quietly takes its cover's colour while white text on+// `surface` tinted a little toward the artwork's dominant color (brought down to a luminance of 0.05, then+// 35% of it mixed in), so a tile or row on the surface quietly takes its cover's color while white text on// it keeps its contrast. Never dimmer than `surface`: a mix that came out darker is lifted back to its// luminance keeping its hue, so a near-black cover cannot cost the tile the step of elevation it stands on,-// nor sink it into the grey band SGRAmoled.x turns pure black. nil to the completion when the image has no+// nor sink it into the gray band SGRAmoled.x turns pure black. nil to the completion when the image has no// bitmap to read.+ (void)tintForImage:(UIImage *)image surface:(UIColor *)surface completion:(void (^)(UIColor *tint))completion;@end-// Any colour made fit to be a field, the same way the edge colour is: for a colour Spotify hands over+// Any color made fit to be a field, the same way the edge color is: for a color Spotify hands over// before the artwork is read. Main thread.UIColor *SGRFieldColorFor(UIColor *color);diff --git a/tweak/Sources/Redesigned/Kit/SGRPalette.m b/tweak/Sources/Redesigned/Kit/SGRPalette.mindex 7df4ccb8..b7edd354 100644--- a/tweak/Sources/Redesigned/Kit/SGRPalette.m+++ b/tweak/Sources/Redesigned/Kit/SGRPalette.m@@ -3,17 +3,17 @@#import "SGRPalette.h"#import "SGRTokens.h"-static const size_t kSample = 64; // the artwork shrunk to this square before its colours are read-static const size_t kEdgeRows = 10; // the bottom rows of it averaged into the edge colour+static const size_t kSample = 64; // the artwork shrunk to this square before its colors are read+static const size_t kEdgeRows = 10; // the bottom rows of it averaged into the edge colorstatic const CGFloat kMaxSaturation = 0.55;static const CGFloat kMaxLuminance = 0.07, kMaxLuminanceContrast = 0.04;static const CGFloat kBackdropWidth = 160, kBackdropMaxHeight = 400, kBackdropSigma = 12;static const CGFloat kDissolveWidth = 96, kDissolveSigma = 5;static const CGFloat kFadeFrom = 0.55, kDissolveOpaque = 0.85;-// A tint: the artwork's dominant colour brought down to this luminance, then this share of it mixed into+// A tint: the artwork's dominant color brought down to this luminance, then this share of it mixed into// the surface it tints.static const CGFloat kTintLuminance = 0.05, kTintShare = 0.35;-// A moving field's colours: luminance held between these (the ceiling 0.07 with Increase Contrast, as a+// A moving field's colors: luminance held between these (the ceiling 0.07 with Increase Contrast, as a// field's), saturation lifted by this much up to a cap, and a near-black one lifted by at most this factor.static const CGFloat kFlowLuminanceMin = 0.03, kFlowLuminanceMax = 0.13;static const CGFloat kFlowSaturationLift = 1.25, kFlowSaturationMax = 0.9, kFlowMaxLift = 4;@@ -63,7 +63,7 @@ static void drawFilling(CGContextRef context, CGImageRef image, size_t width, siCGContextDrawImage(context, CGRectMake((width - iw * scale) / 2, (height - ih * scale) / 2, iw * scale, ih * scale), image);}-#pragma mark - colour+#pragma mark - colorstatic CGFloat toLinear(CGFloat c) {return c <= 0.04045 ? c / 12.92 : pow((c + 0.055) / 1.055, 2.4);@@ -165,8 +165,8 @@ static UIImage *finished(CGImageRef blurred, BOOL dim, CGFloat dimBottom, CGFloa#pragma mark - tint-// The artwork's dominant colour in linear light: its pixels binned 3 bits a channel, each bin scored by its-// count weighted towards colourful pixels, so a busy cover gives its main colour instead of the grey an+// The artwork's dominant color in linear light: its pixels binned 3 bits a channel, each bin scored by its+// count weighted toward colorful pixels, so a busy cover gives its main color instead of the gray an// average makes. Near-black and near-white count for little unless they are nearly all there is.// The same over the rows y0..y1 and columns x0..x1 of a kSample square bitmap (rows top down).static BOOL dominantIn(const uint8_t *px, size_t x0, size_t y0, size_t x1, size_t y1, CGFloat out[3]) {@@ -206,7 +206,7 @@ static BOOL dominantColorOf(CGImageRef image, CGFloat out[3]) {#pragma mark - flow-// A dominant colour in linear light made fit for a moving field: a little more colourful, and within+// A dominant color in linear light made fit for a moving field: a little more colorful, and within// the luminance band that keeps white text readable on it.static UIColor *flowColorFor(const CGFloat linear[3], CGFloat ceiling) {CGFloat r = toEncoded(linear[0]), g = toEncoded(linear[1]), b = toEncoded(linear[2]), h = 0, s = 0, v = 0, a = 1;@@ -220,8 +220,8 @@ static UIColor *flowColorFor(const CGFloat linear[3], CGFloat ceiling) {return [UIColor colorWithRed:toEncoded(MIN(1, lr * k)) green:toEncoded(MIN(1, lg * k)) blue:toEncoded(MIN(1, lb * k)) alpha:1];}-// The artwork's main colour in each quarter, then over the whole of it: the field keeps the artwork's-// colours roughly where the artwork has them.+// The artwork's main color in each quarter, then over the whole of it: the field keeps the artwork's+// colors roughly where the artwork has them.static NSArray<UIColor *> *flowColorsOf(CGImageRef image, CGFloat ceiling) {CGContextRef context = newBitmap(kSample, kSample);if (!context) return nil;@@ -253,9 +253,9 @@ static UIColor *tintOf(CGImageRef image, UIColor *surface) {g * (1 - t) + toEncoded(linear[1]) * t,b * (1 - t) + toEncoded(linear[2]) * t};- // The colour mixed in is held under a luminance of 0.05 but has no floor, so a near-black cover mixes the+ // The color mixed in is held under a luminance of 0.05 but has no floor, so a near-black cover mixes the// surface *down*: the tile ends up darker than the untinted surface it was meant to be a step above, and a- // neutral one lands in the 1-10% grey band SGRAmoled.x turns pure black, which takes the whole card with+ // neutral one lands in the 1-10% gray band SGRAmoled.x turns pure black, which takes the whole card with// it -- a black square lost on a black page (The Weeknd's Trilogy, Bieber's SWAG; issue #36). So a mix// dimmer than the surface is lifted back to the surface's luminance, in linear light and by one factor// across the channels, which leaves its hue where the mix put it. Lifting cannot clip: the targetdiff --git a/tweak/Sources/Redesigned/Kit/SGRRepaint.h b/tweak/Sources/Redesigned/Kit/SGRRepaint.hindex a651fe07..ae142c3b 100644--- a/tweak/Sources/Redesigned/Kit/SGRRepaint.h+++ b/tweak/Sources/Redesigned/Kit/SGRRepaint.h@@ -3,13 +3,13 @@#import <UIKit/UIKit.h>extern __weak UIView *sgr_nowPlayingRoot; // Redesigned/NowPlayingBar/NowPlayingBar.x, the bar-// Every view in the bar Spotify painted as a card, learnt from the album-colour paint, which goes clear. The bar+// Every view in the bar Spotify painted as a card, learned from the album-color paint, which goes clear. The bar// makes the set and picks its card from it: in a Jam Spotify also paints the Jam strip, or a view around the// strip and the track.extern NSHashTable<UIView *> *sgr_nowPlayingPainted;extern __weak UIView *sgr_lyricsPageRoot; // Redesigned/Lyrics/LyricsPage.x// Redesigned/Playlist/PlaylistField.x, the playlist page. Only the base surface Spotify paints the page,-// its list and its rows with goes clear here: the artwork field is underneath, and the greys of a+// its list and its rows with goes clear here: the artwork field is underneath, and the grays of a// placeholder or a badge are what still has to read against it.extern __weak UIView *sgr_playlistRoot;// Redesigned/Album/AlbumField.x, the album page, kept clear the same way and for the same reason.diff --git a/tweak/Sources/Redesigned/Kit/SGRRepaint.x b/tweak/Sources/Redesigned/Kit/SGRRepaint.xindex 03e806d8..23cf134e 100644--- a/tweak/Sources/Redesigned/Kit/SGRRepaint.x+++ b/tweak/Sources/Redesigned/Kit/SGRRepaint.x@@ -1,5 +1,5 @@// Keeps the areas the redesign stripped transparent when Spotify repaints them, and learns which views-// could be the now playing bar's card from the album-colour paint.+// could be the now playing bar's card from the album-color paint.#import "Core/SGCore.h"#import "SGRRepaint.h"diff --git a/tweak/Sources/Redesigned/Kit/SGRRestyle.h b/tweak/Sources/Redesigned/Kit/SGRRestyle.hindex 5479c1df..45f01e30 100644--- a/tweak/Sources/Redesigned/Kit/SGRRestyle.h+++ b/tweak/Sources/Redesigned/Kit/SGRRestyle.h@@ -59,11 +59,11 @@ SGRShadowPlate *SGRShadowPlateIn(UIView *host, const void *key);// The base surface a list cell paints over a page's field, cleared: the #121212 the redesign's AMOLED// black has already turned black, on the cell and on everything under it nearly as wide as the cell, and// the full-width fade a "see more" draws over its last row, which the black makes a dark band. The Kit's-// repaint hook misses all of it -- it only hears about a colour when Spotify sets it, and a cell is painted+// repaint hook misses all of it -- it only hears about a color when Spotify sets it, and a cell is painted// before it is inside the page and brings its old paint with it when it is reused -- so this runs from the// cell's own layout pass, and is cheap enough to.//-// Only what is nearly as wide as the cell: a badge's black disc, a card's grey and an image's placeholder+// Only what is nearly as wide as the cell: a badge's black disc, a card's gray and an image's placeholder// are their own. A cell nested inside the cell and narrower than that (a card in a carousel) is not walked// into: its own row decides for it.void SGRClearCellPaint(UIView *cell);diff --git a/tweak/Sources/Redesigned/Kit/SGRRestyle.m b/tweak/Sources/Redesigned/Kit/SGRRestyle.mindex 48c37c7c..af88d480 100644--- a/tweak/Sources/Redesigned/Kit/SGRRestyle.m+++ b/tweak/Sources/Redesigned/Kit/SGRRestyle.m@@ -337,7 +337,7 @@ SGRShadowPlate *SGRShadowPlateIn(UIView *host, const void *key) {// disc is 26pt and an avatar's ring the same.static const CGFloat kPaintedShare = 0.75;-// The layer's colour, not the view's. -[UIView backgroundColor] answers only what was set through the+// The layer's color, not the view's. -[UIView backgroundColor] answers only what was set through the// view; a view painted straight on its layer reads back nil there, and the first pass of this left the// playlist's Refresh band black while everything beside it cleared (device, trees/continuous/1.txt// 2026-09-20). The layer is where the paint really is, and where the Kit's repaint hook watches for it.@@ -350,7 +350,7 @@ static void clearPaint(UIView *view, UIView *cell, CGFloat wide) {if (view != cell && !full && [view isKindOfClass:UICollectionViewCell.class]) return;if (full) {// Read off the layer, written through the view, so the two are left saying the same thing: the- // clear colour lands on both, and reads back with an alpha the next pass does not take for paint.+ // clear color lands on both, and reads back with an alpha the next pass does not take for paint.CGColorRef color = view.layer.backgroundColor;if (color && SGIsBaseSurface(color)) view.backgroundColor = UIColor.clearColor;if (!view.layer.mask && [NSStringFromClass(view.class) containsString:@"GradientView"]) view.layer.mask = [CALayer layer];diff --git a/tweak/Sources/Redesigned/Kit/SGRTokens.h b/tweak/Sources/Redesigned/Kit/SGRTokens.hindex ffad113d..4050f806 100644--- a/tweak/Sources/Redesigned/Kit/SGRTokens.h+++ b/tweak/Sources/Redesigned/Kit/SGRTokens.h@@ -1,13 +1,13 @@-// The redesign's design tokens: every redesigned screen takes its colours, type, spacing, radii and+// The redesign's design tokens: every redesigned screen takes its colors, type, spacing, radii and// motion from here, so the screens read as one app and nothing is tuned per screen by hand.//-// Colours are white over the artwork field (SGRField.h), whose colour is kept dark enough that+// Colors are white over the artwork field (SGRField.h), whose color is kept dark enough that// SGRPrimary and SGRSecondary both pass WCAG AA on it. Type is the system font (SF Pro) sized by the// text style and capped, since Spotify's pages lay out for a fixed header height. Motion is springs,// critically damped for layout and a little bounce for press feedback; under Reduce Motion both// become instant, while crossfades, responses and exits stay, a fade not being motion.//-// Threading: the constants and the colours are safe anywhere; fonts, SGRAnimate and the+// Threading: the constants and the colors are safe anywhere; fonts, SGRAnimate and the// accessibility reads are main thread only.#import <UIKit/UIKit.h>@@ -21,13 +21,13 @@ extern const CGFloat SGRGlassCircleSize; // 44, a round glass behind a top bar bextern const CGFloat SGRActionHeight; // 48, a button of the action row under a heroextern const CGFloat SGRActionSpacing; // 12, between the buttons of an action rowextern const CGFloat SGRGlassSpacing; // 16, how near two glass shapes merge in one container-extern const NSTimeInterval SGRCrossfade; // 0.35, a new image or field colour fading in+extern const NSTimeInterval SGRCrossfade; // 0.35, a new image or field color fading inUIColor *SGRPrimary(void); // whiteUIColor *SGRSecondary(void); // white 65%, 80% with Increase ContrastUIColor *SGRTertiary(void); // white 40%, 60% with Increase Contrast-UIColor *SGRAccent(void); // the accent colour of Appearance, else Spotify's green-UIColor *SGRNeutralField(void); // #121212, the field before a colour arrives; SGRAmoled.x turns it black+UIColor *SGRAccent(void); // the accent color of Appearance, else Spotify's green+UIColor *SGRNeutralField(void); // #121212, the field before a color arrives; SGRAmoled.x turns it black// Where glass cannot be (Reduce Transparency), the shape it would have had: white 16% over the field.UIColor *SGRSolidGlassFill(void);// A content surface on the field (a card), a step lighter than the field it sits on.@@ -51,7 +51,7 @@ typedef NS_ENUM(NSInteger, SGRMotion) {SGRMotionPress, // a spring with a little bounce, for press feedbackSGRMotionFade, // an ease in and out over SGRCrossfade, kept under Reduce Motion// A strong ease out over 0.2 s, for what comes back or opens at a touch: the eye is on it from the- // first frame. Kept under Reduce Motion like a fade, so only alpha, colour and a glass effect go in it.+ // first frame. Kept under Reduce Motion like a fade, so only alpha, color and a glass effect go in it.SGRMotionRespond,// An ease out over 0.15 s, for what goes once the finger has let it go (the hold's 2x badge): nothing is// watched on its way out. Kept under Reduce Motion like a fade.@@ -61,5 +61,5 @@ typedef NS_ENUM(NSInteger, SGRMotion) {SGRMotionBar,};// Runs `animations` with the motion's timing, or at once under Reduce Motion (except a fade, a response or an exit), and-// always calls `completion`. Only transform, alpha and colour belong in it while a page scrolls.+// always calls `completion`. Only transform, alpha and color belong in it while a page scrolls.void SGRAnimate(SGRMotion motion, void (^animations)(void), void (^completion)(BOOL finished));diff --git a/tweak/Sources/Redesigned/Kit/SGRTokens.m b/tweak/Sources/Redesigned/Kit/SGRTokens.mindex a18465af..88004126 100644--- a/tweak/Sources/Redesigned/Kit/SGRTokens.m+++ b/tweak/Sources/Redesigned/Kit/SGRTokens.m@@ -37,7 +37,7 @@ UIColor *SGRTertiary(void) {return [UIColor colorWithWhite:1 alpha:SGRIncreaseContrast() ? 0.60 : 0.40];}-// Read per call: the accent is stored as it is picked, and the colour row reads it the same way.+// Read per call: the accent is stored as it is picked, and the color row reads it the same way.UIColor *SGRAccent(void) {return SGRAccentColor() ?: [UIColor colorWithRed:0x1E / 255.0 green:0xD7 / 255.0 blue:0x60 / 255.0 alpha:1];}@@ -57,7 +57,7 @@ UIColor *SGRHairline(void) {UIColor *SGRElevated(UIColor *field) {CGFloat r = 0, g = 0, b = 0, a = 1;if (![field getRed:&r green:&g blue:&b alpha:&a]) return [UIColor colorWithWhite:1 alpha:0.08];- // 12% towards white keeps a card on a black field clear of the greys SGRAmoled.x turns black.+ // 12% toward white keeps a card on a black field clear of the grays SGRAmoled.x turns black.CGFloat lift = 0.12;return [UIColor colorWithRed:r + (1 - r) * lift green:g + (1 - g) * lift blue:b + (1 - b) * lift alpha:1];}diff --git a/tweak/Sources/Redesigned/Library/LibraryHeader.x b/tweak/Sources/Redesigned/Library/LibraryHeader.xindex 39d636b1..67163782 100644--- a/tweak/Sources/Redesigned/Library/LibraryHeader.x+++ b/tweak/Sources/Redesigned/Library/LibraryHeader.x@@ -27,7 +27,7 @@// pass and stays where it is put.//// Each control moves by a transform rather than by a frame. Spotify's stack lays them out from constraints of-// its own on every pass, and Auto Layout sets a view's centre and bounds and leaves its transform alone, so the+// its own on every pass, and Auto Layout sets a view's center and bounds and leaves its transform alone, so the// move outlives the pass that made it (Search moves the Browse cells the same way). Nothing leaves the stack:// an arranged view of Spotify's that hides traps its stack in updateConstraints (Kit/SGRRestyle.h), so what// goes is alpha, touches and accessibility, and the title Spotify draws goes that way while ours is a subview@@ -93,7 +93,7 @@ static CGFloat placeTrailing(UIView *header, NSArray<UIView *> *controls) {CGFloat right = header.bounds.size.width - kRowInset;for (UIView *control in controls.reverseObjectEnumerator) {CGFloat width = control.bounds.size.width;- // The centre is where Auto Layout put the control, whatever transform is on it; its frame is not.+ // The center is where Auto Layout put the control, whatever transform is on it; its frame is not.CGFloat natural = [control.superview convertPoint:CGPointZero toView:header].x + control.center.x - width / 2;CGAffineTransform move = CGAffineTransformMakeTranslation(right - width - natural, 0);if (!CGAffineTransformEqualToTransform(control.transform, move)) control.transform = move;diff --git a/tweak/Sources/Redesigned/Lyrics/LyricsPage.x b/tweak/Sources/Redesigned/Lyrics/LyricsPage.xindex 72816313..e92b8b70 100644--- a/tweak/Sources/Redesigned/Lyrics/LyricsPage.x+++ b/tweak/Sources/Redesigned/Lyrics/LyricsPage.x@@ -5,9 +5,9 @@// Page (trees/lyrics.txt): a page of its own, presented over the player by a// _UIOverFullscreenPresentationController, which is why the card's glass stops at the card's edge.// Tome_PageTemplateImpl paints the template view #121212 and FullscreenView paints itself the-// album colour on top, both opaque; clearing them lets the player's blurred artwork through.+// album color on top, both opaque; clearing them lets the player's blurred artwork through.//-// The album colour is the stubborn one: it arrives per track, after the page has laid out, and it+// The album color is the stubborn one: it arrives per track, after the page has laid out, and it// comes back through a path SGRRepaint.x never sees, so a sweep at layout time loses the race.// FullscreenView is asked not to keep it at all instead. The pane goes inside FullscreenView, in// front of whatever that view still fills itself with, rather than behind the whole page.@@ -29,7 +29,7 @@ static UIView *clearAncestors(UIView *view) {}%hook _TtC32Lyrics_FullscreenElementPageImpl14FullscreenView-// A colour kept here is re-applied whenever UIKit feels like it, so it is refused outright.+// A color kept here is re-applied whenever UIKit feels like it, so it is refused outright.- (void)setBackgroundColor:(UIColor *)color {static dispatch_once_t once;dispatch_once(&once, ^{ SGLog(@"lyrics page paints itself %@ through UIView", color); });diff --git a/tweak/Sources/Redesigned/Lyrics/MeaningSheet.m b/tweak/Sources/Redesigned/Lyrics/MeaningSheet.mindex ecbe8f21..3a1e0b29 100644--- a/tweak/Sources/Redesigned/Lyrics/MeaningSheet.m+++ b/tweak/Sources/Redesigned/Lyrics/MeaningSheet.m@@ -4,7 +4,7 @@#import "Redesigned/Kit/SGRTokens.h"static const CGFloat kSide = 24, kTop = 28, kGap = 12;-// The footer's row is drawn 22pt tall; its buttons take touches over 44, centred on it.+// The footer's row is drawn 22pt tall; its buttons take touches over 44, centered on it.static const CGFloat kRow = 22, kTouch = 44;static NSString *authorName(SGLyricsMeaningAuthor author) {diff --git a/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.m b/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.mindex 8ec6000b..984e13a2 100644--- a/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.m+++ b/tweak/Sources/Redesigned/Lyrics/SGRKaraokeView.m@@ -240,7 +240,7 @@ static UIView *lettersOf(NSArray<NSString *> *letters, NSArray<NSNumber *> *xs,free(_letterLift);}-// The cursor is in line units and the feathered edge is centred on it, so the edge runs on through+// The cursor is in line units and the feathered edge is centered on it, so the edge runs on through// the space into the next word instead of starting over at each one. Right to left, the mask is the// same one turned around: white from the word's right edge, the feather `local` in from it.- (void)fillTo:(CGFloat)cursor {@@ -346,7 +346,7 @@ static double heldStrength(double held) {@property (nonatomic, readonly) NSArray<NSNumber *> *order; // SGRLyricsText, largest first, shown ones only@property (nonatomic, readonly) UIFont *lyrics, *pronunciation, *translation; // nil for a text not shown@property (nonatomic, readonly) SGRKaraokeStyle *backing; // the backing row's: smaller, its translation read with the line's-// The line again in Latin letters (Shared/Lyrics' romanised lyrics), at the pronunciation's place in the+// The line again in Latin letters (Shared/Lyrics' romanized lyrics), at the pronunciation's place in the// order, since it is one (the second place's while that is the first); nil while the Lyrics page has// it off. A backing row has none.@property (nonatomic, readonly) UIFont *romanised;@@ -537,7 +537,7 @@ static CGFloat layPair(NSArray<SGKaraokeWord *> *lead, UIFont *leadFont, NSArray}bottom = y + leadHigh;// Under the row, each word at the start of its own, pushed along past the one before it, and the- // pieces of one word flush together, the way the row above has them. A row spelt out wider than+ // pieces of one word flush together, the way the row above has them. A row spelled out wider than// it is written, as Korean is, cannot keep to its words and still fit: it is set as plain words// from the edge instead, in as many rows as it takes.NSUInteger from = j, until = j;@@ -593,7 +593,7 @@ static CGRect blockFrame(NSString *text, UIFont *font, CGFloat width, CGFloat to// The texts a line has, in the style's order, the lyrics and their pronunciation set as a pair where// the order has them side by side, the line in Latin letters right under the lyrics where it is not-// already spelt out by the pronunciation, and the backing row after that. `right` is the side a backing+// already spelled out by the pronunciation, and the backing row after that. `right` is the side a backing// row keeps to, its line's; -1 for a line of its own, which takes its side from its voice and script.static SGRKaraokeLayout *layOut(SGKaraokeLine *line, CGFloat width, SGRKaraokeStyle *style, NSInteger right) {SGRKaraokeLayout *layout = [SGRKaraokeLayout new];@@ -792,7 +792,7 @@ static double secant(SGSweepKnot *knots, NSUInteger i) {@property (nonatomic, readonly) CGRect bubbleTarget;@end-// The translation and the romanised line of a line being sung, brighter than a line waiting but never+// The translation and the romanized line of a line being sung, brighter than a line waiting but never// as bright as the words.static const CGFloat kTranslationLit = 0.6;@@ -1505,7 +1505,7 @@ typedef struct {for (SGRKaraokeLineView *view in _shown.allValues) view.blur = 0;}-// In the caller's animation: the glass dematerialises by its effect and the glyph fades by its alpha, the+// In the caller's animation: the glass dematerializes by its effect and the glyph fades by its alpha, the// one view of the two with no glass in it.- (void)setExtrasHidden:(BOOL)hidden {_extrasHidden = hidden;diff --git a/tweak/Sources/Redesigned/Lyrics/SGRSingButton.h b/tweak/Sources/Redesigned/Lyrics/SGRSingButton.hindex 36709e20..416299c8 100644--- a/tweak/Sources/Redesigned/Lyrics/SGRSingButton.h+++ b/tweak/Sources/Redesigned/Lyrics/SGRSingButton.h@@ -1,7 +1,7 @@// Sing's mic on the redesign's lyrics (Shared/Sing/Sing.h), in the bottom trailing corner of SGRKaraokeView// across from the pronunciation and translation button, as Apple Music has it. It shows what Sing is doing// on itself: the mic struck through where Sing cannot run, a ring filling with the voice model's download (held-// where it is under a dimmed wifi struck through while the download waits for the network), a ring turning while the model prepares and while Sing listens ahead, the mic lit in the accent colour while+// where it is under a dimmed wifi struck through while the download waits for the network), a ring turning while the model prepares and while Sing listens ahead, the mic lit in the accent color while// the vocals are down, a thermometer while the heat holds it, a warning when it failed.//// A tap turns Sing on and off, or says what is missing and offers the model's download. Holding it brings up@@ -13,7 +13,7 @@#import <UIKit/UIKit.h>@interface SGRSingButton : UIView-// Goes with the host's controls when they are hidden, in the host's animation: its glass dematerialises+// Goes with the host's controls when they are hidden, in the host's animation: its glass dematerializes// rather than fading under an alpha, and it takes no touches while tucked.@property (nonatomic) BOOL tucked;@enddiff --git a/tweak/Sources/Redesigned/Lyrics/SGRSingButton.m b/tweak/Sources/Redesigned/Lyrics/SGRSingButton.mindex 1cbeff3f..c41249b7 100644--- a/tweak/Sources/Redesigned/Lyrics/SGRSingButton.m+++ b/tweak/Sources/Redesigned/Lyrics/SGRSingButton.m@@ -88,7 +88,7 @@ static char kButtonGlassKey, kPanelGlassKey;if (_panel) SGRShowGlass([self placePanel], _panelShown);}-// Goes with the host's controls, in the host's animation: the glass dematerialises, the glyph and the ring+// Goes with the host's controls, in the host's animation: the glass dematerializes, the glyph and the ring// fade, and an open slider goes with them.- (void)setTucked:(BOOL)tucked {_tucked = tucked;@@ -131,7 +131,7 @@ static char kButtonGlassKey, kPanelGlassKey;case SGSingStateFailed: glyph = @"exclamationmark.triangle.fill"; tint = UIColor.systemYellowColor; break;}// One glyph replaces the other in place, as the Kit's download glyph does (none under Reduce Motion),- // and the colour crossfades. Set only on a change: the download's progress refreshes many times a second.+ // and the color crossfades. Set only on a change: the download's progress refreshes many times a second.if (![glyph isEqualToString:_glyph]) {_glyph = glyph;UIButtonConfiguration *config = _button.configuration;@@ -302,7 +302,7 @@ static void tell(NSString *message, NSString *action, void (^then)(void)) {[self letPanelGo];}-// Bounds and a centre rather than a frame, since the capsule can be under its entering scale.+// Bounds and a center rather than a frame, since the capsule can be under its entering scale.- (UIView *)placePanel {CGFloat width = self.bounds.size.width, top = -kPanelGap - kPanelHeight;_panel.bounds = CGRectMake(0, 0, width, kPanelHeight);@@ -310,7 +310,7 @@ static void tell(NSString *message, NSString *action, void (^then)(void)) {UIView *glass = SGRGlassCapsuleInside(_panel, &kPanelGlassKey, _panel.bounds.size, NO);_slider.bounds = CGRectMake(0, 0, kPanelHeight - 24, 31);_slider.center = CGPointMake(width / 2, kPanelHeight / 2);- // The slider is centred, so As sung, the middle of its range, is the capsule's middle.+ // The slider is centered, so As sung, the middle of its range, is the capsule's middle._mark.frame = CGRectMake((width - kMarkWidth) / 2, kPanelHeight / 2 - 0.5, kMarkWidth, 1);_level.frame = CGRectMake(width - kLevelWidth, top - kLevelHeight - 4, kLevelWidth, kLevelHeight);return glass;diff --git a/tweak/Sources/Redesigned/Navbar/Navbar.h b/tweak/Sources/Redesigned/Navbar/Navbar.hindex 19e32bd9..9b2d0eee 100644--- a/tweak/Sources/Redesigned/Navbar/Navbar.h+++ b/tweak/Sources/Redesigned/Navbar/Navbar.h@@ -47,7 +47,7 @@ BOOL SGRTabBarMinimized(void);// animation, on the main queue's next turn (SGRTabBarMinimized changes then too). `animated` NO is a cut, made// at once.void SGRSetTabBarMinimized(BOOL minimized, BOOL animated);-// The room between the minimized bar's two tabs, `height` high and centred on them, in `host`'s+// The room between the minimized bar's two tabs, `height` high and centered on them, in `host`'s// coordinates: where the now playing card goes. CGRectNull while the bar is not minimized or not on screen.CGRect SGRTabBarInlineSlot(UIView *host, CGFloat height);diff --git a/tweak/Sources/Redesigned/Navbar/Navbar.x b/tweak/Sources/Redesigned/Navbar/Navbar.xindex 5b5af6ae..596f4303 100644--- a/tweak/Sources/Redesigned/Navbar/Navbar.x+++ b/tweak/Sources/Redesigned/Navbar/Navbar.x@@ -33,7 +33,7 @@ static char kCustomKey, kOrderKey, kApartKey;static const CGFloat kSplitGap = 10;// Where Spotify's own items keep their icon and label, read off one of them every pass, so an item of-// the mod's own sits on the same line as its neighbours.+// the mod's own sits on the same line as its neighbors.static CGRect sg_iconBox = {{0, kIconTop}, {kIconSize, kIconSize}};static CGRect sg_labelBox = {{0, kLabelTop}, {0, kLabelHeight}};@@ -106,8 +106,8 @@ static UIView *iconView(NSDictionary *entry) {[self addSubview:_icon];}-// Both boxes come off a neighbour, so whatever Spotify does to the row's line-up is copied rather than-// guessed at; only the horizontal centring is the item's own.+// Both boxes come off a neighbor, so whatever Spotify does to the row's line-up is copied rather than+// guessed at; only the horizontal centering is the item's own.- (void)layoutSubviews {[super layoutSubviews];CGFloat width = self.bounds.size.width;@@ -280,8 +280,8 @@ void SGRComposeTabBar(UIView *tabBar) {}// Spotify placed the icon and the label for the width it measured (trees/test5.txt: x 28 in a-// 134pt slot, the centre of the 80pt it had with five tabs) and lays the item out no further-// once the slot changes. Assigning the centres back sends them through the hooks below.+// 134pt slot, the center of the 80pt it had with five tabs) and lays the item out no further+// once the slot changes. Assigning the centers back sends them through the hooks below.static void centreContents(UIView *item) {SGForEachView(item, ^(UIView *v) {if ([v isKindOfClass:%c(SPTEncoreIconView)] || [v isKindOfClass:%c(SPTEncoreLabel)]) v.center = v.center;@@ -318,7 +318,7 @@ static void placeRow(UIStackView *stack) {// Spotify's element layout places the icon and the label from the width it measured, not from// the slot above (trees/test5.txt: x 38 in a 134pt element in a 126pt slot), and a view placed by// its parent gets no layout pass of its own. So the placement itself is bent: on the bar, whatever-// x Spotify sets, the view lands centred on its slot.+// x Spotify sets, the view lands centered on its slot.static CGFloat slotCentreX(UIView *view) {UIStackView *row = sg_row;if (!row) return NAN;diff --git a/tweak/Sources/Redesigned/Navbar/NavbarSettings.m b/tweak/Sources/Redesigned/Navbar/NavbarSettings.mindex 1b0efa91..405eda65 100644--- a/tweak/Sources/Redesigned/Navbar/NavbarSettings.m+++ b/tweak/Sources/Redesigned/Navbar/NavbarSettings.m@@ -254,7 +254,7 @@ static NSArray<UITabBarItem *> *itemsFor(NSArray<NSDictionary *> *entries, BOOL@implementation SGRLabelCard {UIView *_picture;NSMutableArray<UIImageView *> *_glyphs;- NSMutableArray<UIView *> *_bars; // a grey bar under each glyph stands for its name+ NSMutableArray<UIView *> *_bars; // a gray bar under each glyph stands for its nameUILabel *_title;UIImageView *_check;}@@ -592,7 +592,7 @@ typedef NS_ENUM(NSInteger, SGRNavbarSection) {break;}case SGRNavbarSectionLinks:- // Links in the accent colour, as the system's own actions in a list are.+ // Links in the accent color, as the system's own actions in a list are.SGFillCell(cell, path.row == 0 ? @"Add a tab" : @"Use Spotify's tabs", nil, SGRAccent(), nil);cell.selectionStyle = UITableViewCellSelectionStyleDefault;cell.accessibilityTraits = UIAccessibilityTraitButton;diff --git a/tweak/Sources/Redesigned/Navbar/SearchField.x b/tweak/Sources/Redesigned/Navbar/SearchField.xindex 98115e32..4b049a96 100644--- a/tweak/Sources/Redesigned/Navbar/SearchField.x+++ b/tweak/Sources/Redesigned/Navbar/SearchField.x@@ -5,7 +5,7 @@// shared app-wide, so the identifier names the one instance the page owns, with a wide light button// as the fallback for a build that stops setting it.//-// Two things about the colours. The glyph is an SPTEncoreIconView, which bakes its colour into what+// Two things about the colors. The glyph is an SPTEncoreIconView, which bakes its color into what// it draws, so tintColor never reaches it and setForegroundColor: is the way in. And coming back// from the full screen search (trees/search opened.txt, a page of its own that this leaves alone)// Spotify configures the field for a white background again, black glyph and black text, after thediff --git a/tweak/Sources/Redesigned/Navbar/TabBar.x b/tweak/Sources/Redesigned/Navbar/TabBar.xindex 0fa39e4d..6bb70484 100644--- a/tweak/Sources/Redesigned/Navbar/TabBar.x+++ b/tweak/Sources/Redesigned/Navbar/TabBar.x@@ -346,7 +346,7 @@ static void logBarOnce(UITabBar *bar) {#pragma mark - the fade under the bars-// The pages darken towards the bottom of the screen under the glass bar and the now playing bar, from clear+// The pages darken toward the bottom of the screen under the glass bar and the now playing bar, from clear// a little above the now playing card to half black at the screen's foot, so a row going under the glass// reads as passing behind it. Never darker than half: the glass still has the page to lens. The fade is the// stock bar's own subview, behind the glass, so it slides away with the bar when a page hides it; Spotify's@@ -523,7 +523,7 @@ static void syncBar(UIView *stockBar) {NSArray<UIView *> *sources = tabItems(stockBar);if (!sources.count) return;- // An item with no title is drawn by UIKit as its glyph alone, centred, on a bar of the same height.+ // An item with no title is drawn by UIKit as its glyph alone, centered, on a bar of the same height.BOOL hideLabels = SGHidden(SGRKeyNavbarHideLabels);SGRSystemTabBar *apartBar = objc_getAssociatedObject(stockBar, &kApartBarKey);UIView *active = SGRNavbarLitTab();@@ -651,7 +651,7 @@ void SGRSetTabBarMinimized(BOOL minimized, BOOL animated) {// buttons that went fade out from where they were.typedef struct {NSMapTable<UIView *, NSArray<NSValue *> *> *frames; // every view of the host: its frame, the frame shown, moving- NSMutableDictionary<NSString *, NSValue *> *glyphs; // the selected tab's glyph centre in the host (buttonKey)+ NSMutableDictionary<NSString *, NSValue *> *glyphs; // the selected tab's glyph center in the host (buttonKey)NSMapTable<UIView *, UIView *> *buttons; // each tab button, a picture of it} SGRBarState;@@ -741,7 +741,7 @@ static void moveFrom(UIView *host, SGRBarState before, void (^along)(void), voidNSValue *was = key ? before.glyphs[key] : nil;if (was) {[moved addObject:v];- [starts addObject:was]; // a centre in the host, placed once the views above it are back+ [starts addObject:was]; // a center in the host, placed once the views above it are back[targets addObject:[NSValue valueWithCGRect:v.frame]];[taken addObject:key];} else if (isTabButton(v) && v.alpha > 0.01) {@@ -755,14 +755,14 @@ static void moveFrom(UIView *host, SGRBarState before, void (^along)(void), void}[UIView performWithoutAnimation:^{- // Top down, so a button's centre is placed in its platter where the platter starts.+ // Top down, so a button's center is placed in its platter where the platter starts.for (NSUInteger i = 0; i < moved.count; i++) {UIView *v = moved[i];if (strcmp(starts[i].objCType, @encode(CGPoint)) != 0) {v.frame = starts[i].CGRectValue;continue;}- // Its glyph where the old one's was: the button moved by as much as its glyph is off its centre.+ // Its glyph where the old one's was: the button moved by as much as its glyph is off its center.UIImageView *glyph = glyphView(v);CGPoint inButton = [v convertPoint:glyph.center fromView:glyph.superview], to = [host convertPoint:starts[i].CGPointValue toView:v.superview];v.center = CGPointMake(to.x - (inButton.x - CGRectGetMidX(v.bounds)), to.y - (inButton.y - CGRectGetMidY(v.bounds)));diff --git a/tweak/Sources/Redesigned/NowPlayingBar/NowPlayingBar.x b/tweak/Sources/Redesigned/NowPlayingBar/NowPlayingBar.xindex f0b740d5..3d5b9099 100644--- a/tweak/Sources/Redesigned/NowPlayingBar/NowPlayingBar.x+++ b/tweak/Sources/Redesigned/NowPlayingBar/NowPlayingBar.x@@ -1,4 +1,4 @@-// The redesign's now playing bar: the album-coloured card becomes a glass card with round artwork and the+// The redesign's now playing bar: the album-colored card becomes a glass card with round artwork and the// progress line under the text. Spotify's own labels, buttons and gestures stay in place.//// The full screen player morphs the bar's own card and artwork into the cover art. The bar wasdiff --git a/tweak/Sources/Redesigned/Player/Player.h b/tweak/Sources/Redesigned/Player/Player.hindex 8e737d07..6992c850 100644--- a/tweak/Sources/Redesigned/Player/Player.h+++ b/tweak/Sources/Redesigned/Player/Player.h@@ -18,7 +18,7 @@// PlayerGestures.x the gestures' hookup// PlayerMorph.x the open and close grown out of the now playing bar's card, the cover flown// PlayerMotion.x Animated artwork: the Canvas or Apple Music's animated cover behind the player-// PlayerVisualiser.m the Visualiser background: a calm spectrum of the song in the cover's colours, read+// PlayerVisualiser.m the Visualizer background: a calm spectrum of the song in the cover's colors, read// through SGRSpectrum.m from the audio effects' tap on Spotify's output// PlayerMenu.m the more button's system menu: Share, Add to playlist and Add to queue on top, then// speed, pitch and reverb, the backgrounds it can switch to, and Spotify's other rows@@ -37,12 +37,12 @@@class SGRArtworkField;// What is behind the player, chosen on the Player page (PlayerSettings.m).-// SGRKeyPlayerMotion is the switch the choice replaced: until a choice is stored, it picks Still or Colours.+// SGRKeyPlayerMotion is the switch the choice replaced: until a choice is stored, it picks Still or Colors.#define SGRKeyPlayerBackground @"spotifyglass.redesign.player.background"#define SGRKeyPlayerMotion @"spotifyglass.redesign.player.movingBackground"typedef NS_ENUM(NSInteger, SGRPlayerBackgroundKind) {SGRPlayerBackgroundStill, // the artwork blurred and held still- SGRPlayerBackgroundColours, // the artwork's colours drifting (SGRFlow.h)+ SGRPlayerBackgroundColours, // the artwork's colors drifting (SGRFlow.h)SGRPlayerBackgroundFluid, // the artwork itself blurred and turning (SGRFluid.h)SGRPlayerBackgroundAnimated, // the track's Canvas or Apple Music's animated cover, over Fluid (PlayerMotion.x)SGRPlayerBackgroundVisualiser, // a spectrum of the song over Fluid held still (PlayerVisualiser.m)@@ -55,7 +55,7 @@ NSArray<NSString *> *SGRPlayerBackgroundNames(void);// The field behind the player, nil until the player has laid out once (PlayerField.x).SGRArtworkField *SGRPlayerField(void);// Holds the field still, or lets it move, for what is over it now: a paused song, an Animated artwork clip, the-// Visualiser (PlayerField.x).+// Visualizer (PlayerField.x).void SGRPlayerHoldField(void);#pragma mark - the cover (PlayerArtwork.x)@@ -115,9 +115,9 @@ UIView *SGRPlayerMotionPreview(void (^arrived)(void));// luminance; between 0.10 and 0.80, 0.15 more while the lyrics are up.CGFloat SGRPlayerClipDim(CGFloat luminance, BOOL contrast, BOOL lyrics);-#pragma mark - the Visualiser (PlayerVisualiser.m)+#pragma mark - the Visualizer (PlayerVisualiser.m)-// The background is the Visualiser.+// The background is the Visualizer.BOOL SGRPlayerVisualiserShowing(void);// Puts the hills on the field or takes them off as the background says, lays them out, and blurs them while the// lyrics are open. Called on every layout pass of the field (PlayerField.x), when the lyrics come or go@@ -126,7 +126,7 @@ BOOL SGRPlayerVisualiserShowing(void);void SGRPlayerVisualiserUpdate(void);// A view of its own drawing the same hills, for the Player page's showcase. It moves only in a window.UIView *SGRPlayerVisualiserPreview(void);-// Switches the background to `kind` from the ⋯ menu, at once: Fluid, Animated or Visualiser, while it is one of+// Switches the background to `kind` from the ⋯ menu, at once: Fluid, Animated or Visualizer, while it is one of// them (SGPlayerMenuOffersAnimatedArtwork); nothing otherwise.void SGRPlayerMenuSetBackground(SGRPlayerBackgroundKind kind);diff --git a/tweak/Sources/Redesigned/Player/PlayerArtwork.x b/tweak/Sources/Redesigned/Player/PlayerArtwork.xindex 49629ad5..02929400 100644--- a/tweak/Sources/Redesigned/Player/PlayerArtwork.x+++ b/tweak/Sources/Redesigned/Player/PlayerArtwork.x@@ -244,8 +244,8 @@ static void watchHold(UIView *tilt) {// Spotify's cell keeps room under the cover for the lyric preview even with the preview gone, so a track// with lyrics had a smaller cover with a blank band under it (issue #77). The preview takes no room-// (below), and the tilt view takes the largest square of the plain view it sits in (01.txt:35), centred.-// Bounds and a centre, not a frame, since the tilt view carries Spotify's tilt while the cover is inspected.+// (below), and the tilt view takes the largest square of the plain view it sits in (01.txt:35), centered.+// Bounds and a center, not a frame, since the tilt view carries Spotify's tilt while the cover is inspected.// A square under kCoverMinWidth is left as it is, so no small cover grows.static void fillRoom(UIView *tilt) {CGRect room = tilt.superview.bounds;diff --git a/tweak/Sources/Redesigned/Player/PlayerControls.x b/tweak/Sources/Redesigned/Player/PlayerControls.xindex 42f6dca5..916308a7 100644--- a/tweak/Sources/Redesigned/Player/PlayerControls.x+++ b/tweak/Sources/Redesigned/Player/PlayerControls.x@@ -63,8 +63,8 @@ static SGRGlyphView *glyphFor(UIView *owner, NSString *symbol, CGFloat size) {return glyph;}-// Centred by the autoresizing mask as well as here: the unit lays out before the buttons in its row-// have a size, so a centre set then is the middle of nothing, (0, 0), and no later pass of the unit's+// Centered by the autoresizing mask as well as here: the unit lays out before the buttons in its row+// have a size, so a center set then is the middle of nothing, (0, 0), and no later pass of the unit's// comes to move it (trees/continuous/1.txt, 2026-09-17: glyphs at {-23.7, -14.7} in 56pt buttons).static void keepOnTop(UIView *view, UIView *host) {if (view.superview != host) {@@ -180,7 +180,7 @@ static void playGlyph(UIView *host) {%orig;UIView *host = ((UIViewController *)self).viewIfLoaded;if (!host) return;- // The unit lays out before its row does, and the glyphs are centred on the buttons in it.+ // The unit lays out before its row does, and the glyphs are centered on the buttons in it.[SGRowIn(host) layoutIfNeeded];sg_controlsHost = host;skipGlyph(host, @"SPTNowPlayingPreviousTrackButton", &kPreviousKey, @"backward.fill");diff --git a/tweak/Sources/Redesigned/Player/PlayerField.x b/tweak/Sources/Redesigned/Player/PlayerField.xindex 791d2deb..ed81ccd6 100644--- a/tweak/Sources/Redesigned/Player/PlayerField.x+++ b/tweak/Sources/Redesigned/Player/PlayerField.x@@ -1,7 +1,7 @@// Player redesign: the artwork field behind the full screen player, and what the switch forces.//// Tree (trees/clean/player/01.txt:449): NPVBackgroundViewController's view is a plane inside the NPV's-// own list (scrolling_npv_collection_view), painted the album colour with Spotify's gradients+// own list (scrolling_npv_collection_view), painted the album color with Spotify's gradients// (NPVGradientView) stacked on it. Its top stays at the top of the content and it grows as the list// scrolls (874 at rest, 1495 and 2144 further down, 02.txt:757, 03.txt:861), so a field inside it// scrolls with the cards and is laid out again on every scroll frame: the hook only compares a frame.@@ -9,13 +9,13 @@// fought over, and nothing depends on a repaint hook.//// With Moving background on (SGRKeyPlayerMotion, the default) the field is the Kit's moving field of the-// artwork's colours (SGRFlow.h) rather than the still blurred artwork; a paused song holds it still.+// artwork's colors (SGRFlow.h) rather than the still blurred artwork; a paused song holds it still.//// The picture comes from the Kit's now playing artwork, keyed on the picture the playing track names// (SGRBridges.h, issue #58): the Kit's own fetch of it, the now playing bar's 40pt cover, published by// the Kit, and the player's own 354pt cover, published here from the cell in the middle of the// sideways list of covers (AccessibleCollectionView, 01.txt:28, one CoverArtCellImpl per queued track,-// the ones out of view hidden). Until the first picture has been read the field takes the colour+// the ones out of view hidden). Until the first picture has been read the field takes the color// Spotify already has for the player, from -[NPVBackgroundViewController// backgroundViewModel:didChangeColor:playerState:] (objc-methods.txt:57949).#import "Core/SGCore.h"@@ -34,7 +34,7 @@ static __weak SGRArtworkField *sg_field;static __weak UIScrollView *sg_coverList;static __weak UIImage *sg_lastCover;static NSString *sg_lastCoverURI;-// Spotify's colour for the player, which can arrive before the plane has laid out once.+// Spotify's color for the player, which can arrive before the plane has laid out once.static UIColor *sg_spotifyColor;SGRArtworkField *SGRPlayerField(void) {@@ -47,11 +47,11 @@ SGRPlayerBackgroundKind SGRPlayerBackground(void) {}NSArray<NSString *> *SGRPlayerBackgroundNames(void) {- return @[@"Still", @"Colours", @"Fluid", @"Animated", @"Visualiser"];+ return @[@"Still", @"Colors", @"Fluid", @"Animated", @"Visualizer"];}-// A paused song holds the colours still, the way it rests the cover (PlayerArtwork.x), and so does what lies over-// the field: an animated artwork's clip, which covers it (PlayerMotion.x), or the Visualiser's hills, which are+// A paused song holds the colors still, the way it rests the cover (PlayerArtwork.x), and so does what lies over+// the field: an animated artwork's clip, which covers it (PlayerMotion.x), or the Visualizer's hills, which are// the one thing moving.static BOOL fieldHeld(void) {return SGPlayerState().isPaused || SGRPlayerMotionShowing() || SGRPlayerVisualiserShowing();@@ -106,7 +106,7 @@ static SGRArtworkField *fieldIn(UIView *plane) {- (void)backgroundViewModel:(id)model didChangeColor:(id)color playerState:(id)state {%orig;static dispatch_once_t once;- dispatch_once(&once, ^{ SGLog(@"redesign player: Spotify's colour %@ (%@), state %@", color, [color class], [state class]); });+ dispatch_once(&once, ^{ SGLog(@"redesign player: Spotify's color %@ (%@), state %@", color, [color class], [state class]); });if (![color isKindOfClass:UIColor.class]) return;sg_spotifyColor = color;UIView *plane = ((UIViewController *)self).viewIfLoaded;diff --git a/tweak/Sources/Redesigned/Player/PlayerFooter.x b/tweak/Sources/Redesigned/Player/PlayerFooter.xindex 8619d3a4..be41a581 100644--- a/tweak/Sources/Redesigned/Player/PlayerFooter.x+++ b/tweak/Sources/Redesigned/Player/PlayerFooter.x@@ -247,7 +247,7 @@ static void lowerRow(UIView *row) {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+ // Spotify put it, since centering 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);diff --git a/tweak/Sources/Redesigned/Player/PlayerLandscape.x b/tweak/Sources/Redesigned/Player/PlayerLandscape.xindex a250abf6..e2982676 100644--- a/tweak/Sources/Redesigned/Player/PlayerLandscape.x+++ b/tweak/Sources/Redesigned/Player/PlayerLandscape.x@@ -84,7 +84,7 @@ static UIButton *controlButton(NSString *symbol, CGFloat size, NSString *label,[super viewDidLoad];self.view.backgroundColor = UIColor.blackColor;- // The player's own field behind the screen, so the colours carry over from the portrait player.+ // The player's own field behind the screen, so the colors carry over from the portrait player._field = [[SGRArtworkField alloc] initWithFrame:self.view.bounds];_field.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;_field.showsBackdrop = YES;@@ -192,7 +192,7 @@ static UIButton *controlButton(NSString *symbol, CGFloat size, NSString *label,NSString *identity = nil;UIImage *art = SGRNowPlayingArtwork(NULL, &identity);if (!art) return;- // On the field's clock, so the cover and the colours behind it change as one.+ // On the field's clock, so the cover and the colors behind it change as one.UIImageView *cover = _cover;[UIView transitionWithView:cover duration:SGRCrossfade options:UIViewAnimationOptionTransitionCrossDissolveanimations:^{ cover.image = art; } completion:nil];diff --git a/tweak/Sources/Redesigned/Player/PlayerLyrics.x b/tweak/Sources/Redesigned/Player/PlayerLyrics.xindex a4985ecd..d1ff8b00 100644--- a/tweak/Sources/Redesigned/Player/PlayerLyrics.x+++ b/tweak/Sources/Redesigned/Player/PlayerLyrics.x@@ -10,7 +10,7 @@// paging list of them, and the two pictures are the same one, so the swap is not seen. The title row// is Spotify's own unit translated, the way PlayerFooter.x moves the footer's controls -- a transform// survives the stack view laying its arranged views out again -- with a mask over it where the controls-// it moved towards begin, so a long title fades out before them instead of running under them. The row+// it moved toward begin, so a long title fades out before them instead of running under them. The row// of chips over it (Switch to video) goes while the lines are up, since they take the room it sits in.//// Tree (trees/clean/player/01.txt): SPTNowPlayingView (:26) holds the content layers, the header row@@ -127,7 +127,7 @@ static __weak UIGestureRecognizer *sg_wake; // on the player, on while alone: threturn inRow == row ? nil : inRow;}-// Made on the first tap and kept afterwards: it measures the song for its width before it can place a+// Made on the first tap and kept afterward: it measures the song for its width before it can place a// line, so a view built again on every tap would show nothing for the first frames. Out of the window// it costs nothing -- its display link only runs while it is in one.- (SGRKaraokeView *)lyrics {@@ -254,7 +254,7 @@ static void placeTitleRow(SGRLyricsLayout l) {if (!title) return;CGAffineTransform slide = CGAffineTransformMakeTranslation(round(shift), 0);if (!CGAffineTransformEqualToTransform(title.transform, slide)) title.transform = slide;- // Closed it reaches as far as Spotify meant it to; moved, only as far as the controls it moved towards.+ // Closed it reaches as far as Spotify meant it to; moved, only as far as the controls it moved toward.CGFloat room = CGFLOAT_MAX;if (sg_open) room = trailingEdgeIn(info) - kTitleGap - (CGRectGetMinX(untransformed(title, info)) + shift);clipTitle(title, room);@@ -274,7 +274,7 @@ BOOL SGRPlayerLyricsOpen(void) {// Puts the overlay's own views where the measurements say, without animating. The thumbnail is laid out// at the size and place Spotify draws its cover at and moved by its transform alone, so a pass that// runs while it is up leaves it exactly where the eye has it: the two are worked out from one-// measurement. Bounds and a centre, not a frame, since both views can be under a transform.+// measurement. Bounds and a center, not a frame, since both views can be under a transform.static void place(SGRPlayerLyricsOverlay *overlay, UIView *host, SGRLyricsLayout l) {overlay.frame = CGRectUnion(l.cover, CGRectUnion(l.thumb, l.stage));CGRect cover = [overlay convertRect:l.cover fromView:host], stage = [overlay convertRect:l.stage fromView:host];@@ -288,7 +288,7 @@ static void place(SGRPlayerLyricsOverlay *overlay, UIView *host, SGRLyricsLayoutoverlay.stage.center = CGPointMake(CGRectGetMidX(stage), CGRectGetMidY(stage));}-// Where the thumbnail's view has to go to land on `l.thumb`, as a transform about its own centre: the+// Where the thumbnail's view has to go to land on `l.thumb`, as a transform about its own center: the// shadow and the corners travel with it that way, instead of a shadow redrawn on every frame.static CGAffineTransform thumbTransform(SGRLyricsLayout l) {CGFloat scale = l.cover.size.width > 0 ? l.thumb.size.width / l.cover.size.width : 1;diff --git a/tweak/Sources/Redesigned/Player/PlayerMenu.m b/tweak/Sources/Redesigned/Player/PlayerMenu.mindex b36d82e1..22680c04 100644--- a/tweak/Sources/Redesigned/Player/PlayerMenu.m+++ b/tweak/Sources/Redesigned/Player/PlayerMenu.m@@ -6,7 +6,7 @@// Playback Speed 0.5× to 2× in the steps Podcasts offers, the current one checked// Pitch Pitch Follows Speed, then three semitones down to three up, Original between them// Reverb Off and a quarter at a time up to 100%, the audio effects' reverb-// Show Fluid Artwork, Show Animated Artwork, Show Visualiser+// Show Fluid Artwork, Show Animated Artwork, Show Visualizer// a button for each of the two the background is not, while it is one of the// three, named for what it switches to//@@ -124,7 +124,7 @@ static NSArray<UIMenuElement *> *playerItems(void) {NSArray<NSArray *> *backgrounds = @[@[@(SGRPlayerBackgroundFluid), @"Show Fluid Artwork", @"drop"],@[@(SGRPlayerBackgroundAnimated), @"Show Animated Artwork", @"play.rectangle.on.rectangle"],- @[@(SGRPlayerBackgroundVisualiser), @"Show Visualiser", @"waveform"],+ @[@(SGRPlayerBackgroundVisualiser), @"Show Visualizer", @"waveform"],];SGRPlayerBackgroundKind current = SGRPlayerBackground();for (NSArray *background in backgrounds) {diff --git a/tweak/Sources/Redesigned/Player/PlayerMorph.x b/tweak/Sources/Redesigned/Player/PlayerMorph.xindex f03d4999..7a2d67fa 100644--- a/tweak/Sources/Redesigned/Player/PlayerMorph.x+++ b/tweak/Sources/Redesigned/Player/PlayerMorph.x@@ -7,12 +7,12 @@// (setProgress: at 0x109815464). There it sets the player's frame to the container's bounds moved down by// the bar's bottom edge times (1 - progress), and the player's alpha, and moves and fades the bar's stand-in.//-// The morph rides on that progress, after Spotify's own, so taps, drags and cancelled drags follow:+// The morph rides on that progress, after Spotify's own, so taps, drags and canceled drags follow:// the sheet a rounded rect from the card's frame and radius to the screen's, filled with the-// field's colour, under the player, showing at once;+// field's color, under the player, showing at once;// the player masked to the sheet, its content scaled and moved so its top left is the sheet's// (sublayerTransform, and the frame's top moved to the sheet's; Spotify's gesture code-// reads back only the frame's height), its own background colour lifted off meanwhile+// reads back only the frame's height), its own background color lifted off meanwhile// (a sublayerTransform does not move it), and faded in over the first part of the growth;// the bar Spotify's stand-in riding the sheet's top edge, gone by a quarter of the way;// the cover a copy flown from the card's artwork to the player's cover, moved within the sheet,diff --git a/tweak/Sources/Redesigned/Player/PlayerMotion.x b/tweak/Sources/Redesigned/Player/PlayerMotion.xindex 631965fc..1fd6e061 100644--- a/tweak/Sources/Redesigned/Player/PlayerMotion.x+++ b/tweak/Sources/Redesigned/Player/PlayerMotion.x@@ -1,7 +1,7 @@// Player redesign: Animated artwork, the track's Canvas or Apple Music's animated cover behind the player,// the way the Music app draws it. The clip runs edge to edge from the top, sharp to near its foot, where// it dissolves into its own last rows drawn on down to the bottom of the field, so it ends in its own-// colour rather than on the Fluid field. A blur comes in from the seam (from above the controls for a+// color rather than on the Fluid field. A blur comes in from the seam (from above the controls for a// Canvas as tall as the screen) and lies under the controls; behind the lyrics the whole clip is blurred.// The player's square cover goes while a clip plays, so a track without one keeps its cover over Fluid// (PlayerField.x keeps the field Fluid for this choice). The player's ⋯ menu switches between Animated@@ -16,7 +16,7 @@// while the player opens or closes, and while the song is paused. Under Reduce Motion and in Low Power Mode// no clip plays at all: the cover stays over Fluid, as for a track without one, until both are off again.// While a clip is showing, the Fluid field under it is held still too, and once the clip has faded in it is-// hidden (the field's covered): the field's colour is what shows above the clip on the pull that dismisses.+// hidden (the field's covered): the field's color is what shows above the clip on the pull that dismisses.//// The clip is dimmed by how bright it is (SGRPlayerClipDim): three of its frames are measured as it comes in,// so a white Canvas is drawn darker than a black one and the white text over it keeps its contrast.@@ -227,7 +227,7 @@ static UIBlurEffect *blurEffect(void) {- (void)playFile:(NSURL *)file poster:(UIImage *)poster {_aspect = poster.size.height / poster.size.width;- // The poster's last rows, stretched from the seam to the bottom: the clip goes on down in its own colour.+ // The poster's last rows, stretched from the seam to the bottom: the clip goes on down in its own color.CGFloat rows = MAX(kFootRows, 1 / MAX(1, poster.size.height * poster.scale));_foot.contents = (__bridge id)poster.CGImage;_still.contents = (__bridge id)poster.CGImage;@@ -610,7 +610,7 @@ static BOOL beginTrack(NSString *track) {#pragma mark - the ⋯ menu's switch (Shared/Player/SpeedPitch.h)-// Fluid, Animated and the Visualiser share the field, so the menu moves between them without a restart. The+// Fluid, Animated and the Visualizer share the field, so the menu moves between them without a restart. The// other backgrounds are a field of another kind, chosen on the Player page (PlayerSettings.m).BOOL SGPlayerMenuOffersAnimatedArtwork(void) {return sg_follower && SGRPlayerBackground() >= SGRPlayerBackgroundFluid;@@ -627,7 +627,7 @@ void SGPlayerMenuSetAnimatedArtwork(BOOL on) {// The playing track is let go, and looked up again when switched on.clear(YES);[sg_follower restart];- // From the Visualiser, whose hills go.+ // From the Visualizer, whose hills go.SGRPlayerVisualiserUpdate();}diff --git a/tweak/Sources/Redesigned/Player/PlayerSettings.m b/tweak/Sources/Redesigned/Player/PlayerSettings.mindex 794e25bc..b220ae72 100644--- a/tweak/Sources/Redesigned/Player/PlayerSettings.m+++ b/tweak/Sources/Redesigned/Player/PlayerSettings.m@@ -6,11 +6,11 @@// card shows the last one played (Shared/Player/SGLastTrack.h), its cover fetched and its Canvas looked up// as the playing one's would be, and with none ever played, Not Playing over a gradient of the accent.//-// The background is the player's own: a field of the same kind (Still, Colours, Fluid), for Animated+// The background is the player's own: a field of the same kind (Still, Colors, Fluid), for Animated// the clip the player is playing (SGRPlayerMotionPreview) in place of the field, or, while the player has// none, the playing track's clip looked up for the card while it is on screen, Fluid until it comes in and// for a track with none, as in the player; the clip crosses over the field as it arrives, its poster first-// while its video decodes. And for Visualiser the hills over Fluid held still (SGRPlayerVisualiserPreview),+// while its video decodes. And for Visualizer the hills over Fluid held still (SGRPlayerVisualiserPreview),// moving with the song. It moves under the field's own conditions (in a window, Spotify in front, Reduce// Motion and Low Power Mode off). Under the card a segmented control picks the background, all five of// them: the names are one word each, each segment as wide as its name, so they fit side by side at an iPhone's@@ -40,10 +40,10 @@ static const CGFloat kCardPadding = 16, kCoverSide = 64;static NSArray<NSString *> *backgroundNotes(void) {return @[@"The cover, blurred and held still.",- @"The cover's colours, drifting slowly.",+ @"The cover's colors, drifting slowly.",@"The cover itself, blurred and slowly turning. It rests while a song is paused.",- @"The song's Canvas or the album's moving cover, else Fluid. The player's ⋯ menu switches between this, Fluid and Visualiser.",- @"The song's sound as gentle hills in the cover's colours, over Fluid held still. They settle while a song is paused.",+ @"The song's Canvas or the album's moving cover, else Fluid. The player's ⋯ menu switches between this, Fluid and Visualizer.",+ @"The song's sound as gentle hills in the cover's colors, over Fluid held still. They settle while a song is paused.",];}@@ -333,9 +333,9 @@ UIViewController *SGRPlayerSettingsPage(NSArray *more) {SGNotedSection(@"Mini player", SGRNowPlayingBarRows(),@"Apple Music style moves the now playing bar in between two tabs as you scroll down."), nil];[sections addObjectsFromArray:more];- // Fluid, Animated and Visualiser share the field (PlayerMotion.x reads the choice on every track, PlayerVisualiser.m- // on the field's layout); Still and Colours are a field of another kind, made once a launch (PlayerField.x).- NSString *footer = @"Fluid, Animated and Visualiser change with the next song. Still, Colours and Hide on the player apply after you restart Spotify.";+ // Fluid, Animated and Visualizer share the field (PlayerMotion.x reads the choice on every track, PlayerVisualiser.m+ // on the field's layout); Still and Colors are a field of another kind, made once a launch (PlayerField.x).+ NSString *footer = @"Fluid, Animated and Visualizer change with the next song. Still, Colors and Hide on the player apply after you restart Spotify.";SGRPlayerPage *page = [[SGRPlayerPage alloc] initWithTitle:@"Player" intro:nil sections:sections footer:footer];page.showcase = showcase;page.backgrounds = backgrounds;diff --git a/tweak/Sources/Redesigned/Player/PlayerVisualiser.m b/tweak/Sources/Redesigned/Player/PlayerVisualiser.mindex 4641e3b3..e7907ec4 100644--- a/tweak/Sources/Redesigned/Player/PlayerVisualiser.m+++ b/tweak/Sources/Redesigned/Player/PlayerVisualiser.m@@ -1,5 +1,5 @@-// Player redesign: the Visualiser background, a calm spectrum of what is playing behind the player, in the-// cover's colours, over the Fluid field held still (PlayerField.x keeps the field Fluid for this choice, as for+// Player redesign: the Visualizer background, a calm spectrum of what is playing behind the player, in the+// cover's colors, over the Fluid field held still (PlayerField.x keeps the field Fluid for this choice, as for// Animated, so the ⋯ menu moves between the three without a restart).//// The sound is Spotify's output as it plays, read on the render thread through the audio effects' notify@@ -8,7 +8,7 @@// the last few seconds at the top, so a quiet track moves as much as a loud one), eases each band up quickly// and down slowly, and draws two soft hills across the foot of the screen, mirrored about its middle, the bass// in the middle and the treble at either edge: a slow one behind, a quicker one in front. Each is a gradient of-// the cover's colours (SGRPalette's flow colours, kept dark enough that white text on them stays over 5.5:1)+// the cover's colors (SGRPalette's flow colors, kept dark enough that white text on them stays over 5.5:1)// masked by a shape layer, so the render server does the drawing and the app only hands it two paths a frame.//// It moves only while it is in a window, Spotify is in front, the player is not opening or closing, Low Power@@ -35,9 +35,9 @@ enum { kBands = SGRSpectrumBands, kPoints = 2 * kBands - 1 };// The loudness a band is drawn against: the loudest band of late at the top, kRange dB under it at the floor,// the top falling kPeakFall dB a second after a loud passage and never under kPeakFloor, so silence stays flat.static const float kRange = 40, kPeakFall = 4, kPeakFloor = -60;-// A rise towards the treble, in dB a band (three bands an octave), since music has less there: a tuning knob.+// A rise toward the treble, in dB a band (three bands an octave), since music has less there: a tuning knob.static const float kTilt = 0.6f;-// How quickly a band eases towards its level, up and down, in seconds; the hill behind is slower. With Reduce+// How quickly a band eases toward its level, up and down, in seconds; the hill behind is slower. With Reduce// Motion both ease over kStillEase.static const double kFrontUp = 0.08, kFrontDown = 0.4, kBackUp = 0.3, kBackDown = 0.9, kStillEase = 3;// No new bands for this long reads as silence (a pause, a stall, a tap that never ran).@@ -46,13 +46,13 @@ static const double kStale = 0.3;static const CGFloat kFrontHeight = 0.24, kBackHeight = 0.3, kRestHeight = 0.012;// Below this every band has settled (under 2 pt at the top of the front hill), and a paused song's link can stop.static const float kSettled = 0.02f;-// Each band shares this much with either neighbour, twice over, so one loud band is a hill and not a spike.+// Each band shares this much with either neighbor, twice over, so one loud band is a hill and not a spike.static const float kSpread = 0.25f;static const NSTimeInterval kTransitionSlack = 0.05;static NSUInteger sg_readers;-// The reader on while any view is moving, so nothing is analysed while none is.+// The reader on while any view is moving, so nothing is analyzed while none is.static void needReader(BOOL need) {if (need) {if (sg_readers++ == 0) {@@ -151,7 +151,7 @@ static CAGradientLayer *fill(CAShapeLayer *shape) {if (_reading) needReader(NO);}-#pragma mark - colour+#pragma mark - color// Bottom left, the whole cover and bottom right in front, the top two behind, so the hills read as the cover's// lower half under its upper.@@ -174,7 +174,7 @@ static CAGradientLayer *fill(CAShapeLayer *shape) {[view applyColors:palette.flowColors];return;}- // The colours cross over as the field's do.+ // The colors cross over as the field's do.[CATransaction begin];[CATransaction setAnimationDuration:SGRCrossfade];[CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];@@ -433,7 +433,7 @@ void SGRPlayerVisualiserUpdate(void) {if (made) {[sg_view setBlurred:SGRPlayerLyricsOpen() animated:NO];[sg_view appear:field.window != nil];- SGLog(@"redesign player: visualiser on the field");+ SGLog(@"redesign player: visualizer on the field");} else {BOOL open = SGRPlayerLyricsOpen();if (open != sg_view.blurred) [sg_view setBlurred:open animated:sg_view.window != nil];diff --git a/tweak/Sources/Redesigned/Player/SGRSpectrum.h b/tweak/Sources/Redesigned/Player/SGRSpectrum.hindex c68445f5..807da69f 100644--- a/tweak/Sources/Redesigned/Player/SGRSpectrum.h+++ b/tweak/Sources/Redesigned/Player/SGRSpectrum.h@@ -1,4 +1,4 @@-// The player's Visualiser background (PlayerVisualiser.x) reads the sound through this: what Spotify's+// The player's Visualizer background (PlayerVisualiser.x) reads the sound through this: what Spotify's// output plays, cut into SGRSpectrumBands bands spaced evenly in pitch from kLowest to kHighest Hz (SGRSpectrum.m),// each band's level in dB, 0 dB being a full scale sine in it.//diff --git a/tweak/Sources/Redesigned/Player/SGRSpectrum.m b/tweak/Sources/Redesigned/Player/SGRSpectrum.mindex 824d27b0..9b8d324a 100644--- a/tweak/Sources/Redesigned/Player/SGRSpectrum.m+++ b/tweak/Sources/Redesigned/Player/SGRSpectrum.m@@ -1,4 +1,4 @@-// The Visualiser's spectrum (SGRSpectrum.h): a ring of the last kSize samples, analysed every kHop.+// The Visualizer's spectrum (SGRSpectrum.h): a ring of the last kSize samples, analyzed every kHop.#import <Accelerate/Accelerate.h>#import <math.h>#import <stdatomic.h>diff --git a/tweak/Sources/Redesigned/Playlist/Playlist.h b/tweak/Sources/Redesigned/Playlist/Playlist.hindex 6d31609f..85c90d07 100644--- a/tweak/Sources/Redesigned/Playlist/Playlist.h+++ b/tweak/Sources/Redesigned/Playlist/Playlist.h@@ -7,7 +7,7 @@// PlaylistField.x the artwork field behind the whole page, the artwork it is read from, the flags// the screen forces// PlaylistHeader.x the header: the cover full bleed at the top dissolving into the field, the title,-// the creator and the length centred under it, and one row of glass controls --+// the creator and the length centered under it, and one row of glass controls --// shuffle, a prominent Play capsule, add, and more where Spotify still has it// PlaylistRows.x the track rows on the field with no surface of their own, rounded artwork, a// hairline between them, and the curation pills collapsed@@ -39,10 +39,10 @@ UIView *SGRPlaylistPageOf(UIView *view);// PlaylistField.x. The field belongs to the page `view` is on, found by walking up from it, so two playlist// pages on the navigation stack keep a field each.//-// The colour the page's field is showing, SGRNeutralField() before one has been read: what the header's+// The color the page's field is showing, SGRNeutralField() before one has been read: what the header's// cover has to dissolve into for there to be no seam.UIColor *SGRPlaylistFieldColor(UIView *view);-// The cover of the page `view` is on, for its field to take its colour from. The same image again is a no-op.+// The cover of the page `view` is on, for its field to take its color from. The same image again is a no-op.void SGRPlaylistSetArtwork(UIView *view, UIImage *image);// The page `view` is on has no cover to wait for (Liked Songs): shown now rather than after the field's limit.void SGRPlaylistShowPage(UIView *view);diff --git a/tweak/Sources/Redesigned/Playlist/PlaylistField.x b/tweak/Sources/Redesigned/Playlist/PlaylistField.xindex e4dad488..610b4e5e 100644--- a/tweak/Sources/Redesigned/Playlist/PlaylistField.x+++ b/tweak/Sources/Redesigned/Playlist/PlaylistField.x@@ -5,14 +5,14 @@// the size of the window) and, after it and so over it, the header (id=PL.Header). Neither scrolls the// other: the list keeps its frame and the header's y runs from -134 at rest to -529 scrolled, so a field// put behind both stays still while the cover at the top of the header slides up over it -- which is what-// the Music app does with the page colour.+// the Music app does with the page color.//// So the field is the page's bottom-most view, the size of the view and bleeding past it, with no backdrop// of its own: the sharp cover at the top of the header is the picture, and PlaylistHeader.x fades it into-// exactly this field's colour. What Spotify paints over the field -- the page, the list and every row, all+// exactly this field's color. What Spotify paints over the field -- the page, the list and every row, all// of them the base surface -- is kept clear by the Kit's repaint hook while sgr_playlistRoot is this page.//-// The colour is the main colour of the cover the header shows (PlaylistHeader.x hands it over), not its+// The color is the main color of the cover the header shows (PlaylistHeader.x hands it over), not its// bottom edge, and until that has loaded the field is the neutral one, as it is for a playlist with no// cover at all.#import "Core/SGCore.h"diff --git a/tweak/Sources/Redesigned/Playlist/PlaylistHeader.x b/tweak/Sources/Redesigned/Playlist/PlaylistHeader.xindex f0c971f7..cd698f9a 100644--- a/tweak/Sources/Redesigned/Playlist/PlaylistHeader.x+++ b/tweak/Sources/Redesigned/Playlist/PlaylistHeader.x@@ -1,12 +1,12 @@// Playlist redesign: the header the Music app gives a playlist (iOS 26.4). The cover runs full bleed across-// the top of the page and dissolves into the page's colour; the title, the creator and the length are centred+// the top of the page and dissolves into the page's color; the title, the creator and the length are centered// on the bottom of that dissolve; under them one row -- shuffle, a white Play capsule, and save (someone// else's playlist) or download (one's own, Liked Songs) -- and the description last.//// Tree (trees/clean/playlist/01.txt:640-869). Spotify's header is id=PL.Header, and at rest its// HeaderContentLayout starts at the very top of the page. It holds exactly two things://-// Components.Header.UI.ArtworkImage a ShadowContainer, the cover square, centred at {80, 68} 243x243+// Components.Header.UI.ArtworkImage a ShadowContainer, the cover square, centered at {80, 68} 243x243// the block a plain UIView at {0, 327} 386x178: a column of title, description,// creator row and length, and under it the action row//@@ -71,7 +71,7 @@ UIViewController *SGRPlaylistHeaderOf(UIView *view) {return nil;}-// Invisible for good, whatever Spotify does to it. It fades its cover square and its colour wash back in+// Invisible for good, whatever Spotify does to it. It fades its cover square and its color wash back in// from the scroll itself (trees/continuous/1.txt, 2026-09-17), which a hidden layer shrugs off; but pressing// Play reconfigures the header, and that shows the wash, the find bar and the play disc again with// -setHidden:NO, which writes the layer's own hidden and so undid this: the wash came back over the@@ -101,12 +101,12 @@ static UIView *firstOfClass(UIView *root, Class wanted) {#pragma mark - the cover, full bleed// The picture across the top of the page, a scrim over its top for the status bar, and its bottom masked-// away so the field shows through whatever colour it is at that height: pulled down, the hero ends where-// the field is already fading to black, and a fade to the field's flat colour showed as an edge.+// away so the field shows through whatever color it is at that height: pulled down, the hero ends where+// the field is already fading to black, and a fade to the field's flat color showed as an edge.@interface SGRPlaylistHero : UIView@property (nonatomic, readonly) UIImageView *picture;@property (nonatomic) CGFloat coverPixels; // the widest copy of the artwork it has been shown-// The cover in Spotify's artwork view, and every cover it puts there afterwards: the hero keeps itself+// The cover in Spotify's artwork view, and every cover it puts there afterward: the hero keeps itself// right, rather than being handed a picture on each of the header's passes and staying empty between them.- (void)followCover:(UIImageView *)source;@end@@ -176,7 +176,7 @@ static UIView *firstOfClass(UIView *root, Class wanted) {self.coverPixels = image.size.width;_picture.image = image;- // The page's field takes its colour from the same picture.+ // The page's field takes its color from the same picture.SGRPlaylistSetArtwork(self, image);static BOOL logged;if (late && !logged) {@@ -201,7 +201,7 @@ static UIImageView *coverImageIn(UIView *cover) {return found ?: empty;}-// The hero sits in the plane Spotify's colour wash is drawn on, which slides away as the header collapses, so+// The hero sits in the plane Spotify's color wash is drawn on, which slides away as the header collapses, so// Core Animation carries it and its frame is only measured at rest: reading the header per frame flickers.// Pulled down past the top the plane grows and the hero stretches with it, bottom kept in place.static void applyHero(UIView *layout, UIView *cover, UIView *plane, UIView *block, CGFloat reach, CGFloat stretch) {@@ -403,7 +403,7 @@ static SGRHeaderInfo *applyInfo(UIView *block, UIView *headerRoot, UIViewControlfor (UIView *sub in block.subviews) {if (sub != info) conceal(sub);}- // The page's width, centred on the screen: Spotify's block is 16pt narrower than the page (386 of 402).+ // The page's width, centered on the screen: Spotify's block is 16pt narrower than the page (386 of 402).CGFloat x = -[block convertPoint:CGPointZero toView:headerRoot].x;CGRect frame = CGRectMake(round(x), 0, headerRoot.bounds.size.width, block.bounds.size.height);if (!CGRectEqualToRect(info.frame, frame)) info.frame = frame;@@ -420,7 +420,7 @@ static SGRHeaderInfo *applyInfo(UIView *block, UIView *headerRoot, UIViewControl#pragma mark - the header's pass// Find on this page and Sort sit above the cover, shown as the page is pulled down. They stay Spotify's own-// controls, so the tap opens Spotify's find page; only the grey box becomes glass.+// controls, so the tap opens Spotify's find page; only the gray box becomes glass.static void glassUp(UIView *box, const void *key) {CGSize size = box.bounds.size;if (size.width < 1 || size.height < 1) return;@@ -444,7 +444,7 @@ static void applyToolbar(UIView *headerRoot) {}}-// Two scrims Spotify fades in under the navigation bar as the page scrolls, each tinted with its own colour+// Two scrims Spotify fades in under the navigation bar as the page scrolls, each tinted with its own color// for the page rather than the field's: LiquidGlass.gradientContainer (124pt, a child of HeaderLayout) and// the HeaderNavigationBar's GradientView. On Liked Songs the first is Spotify's blue, a band across the top// of a black page (trees/continuous/2.txt, 2026-09-18). UIKit's own scroll edge effect is still there under@@ -465,7 +465,7 @@ static void applyScrims(UIView *headerRoot) {}}-// Spotify's colour wash goes, so the page's field shows through, and the plane it was drawn on is handed+// Spotify's color wash goes, so the page's field shows through, and the plane it was drawn on is handed// back: it is where the hero belongs (applyHero).//// The wash is a gradient on a plain view of its own, and that view is painted the base surface. Spotifydiff --git a/tweak/Sources/Redesigned/Playlist/PlaylistMenu.x b/tweak/Sources/Redesigned/Playlist/PlaylistMenu.xindex 2807105c..dd66e7db 100644--- a/tweak/Sources/Redesigned/Playlist/PlaylistMenu.x+++ b/tweak/Sources/Redesigned/Playlist/PlaylistMenu.x@@ -50,7 +50,7 @@ static char kToolbarKey, kSortKey, kBlockKey, kDecidedKey;// The SPTEncoreIcon an Encore icon view was built with, which knows its own name. Encore keeps it in a// Swift ivar with no getter, as Redesigned/Navbar/TabBar.x found -- but not always the same one: the view// holds both `icon` and `experimentalIcon` (nm on SpotifyShared), and reading `icon` alone left the Sort-// pill unrecognised on the phone while Mix, which is known by its identifier, came through+// pill unrecognized on the phone while Mix, which is known by its identifier, came through// (device 2026-09-20). So every object ivar the view has is asked, and the first that knows a name answers.static NSString *glyphName(UIView *iconView) {unsigned int count = 0;diff --git a/tweak/Sources/Redesigned/Playlist/PlaylistRows.x b/tweak/Sources/Redesigned/Playlist/PlaylistRows.xindex a287921e..8d7e6ef8 100644--- a/tweak/Sources/Redesigned/Playlist/PlaylistRows.x+++ b/tweak/Sources/Redesigned/Playlist/PlaylistRows.x@@ -4,7 +4,7 @@// Tree (trees/clean/playlist/02.txt:164-247): a cell id=Playlist.ItemCell holds an Encore.ListRow painted the// base surface, and in it Encore.ImageView 48x48 (the artwork), Track.Row.Content.Title,// Track.Row.Content.Subtitle and, at the trailing edge, Components.UI.ContextMenuButton. The row's own paint-// is cleared here rather than left to the Kit's repaint hook, which only hears about a colour when Spotify+// is cleared here rather than left to the Kit's repaint hook, which only hears about a color when Spotify// sets it and not when a reused cell already carries one.//// Spotify's type and its spacing are left alone: the row is 64pt for a title of 18pt, and a larger font ofdiff --git a/tweak/Sources/Redesigned/Search/Search.h b/tweak/Sources/Redesigned/Search/Search.hindex f83933ef..b81c3354 100644--- a/tweak/Sources/Redesigned/Search/Search.h+++ b/tweak/Sources/Redesigned/Search/Search.h@@ -7,7 +7,7 @@// cards below move up by the spacing the collapsed ones leave// SearchPage.x the header the way Home has it: a large title, the avatar at the trailing edge, no camera, no// scrim; and the page's layout pass, which measures that spacing-// SearchCards.x each category card as Liquid Glass tinted by its own colour, at the card radius, giving under a press+// SearchCards.x each category card as Liquid Glass tinted by its own color, at the card radius, giving under a press//// Every hook installs only while Redesigned UI is on (SGRedesignedUI).// Threading: main thread only.diff --git a/tweak/Sources/Redesigned/Search/SearchCards.x b/tweak/Sources/Redesigned/Search/SearchCards.xindex 5a12c9b1..93bbf2d1 100644--- a/tweak/Sources/Redesigned/Search/SearchCards.x+++ b/tweak/Sources/Redesigned/Search/SearchCards.x@@ -1,24 +1,24 @@-// Search redesign: each category card as Liquid Glass tinted by its own colour. Under the glass, the card's colour runs+// Search redesign: each category card as Liquid Glass tinted by its own color. Under the glass, the card's color runs// diagonally from itself at the top leading corner to a darker shade of it at the bottom trailing one; the glass is the-// clear style with that colour at 35% for its tint, so its rim catches the colour and its body stays as vivid as+// clear style with that color at 35% for its tint, so its rim catches the color and its body stays as vivid as// Spotify's card. The cover and the title stay Spotify's, over the glass. The card takes the card radius, continuous;-// the title moves in with it; and the card gives a little under a press, which Spotify showed by darkening the colour+// the title moves in with it; and the card gives a little under a press, which Spotify showed by darkening the color// the glass now covers. Picked on the iOS 27 simulator against plain tinted glass (flat on black), regular glass over-// the colour (muddy) and the cover under clear glass (smeared), 2026-09-17.+// the color (muddy) and the cover under clear glass (smeared), 2026-09-17.//-// Under Reduce Transparency, or before iOS 26, the card is the colour alone.+// Under Reduce Transparency, or before iOS 26, the card is the color alone.//// Tree (trees/clean/search/01.txt:332-339): Control<Box> id=Components.UI.CategoryCardBrowse 177x108 >// Encore.Box 177x108 clips > UIView r=4 clips (the Box's content view) > Encore.ImageView (the cover, turned 25 degrees-// at the trailing edge) and SPTEncoreLabel {8, 8} 120x18 (the title). The colour is in no view: Box's layoutSubviews sets-// the path and the fill colour of its animationLayer, a CAShapeLayer among its layer's sublayers, from the card's colour+// at the trailing edge) and SPTEncoreLabel {8, 8} 120x18 (the title). The color is in no view: Box's layoutSubviews sets+// the path and the fill color of its animationLayer, a CAShapeLayer among its layer's sublayers, from the card's color// set on every pass (Encore_LayoutKit.Box's fields, and -[Box layoutSubviews] calling setPath: and setFillColor:,-// 2026-09-17). So the colour is read off that layer, and the layer is hidden rather than cleared, since Spotify fills it again.+// 2026-09-17). So the color is read off that layer, and the layer is hidden rather than cleared, since Spotify fills it again.#import "Core/SGCore.h"#import "Redesigned/Kit/SGRKit.h"#import "Search.h"-// The tint the glass takes of the card's colour, and how dark the far corner of the colour under it gets.+// The tint the glass takes of the card's color, and how dark the far corner of the color under it gets.static const CGFloat kTintAlpha = 0.35;static const CGFloat kFarBrightness = 0.55;// Where the title's top leading corner moves to, clear of the larger corner.@@ -148,7 +148,7 @@ static void paint(SGRSearchCardParts *parts, UIColor *color) {}}-// The title's own position, before the move, is where Spotify's layout put its centre.+// The title's own position, before the move, is where Spotify's layout put its center.static void moveTitleIn(UIView *content) {for (UIView *sub in content.subviews) {if (![NSStringFromClass(sub.class) containsString:@"EncoreLabel"]) continue;@@ -177,7 +177,7 @@ static void style(UIView *box) {logOnce([NSString stringWithFormat:@"a category card without its %@, left as Spotify's", content ? @"fill layer" : @"content view"]);return;}- // A pressed card's fill is Spotify's pressed shade; the colour is taken while it is not pressed.+ // A pressed card's fill is Spotify's pressed shade; the color is taken while it is not pressed.CGColorRef fillColor = fill.fillColor;SGRSearchCardParts *parts = partsIn(box, content);if (fillColor && CGColorGetAlpha(fillColor) > 0 && ![box isHighlighted]) paint(parts, [UIColor colorWithCGColor:fillColor]);@@ -185,7 +185,7 @@ static void style(UIView *box) {hideFills(box);// The card is cut at the card radius by the Box, which clips already and which Spotify gives no radius. Spotify puts- // its own 4pt back on the content view between layout passes, and the colour and the cover then showed past the glass+ // its own 4pt back on the content view between layout passes, and the color and the cover then showed past the glass// at the corners (on the phone, 2026-09-17); the content view keeps the card radius only for as long as it lasts.if (content.layer.cornerRadius != SGRRadiusCard && objc_getAssociatedObject(box, &kRoundedKey)) {logOnce([NSString stringWithFormat:@"Spotify set a card's content radius back to %.0f; the Box's corner holds", content.layer.cornerRadius]);@@ -202,7 +202,7 @@ static void style(UIView *box) {}moveTitleIn(content);roundCover(content);- logOnce(parts.glass ? @"category cards on tinted glass" : @"category cards on their colour, no glass");+ logOnce(parts.glass ? @"category cards on tinted glass" : @"category cards on their color, no glass");}%hook _TtCE16Encore_LayoutKitO16EncoreFoundation6Encore3Boxdiff --git a/tweak/Sources/Settings/SGGlowSwitch.h b/tweak/Sources/Settings/SGGlowSwitch.hindex a5404190..f16318c5 100644--- a/tweak/Sources/Settings/SGGlowSwitch.h+++ b/tweak/Sources/Settings/SGGlowSwitch.h@@ -1,5 +1,5 @@// A switch that glows: a capsule whose rim is a slowly circling rainbow with a soft glow of the same-// colours, full when on and softer when off, to invite the tap. A white knob slides on a spring.+// colors, full when on and softer when off, to invite the tap. A white knob slides on a spring.// For the one switch of a page that changes the whole app (Redesigned UI, the first row of Mod Settings); every other// switch stays a UISwitch.//diff --git a/tweak/Sources/Settings/SGGlowSwitch.m b/tweak/Sources/Settings/SGGlowSwitch.mindex 143a47b6..5ba2065e 100644--- a/tweak/Sources/Settings/SGGlowSwitch.m+++ b/tweak/Sources/Settings/SGGlowSwitch.m@@ -119,7 +119,7 @@ static CAShapeLayer *newStroke(CGFloat width) {[super layoutSubviews];CGRect bounds = self.bounds;UIBezierPath *capsule = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(bounds, kRimWidth / 2, kRimWidth / 2) cornerRadius:bounds.size.height / 2];- // A square the capsule's diagonal across, so the colours cover the rim at every angle of the turn.+ // A square the capsule's diagonal across, so the colors cover the rim at every angle of the turn.CGFloat side = ceil(hypot(bounds.size.width, bounds.size.height)) + 2;CGRect square = CGRectMake(CGRectGetMidX(bounds) - side / 2, CGRectGetMidY(bounds) - side / 2, side, side);@@ -156,7 +156,7 @@ static CAShapeLayer *newStroke(CGFloat width) {_knob.layer.cornerRadius = side / 2;}-// Colours for the state. Off is meant to tempt: the rainbow already circles the rim, softer, with a+// Colors for the state. Off is meant to tempt: the rainbow already circles the rim, softer, with a// fainter glow. On it comes in full, glow and all.- (void)paint {BOOL on = self.on;diff --git a/tweak/Sources/Settings/SGModPage.h b/tweak/Sources/Settings/SGModPage.hindex e38f1b5e..5b9b16fc 100644--- a/tweak/Sources/Settings/SGModPage.h+++ b/tweak/Sources/Settings/SGModPage.h@@ -22,7 +22,7 @@@property (nonatomic, copy) void (^changed)(BOOL on); // after the switch is stored; the page reloads@property (nonatomic, strong) UIColor *color; // title, subtitle and symbol, for a warning row@property (nonatomic, copy) NSString *symbol;-@property (nonatomic, strong) UIColor *tint; // the square under the symbol, grey when nil (SGWithTile)+@property (nonatomic, strong) UIColor *tint; // the square under the symbol, gray when nil (SGWithTile)// A switch row that changes the whole app draws SGGlowSwitch instead of a UISwitch.@property (nonatomic) BOOL glows;// An ⓘ button beside the row's switch, whose tap reads this out under the row's title.@@ -32,7 +32,7 @@// it sits. Nil shows it always. A row that only waits on a switch takes `waitsOn` instead.@property (nonatomic, copy) BOOL (^visible)(void);// The key of a switch row on the same page this row works under: while that switch is off the row stays-// where it is, greyed out, and a tap on it nudges the switch.+// where it is, grayed out, and a tap on it nudges the switch.@property (nonatomic, copy) NSString *waitsOn;// A choice row's: a line under each name in its list, in the same order, and what runs once one is stored.@property (nonatomic, copy) NSArray<NSString *> *choiceNotes;@@ -46,7 +46,7 @@@property (nonatomic, copy) NSString *(^format)(double value);// A menu row's (SGMenuRow): the names its pull-down menu offers, the current one being whichever `value` reads.@property (nonatomic, copy) NSArray<NSString *> *menu;-// A small rounded square of this colour before the row's value.+// A small rounded square of this color before the row's value.@property (nonatomic, copy) UIColor *(^swatch)(void);@end@@ -60,7 +60,7 @@- (instancetype)initWithTitle:(NSString *)title intro:(NSString *)intro sections:(NSArray<SGModSection *> *)sections footer:(NSString *)footer;// Asks every row's `visible` again, after something other than a switch on the page changed what it reads.- (void)refreshVisibility;-// Rows draw their symbol on a coloured tile; off, the default, they show none. Mod Settings' main page has them.+// Rows draw their symbol on a colored tile; off, the default, they show none. Mod Settings' main page has them.@property (nonatomic) BOOL tiles;@end@@ -92,7 +92,7 @@ SGModRow *SGSliderRow(NSString *title, NSString *subtitle, double minimum, doubl// lists `choices`, a checkmark against the one `value` reads, and picking one runs `chosen` with its index,// after which the page reads every row again.SGModRow *SGMenuRow(NSString *title, NSArray<NSString *> *choices, NSString *(^value)(void), void (^chosen)(NSInteger index));-// The system colour picker in a page sheet, opaque colours only: the checkmark hands 0xRRGGBB to `picked`,+// The system color picker in a page sheet, opaque colors only: the checkmark hands 0xRRGGBB to `picked`,// closing or swiping the sheet away keeps what was there.void SGPickColor(NSString *title, NSInteger initial, void (^picked)(NSInteger rgb));UIColor *SGColorRGB(NSInteger rgb); // 0xRRGGBB, opaque@@ -100,7 +100,7 @@ SGModRow *SGLinkRow(NSString *title, NSString *subtitle, NSString *url);SGModRow *SGStatActionRow(NSString *title, NSString *subtitle, NSString *(^value)(void), void (^action)(void));SGModSection *SGSection(NSString *title, NSArray<SGModRow *> *rows);SGModSection *SGNotedSection(NSString *title, NSArray<SGModRow *> *rows, NSString *footer);-// Gives a row its leading symbol, drawn on a grey tile unless the row has a colour of its own.+// Gives a row its leading symbol, drawn on a gray tile unless the row has a color of its own.SGModRow *SGWithSymbol(SGModRow *row, NSString *symbol);-// The same on a tile of `color`, the way Settings colours the icon of each of its rows.+// The same on a tile of `color`, the way Settings colors the icon of each of its rows.SGModRow *SGWithTile(SGModRow *row, NSString *symbol, UIColor *color);diff --git a/tweak/Sources/Settings/SGModPage.m b/tweak/Sources/Settings/SGModPage.mindex 70f21cb9..4cbff1d8 100644--- a/tweak/Sources/Settings/SGModPage.m+++ b/tweak/Sources/Settings/SGModPage.m@@ -71,7 +71,7 @@ SGModRow *SGActionRow(NSString *title, NSString *subtitle, void (^action)(void))}// Red, with a warning symbol. SGFillCell tints the title and the symbol; the cell below takes the-// colour down to the subtitle too, so the whole row reads as the warning it is.+// color down to the subtitle too, so the whole row reads as the warning it is.SGModRow *SGWarningRow(NSString *title, NSString *subtitle, void (^action)(void)) {SGModRow *row = SGActionRow(title, subtitle, action);row.color = SGRed();@@ -207,9 +207,9 @@ SGModRow *SGMenuRow(NSString *title, NSArray<NSString *> *choices, NSString *(^vreturn row;}-#pragma mark - the colour sheet+#pragma mark - the color sheet-// Holds the picker's callback for as long as the sheet is up: the checkmark is the one way a colour is stored.+// Holds the picker's callback for as long as the sheet is up: the checkmark is the one way a color is stored.@interface SGColorSheet : NSObject@property (nonatomic, weak) UIColorPickerViewController *picker;@property (nonatomic, copy) void (^picked)(NSInteger rgb);@@ -233,7 +233,7 @@ SGModRow *SGMenuRow(NSString *title, NSArray<NSString *> *choices, NSString *(^v@end// Made from a CGColor: either look's accent hooks swap Spotify's green as UIColor makes it from components, and-// this colour has to stay the one asked for, Spotify's green included, to show what a preset is.+// this color has to stay the one asked for, Spotify's green included, to show what a preset is.UIColor *SGColorRGB(NSInteger rgb) {CGColorRef cg = CGColorCreateSRGB(((rgb >> 16) & 0xFF) / 255.0, ((rgb >> 8) & 0xFF) / 255.0, (rgb & 0xFF) / 255.0, 1);UIColor *color = [UIColor colorWithCGColor:cg];@@ -329,8 +329,8 @@ static UIView *valueAndChevron(NSString *text) {return box;}-// What a row with a value and no page shows on the right: the value, after a swatch of the row's colour-// when it has one, rounded like the cards and edged with a hairline so a dark colour still shows on them.+// What a row with a value and no page shows on the right: the value, after a swatch of the row's color+// when it has one, rounded like the cards and edged with a hairline so a dark color still shows on them.// The swatch is drawn into an image, past the accent hooks on layer backgrounds (see SGColorRGB).static UIView *valueView(SGModRow *row) {UILabel *label = [UILabel new];@@ -416,7 +416,7 @@ static UIFont *tabular(UIFont *font) {@end// The Audio effects page's slider row (Shared/AudioEffects/AudioEffectsPage.m), for any page: the title and the-// value over a slider in the accent colour, a subtitle between them when there is one, each step stored+// value over a slider in the accent color, a subtitle between them when there is one, each step stored// as the thumb reaches it.@interface SGModSliderCell : UITableViewCell+ (CGFloat)heightFor:(SGModRow *)row width:(CGFloat)width;@@ -695,7 +695,7 @@ static void showWaiting(UITableViewCell *cell, BOOL waiting, NSString *switchTitif (path) [self nudgeAt:path];}-// The switch leans 6pt towards on and springs back, with a light tap, so the eye and the finger find what to+// The switch leans 6pt toward on and springs back, with a light tap, so the eye and the finger find what to// turn on first. Each nudge starts from wherever the last one has the switch, so taps in a row never jump it.// With Reduce Motion nothing moves: the switch's row lights up for a moment instead.- (void)nudgeAt:(NSIndexPath *)path {@@ -758,7 +758,7 @@ static void showWaiting(UITableViewCell *cell, BOOL waiting, NSString *switchTit[self.tableView reloadData];if (!_live) return;// The counters climb while the page is open; the labels are written straight into the cells so- // that a reload never lands under a switch being dragged. A cancelled back swipe appears the+ // that a reload never lands under a switch being dragged. A canceled back swipe appears the// page again without it ever disappearing, so the old timer goes first.[_ticker invalidate];_ticker = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(tick) userInfo:nil repeats:YES];@@ -943,7 +943,7 @@ static void showWaiting(UITableViewCell *cell, BOOL waiting, NSString *switchTit[self readValues];}-// A menu row's value as a pop-up button, the way Settings draws one: the name in grey over the up and down+// A menu row's value as a pop-up button, the way Settings draws one: the name in gray over the up and down// chevrons, the menu opening on the first touch and anchored to the button, so it points at the row on iPad.// A pick runs the row's block and every row is read again, the ones that follow from it with it.- (UIButton *)menuButtonFor:(SGModRow *)row {@@ -975,7 +975,7 @@ static void showWaiting(UITableViewCell *cell, BOOL waiting, NSString *switchTitreturn button;}-// The ⓘ to the left of the switch (or of a choice's name and chevron), the grey of a subtitle, 30pt across+// The ⓘ to the left of the switch (or of a choice's name and chevron), the gray of a subtitle, 30pt across// so it is easy to hit next to it.- (UIView *)infoButtonBeside:(UIView *)toggle {UIButton *info = [UIButton buttonWithType:UIButtonTypeSystem];diff --git a/tweak/Sources/Settings/SGPageStyle.h b/tweak/Sources/Settings/SGPageStyle.hindex d008dfd8..9defe6e5 100644--- a/tweak/Sources/Settings/SGPageStyle.h+++ b/tweak/Sources/Settings/SGPageStyle.h@@ -1,10 +1,10 @@// The look of every page of the mod's, in the dark appearance: cards of #1C1C1E on black, 13pt titles over 11pt-// grey subtitles in Spotify's typeface, 11pt uppercase section headers and notes, a white symbol on a coloured-// rounded square leading a row, white chevrons, switches in the look's accent colour. The text follows Dynamic+// gray subtitles in Spotify's typeface, 11pt uppercase section headers and notes, a white symbol on a colored+// rounded square leading a row, white chevrons, switches in the look's accent color. The text follows Dynamic// Type through the accessibility sizes, and the app font of Shared/Fonts.#import <UIKit/UIKit.h>-UIColor *SGGrey(void); // the secondary label's grey+UIColor *SGGrey(void); // the secondary label's grayUIColor *SGGreen(void);UIColor *SGOnAccent(void); // black or white text on the accentUIColor *SGAccentMark(void); // a visible accent mark on a dark card@@ -28,14 +28,14 @@ void SGAdoptFonts(UIView *list, UIView *exclude);UIFont *SGSpotifyListFont(void);UIImageView *SGSymbolView(NSString *name, CGFloat size, UIImageSymbolWeight weight, CGFloat box);-// A white symbol on a rounded square of `color`, the leading icon of a row; SGTileImage's square is grey.+// A white symbol on a rounded square of `color`, the leading icon of a row; SGTileImage's square is gray.UIImage *SGTileImageTinted(NSString *symbol, UIColor *color);UIImage *SGTileImage(NSString *symbol);-// The chevron of a row that opens a page, in the tertiary label's grey.+// The chevron of a row that opens a page, in the tertiary label's gray.UIImageView *SGChevronView(void);// The separator inset of a row led by a tile, so the hairline starts under the title as in Settings.extern const CGFloat SGTileRowInset;-// A grey note in a wrapper view, for a table header or footer; SGFitNote sizes it to its text.+// A gray note in a wrapper view, for a table header or footer; SGFitNote sizes it to its text.UIView *SGNote(NSString *text);void SGFitNote(UITableView *table, UIView *wrapper, CGFloat top, CGFloat bottom);// The now playing bar and the tab bar float over the content, so a page insets itself under them.diff --git a/tweak/Sources/Settings/SGPageStyle.m b/tweak/Sources/Settings/SGPageStyle.mindex 4cf03c72..3bbcbdd1 100644--- a/tweak/Sources/Settings/SGPageStyle.m+++ b/tweak/Sources/Settings/SGPageStyle.m@@ -73,7 +73,7 @@ UIImageView *SGSymbolView(NSString *name, CGFloat size, UIImageSymbolWeight weigreturn view;}-// A grey note in a wrapper view, for the table header and footer.+// A gray note in a wrapper view, for the table header and footer.UIView *SGNote(NSString *text) {UILabel *label = [UILabel new];label.text = text;@@ -126,7 +126,7 @@ void SGInsetForBars(UITableView *table) {table.verticalScrollIndicatorInsets = inset;}-// The pages follow the running look's accent colour, read here by its key so the page framework depends on no+// The pages follow the running look's accent color, read here by its key so the page framework depends on no// layer: the native look's (Native/Appearance) or the redesign's (Redesigned/Kit/SGRAccent.h).static NSString *const kAccentKey = @"spotifyglass.accent";static NSString *const kRedesignAccentKey = @"spotifyglass.redesign.accent";@@ -169,7 +169,7 @@ UIImage *SGTileImageTinted(NSString *symbol, UIColor *color) {UIImageSymbolConfiguration *config = [UIImageSymbolConfiguration configurationWithPointSize:16 weight:UIImageSymbolWeightMedium];UIImage *glyph = [[UIImage systemImageNamed:symbol withConfiguration:config] imageWithTintColor:UIColor.whiteColor renderingMode:UIImageRenderingModeAlwaysOriginal];CGRect box = CGRectMake(0, 0, 29, 29);- // A system colour is drawn in its dark appearance, the one the pages wear, whatever the phone's.+ // A system color is drawn in its dark appearance, the one the pages wear, whatever the phone's.color = [color resolvedColorWithTraitCollection:[UITraitCollection traitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark]];UIImage *tile = [[[UIGraphicsImageRenderer alloc] initWithSize:box.size] imageWithActions:^(UIGraphicsImageRendererContext *ctx) {[color setFill];@@ -194,7 +194,7 @@ UIImageView *SGChevronView(void) {CGFloat SGSectionHeaderHeight(void) { return MAX(38, ceil(SGSubtitleFont().lineHeight) + 14); }const CGFloat SGSectionGap = 20;-// Every page below draws the same row: a 13pt white title over an 11pt grey subtitle in Spotify's typeface,+// Every page below draws the same row: a 13pt white title over an 11pt gray subtitle in Spotify's typeface,// with an optional symbol in the leading slot.void SGFillCell(UITableViewCell *cell, NSString *title, NSString *subtitle, UIColor *color, NSString *symbolName) {UIListContentConfiguration *content = [UIListContentConfiguration subtitleCellConfiguration];diff --git a/tweak/Sources/Shared/AdBlock/AdNetwork.x b/tweak/Sources/Shared/AdBlock/AdNetwork.xindex 1af3d3cc..17ebe778 100644--- a/tweak/Sources/Shared/AdBlock/AdNetwork.x+++ b/tweak/Sources/Shared/AdBlock/AdNetwork.x@@ -3,7 +3,7 @@// other way. A request for an ad is answered empty. With Spoof Premium on, the bootstrap// and customize bodies are rewritten by Premium.m before the client sees them, the endpoints the// server would use to log the account out are answered as if they succeeded, and past the first-// thirty seconds the re-fetches that could bring the real state back are cancelled before they+// thirty seconds the re-fetches that could bring the real state back are canceled before they// leave. Feeds go through Feeds.m. Everything here is EeveeSpotify's, less its Ably hooks, which// it does not turn on for 9.1 either.#import "Core/SGCore.h"@@ -218,7 +218,7 @@ static void complete(id<NSURLSessionDataDelegate> delegate, NSURLSession *sessio#pragma mark - before a request leaves// The re-fetches that could put the real product state back, or drop the push token, use sessions-// of their own that the delegate hooks do not see; they are cancelled at the task. login5 and the+// of their own that the delegate hooks do not see; they are canceled at the task. login5 and the// Google token stay: blocking those was a crash loop.%group Premium%hook NSURLSessionTask@@ -229,7 +229,7 @@ static void complete(id<NSURLSessionDataDelegate> delegate, NSURLSession *sessioif (spotify && elapsed() > 30 && (has(path, @"deletetoken") || has(path, @"signup/public") || has(path, @"pses/screenconfig")|| isCustomize(path) || has(host, @"apresolve"))) {SGAdBlockCountOne(@"Requests");- SGLog(@"cancelled %@%@ before it left", host, path);+ SGLog(@"canceled %@%@ before it left", host, path);[self cancel];return;}diff --git a/tweak/Sources/Shared/AnimatedArtwork/SGFluidClip.m b/tweak/Sources/Shared/AnimatedArtwork/SGFluidClip.mindex 2969c3a1..be7cf3b2 100644--- a/tweak/Sources/Shared/AnimatedArtwork/SGFluidClip.m+++ b/tweak/Sources/Shared/AnimatedArtwork/SGFluidClip.m@@ -5,9 +5,9 @@#import <CoreImage/CoreImage.h>#import "SGFluidClip.h"-// Each copy, as in SGRFluid.m: its side as a share of the clip's longer side, its centre as shares of the+// Each copy, as in SGRFluid.m: its side as a share of the clip's longer side, its center as shares of the// clip, its opacity, and its resting angle. Over the loop it sways by kSway either side of that angle and-// its centre circles kDrift of the clip, a quarter cycle after the copy before it.+// its center circles kDrift of the clip, a quarter cycle after the copy before it.static const struct { CGFloat side, x, y, opacity, angle; } kCopy[] = {{2.2, 0.25, 0.20, 1.0, 0.0},{2.0, 0.80, 0.35, 0.7, 1.1},@@ -20,7 +20,7 @@ static const CGFloat kSway = 0.35, kDrift = 0.06;static const CGFloat kBlurSide = 128, kBlurRadius = 10, kSaturation = 1.5, kBrightness = -0.08, kFieldScale = 0.125;// The shade over the bottom, where the lock screen's controls are.static const CGFloat kShadeFrom = 0.55, kShadeAlpha = 0.45;-// The cover's side as a share of the clip's width, and its centre's height from the top. The lock screen+// The cover's side as a share of the clip's width, and its center's height from the top. The lock screen// cuts a 3:4 clip's sides off on a phone's taller screen, so the cover keeps to the middle.// ponytail: guessed from the screen's shape, as SGLyricsClip.m's column is; tune both on a device.static const CGFloat kCoverSide = 0.5, kCoverY = 0.45, kCoverRadius = 0.035, kShadowBlur = 0.08;diff --git a/tweak/Sources/Shared/AudioEffects/AudioEffects.h b/tweak/Sources/Shared/AudioEffects/AudioEffects.hindex ddb4b44c..4de80b4b 100644--- a/tweak/Sources/Shared/AudioEffects/AudioEffects.h+++ b/tweak/Sources/Shared/AudioEffects/AudioEffects.h@@ -4,7 +4,7 @@//// What it offers: output gain and limiter, a multiband compander, dynamic bass boost, a 15 band equalizer,// the Graphic EQ (any curve, as AutoEq writes them), the convolver (impulse responses), ViPER DDC files,-// Liveprog (EEL2 scripts), reverb, stereo widening, crossfeed and analog modelling. Each effect has a switch+// Liveprog (EEL2 scripts), reverb, stereo widening, crossfeed and analog modeling. Each effect has a switch// and its own values, kept under its own keys.//// Unlike the mod's other switches these apply as they change, not at launch: every setter below stores thediff --git a/tweak/Sources/Shared/AudioEffects/AudioEffects.x b/tweak/Sources/Shared/AudioEffects/AudioEffects.xindex 4479c796..aedaa63b 100644--- a/tweak/Sources/Shared/AudioEffects/AudioEffects.x+++ b/tweak/Sources/Shared/AudioEffects/AudioEffects.x@@ -9,7 +9,7 @@// place: the way the first version of Pitch worked on the phone. A notify stays on a unit that was the music's// once and does nothing there, so one engine never runs on two render threads. Speed and pitch feeds the// unit's input, so its sound reaches the notify changed. After the engine, with the switch on or off, the notify-// hands the music's buffer mixed to mono to one reader (SGAudioSetOutputReader), the player's Visualiser, which+// hands the music's buffer mixed to mono to one reader (SGAudioSetOutputReader), the player's Visualizer, which// only reads it.//// The engine is made the first time the output starts with the master switch on, at the output's rate,@@ -293,7 +293,7 @@ static NSString *effectName(NSString *effect) {NSDictionary<NSString *, NSString *> *names = @{SGKeyDSPCompander: @"compander", SGKeyDSPBass: @"bass boost", SGKeyDSPEqualizer: @"equalizer", SGKeyDSPGraphicEq: @"graphic EQ",SGKeyDSPConvolver: @"convolver", SGKeyDSPDDC: @"DDC", SGKeyDSPLiveprog: @"Liveprog", SGKeyDSPReverb: @"reverb",- SGKeyDSPStereoWide: @"stereo widening", SGKeyDSPCrossfeed: @"crossfeed", SGKeyDSPTube: @"analog modelling",+ SGKeyDSPStereoWide: @"stereo widening", SGKeyDSPCrossfeed: @"crossfeed", SGKeyDSPTube: @"analog modeling",};return names[effect] ?: effect;}@@ -434,7 +434,7 @@ static void applyEffect(SGDSPEngine *engine, NSString *effect) {} else if ([effect isEqualToString:SGKeyDSPTube]) {double drive = SGDSPNumber(SGKeyDSPTubeDrive);SGDSPEngineSetTube(engine, on, drive);- what = [NSString stringWithFormat:@"analog modelling %@, %.1f dB", onOff(on), drive];+ what = [NSString stringWithFormat:@"analog modeling %@, %.1f dB", onOff(on), drive];} else {return;}diff --git a/tweak/Sources/Shared/AudioEffects/AudioEffectsPage.m b/tweak/Sources/Shared/AudioEffects/AudioEffectsPage.mindex c9e5b511..17ae547d 100644--- a/tweak/Sources/Shared/AudioEffects/AudioEffectsPage.m+++ b/tweak/Sources/Shared/AudioEffects/AudioEffectsPage.m@@ -146,7 +146,7 @@ static NSArray<SGDSPEffect *> *effects(void) {effect(SGKeyDSPCrossfeed, @"Crossfeed", @"Softer stereo on headphones", @[choice(@"Preset", SGKeyDSPCrossfeedMode, SGDSPCrossfeedModeNames()),]),- effect(SGKeyDSPTube, @"Analog modelling", @"Tube amplifier warmth", @[+ effect(SGKeyDSPTube, @"Analog modeling", @"Tube amplifier warmth", @[slider(@"Drive", SGKeyDSPTubeDrive, @" dB"),]),];@@ -221,7 +221,7 @@ static UIFont *tabular(UIFont *font) {@end-// The title and the value over a slider in the accent colour, storing each step as the thumb reaches it.+// The title and the value over a slider in the accent color, storing each step as the thumb reaches it.@interface SGDSPSliderCell : UITableViewCell- (void)showRow:(SGDSPRow *)row;@end@@ -409,7 +409,7 @@ static UIFont *tabular(UIFont *font) {self.tableView.tableFooterView = _credits;}-// The libraries two of the effects run on, in the grey of a note with the names as links.+// The libraries two of the effects run on, in the gray of a note with the names as links.- (void)buildCredits {NSDictionary *grey = @{NSFontAttributeName: SGSubtitleFont(), NSForegroundColorAttributeName: SGGrey()};NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"Crossfeed is " attributes:grey];@@ -458,7 +458,7 @@ static UIFont *tabular(UIFont *font) {// A choice, a file or the GraphicEQ text may have changed on the page this one opened.[self readState];[self.tableView reloadData];- // A cancelled back swipe appears the page again without it ever disappearing, so the old timer goes first.+ // A canceled back swipe appears the page again without it ever disappearing, so the old timer goes first.[_ticker invalidate];_ticker = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(tick) userInfo:nil repeats:YES];}diff --git a/tweak/Sources/Shared/AudioEffects/SGDSPCurveView.m b/tweak/Sources/Shared/AudioEffects/SGDSPCurveView.mindex 68e9085b..e806d6b9 100644--- a/tweak/Sources/Shared/AudioEffects/SGDSPCurveView.m+++ b/tweak/Sources/Shared/AudioEffects/SGDSPCurveView.m@@ -81,7 +81,7 @@ static NSString *signedNumber(double value, int decimals) {NSInteger _touched; // the band under the finger that went down, -1 for noneNSInteger _dragging; // the band being dragged, -1 for none- CGFloat _offset; // from the finger to the handle's centre, kept through the drag+ CGFloat _offset; // from the finger to the handle's center, kept through the dragUISelectionFeedbackGenerator *_detent;}@@ -331,7 +331,7 @@ static NSString *signedNumber(double value, int decimals) {[self paint];}-// The accent colour is read each time the row shows, so a colour picked since shows here too.+// The accent color is read each time the row shows, so a color picked since shows here too.- (void)paint {UIColor *accent = SGGreen();_curve.strokeColor = accent.CGColor;diff --git a/tweak/Sources/Shared/AudioEffects/SGDSPEffects.h b/tweak/Sources/Shared/AudioEffects/SGDSPEffects.hindex 1e7e346e..5e0dd188 100644--- a/tweak/Sources/Shared/AudioEffects/SGDSPEffects.h+++ b/tweak/Sources/Shared/AudioEffects/SGDSPEffects.h@@ -37,7 +37,7 @@ SGDSPWide *SGDSPWideCreate(double rate, double levelPercent);void SGDSPWideSet(SGDSPWide *wide, double levelPercent);void SGDSPWideRun(void *wide, float *left, float *right, uint32_t frames);-// Seven Linkwitz-Riley bands around `frequencies`, each band's loud and quiet moments pulled towards its own+// Seven Linkwitz-Riley bands around `frequencies`, each band's loud and quiet moments pulled toward its own// running level by gains[i] (1: 60% less dynamics) or pushed away from it (-1: 60% more), by 12 dB at most.// `timeConstant` is the release; the attack a tenth of it, the running level ten times it.typedef struct SGDSPCompander SGDSPCompander;diff --git a/tweak/Sources/Shared/AudioEffects/SGDSPEngine.m b/tweak/Sources/Shared/AudioEffects/SGDSPEngine.mindex b8b86e09..4532319a 100644--- a/tweak/Sources/Shared/AudioEffects/SGDSPEngine.m+++ b/tweak/Sources/Shared/AudioEffects/SGDSPEngine.m@@ -17,7 +17,7 @@ _Static_assert(kSGDSPEngineBlock == kSGDSPConvolverBlock && kSGDSPEngineBlock ==// and the one just made, with room to spare.enum { kRing = 4 * kSGDSPEngineBlock };-// The order a block goes through the effects: tone, then dynamics and colour, the script, the stereo image,+// The order a block goes through the effects: tone, then dynamics and color, the script, the stereo image,// and the rooms last.typedef enum {SlotBass, SlotEqualizer, SlotGraphicEq, SlotDDC, SlotCompander, SlotTube, SlotLiveprog, SlotWide, SlotCrossfeed,diff --git a/tweak/Sources/Shared/AudioEffects/SGDSPFilters.h b/tweak/Sources/Shared/AudioEffects/SGDSPFilters.hindex b328eb87..f1792f2a 100644--- a/tweak/Sources/Shared/AudioEffects/SGDSPFilters.h+++ b/tweak/Sources/Shared/AudioEffects/SGDSPFilters.h@@ -1,4 +1,4 @@-// The effects' filter maths: biquads and their designs, the gain a design makes, ViPER DDC and GraphicEQ text+// The effects' filter math: biquads and their designs, the gain a design makes, ViPER DDC and GraphicEQ text// read, and minimum phase responses made from a magnitude. SGBiquadTick and SGBiquadRun are the render// thread's; the rest allocates.#import <stdbool.h>@@ -32,7 +32,7 @@ SGBiquad SGBiquadAllPass(double rate, double frequency, double q);double SGBiquadGainDB(const SGBiquad *sections, int count, double rate, double frequency);// Peaking bands at `frequencies`, their own gains solved so that the whole cascade meets each band's gain-// at its centre. A band at or over 0.46 of the rate stays flat.+// at its center. A band at or over 0.46 of the rate stays flat.void SGDSPDesignEqualizer(double rate, const double frequencies[15], const double gains[15], SGBiquad bands[15]);// `count` frequencies log spaced from 20 Hz to 20 kHz.diff --git a/tweak/Sources/Shared/AudioEffects/SGDSPFilters.m b/tweak/Sources/Shared/AudioEffects/SGDSPFilters.mindex a3039920..75625cac 100644--- a/tweak/Sources/Shared/AudioEffects/SGDSPFilters.m+++ b/tweak/Sources/Shared/AudioEffects/SGDSPFilters.m@@ -61,7 +61,7 @@ double SGBiquadGainDB(const SGBiquad *sections, int count, double rate, double f#pragma mark - the equalizer-// About two thirds of an octave wide, the bands' spacing, so neighbours overlap enough to leave no dips.+// About two thirds of an octave wide, the bands' spacing, so neighbors overlap enough to leave no dips.static const double kBandQ = 2.1;static void designBands(double rate, const double frequencies[15], const double gains[15], const bool usable[15], SGBiquad bands[15]) {@@ -77,7 +77,7 @@ void SGDSPDesignEqualizer(double rate, const double frequencies[15], const doublusable[i] = frequencies[i] < 0.46 * rate;own[i] = usable[i] ? gains[i] : 0;}- // Each band's gain corrected by what the cascade misses at its centre, until it misses by nothing audible.+ // Each band's gain corrected by what the cascade misses at its center, until it misses by nothing audible.for (int iteration = 0; iteration < 60; iteration++) {designBands(rate, frequencies, own, usable, bands);double worst = 0, missed[15] = {0};diff --git a/tweak/Sources/Shared/AudioEffects/SGDSPTone.m b/tweak/Sources/Shared/AudioEffects/SGDSPTone.mindex d71fcb26..00e8a2ea 100644--- a/tweak/Sources/Shared/AudioEffects/SGDSPTone.m+++ b/tweak/Sources/Shared/AudioEffects/SGDSPTone.m@@ -145,7 +145,7 @@ void SGDSPWideRun(void *state, float *left, float *right, uint32_t frames) {double extra = wide->side - 1;for (uint32_t i = 0; i < frames; i++) {double mid = 0.5 * ((double)left[i] + right[i]), side = 0.5 * ((double)left[i] - right[i]);- // Narrowing scales the whole side; widening adds to it over 150 Hz only, so the bass stays centred.+ // Narrowing scales the whole side; widening adds to it over 150 Hz only, so the bass stays centered.double highs = SGBiquadTick(&wide->highs, &wide->highsState, side);side = extra > 0 ? side + extra * highs : side * wide->side;left[i] = (float)(mid + side);diff --git a/tweak/Sources/Shared/Fonts/FontImport.m b/tweak/Sources/Shared/Fonts/FontImport.mindex e506b9dc..49960f05 100644--- a/tweak/Sources/Shared/Fonts/FontImport.m+++ b/tweak/Sources/Shared/Fonts/FontImport.m@@ -62,7 +62,7 @@ static NSString *importedFamily(void) {}// A face iOS already carries under the same name (Chalkduster, say) is refused as a duplicate and is there-// all the same, so what counts is whether the family has faces afterwards. Files that are gone are skipped.+// all the same, so what counts is whether the family has faces afterward. Files that are gone are skipped.NSString *SGRegisterCustomFont(void) {NSString *family = importedFamily();for (NSURL *url in storedFiles()) {diff --git a/tweak/Sources/Shared/Haptics/HapticsSettings.m b/tweak/Sources/Shared/Haptics/HapticsSettings.mindex 24153f1b..cef6bba6 100644--- a/tweak/Sources/Shared/Haptics/HapticsSettings.m+++ b/tweak/Sources/Shared/Haptics/HapticsSettings.m@@ -5,7 +5,7 @@// follows (a choice that also says whether the rumble plays, rather than a switch of its own that one choice would// leave with nothing to do) under it; and In the Background, which names the song to iOS's own Music Haptics, with// what iOS's own is doing under it, or, while Music Haptics is off in Settings > Accessibility, a row saying so.-// The rows under a switch stay where they are, greyed, while it is off. Each strength's slider plays a tap at the+// The rows under a switch stay where they are, grayed, while it is off. Each strength's slider plays a tap at the// new strength with each step, and the preview ripples with it.#import "Core/SGCore.h"#import "Settings/SGModPage.h"diff --git a/tweak/Sources/Shared/Haptics/SGVibrationsPreview.m b/tweak/Sources/Shared/Haptics/SGVibrationsPreview.mindex ffc4467c..9bcb2d11 100644--- a/tweak/Sources/Shared/Haptics/SGVibrationsPreview.m+++ b/tweak/Sources/Shared/Haptics/SGVibrationsPreview.m@@ -1,5 +1,5 @@// Rings of dots seen from above, like a drop on still water: a tap presses the middle and a crest runs out-// ring by ring, pushing each ring's dots out a few points and lighting them in the look's accent colour as it+// ring by ring, pushing each ring's dots out a few points and lighting them in the look's accent color as it// passes, the Taptic Engine playing on the same frame. The stronger the feature's Strength, the higher the// crest and the further it carries; at the lowest it dies out a few rings in. Music Haptics' taps, while it// is on and the page shows, send out a low crest of their own that fades within the inner rings.@@ -21,7 +21,7 @@ static const CGFloat kDot = 2.5, kMiddle = 6;static const CGFloat kField = 2 * (kFirstRadius + (kRings - 1) * kRingGap) + 24;static const CGFloat kCaptionGap = 6, kBottom = 14;// How far a full-strength crest pushes the first ring out, how long it takes to reach the next ring, how-// long a ring takes to settle, and how long it stays lit: short, so the light reads as one ring travelling.+// long a ring takes to settle, and how long it stays lit: short, so the light reads as one ring traveling.static const CGFloat kCrest = 6;static const CFTimeInterval kRingDelay = 0.05, kCrestLength = 0.6, kLightLength = 0.34;// Music Haptics' taps are felt at their own strength; their crest is this much of a tapped one.@@ -99,7 +99,7 @@ static CAKeyframeAnimation *keyframes(NSString *path, NSArray *values, NSArray<Nreplicator.instanceTransform = CATransform3DMakeRotation(2 * M_PI / count, 0, 0, 1);// Every other ring turned half a step, so the dots weave rather than line up in spokes.replicator.transform = CATransform3DMakeRotation(ring % 2 ? M_PI / count : 0, 0, 0, 1);- // Fainter outwards, so the field has no hard edge.+ // Fainter outward, so the field has no hard edge.CGFloat rest = 0.46 - 0.34 * ring / (kRings - 1);CALayer *dot = [self dotOfSize:kDot colour:UIColor.whiteColor];dot.position = CGPointMake(centre.x + radius, centre.y);diff --git a/tweak/Sources/Shared/Haptics/SystemMusicHaptics.x b/tweak/Sources/Shared/Haptics/SystemMusicHaptics.xindex 3c5ba81d..fff0b1f7 100644--- a/tweak/Sources/Shared/Haptics/SystemMusicHaptics.x+++ b/tweak/Sources/Shared/Haptics/SystemMusicHaptics.x@@ -32,7 +32,7 @@// ponytail: the identifier rides on Spotify's info by title, as NowPlayingExtras matches it, so a next track// with the same title can carry the last one's for the moment before the player reports it. Matching by the// info's external content identifier would close that, in NowPlayingExtras for every owner.-// ponytail: an answer for an earlier track is dropped rather than its request cancelled; the lookups are+// ponytail: an answer for an earlier track is dropped rather than its request canceled; the lookups are// kept and shared, and a cancel would take the answer from another asker waiting on it.#import <MediaAccessibility/MediaAccessibility.h>#import <MediaPlayer/MediaPlayer.h>diff --git a/tweak/Sources/Shared/HeadGestures/HeadGesturesTeach.m b/tweak/Sources/Shared/HeadGestures/HeadGesturesTeach.mindex 10d93570..288a2ad1 100644--- a/tweak/Sources/Shared/HeadGestures/HeadGesturesTeach.m+++ b/tweak/Sources/Shared/HeadGestures/HeadGesturesTeach.m@@ -112,7 +112,7 @@ static BOOL headOffset(double *pitch, double *yaw) {NSArray<CAShapeLayer *> *_ticks;double _levels[kTicks];CALayer *_dot;- CGPoint _dotAt; // from the centre+ CGPoint _dotAt; // from the centerUIImageView *_check;CADisplayLink *_link;CFTimeInterval _lastFrame;@@ -339,7 +339,7 @@ static BOOL headOffset(double *pitch, double *yaw) {- (void)viewDidLoad {[super viewDidLoad];- // iOS 26 gives a sheet its own material; before it the sheet takes the mod's page colour.+ // iOS 26 gives a sheet its own material; before it the sheet takes the mod's page color.if (@available(iOS 26.0, *)) {} else self.view.backgroundColor = SGPageBackground();self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];@@ -415,7 +415,7 @@ static BOOL headOffset(double *pitch, double *yaw) {NSInteger landed = (NSInteger)_samples.count;_count.text = [NSString stringWithFormat:@"%ld of %ld", (long)landed, (long)kSamples];_dial.accessibilityValue = _count.text;- // Landed dots full, the one being recorded dim, the rest grey: a colour change, so Reduce Motion keeps it.+ // Landed dots full, the one being recorded dim, the rest gray: a color change, so Reduce Motion keeps it.[UIView animateWithDuration:kFade delay:0 options:UIViewAnimationOptionCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState animations:^{for (NSInteger i = 0; i < kSamples; i++) {BOOL recording = i == landed && self->_listening;diff --git a/tweak/Sources/Shared/LiveActivity/SGLiveActivityPreview.m b/tweak/Sources/Shared/LiveActivity/SGLiveActivityPreview.mindex a6681fba..f201b686 100644--- a/tweak/Sources/Shared/LiveActivity/SGLiveActivityPreview.m+++ b/tweak/Sources/Shared/LiveActivity/SGLiveActivityPreview.m@@ -25,7 +25,7 @@ static UIFont *font(CGFloat size, UIFontWeight weight) { return [UIFont systemFostatic const CGFloat kHeadline = 17, kTitle3 = 20, kTitle2 = 22, kSubheadline = 15, kFootnote = 13, kCaption = 12, kCaption2 = 11;// A made-up song.-static NSString *const kTitle = @"Paper Lanterns", *const kArtist = @"The Quiet Harbour";+static NSString *const kTitle = @"Paper Lanterns", *const kArtist = @"The Quiet Harbor";static NSString *const kQuietTitle = @"Low Tide (Interlude)";typedef struct { __unsafe_unretained NSString *line, *next, *translation; } Line;static const Line kLines[] = {@@ -36,7 +36,7 @@ static const Line kLines[] = {static const NSInteger kLineCount = 3;static NSString *const kQueue[][2] = {{@"Salt and Static", @"Mira Vale"},- {@"Northbound Lights", @"The Quiet Harbour"},+ {@"Northbound Lights", @"The Quiet Harbor"},{@"Glasshouse", @"Juniper & Cole"},};diff --git a/tweak/Sources/Shared/LocalFiles/EditInfoMenu.x b/tweak/Sources/Shared/LocalFiles/EditInfoMenu.xindex 6afb0c67..0c571c1e 100644--- a/tweak/Sources/Shared/LocalFiles/EditInfoMenu.x+++ b/tweak/Sources/Shared/LocalFiles/EditInfoMenu.x@@ -396,7 +396,7 @@ void SGLocalFilePresentEditor(UIViewController *presenter, NSString *uri) {if (!(self = [super initWithFrame:frame])) return nil;UIColor *secondary = [UIColor colorWithWhite:1 alpha:UIAccessibilityDarkerSystemColorsEnabled() ? 0.80 : 0.65];UIImage *glyph = [UIImage systemImageNamed:@"pencil" withConfiguration:[UIImageSymbolConfiguration configurationWithPointSize:20 weight:UIImageSymbolWeightRegular]];- // Colours drawn in, so nothing passes through the sheet's tint.+ // Colors drawn in, so nothing passes through the sheet's tint._icon = [[UIImageView alloc] initWithImage:[glyph imageWithTintColor:secondary renderingMode:UIImageRenderingModeAlwaysOriginal]];_icon.contentMode = UIViewContentModeCenter;_title = [UILabel new];diff --git a/tweak/Sources/Shared/LockScreenLyrics/SGLyricsClip.m b/tweak/Sources/Shared/LockScreenLyrics/SGLyricsClip.mindex d8fbfa66..c179c196 100644--- a/tweak/Sources/Shared/LockScreenLyrics/SGLyricsClip.m+++ b/tweak/Sources/Shared/LockScreenLyrics/SGLyricsClip.m@@ -6,7 +6,7 @@#import "SGLyricsClip.h"// The lock screen fills the screen with a 3:4 clip, so a phone's taller screen cuts its sides off: the-// words keep to this middle share of the width. The centre of the words sits this far down, clear of+// words keep to this middle share of the width. The center of the words sits this far down, clear of// the clock above and the controls below.// ponytail: guessed from the screen's shape, not measured on a lock screen; tune both on a device.static const CGFloat kColumn = 0.56;diff --git a/tweak/Sources/Shared/Lyrics/KaraokeTiming.m b/tweak/Sources/Shared/Lyrics/KaraokeTiming.mindex 8ac5da8b..d312c031 100644--- a/tweak/Sources/Shared/Lyrics/KaraokeTiming.m+++ b/tweak/Sources/Shared/Lyrics/KaraokeTiming.m@@ -150,7 +150,7 @@ static void appendWords(NSMutableArray<SGKaraokeWord *> *pieces, NSString *token// The line split into what the sweep lights one at a time: words where the script spaces them, a// syllable at a time where it does not, so a Japanese line sweeps instead of lighting up whole, and-// the dictionary's words in Thai and its neighbours, so a long line wraps between them.+// the dictionary's words in Thai and its neighbors, so a long line wraps between them.// Everything a token holds past its first piece is joined to the one before it.static NSArray<SGKaraokeWord *> *piecesOf(NSString *line) {NSMutableArray<SGKaraokeWord *> *pieces = [NSMutableArray array];diff --git a/tweak/Sources/Shared/Lyrics/LyricsSettings.m b/tweak/Sources/Shared/Lyrics/LyricsSettings.mindex 6765a024..b02ce8bb 100644--- a/tweak/Sources/Shared/Lyrics/LyricsSettings.m+++ b/tweak/Sources/Shared/Lyrics/LyricsSettings.m@@ -45,7 +45,7 @@ SGModRow *SGLyricsTranslationLanguageRow(void) {// Only the redesign's lyrics view draws it, and every one there is redrawn as the switch flips.SGModRow *SGLyricsRomanisedRow(void) {- SGModRow *row = SGOptionRow(@"Romanised lyrics", @"Lines in other alphabets, again in Latin letters", SGKeyLyricsRomanised);+ SGModRow *row = SGOptionRow(@"Romanized lyrics", @"Lines in other alphabets, again in Latin letters", SGKeyLyricsRomanised);row.changed = ^(BOOL on) {[NSNotificationCenter.defaultCenter postNotificationName:SGLyricsRomanisedDidChangeNotification object:nil];};diff --git a/tweak/Sources/Shared/LyricsSources/LrcLib.m b/tweak/Sources/Shared/LyricsSources/LrcLib.mindex 5de31232..a6babc31 100644--- a/tweak/Sources/Shared/LyricsSources/LrcLib.m+++ b/tweak/Sources/Shared/LyricsSources/LrcLib.m@@ -1,5 +1,5 @@-// LRCLIB, the floor of the order. It is an open library with no key and no catalogue to license, so-// it holds what the rest cannot: the tracks Apple's word by word programme never reached, and the+// LRCLIB, the floor of the order. It is an open library with no key and no catalog to license, so+// it holds what the rest cannot: the tracks Apple's word by word program never reached, and the// ones Musixmatch may show nobody. It times lines and not words, which is the whole point of putting// it last — the estimate inside a line is still a sweep, where Spotify's own lyrics only scroll.//diff --git a/tweak/Sources/Shared/LyricsSources/LyricsHook.x b/tweak/Sources/Shared/LyricsSources/LyricsHook.xindex a4ebd73f..7981ffa8 100644--- a/tweak/Sources/Shared/LyricsSources/LyricsHook.x+++ b/tweak/Sources/Shared/LyricsSources/LyricsHook.x@@ -408,7 +408,7 @@ static void answerHeld(id delegate, NSURLSession *session, NSURLSessionDataTask}if (ended || cancelled) {SGLog(@"lyrics: the request for %@ ended before the sources answered, nothing delivered", state.track);- // URLSession holds the end of a cancelled task back until it has a disposition.+ // URLSession holds the end of a canceled task back until it has a disposition.if (cancelled) handler(NSURLSessionResponseCancel);return;}@@ -476,7 +476,7 @@ static void finishDonor(id delegate, NSURLSession *session, NSURLSessionDataTaskforward(error);return;}- // The donor's colours are the track's own only when they were worked out from its artwork.+ // The donor's colors are the track's own only when they were worked out from its artwork.NSData *page = decide(state.track, chain, nil, YES, state.artwork ? coloursIn(body) : nil);if (!page) {SGLog(@"lyrics: no source has lyrics for %@ any more, its request fails", state.track);diff --git a/tweak/Sources/Shared/LyricsSources/LyricsSources.h b/tweak/Sources/Shared/LyricsSources/LyricsSources.hindex 7325bbb7..89e6f203 100644--- a/tweak/Sources/Shared/LyricsSources/LyricsSources.h+++ b/tweak/Sources/Shared/LyricsSources/LyricsSources.h@@ -178,7 +178,7 @@ NSArray<SGKaraokeLine *> *SGLyricsPieceLines(NSString *body, BOOL krc);NSString *SGLyricsMatchKey(NSString *text);NSString *SGLyricsLeadArtist(NSString *artist);BOOL SGLyricsSameArtist(NSString *credited, NSString *artist);-// What the two catalogues are asked as: a browser.+// What the two catalogs are asked as: a browser.#define SGLyricsBrowserAgent @"Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"// KuGou.m. A download's base64 content as lines, nil when it is not KRC or holds no timed line.NSArray<SGKaraokeLine *> *SGKuGouLines(NSString *content);diff --git a/tweak/Sources/Shared/LyricsSources/LyricsSources.m b/tweak/Sources/Shared/LyricsSources/LyricsSources.mindex 7a506bc9..bf065cf8 100644--- a/tweak/Sources/Shared/LyricsSources/LyricsSources.m+++ b/tweak/Sources/Shared/LyricsSources/LyricsSources.m@@ -174,13 +174,13 @@ NSArray<SGLyricsProvider *> *SGLyricsAllProviders(void) {};all = @[make(@"binilyrics", @"BiniLyrics", @"Apple Music word timing", SGBiniLyricsAsk),- make(@"musixmatch", @"Musixmatch", @"Spotify's licensed catalogue", SGMusixmatchAsk),+ make(@"musixmatch", @"Musixmatch", @"Spotify's licensed catalog", SGMusixmatchAsk),make(@"unison", @"Unison", @"Hand-timed, few tracks", SGUnisonAsk),make(@"netease", @"NetEase", @"Word timing, censored", SGNetEaseAsk),make(@"lrclib", @"LRCLIB", @"Line timing, open fallback", SGLrcLibAsk),make(SGSpicyLyricsKey, @"Spicy Lyrics", @"Community word syncs, your own key", SGSpicyLyricsAsk),- make(@"qqmusic", @"QQ Music", @"Line timing, Chinese catalogue", SGQQMusicAsk),- make(@"kugou", @"KuGou", @"Word timing, Chinese catalogue", SGKuGouAsk),+ make(@"qqmusic", @"QQ Music", @"Line timing, Chinese catalog", SGQQMusicAsk),+ make(@"kugou", @"KuGou", @"Word timing, Chinese catalog", SGKuGouAsk),make(SGImportedLRCKey, @"Imported LRC", @"Your own .lrc files", SGImportedLRCAsk),];});@@ -204,7 +204,7 @@ static NSArray<NSString *> *fromLegacyKeys(void) {}// With nothing stored and nothing to carry over, every source is on: the user's own files first, word-// timing ahead of line timing, and the two Chinese catalogues last, asked only once the rest have missed.+// timing ahead of line timing, and the two Chinese catalogs last, asked only once the rest have missed.// Spicy Lyrics passes straight on without its key.static NSArray<NSString *> *defaultOrder(void) {return @[SGImportedLRCKey, SGSpicyLyricsKey, @"binilyrics", @"musixmatch", @"unison", @"netease", @"lrclib", @"qqmusic", @"kugou"];diff --git a/tweak/Sources/Shared/LyricsSources/Musixmatch.m b/tweak/Sources/Shared/LyricsSources/Musixmatch.mindex 1a8a8c07..596f77e9 100644--- a/tweak/Sources/Shared/LyricsSources/Musixmatch.m+++ b/tweak/Sources/Shared/LyricsSources/Musixmatch.m@@ -1,4 +1,4 @@-// Lyrics from Musixmatch. It is the catalogue Spotify licenses, and for part of it Musixmatch also+// Lyrics from Musixmatch. It is the catalog Spotify licenses, and for part of it Musixmatch also// has the time of every word (richsync), which Spotify never sends. The token is an anonymous one// asked for as Musixmatch's iOS app, so Musixmatch learns the track's id and nothing of the Spotify// account. It is the one source that matches by Spotify's own track id, so it never has to guess atdiff --git a/tweak/Sources/Shared/LyricsSources/QQMusic.m b/tweak/Sources/Shared/LyricsSources/QQMusic.mindex 11d45530..0c4fe5f2 100644--- a/tweak/Sources/Shared/LyricsSources/QQMusic.m+++ b/tweak/Sources/Shared/LyricsSources/QQMusic.m@@ -46,7 +46,7 @@ static void ask(NSString *name, NSDictionary *request, void (^done)(id reply)) {});}-// The first recording on the page that is the track: QQ ranks its own catalogue well, so the first+// The first recording on the page that is the track: QQ ranks its own catalog well, so the first// that fits is taken rather than the closest in length.static NSNumber *songFor(id data, SGLyricsQuery *query) {NSString *title = SGLyricsMatchKey(query.title);diff --git a/tweak/Sources/Shared/LyricsSources/SGTTML.m b/tweak/Sources/Shared/LyricsSources/SGTTML.mindex 603ce22a..fd1eb085 100644--- a/tweak/Sources/Shared/LyricsSources/SGTTML.m+++ b/tweak/Sources/Shared/LyricsSources/SGTTML.m@@ -12,7 +12,7 @@// syllable continues a word rather than starting one.//// The head can carry the lines again in two more ways, each keyed to its line by the itunes:key of-// the <p>: Apple's translations, as text, and its pronunciations (transliterations), spelt in the+// the <p>: Apple's translations, as text, and its pronunciations (transliterations), spelled in the// Latin alphabet and timed by spans that start with the words of the line they spell out.//// <iTunesMetadata><translations><translation xml:lang="en-US"><text for="L1">I'm so drunk …@@ -65,7 +65,7 @@ static NSInteger msOfClock(NSString *clock) {@implementation SGTTMLText@end-// What a <text> of the head is: a line again, in another language or spelt out.+// What a <text> of the head is: a line again, in another language or spelled out.typedef NS_ENUM(NSInteger, SGTTMLPart) {SGTTMLPartNone,SGTTMLPartTranslation,@@ -265,7 +265,7 @@ typedef NS_ENUM(NSInteger, SGTTMLPart) {#pragma mark - what the head adds to the lines// The letters and digits alone, lowercased: a pronunciation or a translation that reads the same as its-// line is the line again, as an English line of a Japanese song is spelt out as itself.+// line is the line again, as an English line of a Japanese song is spelled out as itself.NSString *SGLyricsBareText(NSString *text) {NSMutableString *bare = [NSMutableString string];NSCharacterSet *kept = NSCharacterSet.alphanumericCharacterSet;@@ -307,7 +307,7 @@ SGKaraokeLine *SGLyricsPronunciation(NSArray<SGKaraokeWord *> *words, NSString *line = [SGKaraokeLine new];line.words = words;} else if (said.length) {- // Spelt out without spans: its words are estimated across the time of the line they spell.+ // Spelled out without spans: its words are estimated across the time of the line they spell.line = [SGKaraokeEstimatedLines(@[@(of.start), @(MAX(of.end, of.start))], @[said, @""]) firstObject];}if (!line || [SGLyricsBareText(SGKaraokeLineText(line)) isEqualToString:SGLyricsBareText(SGKaraokeLineText(of))]) return nil;diff --git a/tweak/Sources/Shared/LyricsSources/SpicyLyrics.m b/tweak/Sources/Shared/LyricsSources/SpicyLyrics.mindex 07205d07..5e62073f 100644--- a/tweak/Sources/Shared/LyricsSources/SpicyLyrics.m+++ b/tweak/Sources/Shared/LyricsSources/SpicyLyrics.m@@ -204,7 +204,7 @@ static NSArray<SGKaraokeLine *> *staticLines(NSArray *rows, NSArray<NSString *>}// What the credit reads, and the pages it links to. A community sync names the people who made it,-// each linked where the API gives an address; a catalogue's is named as the provider it is, reached+// each linked where the API gives an address; a catalog's is named as the provider it is, reached// through Spicy Lyrics.static NSString *creditFor(NSDictionary *body, NSArray<SGLyricsLink *> **links) {*links = nil;diff --git a/tweak/Sources/Shared/Navigation/AddTabSheet.m b/tweak/Sources/Shared/Navigation/AddTabSheet.mindex 06093f8e..28eb5ee0 100644--- a/tweak/Sources/Shared/Navigation/AddTabSheet.m+++ b/tweak/Sources/Shared/Navigation/AddTabSheet.m@@ -37,7 +37,7 @@ static NSString *iconSummary(SGTabDraft *draft) {return [NSString stringWithFormat:@"%@ · %@", draft.symbols ? @"SF Symbols" : @"Spotify Encore", draft.icon];}-// An icon at `size`, centred in a box of that size, for the right of a row.+// An icon at `size`, centered in a box of that size, for the right of a row.static UIView *previewOf(NSString *name, BOOL symbols, CGFloat size) {UIView *box = [[UIView alloc] initWithFrame:CGRectMake(0, 0, size, size)];UIView *icon = SGTabIconView(name, symbols, UIColor.whiteColor);diff --git a/tweak/Sources/Shared/Navigation/PageTransition.x b/tweak/Sources/Shared/Navigation/PageTransition.xindex 69e722db..a291105c 100644--- a/tweak/Sources/Shared/Navigation/PageTransition.x+++ b/tweak/Sources/Shared/Navigation/PageTransition.x@@ -24,7 +24,7 @@//// The cost is that the page being left behind is measured against the bar too, and reflows by the// same 54pt as it slides away under the swipe. It is on its way off screen, which is the better-// place for the jump than the page being arrived at. A cancelled swipe puts the bar back on its+// place for the jump than the page being arrived at. A canceled swipe puts the bar back on its// own: Spotify's completion block sees the cancellation and asks for the state again, which for the// page that stayed is a bar shown.//diff --git a/tweak/Sources/Shared/Navigation/TabIcons.m b/tweak/Sources/Shared/Navigation/TabIcons.mindex b92ae404..2fe37f84 100644--- a/tweak/Sources/Shared/Navigation/TabIcons.m+++ b/tweak/Sources/Shared/Navigation/TabIcons.m@@ -36,7 +36,7 @@ UIView *SGTabIconView(NSString *name, BOOL symbol, UIColor *color) {return encoreView(name, color) ?: symbolView(symbolImage(@"star.fill"), color);}-#pragma mark - the catalogues+#pragma mark - the catalogs// Methods every class answers, which are not glyphs and some of which must not be called bare.static BOOL notAGlyph(NSString *name) {@@ -110,7 +110,7 @@ static BOOL scriptVariant(NSString *name) {return dot.location != NSNotFound && [scripts containsObject:[name substringFromIndex:dot.location + 1]];}-// UIKit lists no symbol names. The system's own catalogue does, in CoreGlyphs (a link in CoreServices to+// UIKit lists no symbol names. The system's own catalog does, in CoreGlyphs (a link in CoreServices to// SFSymbols.framework's bundle on iOS 26 and 27, checked against the iOS 27 simulator runtime): its// symbol_order.plist names each symbol once, in the SF Symbols app's order.static NSArray<NSString *> *systemSymbolNames(void) {diff --git a/tweak/Sources/Shared/Player/MinuteLabel.x b/tweak/Sources/Shared/Player/MinuteLabel.xindex de007853..005c2f75 100644--- a/tweak/Sources/Shared/Player/MinuteLabel.x+++ b/tweak/Sources/Shared/Player/MinuteLabel.x@@ -11,7 +11,7 @@ static void fixMinute(UIView *cell) {if (![view isKindOfClass:UILabel.class]) return;UILabel *label = (UILabel *)view;if (label.text.length != 9 || ![label.text isEqualToString:@"1 minutes"]) return;- // Through the attributed text, so the label keeps the font and colour Spotify gave it.+ // Through the attributed text, so the label keeps the font and color Spotify gave it.NSMutableAttributedString *text = [label.attributedText mutableCopy];[text replaceCharactersInRange:NSMakeRange(0, text.length) withString:@"1 minute"];label.attributedText = text;diff --git a/tweak/Sources/Shared/Player/PlayerEvents.x b/tweak/Sources/Shared/Player/PlayerEvents.xindex 6d2d9862..6afeaacf 100644--- a/tweak/Sources/Shared/Player/PlayerEvents.x+++ b/tweak/Sources/Shared/Player/PlayerEvents.x@@ -1,6 +1,6 @@// The player's open and close, told from the appearance callbacks of a controller inside the player,// which UIKit sends as the presentation or the dismissal begins, whatever animates it; the transition-// coordinator says when it is over, a cancelled swipe included. Spotify 9.1.78 presents the player+// coordinator says when it is over, a canceled swipe included. Spotify 9.1.78 presents the player// through SPTBarInteractivePresentationController, never through NowPlaying_ViewPageImpl's// Show/CloseFullscreenAnimatedTransitioning animators, whose hooks never once fired.#import "Core/SGCore.h"diff --git a/tweak/Sources/Shared/Player/SGLastTrack.m b/tweak/Sources/Shared/Player/SGLastTrack.mindex 014064be..c3a90cfa 100644--- a/tweak/Sources/Shared/Player/SGLastTrack.m+++ b/tweak/Sources/Shared/Player/SGLastTrack.m@@ -129,8 +129,8 @@ UIImage *SGPlaceholderArtwork(UIColor *tint) {format.scale = 1;format.opaque = YES;return [[[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(side, side) format:format] imageWithActions:^(UIGraphicsImageRendererContext *context) {- // The tint, muted and dim, at the top left to near black at the bottom right, so the fields made from it (Colours,- // Fluid) have two calm colours to move between rather than the accent at full strength.+ // The tint, muted and dim, at the top left to near black at the bottom right, so the fields made from it (Colors,+ // Fluid) have two calm colors to move between rather than the accent at full strength.CGFloat h = 0, s = 0, b = 0, a = 0;[tint getHue:&h saturation:&s brightness:&b alpha:&a];UIColor *light = [UIColor colorWithHue:h saturation:s * 0.55 brightness:b * 0.5 alpha:1];diff --git a/tweak/Sources/Shared/Player/SleepTimer.h b/tweak/Sources/Shared/Player/SleepTimer.hindex bd86f020..0833300d 100644--- a/tweak/Sources/Shared/Player/SleepTimer.h+++ b/tweak/Sources/Shared/Player/SleepTimer.h@@ -5,7 +5,7 @@// volume. The Live Activity's Timer tab, the Sleep Timer shortcut and its Control Center control set it// (Shared/LiveActivity), and the card reads it back.//-// It lasts until it is up or cancelled, or Spotify quits; nothing is stored but the fade's length. While one+// It lasts until it is up or canceled, or Spotify quits; nothing is stored but the fade's length. While one// is set a timer checks it four times a second, on the main thread, playing or paused.//// Threading: main thread only.diff --git a/tweak/Sources/Shared/Player/SpeedPitch.h b/tweak/Sources/Shared/Player/SpeedPitch.hindex 8ac35993..7bdc9824 100644--- a/tweak/Sources/Shared/Player/SpeedPitch.h+++ b/tweak/Sources/Shared/Player/SpeedPitch.h@@ -49,9 +49,9 @@ float SGPlayerReverb(void);void SGPlayerSetReverb(float amount);// The redesign's Animated artwork, switched in the same block: whether the player offers the switch (the-// redesign is running and its background is Fluid, Animated or Visualiser, the three that share a field),+// redesign is running and its background is Fluid, Animated or Visualizer, the three that share a field),// whether it is on, and switching it, which applies at once and is stored as the Background choice (off is-// Fluid, and from the Visualiser changes nothing). Defined by+// Fluid, and from the Visualizer changes nothing). Defined by// Redesigned/Player/PlayerMotion.x; NO from the first under the native look.BOOL SGPlayerMenuOffersAnimatedArtwork(void);BOOL SGPlayerMenuAnimatedArtwork(void);diff --git a/tweak/Sources/Shared/Player/SpeedPitch.x b/tweak/Sources/Shared/Player/SpeedPitch.xindex fde78aac..ea235ae7 100644--- a/tweak/Sources/Shared/Player/SpeedPitch.x+++ b/tweak/Sources/Shared/Player/SpeedPitch.x@@ -364,7 +364,7 @@ static BOOL hasSound(Format *format, AudioUnitRenderActionFlags flags, const Aud// The gain asked for (main thread writes, render thread reads) and the one the sound is at (the music's render// thread only). The sound moves toward the one asked for by at most the whole way in kGainSlew seconds, so a-// fade that starts late, a timer cancelled halfway or more time added never steps.+// fade that starts late, a timer canceled halfway or more time added never steps.static const double kGainSlew = 0.5;static atomic_uint sg_gainBits;static float sg_gainNow = 1;diff --git a/tweak/Sources/Shared/Player/SpeedPitchMenu.x b/tweak/Sources/Shared/Player/SpeedPitchMenu.xindex 0cdcbb90..854fe320 100644--- a/tweak/Sources/Shared/Player/SpeedPitchMenu.x+++ b/tweak/Sources/Shared/Player/SpeedPitchMenu.x@@ -120,7 +120,7 @@ static UIImage *symbol(NSString *name, CGFloat size, UIImageSymbolWeight weight)return [UIImage systemImageNamed:name withConfiguration:[UIImageSymbolConfiguration configurationWithPointSize:size weight:weight]];}-// A glyph with its colour drawn in, so it never passes through a tint on its way to the screen.+// A glyph with its color drawn in, so it never passes through a tint on its way to the screen.static UIImage *paintedSymbol(NSString *name, CGFloat size, UIImageSymbolWeight weight, UIColor *color) {return [symbol(name, size, weight) imageWithTintColor:color renderingMode:UIImageRenderingModeAlwaysOriginal];}@@ -146,7 +146,7 @@ static UILabel *makeLabel(UIFont *font, UIColor *color) {return button;}-// A glyph centred in a box of one size, so both sliders' tracks start and end at the same x.+// A glyph centered in a box of one size, so both sliders' tracks start and end at the same x.static UIImage *endImage(NSString *name, CGFloat size) {UIImage *glyph = paintedSymbol(name, size, UIImageSymbolWeightMedium, secondary());CGSize box = CGSizeMake(24, 24);@@ -192,7 +192,7 @@ static void placeTick(UISlider *slider) {if (!(self = [super initWithFrame:frame])) return nil;self.clipsToBounds = YES;self.backgroundColor = UIColor.clearColor;- // Nothing here draws in the tint: every colour is set on the view that draws it, and the glyphs have+ // Nothing here draws in the tint: every color is set on the view that draws it, and the glyphs have// theirs painted in rather than tinted. The row came up in the system blue for a moment as the sheet// appeared on the phone (issue #68), which is the tint a view inherits when nothing up the sheet sets// one. The block's own tint is white as well, for whatever UIKit draws in it (the sliders' parts).diff --git a/tweak/Sources/Shared/Player/SpotifySleepTimer.m b/tweak/Sources/Shared/Player/SpotifySleepTimer.mindex 0275b9fe..b702fc5d 100644--- a/tweak/Sources/Shared/Player/SpotifySleepTimer.m+++ b/tweak/Sources/Shared/Player/SpotifySleepTimer.m@@ -7,7 +7,7 @@// gone off; a player state observer starts and stops it. Over the last seconds before the time, or before// the end of the track, the gain comes down. Once the timer is up (its time came, the track it ended changed,// Spotify paused or dropped the timer within a couple of seconds of its end) the gain stays down until-// Spotify's pause has landed and comes back a second later, or 5 s on without a pause. A timer cancelled or+// Spotify's pause has landed and comes back a second later, or 5 s on without a pause. A timer canceled or// moved later brings the gain back at once. The core may keep a timer that went off in its state for a while,// so one that went off is not followed again.//@@ -149,7 +149,7 @@ static void check(void) {} else if (sg_following) {if (!key && sg_left >= 0 && sg_left < kUpWithin) wentOff(@"timer cleared at its end");else {- SGLog(@"sleep timer: Spotify's cancelled%@", sg_lowered ? @", gain back" : @"");+ SGLog(@"sleep timer: Spotify's canceled%@", sg_lowered ? @", gain back" : @"");sg_following = nil;sg_left = -1;if (sg_lowered) restoreGain(YES);diff --git a/tweak/Sources/Shared/Sing/SGSingCard.m b/tweak/Sources/Shared/Sing/SGSingCard.mindex a144b709..5d375f19 100644--- a/tweak/Sources/Shared/Sing/SGSingCard.m+++ b/tweak/Sources/Shared/Sing/SGSingCard.m@@ -55,7 +55,7 @@ static CGFloat height(float rms) {- (instancetype)initWithFrame:(CGRect)frame {if (!(self = [super initWithFrame:frame])) return nil;- // Glass over the card's flat grey shows little of itself, so a light wash gives the track its shape.+ // Glass over the card's flat gray shows little of itself, so a light wash gives the track its shape.UIVisualEffectView *glass = SGGlassFor(self, @selector(initWithFrame:));glass.userInteractionEnabled = NO;self.backgroundColor = [UIColor colorWithWhite:1 alpha:0.1];@@ -391,7 +391,7 @@ static CGFloat height(float rms) {[CATransaction begin];[CATransaction setDisableActions:!settle];if (settle) [CATransaction setAnimationDuration:0.4];- // Calm also in colour: the vocals' line dims while there is nothing to trace.+ // Calm also in color: the vocals' line dims while there is nothing to trace._vocals.strokeColor = [SGGreen() colorWithAlphaComponent:heard ? 1 : 0.35].CGColor;_vocals.path = [self pathFor:vocals count:kHistory + 1 step:step].CGPath;_rest.path = [self pathFor:rest count:kHistory + 1 step:step].CGPath;diff --git a/tweak/Sources/Shared/Sing/SGSingEngine.h b/tweak/Sources/Shared/Sing/SGSingEngine.hindex e0e563cd..ea28f11a 100644--- a/tweak/Sources/Shared/Sing/SGSingEngine.h+++ b/tweak/Sources/Shared/Sing/SGSingEngine.h@@ -31,7 +31,7 @@@class SGSingSeparator;enum {- kSGSingEngineHop = 66150, // 1.5 s between windows, so neighbours share half a second+ kSGSingEngineHop = 66150, // 1.5 s between windows, so neighbors share half a second};typedef struct SGSingEngine SGSingEngine;diff --git a/tweak/Sources/Shared/Sing/SGSingEngine.m b/tweak/Sources/Shared/Sing/SGSingEngine.mindex 6b5761f4..dcece65f 100644--- a/tweak/Sources/Shared/Sing/SGSingEngine.m+++ b/tweak/Sources/Shared/Sing/SGSingEngine.m@@ -233,7 +233,7 @@ OSStatus SGSingEngineRender(SGSingEngine *engine, UInt32 frames, float *left, flfloat vocalsStep = (vocalsTo - engine->vocalsGain) / frames, otherStep = (otherTo - engine->otherGain) / frames;float fade = 1.0f / (kFadeSeconds * kSGSingRate), amountTo = on && mixing ? 1 : 0;- // The voice's angle glides the short way round towards the one set, and lands on it; within the buffer+ // The voice's angle glides the short way round toward the one set, and lands on it; within the buffer// each ear's gain, delay and low-pass move in a straight line from where the angle was to where it is.float angleTo = loadFloat(&engine->voiceAngleBits), angleFrom = engine->voiceAngle;float turn = remainderf(angleTo - angleFrom, 2 * (float)M_PI);diff --git a/tweak/Sources/Shared/Sing/SGSingSeparator.h b/tweak/Sources/Shared/Sing/SGSingSeparator.hindex 8df6ec1d..0c540acf 100644--- a/tweak/Sources/Shared/Sing/SGSingSeparator.h+++ b/tweak/Sources/Shared/Sing/SGSingSeparator.h@@ -3,7 +3,7 @@// core only, so the STFT around it is done here, as the checkpoint's reference implementation does it// (its configs/config_vocals_mel_band_roformer.yaml, and model.mil read for the layout)://-// 44.1 kHz stereo, n_fft 2048, hop 441, a periodic Hann window of 2048, unnormalized, centred with+// 44.1 kHz stereo, n_fft 2048, hop 441, a periodic Hann window of 2048, unnormalized, centered with// reflect padding (torch.stft's defaults), so two seconds (88200 frames) make 201 frames of 1025 bins.// The model's `spectrum` and `vocals_spectrum` are float32 [1, 2050, 201, 2]: axis 1 is bin-major with// the two channels interleaved (bin f of channel c at 2f + c, which its band split's gather indices@@ -52,7 +52,7 @@ typedef struct {// The faster copy, already warm, and the name the log gives it; nil takes it away.- (void)setFastModel:(MLModel *)model named:(NSString *)name;- (SGSingSeparatorStats)stats;-// One prediction of silence on `model`, which Core ML spends allocating and specialising, so the first real window+// One prediction of silence on `model`, which Core ML spends allocating and specializing, so the first real window// does not; its time in seconds, or a negative number and `error` when the model failed or answered in a shape the// separator does not read.+ (double)warmUp:(MLModel *)model error:(NSError **)error;diff --git a/tweak/Sources/Shared/Sing/SGSingSeparator.m b/tweak/Sources/Shared/Sing/SGSingSeparator.mindex aaeffff7..9e5b31dd 100644--- a/tweak/Sources/Shared/Sing/SGSingSeparator.m+++ b/tweak/Sources/Shared/Sing/SGSingSeparator.m@@ -6,7 +6,7 @@#import "SGSingSeparator.h"enum {- kPad = kSGSingFFT / 2, // the centring's reflect padding on each side+ kPad = kSGSingFFT / 2, // the centering's reflect padding on each sidekPadded = kSGSingWindowFrames + 2 * kPad,kHalf = kSGSingFFT / 2,};diff --git a/tweak/Sources/Shared/Sing/SGSpatialPreview.m b/tweak/Sources/Shared/Sing/SGSpatialPreview.mindex d347780a..1f7da042 100644--- a/tweak/Sources/Shared/Sing/SGSpatialPreview.m+++ b/tweak/Sources/Shared/Sing/SGSpatialPreview.m@@ -1,5 +1,5 @@// The Spatial voice page's preview (Sing.h): the listener in the middle of a disc of dots seen from just behind-// and above the head, the voice a point of the accent colour in front with its light on the floor under it.+// and above the head, the voice a point of the accent color in front with its light on the floor under it.// The disc is the room and the camera is the head: as the head turns the disc turns the other way under it, so// the voice keeps its place in the room and comes round to the side, by the angle SGSpatialVoiceAngle hands the// engine (SGSingEngine.h). Rings go out slowly from the voice, as sound does. With no head to follow, the disc@@ -146,7 +146,7 @@ static CAGradientLayer *floorLight(CGPoint at, CGFloat size, UIColor *color, CGF_field.frame = _plane.bounds;[_field setValue:@(_angle) forKeyPath:@"transform.rotation.z"];[_plane addSublayer:_field];- // Rings of dots spaced evenly along each, dimmer outwards, one layer a ring.+ // Rings of dots spaced evenly along each, dimmer outward, one layer a ring.for (int ring = 1; ring <= kRings; ring++) {CGFloat r = _radius * ring / kRings;int count = (int)round(2 * M_PI * r / kDotSpacing);diff --git a/tweak/Sources/Shared/Sing/Sing.h b/tweak/Sources/Shared/Sing/Sing.hindex c506c3ff..ad106418 100644--- a/tweak/Sources/Shared/Sing/Sing.h+++ b/tweak/Sources/Shared/Sing/Sing.h@@ -51,7 +51,7 @@ typedef NS_ENUM(NSInteger, SGSingState) {SGSingStateNoModel, // the model is not downloadedSGSingStateDownloading,SGSingStateOff,- SGSingStatePreparing, // the model loading (only while Spotify is active), which Core ML specialises the first time+ SGSingStatePreparing, // the model loading (only while Spotify is active), which Core ML specializes the first timeSGSingStateWaiting, // on, the model ready, Spotify not playing through the chain yet; or resting at As sung// (SGSingStatusText says which)SGSingStateBuffering, // on, the lead filling: what plays is dry