enricobuehler
a14b000c9b
The form screens' pinned title and legend lost their gradient blur when
GamepadTrayScrim went (2590238b): the scrim was `.ultraThinMaterial`, and a
material by definition lifts and tints whatever it blurs — it read grey over
the aurora, and washed with the palette's ground it read coloured. There is
no public way to blur a backdrop without that tint, so the layer was deleted
rather than re-tuned, and the rows have scrolled to a raw edge since.
Glur's GlurView blurs the backdrop through a gradient with NO material stage
on top — the rows soften as they slide under the pinned trays and nothing
carries a colour. Three things about the adoption are deliberate:
- It is the library's GlurBackdrop product, which uses a private API
(a variable-blur CAFilter on UIKit/AppKit). The public `.glur()`
modifier is a Metal shader on a view's OWN content and silently no-ops
over platform-backed views like ScrollView, so it cannot reach a
backdrop at all. GlurBackdrop ships as a separate module precisely so
adopters can weigh the App Store exposure; it disables hit testing
itself, so the band never eats a touch.
- The dependency is pinned by REVISION: GlurBackdrop exists only on main —
no release carries it (the newest tag, `1.1`, predates it and is not
three-component semver anyway, so `from:` resolution stops at 1.0.4,
which doesn't have the product). Wired into BOTH manifests — the
package for `swift build`, and the xcodeproj (remote package reference
+ per-target product deps) for the app targets, which compile these
sources themselves and know nothing of Package.swift's dependencies.
- The band takes NO content-side overhang, unlike the scrim it replaces —
and dropping the scrim's hard-won -44/-72 runway is the point, not an
oversight. That runway existed because a material carries body at every
alpha and had to dissolve OUTSIDE the tray; carried over here it blurred
fully-visible rows at rest (first on-glass verdict). Glur's ramp reaches
literal zero, so the band ends exactly at the tray's layout edge: open
content untouched, rows soften only where they actually slide under.
The 80 pt outer bleed and the pinned shape
(`transaction { $0.animation = nil }`) are kept — full-bleed by LAYOUT
rather than `.ignoresSafeArea()`, so a push never shows the band
growing into place.
Mounted exactly where the scrim was: settings, add-host and pair trays
(top + bottom) and the library title (top). Glur is attributed on the
Acknowledgements screen alongside the bundled font — it is a Swift package,
so the Rust-closure notices generator rightly knows nothing about it.
macOS build, tvOS typecheck; band placement and the blur itself verified on
the iPad on glass.
84 lines
4.6 KiB
Swift
84 lines
4.6 KiB
Swift
// swift-tools-version: 5.9
|
|
// PunktfunkKit — Swift wrapper around the punktfunk-core C ABI (punktfunk/1 client connector) plus the
|
|
// SwiftUI/VideoToolbox presentation layer. Build PunktfunkCore.xcframework first:
|
|
// bash ../../scripts/build-xcframework.sh (on a Mac; see README.md)
|
|
import PackageDescription
|
|
|
|
let package = Package(
|
|
name: "PunktfunkKit",
|
|
platforms: [.macOS(.v14), .iOS(.v17), .tvOS(.v17)],
|
|
products: [
|
|
.library(name: "PunktfunkKit", targets: ["PunktfunkKit"]),
|
|
// Dependency-free foundation (stored-host model + JSON codec, settings keys, App-Group
|
|
// constant, deep-link grammar, Live Activity attributes). A separate PRODUCT so the widget
|
|
// extension — which must never link PunktfunkKit (Rust staticlib + presentation layer) —
|
|
// can link this and nothing else. PunktfunkKit re-exports it (see SharedReexport.swift).
|
|
.library(name: "PunktfunkShared", targets: ["PunktfunkShared"]),
|
|
.executable(name: "PunktfunkClient", targets: ["PunktfunkClient"]),
|
|
],
|
|
dependencies: [
|
|
// Progressive (gradient) backdrop blur for the form screens' trays — a real blur with no
|
|
// material tint stage (see GamepadTrayBlur). Pinned by REVISION, not `from:`: the
|
|
// GlurBackdrop product exists only on main — no release carries it (the newest tag,
|
|
// `1.1`, predates it, and is not three-component semver anyway, so version-based
|
|
// resolution stops at 1.0.4). The revision is main's head at adoption time; a revision
|
|
// pin stays reproducible when the branch moves.
|
|
.package(
|
|
url: "https://github.com/joogps/Glur.git",
|
|
revision: "ba4f05d3c9a608ec773b9305f2af6089390de68a"),
|
|
],
|
|
targets: [
|
|
.binaryTarget(name: "PunktfunkCore", path: "PunktfunkCore.xcframework"),
|
|
// No dependencies by design — an extension process links this alone.
|
|
.target(name: "PunktfunkShared"),
|
|
.target(
|
|
name: "PunktfunkKit",
|
|
dependencies: ["PunktfunkCore", "PunktfunkShared"],
|
|
// OSS attribution shown by the app's Acknowledgements screen. Bundled here (not in the
|
|
// app target) so it rides along via Bundle.module in both `swift build` and the Xcode
|
|
// app, which links the PunktfunkKit product. Refresh with
|
|
// scripts/gen-third-party-notices.sh (it copies the generated file into Resources/).
|
|
resources: [
|
|
.copy("Resources/THIRD-PARTY-NOTICES.txt"),
|
|
.copy("Resources/LICENSE-MIT.txt"),
|
|
.copy("Resources/LICENSE-APACHE.txt"),
|
|
// Geist (SIL OFL 1.1) — the brand typeface, shared with punktfunk-website.
|
|
// Registered with Core Text at first use; see BrandFont.swift.
|
|
.copy("Resources/Fonts"),
|
|
// The host cards' OS marks (template vector imagesets generated from the
|
|
// assets/os-icons masters by scripts/gen-os-icons.sh — per-mark provenance and
|
|
// licensing in that README). `.process` compiles the catalog; loaded via
|
|
// OsIcon.swift.
|
|
.process("Resources/OsIcons.xcassets"),
|
|
],
|
|
linkerSettings: [
|
|
// Rust staticlib system deps.
|
|
.linkedFramework("Security"),
|
|
.linkedFramework("SystemConfiguration"),
|
|
.linkedLibrary("resolv"),
|
|
]
|
|
),
|
|
// Development app shell (swift run PunktfunkClient): connect form → stream + input.
|
|
// (The tvOS slide-transition package is referenced by the Xcode PROJECT only —
|
|
// its manifest breaks SwiftPM whole-graph validation on macOS, and only the
|
|
// Punktfunk-tvOS target links it; the #if os(tvOS) import never compiles here.)
|
|
.executableTarget(
|
|
name: "PunktfunkClient",
|
|
dependencies: [
|
|
"PunktfunkKit",
|
|
.product(name: "GlurBackdrop", package: "Glur"),
|
|
]),
|
|
// PunktfunkCore is a direct dep too so the wire tests can name the C ABI's
|
|
// `PunktfunkInputEvent` / `PUNKTFUNK_INPUT_KIND_*` when asserting the gamepad byte layout.
|
|
.testTarget(
|
|
name: "PunktfunkKitTests",
|
|
dependencies: ["PunktfunkKit", "PunktfunkShared", "PunktfunkCore"],
|
|
resources: [
|
|
// PyroWave golden fixtures: host-encoded AUs + upstream-decoded reference
|
|
// planes (regenerate with punktfunk-host's `pyrowave_dump_golden` on a
|
|
// Vulkan box — see PyroWaveDecoderTests.swift).
|
|
.copy("PyroWaveFixtures")
|
|
]),
|
|
]
|
|
)
|