FuelBoard Contributor
2a2823c180
Distance confidence - Every distance surface takes the figure AND its "Approx." marker from one FuelStore.stationDistanceDisplay call (station rows, detail sheet, widget, Live Activity, watch, Siri), so a surface can never mark one figure approximate while showing a routed one. Radius filters and Closest ordering test that same displayed distance, so no row can read a distance outside the radius that filtered it (the reported "14.6 mi inside a 10-mile list"). Accurate distances (Settings -> Distances, default off) - Off: the browse layer serves the straight line, marked Approx., for every row, so two installs agree to the metre and the app makes no route requests at all. - On: routed distances for the whole search area, unmarked, served only from a COMPLETE set anchored within 600 m — a partial fill reverts every row at once rather than mixing road and straight-line bases. - Best Value maths sits deliberately outside the toggle: it keeps using measured road routes and its own confidence marking, so money figures never move with the switch. - Fills run only while the toggle is on and the app is frontmost; capacity raised to 600 stations per pass; completeness tolerates pins Apple Maps has no route for, which otherwise left an area permanently incomplete and the whole list stuck on estimates. Performance (the reported slowdown switching to Closest / launching with it) - FuelStore.accurateDistancesEnabled was a UserDefaults(suiteName:) read per call: a synchronous cfprefsd round-trip measured at ~1.9 us, ~200k calls per Closest sort. Memoised, with the setter keeping it in step. - Both keyed sorts decorate their keys — one distance per station, carried as an index instead of copying whole stations into the decorated array — and the comparison baseline plus per-station journeys now come from ONE pass instead of two full scans per tab. The Stations tab also reuses its single sorted list for the count and the TOP badge instead of sorting the country three times. - Measured on iPhone SE (7,914-station Closest pool): sort 36.6 ms -> 17.1 ms per list, Cheapest 6 ms, Best Value 11 ms. - DEBUG probes: FB_PERF list timing, FB_PERF_BENCH toggle-read benchmark, and FB_DIST_FOCUS now reports the served value, marker and mode (and re-prints when a fill lands). FB_ACCURATE_DISTANCES / FB_SORT_MODE env forms for devices, where devicectl eats a leading-dash argument. Tests: 198, 0 failures. Device and simulator Debug builds green.
101 lines
4.6 KiB
Swift
101 lines
4.6 KiB
Swift
import SwiftUI
|
||
import WidgetKit
|
||
|
||
/// Full-screen widget preview (launch arg `-widgets`): the real app icon
|
||
/// plus the REAL widget faces (Shared/FuelPriceWidgetViews.swift — the same
|
||
/// code the widget extension renders) at small + medium sizes. Used for App
|
||
/// Store screenshot captures; not reachable from the UI.
|
||
struct WidgetMockScreen: View {
|
||
@Environment(\.colorScheme) private var colorScheme
|
||
|
||
var body: some View {
|
||
ZStack {
|
||
// Real iPhone wallpaper (extracted from the iOS 26.3 sim runtime —
|
||
// ActionButtonSelector Display.ca asset, 1320×2870 native res).
|
||
Image("PreviewWallpaper")
|
||
.resizable()
|
||
.scaledToFill()
|
||
.ignoresSafeArea()
|
||
|
||
VStack(alignment: .leading, spacing: 26) {
|
||
// App icon + name, home-screen style. Uses the SAME artwork
|
||
// the app ships (AppIcon.appiconset), with the dark variant
|
||
// when the device is in dark mode — matching iOS behaviour.
|
||
HStack(spacing: 16) {
|
||
Image(colorScheme == .dark ? "AppIconPreviewDark" : "AppIconPreview")
|
||
.resizable()
|
||
.frame(width: 76, height: 76)
|
||
.clipShape(RoundedRectangle(cornerRadius: 17, style: .continuous))
|
||
VStack(alignment: .leading, spacing: 3) {
|
||
Text("FuelBoard")
|
||
.font(.title2.bold())
|
||
.foregroundStyle(.white)
|
||
.shadow(radius: 2, y: 1)
|
||
Text("Cheapest fuel near you")
|
||
.font(.subheadline)
|
||
.foregroundStyle(.white.opacity(0.9))
|
||
.shadow(radius: 2, y: 1)
|
||
}
|
||
}
|
||
.padding(.top, 8)
|
||
|
||
widgetCard(.systemSmall, label: "Small widget")
|
||
widgetCard(.systemMedium, label: "Medium widget")
|
||
|
||
Spacer(minLength: 0)
|
||
}
|
||
.padding(30)
|
||
}
|
||
}
|
||
|
||
private func widgetCard(_ family: WidgetFamily, label: String) -> some View {
|
||
// Real widget proportions: system small content is 158×158pt,
|
||
// medium 338×158pt (card adds the 14pt padding each side).
|
||
let contentW: CGFloat = family == .systemSmall ? 158 : 338
|
||
let cardW: CGFloat = contentW + 28
|
||
let cardH: CGFloat = contentW + 28
|
||
return VStack(alignment: .leading, spacing: 10) {
|
||
Text(label.uppercased())
|
||
.font(.caption.weight(.semibold))
|
||
.tracking(1)
|
||
.foregroundStyle(.secondary)
|
||
FuelPriceWidgetContent(entry: mockEntry(family: family), family: family, isWidget: false)
|
||
.padding(14)
|
||
.frame(width: cardW, height: cardH, alignment: .leading)
|
||
.background(Color(.systemBackground), in: RoundedRectangle(cornerRadius: 24, style: .continuous))
|
||
}
|
||
}
|
||
|
||
/// Real stations (loaded dump) for the widget's DEFAULT configuration —
|
||
/// Unleaded / Cheapest / 5 miles — with the SAME radius test the widget's
|
||
/// provider applies. Without it this preview happily listed the UK-wide
|
||
/// cheapest (Banbridge, 184 mi away) under "Cheapest fuel near you", which
|
||
/// is not what the widget ever shows.
|
||
private func mockEntry(family: WidgetFamily) -> FuelPriceWidgetEntryData {
|
||
let fuel = FuelType.e10
|
||
let location = FuelStore.loadLocation().map { Coordinate(lat: $0.lat, lng: $0.lng) }
|
||
// 5 miles — the widget config's default Distance. WidgetDistance itself
|
||
// lives in the widget target, so the preview mirrors its default here.
|
||
let radiusKM = 5 * 1.60934
|
||
let all = FuelStore.loadStations()
|
||
let selling = all.filter { station in
|
||
guard station.prices[fuel] != nil else { return false }
|
||
guard let location else { return true }
|
||
return FuelStore.isWithinDisplayRadius(station: station, radiusKM: radiusKM,
|
||
userLat: location.lat, userLng: location.lng)
|
||
}
|
||
.sorted { ($0.prices[fuel] ?? .infinity) < ($1.prices[fuel] ?? .infinity) }
|
||
let count = family == .systemSmall ? 1 : 3
|
||
return FuelPriceWidgetEntryData(
|
||
date: Date(),
|
||
stations: Array(selling.prefix(count)),
|
||
fuel: fuel,
|
||
sort: .cheapest,
|
||
isFavourites: false,
|
||
location: location,
|
||
locationSource: location != nil ? "live" : "none",
|
||
unit: FuelStore.loadDistanceUnit()
|
||
)
|
||
}
|
||
}
|