test: symlink DataRefreshMode into test target

FuelStore references DataRefreshMode; without the symlink the SPM test target fails to compile. 107 tests pass.
build: align embedded bundle versions for archive
2026-09-14 21:39:14 +01:00 · 2026-08-31 11:35:22 +01:00 · 2026-08-31 11:18:05 +01:00 · 2026-08-31 10:40:16 +01:00 · 2026-08-31 08:23:07 +01:00 · 2026-08-31 07:48:20 +01:00
81 changed files with 1647 additions and 212 deletions
@@ -1,6 +1,7 @@
 build/
 build-release/
 build-sim/
+build-watch/
 .DS_Store
 *.xcuserstate
 xcuserdata/
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocalNetworkUsageDescription</key>
@@ -41,8 +41,13 @@
 	<string>FuelBoard uses your location to find the cheapest nearby petrol stations.</string>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>com.apt.fuelboard.smart-refresh</string>
+	</array>
 	<key>UIBackgroundModes</key>
 	<array>
+		<string>fetch</string>
 		<string>location</string>
 	</array>
 	<key>UILaunchScreen</key>
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>FuelBoardWatch</string>
+	<string>FuelBoard</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
+	<string>FuelBoard</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
@@ -406,7 +406,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -471,7 +472,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -535,7 +537,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -599,7 +602,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -695,14 +699,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Config/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/App-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.apt.fuelboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -717,14 +722,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Config/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/App-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.apt.fuelboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -739,7 +745,8 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_ENTITLEMENTS = Config/Widget.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/Widget-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -747,7 +754,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.apt.fuelboard.widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -763,7 +770,8 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_ENTITLEMENTS = Config/Widget.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/Widget-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -771,7 +779,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.apt.fuelboard.widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1,38 +1,170 @@
 {
-  "images" : [
+  "images": [
    {
-      "filename" : "AppIcon.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename": "AppIcon.png",
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
    },
    {
-      "appearances" : [
+      "appearances": [
        {
-          "appearance" : "luminosity",
-          "value" : "dark"
+          "appearance": "luminosity",
+          "value": "dark"
        }
      ],
-      "filename" : "AppIcon-dark.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename": "AppIcon-dark.png",
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
    },
    {
-      "appearances" : [
+      "appearances": [
        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
+          "appearance": "luminosity",
+          "value": "tinted"
        }
      ],
-      "filename" : "AppIcon-tinted.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename": "AppIcon-tinted.png",
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
+    },
+    {
+      "filename": "Watch-NotificationCenter-48.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "24x24",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-NotificationCenter-55.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "27.5x27.5",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-NotificationCenter-66.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "33x33",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-CompanionSettings-58.png",
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "Watch-CompanionSettings-87.png",
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "filename": "Watch-AppLauncher-80.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "40x40",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-88.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "44x44",
+      "subtype": "40mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-92.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "46x46",
+      "subtype": "41mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-100.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "50x50",
+      "subtype": "44mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-102.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "51x51",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-108.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "54x54",
+      "subtype": "49mm"
+    },
+    {
+      "filename": "Watch-QuickLook-172.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "86x86",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-QuickLook-196.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "98x98",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-QuickLook-216.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "108x108",
+      "subtype": "44mm"
+    },
+    {
+      "filename": "Watch-QuickLook-234.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "117x117",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-QuickLook-258.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "129x129",
+      "subtype": "49mm"
+    },
+    {
+      "filename": "Watch-Marketing-1024.png",
+      "idiom": "watch-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
    }
  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
  }
 }
@@ -16,6 +16,7 @@ struct ContentView: View {

    @State private var stations: [FuelStation] = FuelStore.loadStations()
    @State private var selectedFuel: FuelType = FuelStore.loadSelectedFuel()
+    @State private var dataRefreshMode: DataRefreshMode = FuelStore.loadDataRefreshMode()
    @State private var sortMode: SortMode = FuelStore.loadSortMode()
    @State private var stationLimit: Int = FuelStore.loadStationLimit()
    @State private var distanceUnit: DistanceUnit = FuelStore.loadDistanceUnit()
@@ -50,6 +51,23 @@ struct ContentView: View {
            // fires on every fix incl. background significant-change
            // wake-ups, so the Lock Screen pill stays live while driving.
            updateLiveActivity()
+            refreshRoadDistancesIfNeeded()
+        }
+    }
+
+    /// Kicks off a (throttled) Apple-Maps road-distance recompute for the
+    /// stations around the current fix. The app owns routing — the widget and
+    /// Live Activity only read the cached result. Falls back to the last saved
+    /// location so it can run before the first fresh GPS fix arrives.
+    private func refreshRoadDistancesIfNeeded() {
+        let origin = location ?? FuelStore.loadLocation()
+        guard let origin else { return }
+        Task {
+            await RoadDistanceService.refreshIfNeeded(
+                stations: stations,
+                lat: origin.lat,
+                lng: origin.lng
+            )
        }
    }

@@ -258,6 +276,7 @@ struct ContentView: View {
                }
                if !favs.isEmpty {
                    FuelStore.saveFavourites(favs)
+                    WatchSyncManager.shared.pushSnapshot()
                }
            }
            if let i = args.firstIndex(of: "-tab"), i + 1 < args.count {
@@ -304,7 +323,7 @@ struct ContentView: View {
 #else
            let shouldSkipOnboarding = false
 #endif
-            if FuelStore.loadHasCompletedOnboarding()
+            if !FuelStore.shouldShowOnboarding()
                || shouldSkipOnboarding {
                locationManager.startForegroundTracking()
                // Geofences and the Live Activity must follow the user even in
@@ -317,6 +336,10 @@ struct ContentView: View {
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                monitor.setEnabled(alertsEnabled)
                updateLiveActivity()
+                // Compute road distances early (throttled; falls back to the
+                // last saved location) so distance surfaces are road-matched
+                // as soon as stations are available.
+                refreshRoadDistancesIfNeeded()
                // Refresh only when the cache is stale (twice-a-day policy).
                // Skipped under the force-* hooks so the banner stays up.
 #if DEBUG
@@ -362,6 +385,7 @@ struct ContentView: View {
                monitor.update(stations: stations, favourites: refreshedFavourites,
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                updateLiveActivity()
+                refreshRoadDistancesIfNeeded()
                if FuelStore.hasPendingWatchRefreshRequest {
                    Task { await handlePendingWatchRefreshRequest() }
                }
@@ -374,12 +398,14 @@ struct ContentView: View {
            if let newLocation {
                location = newLocation
                FuelStore.saveLocation(lat: newLocation.lat, lng: newLocation.lng)
+                WatchSyncManager.shared.pushSnapshot()
                WidgetCenter.shared.reloadAllTimelines()
                // Geofences follow the user's position, but the station list is
                // NOT re-fetched on every movement (cached, twice-a-day policy).
                monitor.update(stations: stations, favourites: refreshedFavourites,
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                updateLiveActivity()
+                refreshRoadDistancesIfNeeded()
            }
        }
        )
@@ -391,6 +417,7 @@ struct ContentView: View {
                .onChange(of: selectedFuel) { _, _ in
            // No re-fetch needed — one response carries E5/E10/DIESEL prices.
            WidgetCenter.shared.reloadAllTimelines()
+            WatchSyncManager.shared.pushSnapshot()
        }
        .onChange(of: stationLimit) { _, newValue in
            // Distance filter is LOCAL math now — the cache holds the full-UK
@@ -767,6 +794,7 @@ struct ContentView: View {
            tipStore: tipStore,
            distanceUnit: $distanceUnit,
            priceDisplayStyle: $priceDisplayStyle,
+            dataRefreshMode: $dataRefreshMode,
            alertsFuel: alertsFuel,
            alertsRadiusKM: alertsRadius,
            testAlertResult: monitor.lastTestResult,
@@ -795,6 +823,7 @@ struct ContentView: View {
            favourites.append(key)
        }
        FuelStore.saveFavourites(favourites)
+        WatchSyncManager.shared.pushSnapshot()
        WidgetCenter.shared.reloadAllTimelines()
        monitor.update(stations: stations, favourites: refreshedFavourites,
                       fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
@@ -806,6 +835,7 @@ struct ContentView: View {
    private func reorderFavourites(_ newOrder: [FavouriteEntry]) {
        favourites = newOrder
        FuelStore.saveFavourites(favourites)
+        WatchSyncManager.shared.pushSnapshot()
        WidgetCenter.shared.reloadAllTimelines()
        monitor.update(stations: stations, favourites: refreshedFavourites,
                       fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
@@ -837,6 +867,7 @@ struct ContentView: View {
            if force, FuelStore.hasPendingWatchRefreshRequest {
                FuelStore.markWatchRefreshHandled()
            }
+            WatchSyncManager.shared.pushSnapshot()
            // Persist envelope metadata (source, station count, GOV.UK
            // dataset update time) for the Settings → About section — the
            // live chain records whichever leg served the fetch.
@@ -963,7 +994,7 @@ struct StationRow: View {
                    .lineLimit(1)
                    .truncationMode(.tail)
                if let location {
-                    Text(distanceUnit.format(station.distanceKM(to: location.lat, lng2: location.lng)))
+                    Text(distanceUnit.format(FuelStore.displayDistanceKM(station: station, userLat: location.lat, userLng: location.lng)))
                        .font(.caption2)
                        .foregroundStyle(.secondary)
                        .monospacedDigit()
@@ -1,13 +1,64 @@
+import ActivityKit
+import BackgroundTasks
 import SwiftUI

@main
 struct FuelBoardApp: App {
+    init() {
+        WatchSyncManager.shared.activate()
+        #if DEBUG
+        // QA hook (Debug builds only): `-qaLiveActivity e10|e5|diesel` starts a
+        // Live Activity with a long station name so the Lock Screen / island
+        // layout can be rendered in the Simulator for visual QA.
+        let args = ProcessInfo.processInfo.arguments
+        if let idx = args.firstIndex(of: "-qaLiveActivity"),
+           args.indices.contains(idx + 1),
+           let fuel = FuelType(rawValue: args[idx + 1]) {
+            startQALiveActivity(fuel: fuel)
+        }
+        #endif
+    }
+
    var body: some Scene {
        WindowGroup {
            ContentView()
                .onOpenURL(perform: handleOpenURL)
+                .onReceive(NotificationCenter.default.publisher(for: .fuelBoardWatchRefreshRequested)) { _ in
+                    WatchSyncManager.shared.pushSnapshot()
                }
        }
+        .backgroundTask(.appRefresh(SmartDataRefreshScheduler.taskIdentifier)) {
+            await SmartDataRefreshCoordinator.runBackgroundProbe()
+        }
+    }
+
+    #if DEBUG
+    private func startQALiveActivity(fuel: FuelType) {
+        let state = FuelBoardLiveActivityAttributes.ContentState(
+            fuel: fuel,
+            stationID: "qa-phoenix",
+            stationName: "Phoenix Filling Stations",
+            brand: "Phoenix",
+            pricePence: 1499,
+            priceDisplayStyle: FuelStore.loadPriceDisplayStyle(),
+            distanceKM: 8.0,
+            lat: 51.5,
+            lng: -0.12,
+            updatedAt: Date()
+        )
+        let attrs = FuelBoardLiveActivityAttributes()
+        do {
+            let activity = try Activity.request(
+                attributes: attrs,
+                content: .init(state: state, staleDate: nil),
+                pushType: nil
+            )
+            print("QA-LIVE-ACTIVITY STARTED id=\(activity.id)")
+        } catch {
+            print("QA-LIVE-ACTIVITY FAILED: \(error)")
+        }
+    }
+    #endif

    /// Handles deep links that end up in the app. Widget taps arrive here in
    /// two cases:
@@ -57,7 +57,7 @@ enum LiveActivityManager {
            brand: best.brand,
            pricePence: price,
            priceDisplayStyle: priceDisplayStyle ?? FuelStore.loadPriceDisplayStyle(),
-            distanceKM: best.distanceKM(to: location.lat, lng2: location.lng),
+            distanceKM: FuelStore.displayDistanceKM(station: best, userLat: location.lat, userLng: location.lng),
            lat: best.lat,
            lng: best.lng,
            updatedAt: Date()
@@ -0,0 +1,98 @@
+// RoadDistanceService.swift — computes Apple-Maps-matched ROAD distances for
+// nearby stations and caches them (keychain) so widgets + Live Activity can
+// show real driving distance instead of straight-line haversine.
+//
+// Runs only in the APP: MKDirections is network-bound and the widget extension
+// has a tiny execution budget + a ~40-70/day refresh budget, so routing belongs
+// here, not in the widget. The widget/Live Activity just read the cache.
+//
+// Throttling: recompute at most every `throttleMinutes`, or when the user has
+// moved `moveThresholdMeters` from where the cache was built. Bounded to the
+// `candidatesPerPass` nearest stations so a pass stays a handful of route calls.
+
+import Foundation
+import MapKit
+import WidgetKit
+
+enum RoadDistanceService {
+    /// Upper bound on stations routed per pass, so a pass stays a bounded set of
+    /// route calls. Raised from 12 so stations past the old nearest-12 cutoff
+    /// still get real road distances instead of a straight-line fallback.
+    static let candidatesPerPass = 40
+    /// Only route stations within this straight-line radius (km). Covers the
+    /// largest search radius the UI exposes (15 mi ≈ 24.1 km) plus margin, so
+    /// every station a widget/Live Activity/list can actually show gets routed.
+    static let maxRadiusKM: Double = 25
+    /// Don't route again more often than this (minutes).
+    static let throttleMinutes: Double = 10
+    /// Recompute when the user moves more than this (metres) from the last
+    /// source location.
+    static let moveThresholdMeters: Double = 400
+
+    /// Refreshes the cached road distances for the in-radius stations around
+    /// `lat`/`lng`. Throttled by time + distance; safe to call on every fix.
+    static func refreshIfNeeded(stations: [FuelStation], lat: Double, lng: Double) async {
+        guard !stations.isEmpty else { return }
+
+        // Throttle: keep cached values when fresh and the user hasn't moved far.
+        if let cache = FuelStore.loadRoadDistances() {
+            let elapsed = Date().timeIntervalSince1970 - cache.updatedAt
+            let movedMeters = haversineMeters(cache.sourceLat, cache.sourceLng, lat, lng)
+            if elapsed < throttleMinutes * 60 && movedMeters < moveThresholdMeters {
+                return
+            }
+        }
+
+        // Candidate stations: the nearest-by-straight-line subset that the UI
+        // could actually display, capped so a pass stays bounded.
+        let nearest = stations
+            .sorted { $0.distanceKM(to: lat, lng2: lng) < $1.distanceKM(to: lat, lng2: lng) }
+            .prefix(candidatesPerPass)
+            .filter { $0.distanceKM(to: lat, lng2: lng) <= maxRadiusKM }
+
+        let origin = CLLocationCoordinate2D(latitude: lat, longitude: lng)
+        var entries: [String: CachedRoadDistance] = [:]
+        for station in nearest {
+            let dest = CLLocationCoordinate2D(latitude: station.lat, longitude: station.lng)
+            if let meters = await roadMeters(from: origin, to: dest) {
+                // Store the exact pin that was routed so the display layer can
+                // refuse to serve this value if the station later appears with
+                // a different coordinate (corrected pin / other data source).
+                entries[station.id] = CachedRoadDistance(meters: meters,
+                                                         lat: station.lat,
+                                                         lng: station.lng)
+            }
+        }
+        guard !entries.isEmpty else { return }
+
+        FuelStore.saveRoadDistances(sourceLat: lat, sourceLng: lng, entries: entries)
+        // Wake the widgets so the new road distances surface immediately.
+        WidgetCenter.shared.reloadAllTimelines()
+    }
+
+    /// Driving distance (metres) between two coordinates via Apple Maps routing.
+    private static func roadMeters(from: CLLocationCoordinate2D, to: CLLocationCoordinate2D) async -> Double? {
+        let request = MKDirections.Request()
+        request.source = MKMapItem(placemark: MKPlacemark(coordinate: from))
+        request.destination = MKMapItem(placemark: MKPlacemark(coordinate: to))
+        request.transportType = .automobile
+        request.requestsAlternateRoutes = false
+        do {
+            let response = try await MKDirections(request: request).calculate()
+            return response.routes.first?.distance
+        } catch {
+            return nil
+        }
+    }
+
+    /// Straight-line haversine distance between two coordinates, in metres.
+    private static func haversineMeters(_ lat1: Double, _ lng1: Double, _ lat2: Double, _ lng2: Double) -> Double {
+        let r = 6371000.0
+        let dLat = (lat2 - lat1) * .pi / 180
+        let dLng = (lng2 - lng1) * .pi / 180
+        let a = sin(dLat / 2) * sin(dLat / 2) +
+                cos(lat1 * .pi / 180) * cos(lat2 * .pi / 180) *
+                sin(dLng / 2) * sin(dLng / 2)
+        return r * 2 * atan2(sqrt(a), sqrt(1 - a))
+    }
+}
@@ -18,6 +18,7 @@ struct SettingsView: View {
    @ObservedObject var tipStore: TipStore
    @Binding var distanceUnit: DistanceUnit
    @Binding var priceDisplayStyle: PriceDisplayStyle
+    @Binding var dataRefreshMode: DataRefreshMode
    /// The fuel + radius currently configured for alerts (mirrors the Alerts
    /// tab) so the test notification matches what real alerts will say.
    var alertsFuel: FuelType = .e10
@@ -103,6 +104,7 @@ struct SettingsView: View {
                    .onChange(of: distanceUnit) { _, newValue in
                        FuelStore.saveDistanceUnit(newValue)
                        WidgetCenter.shared.reloadAllTimelines()
+                        WatchSyncManager.shared.pushSnapshot()
                    }
                    Picker("Price display", selection: $priceDisplayStyle) {
                        ForEach(PriceDisplayStyle.allCases) { style in
@@ -113,6 +115,7 @@ struct SettingsView: View {
                    .onChange(of: priceDisplayStyle) { _, newValue in
                        FuelStore.savePriceDisplayStyle(newValue)
                        WidgetCenter.shared.reloadAllTimelines()
+                        WatchSyncManager.shared.pushSnapshot()
                    }
                } header: {
                    Text("Units")
@@ -120,6 +123,30 @@ struct SettingsView: View {
                    Text("Distances and search radii across the app, widget and alerts are shown in this unit. Prices can be shown as on a station sign (129.9) or in pounds and pence (£1.29⁹/L).")
                }

+                Section {
+                    Picker("Data checking", selection: $dataRefreshMode) {
+                        ForEach(DataRefreshMode.allCases) { mode in
+                            Text(mode.displayName).tag(mode)
+                        }
+                    }
+                    .pickerStyle(.segmented)
+                    .onChange(of: dataRefreshMode) { _, newValue in
+                        FuelStore.saveDataRefreshMode(newValue)
+                        SmartDataRefreshScheduler.scheduleNextIfNeeded()
+                        WatchSyncManager.shared.pushSnapshot()
+                    }
+                    VStack(alignment: .leading, spacing: 8) {
+                        Text(dataRefreshMode.summary)
+                        Text("Background checks are best-effort and happen only when iOS allows, so timing is not exact.")
+                            .foregroundStyle(.secondary)
+                    }
+                    .font(.footnote)
+                } header: {
+                    Text("Data checking")
+                } footer: {
+                    Text("Standard saves battery and refreshes price data up to twice daily. Smart checks for newer data more often in the background and only refreshes full prices when an update is available.")
+                }
+
                Section {
                    Button {
                        onShowOnboarding()
@@ -125,7 +125,7 @@ struct CheapestFuelIntent: AppIntent {
 struct DirectionsToCheapestFuelIntent: AppIntent {
    static var title: LocalizedStringResource = "Directions to Cheapest Fuel Near Me"
    static var description = IntentDescription(
-        "Opens Apple Maps directions to the cheapest station selling a fuel near you, using the latest cached prices."
+        "Opens directions to the cheapest station selling a fuel near you, using the latest cached prices."
    )

    @Parameter(title: "Fuel")
@@ -285,7 +285,7 @@ struct FavouriteFuelPriceIntent: AppIntent {
 struct DirectionsToFavouriteFuelIntent: AppIntent {
    static var title: LocalizedStringResource = "Directions to Favourite Fuel Station"
    static var description = IntentDescription(
-        "Opens Apple Maps directions to your top favourite station for a fuel."
+        "Opens directions to your top favourite station for a fuel."
    )

    @Parameter(title: "Fuel")
@@ -404,7 +404,7 @@ struct FuelMessage: View {
 /// Shortcut slot and adds no phrase.
 struct OpenDirectionsIntent: AppIntent {
    static var title: LocalizedStringResource = "Directions"
-    static var description = IntentDescription("Opens Apple Maps directions to the station.")
+    static var description = IntentDescription("Opens directions to the station.")
    static var isDiscoverable: Bool = false

    @Parameter var stationName: String
@@ -489,19 +489,14 @@ struct FuelMessageSnippetIntent: SnippetIntent {

 struct FuelBoardShortcuts: AppShortcutsProvider {
    static var appShortcuts: [AppShortcut] {
-        // Generic parameterized shortcut — matches whatever fuel word Siri
-        // resolves. Parameter resolution is flaky on-device ("cheapest diesel"
-        // matched, "cheapest unleaded" didn't), which is why the fixed-fuel
-        // entries below carry the fuel word as LITERAL phrase text.
-        AppShortcut(
-            intent: CheapestFuelIntent(),
-            phrases: [
-                "Ask \(.applicationName) what's the cheapest \(\.$fuel) near me",
-            ],
-            shortTitle: "Cheapest Fuel",
-            systemImageName: "fuelpump"
-        )
-
+        // NOTE (2026-08-20): the generic parameterized shortcut ("cheapest
+        // ${fuel}") was REMOVED. It competed with the fixed-fuel literal-word
+        // shortcuts for the same intent (parameter resolution was already flaky
+        // on-device), which degraded Siri's NLU ranking and caused the
+        // hit-and-miss "can't do that, searching in app" fallback. Now Siri
+        // routes on literal fuel words only, and the freed slot keeps us under
+        // the 10-shortcut cap. Every phrase carries .applicationName (iOS 26
+        // metadata-processor requirement) and mirrors how people actually ask.
        AppShortcut(
            intent: CheapestFuelIntent(fuel: .e10),
            phrases: [
@@ -509,6 +504,10 @@ struct FuelBoardShortcuts: AppShortcutsProvider {
                "Ask \(.applicationName) for the cheapest petrol near me",
                "Find the cheapest petrol near me \(.applicationName)",
                "Find the cheapest unleaded near me \(.applicationName)",
+                "What's the cheapest unleaded near me \(.applicationName)",
+                "What's the cheapest petrol near me \(.applicationName)",
+                "Cheapest unleaded near me \(.applicationName)",
+                "Where's the cheapest petrol \(.applicationName)",
            ],
            shortTitle: "Cheapest Unleaded",
            systemImageName: "fuelpump"
@@ -0,0 +1,89 @@
+import BackgroundTasks
+import Foundation
+import WidgetKit
+
+enum SmartDataRefreshScheduler {
+    static let taskIdentifier = "com.apt.fuelboard.smart-refresh"
+
+    static func register() {
+        BGTaskScheduler.shared.register(forTaskWithIdentifier: taskIdentifier, using: nil) { task in
+            guard let task = task as? BGAppRefreshTask else {
+                task.setTaskCompleted(success: false)
+                return
+            }
+            handle(task)
+        }
+    }
+
+    static func scheduleNextIfNeeded() {
+        BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: taskIdentifier)
+        guard FuelStore.loadDataRefreshMode() == .smart else { return }
+        let request = BGAppRefreshTaskRequest(identifier: taskIdentifier)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: FuelStore.smartProbeInterval)
+        do {
+            try BGTaskScheduler.shared.submit(request)
+        } catch {
+            #if DEBUG
+            print("SMART-REFRESH schedule failed: \(error)")
+            #endif
+        }
+    }
+
+    private static func handle(_ task: BGAppRefreshTask) {
+        scheduleNextIfNeeded()
+        let refreshTask = Task {
+            let success = await SmartDataRefreshCoordinator.runBackgroundProbe()
+            task.setTaskCompleted(success: success)
+        }
+        task.expirationHandler = {
+            refreshTask.cancel()
+        }
+    }
+}
+
+enum SmartDataRefreshCoordinator {
+    @discardableResult
+    static func runBackgroundProbe(now: Date = Date()) async -> Bool {
+        guard FuelStore.loadDataRefreshMode() == .smart else { return true }
+        guard FuelStore.isSmartProbeDue(now: now) || FuelStore.loadStations().isEmpty else {
+            return true
+        }
+        FuelStore.saveLastSmartProbe(now)
+        guard !Task.isCancelled else { return false }
+
+        guard let latest = await FuelHistoryStore.fetchLatest() else {
+            return false
+        }
+
+        let latestDay = latest.availableTo ?? latest.date
+        let latestUpdated = latest.dataUpdated
+        let cachedDay = MirrorFuelProvider.loadDumpCache()?.day
+        let savedUpdated = FuelStore.loadDataUpdated()
+        let shouldFetchFullDump = FuelStore.loadStations().isEmpty
+            || !FuelStore.isCacheFresh(now: now)
+            || (latestDay != nil && latestDay != cachedDay)
+            || (latestUpdated != nil && latestUpdated != savedUpdated)
+
+        guard shouldFetchFullDump, !Task.isCancelled else { return true }
+
+        do {
+            let fetched = try await FuelPriceProvider.active.fetchStations(
+                near: nil,
+                lng: nil,
+                fuel: FuelStore.loadSelectedFuel(),
+                radiusKM: nil
+            )
+            guard !Task.isCancelled else { return false }
+            FuelStore.saveStations(fetched)
+            FuelStore.saveLastRefresh(now)
+            await WatchSyncManager.shared.pushSnapshot()
+            if let meta = LiveChainProvider.latestMeta {
+                FuelStore.saveRelayMeta(meta)
+            }
+            WidgetCenter.shared.reloadAllTimelines()
+            return true
+        } catch {
+            return false
+        }
+    }
+}
@@ -317,17 +317,6 @@ extension FuelType {
        case .diesel: return "Diesel"
        }
    }
-
-    /// Fuel colour wheel (user-chosen palette): green = unleaded (#30D158),
-    /// yellow = premium (#FFD60A), cyan = diesel (#64D2FF). Used for the
-    /// fuel-type tab icons and the title icon.
-    var tintColor: Color {
-        switch self {
-        case .e10: return Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0)      // #30D158
-        case .e5: return Color(red: 255/255.0, green: 214/255.0, blue: 10/255.0)      // #FFD60A
-        case .diesel: return Color(red: 100/255.0, green: 210/255.0, blue: 255/255.0) // #64D2FF
-        }
-    }
 }

 /// Fuel-type selector styled like a segmented control, with a coloured pump
@@ -25,6 +25,7 @@ struct TrendsView: View {
    var onHistoryRecovered: (() -> Void)? = nil

    @Environment(\.dismiss) private var dismiss
+    @Environment(\.accessibilityReduceMotion) private var reduceMotion

    @State private var fuel: FuelType = .e10
    @State private var rangeDays: Int = 30
@@ -34,6 +35,13 @@ struct TrendsView: View {
    @State private var loadFailed = false
    @State private var firstSnapshot: String?

+    /// Per-series draw-in waterline: maps stationID → how many leading points
+    /// are revealed, so each line traces left→right on first appearance.
+    /// Series reveal in a short staggered cascade so the draw is clearly
+    /// visible even with only 2 points per line. Stays full after the first
+    /// reveal so range/mode switches morph instead of re-tracing.
+    @State private var revealed: [String: Int] = [:]
+
    /// Seeded from `selectedFuel` (the fuel the tab was on) so the sheet
    /// opens where the user was — same pattern as FavouritesView.
    init(favourites: [FavouriteEntry],
@@ -157,7 +165,13 @@ struct TrendsView: View {
            // pointer probe already done above.
            loadFailed = firstSnapshot == nil
        }
+        // Always redraw the lines on a selection change. `.task(id:)` fires on
+        // the initial appear and on every fuel/range switch (there's no
+        // periodic refetch in this sheet), so a staggered per-series draw-in
+        // replays exactly when the user picks 7/30/90 (or switches fuel) while
+        // a width-stable morph keeps the x-axis/y-range from jumping abruptly.
        series = fetched
+        revealSeries(fetched)
        // A failure with no data IS a connection problem — raise the global
        // banner so the user isn't stuck with a silent retry state. Success
        // clears it (only if the banner is the connection banner).
@@ -168,6 +182,32 @@ struct TrendsView: View {
        }
    }

+    /// Replays the staggered per-series draw-in for the given histories:
+    /// resets the waterline, then cascades each station's line left→right,
+    /// 0.18s apart, on every range/fuel selection. Reduce Motion jump-cuts
+    /// straight to the full state.
+    private func revealSeries(_ histories: [StationHistory]) {
+        let hasPoints = histories.contains { !$0.points.isEmpty }
+        guard hasPoints else { return }
+        if reduceMotion {
+            revealed = histories.reduce(into: [:]) { $0[$1.stationID] = $1.points.count }
+            return
+        }
+        revealed = [:]
+        let cascadeNS = UInt64(0.18 * 1_000_000_000)
+        for (i, h) in histories.enumerated() {
+            let sid = h.stationID
+            let total = h.points.count
+            Task {
+                try? await Task.sleep(nanoseconds: UInt64(i) * cascadeNS)
+                guard !Task.isCancelled else { return }
+                withAnimation(.easeOut(duration: 0.5)) {
+                    revealed[sid] = total
+                }
+            }
+        }
+    }
+
    private func yLabel(_ pence: Double) -> String {
        switch mode {
        case .price:
@@ -330,6 +370,9 @@ struct TrendsView: View {
                    .font(.system(size: 30, weight: .bold, design: .default))
                    .monospacedDigit()
                    .foregroundStyle(.primary)
+                    // Roll the digits to the new figure on range/mode change
+                    // (fires inside the animated transaction above).
+                    .contentTransition(.numericText(value: headAvg))
                if let delta = headlineDelta, delta != 0 {
                    Label(
                        "\(deltaIsGood ? "−" : "+")\(abs(delta), specifier: "%.1f")p",
@@ -389,13 +432,13 @@ struct TrendsView: View {
        // type-checker's budget.)
        Chart {
            ForEach(displaySeries) { history in
-                ForEach(history.points) { point in
+                ForEach(history.points.prefix(revealed[history.stationID] ?? 0)) { point in
                    areaMark(point, series: history.name,
                             color: seriesColor(index(of: history.stationID)))
                }
            }
            ForEach(displaySeries) { history in
-                ForEach(history.points) { point in
+                ForEach(history.points.prefix(revealed[history.stationID] ?? 0)) { point in
                    lineMark(point, series: history.name,
                             color: seriesColor(index(of: history.stationID)))
                }
@@ -424,6 +467,9 @@ struct TrendsView: View {
            }
        }
        .frame(height: 190)
+        // Price ↔ vs-cheapest is a pure view toggle (no network): animate the
+        // lines + axis gliding to the rebased series.
+        .animation(.easeInOut(duration: 0.35), value: mode)
    }

    /// One gradient-filled area band under a single point of a series.
@@ -0,0 +1,117 @@
+import Foundation
+import WatchConnectivity
+
+extension Notification.Name {
+    static let fuelBoardWatchRefreshRequested = Notification.Name("FuelBoardWatchRefreshRequested")
+}
+
+@MainActor
+final class WatchSyncManager: NSObject, WCSessionDelegate {
+    static let shared = WatchSyncManager()
+
+    private var pendingSnapshotPush = false
+
+    private override init() {
+        super.init()
+    }
+
+    func activate() {
+        guard WCSession.isSupported() else { return }
+        pendingSnapshotPush = true
+        let session = WCSession.default
+        if session.delegate !== self {
+            session.delegate = self
+        }
+        session.activate()
+    }
+
+    func pushSnapshot() {
+        guard WCSession.isSupported() else { return }
+        let session = WCSession.default
+        guard session.activationState == .activated else {
+            pendingSnapshotPush = true
+            return
+        }
+        do {
+            try session.updateApplicationContext(snapshotContext())
+            pendingSnapshotPush = false
+        } catch {
+            print("WATCH-SYNC push failed: \(error.localizedDescription)")
+        }
+    }
+
+    private func snapshotContext() -> [String: Any] {
+        var context: [String: Any] = [:]
+
+        if let favourites = try? JSONEncoder().encode(FuelStore.loadFavourites()) {
+            context[FuelStore.favouritesKey] = favourites
+        }
+        // Do NOT send the full station dump to watchOS via WatchConnectivity.
+        // The UK dataset is megabytes large and exceeds application-context
+        // payload limits, which prevents any snapshot from arriving. The
+        // favourites payload already carries station snapshots + prices, so the
+        // watch can render favourites without the full list.
+
+        context[FuelStore.fuelKey] = FuelStore.loadSelectedFuel().rawValue
+        context[FuelStore.distanceUnitKey] = FuelStore.loadDistanceUnit().rawValue
+        context[FuelStore.priceDisplayStyleKey] = FuelStore.loadPriceDisplayStyle().rawValue
+
+        if let lastRefresh = FuelStore.loadLastRefresh() {
+            context[FuelStore.lastRefreshKey] = String(lastRefresh.timeIntervalSince1970)
+        }
+
+        if let handled = FuelStore.loadWatchRefreshHandled() {
+            context[FuelStore.watchRefreshHandledKey] = String(handled.timeIntervalSince1970)
+        }
+
+        if let location = FuelStore.loadLocationWithDate() {
+            context[FuelStore.locationKey] = "\(location.coordinate.lat),\(location.coordinate.lng),\(location.date.timeIntervalSince1970)"
+        }
+
+        return context
+    }
+
+    nonisolated func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: (any Error)?) {
+        if let error {
+            print("WATCH-SYNC activation failed: \(error.localizedDescription)")
+            return
+        }
+        Task { @MainActor in
+            if activationState == .activated, self.pendingSnapshotPush {
+                self.pushSnapshot()
+            }
+        }
+    }
+
+    nonisolated func sessionDidBecomeInactive(_ session: WCSession) {}
+
+    nonisolated func sessionDidDeactivate(_ session: WCSession) {
+        Task { @MainActor in
+            WCSession.default.activate()
+        }
+    }
+
+    nonisolated func session(_ session: WCSession, didReceiveUserInfo userInfo: [String : Any] = [:]) {
+        handleIncomingMessage(userInfo)
+    }
+
+    nonisolated func session(_ session: WCSession, didReceiveMessage message: [String : Any]) {
+        handleIncomingMessage(message)
+    }
+
+    private nonisolated func handleIncomingMessage(_ payload: [String: Any]) {
+        if payload["fuelboard.snapshotRequest"] as? String != nil {
+            Task { @MainActor in
+                self.pushSnapshot()
+            }
+        }
+
+        guard let raw = payload[FuelStore.watchRefreshRequestKey] as? String,
+              let timestamp = TimeInterval(raw) else { return }
+        let date = Date(timeIntervalSince1970: timestamp)
+        Task { @MainActor in
+            FuelStore.requestWatchRefresh(date)
+            NotificationCenter.default.post(name: .fuelBoardWatchRefreshRequested, object: nil)
+        }
+    }
+}
@@ -0,0 +1 @@
+../../../Shared/DataRefreshMode.swift
@@ -620,3 +620,82 @@ final class OfflineDataLabelTests: XCTestCase {
        XCTAssertNil(FuelStore.offlineDataLabel(from: "not-a-date"))
    }
 }
+
+// MARK: - Road distance cache
+
+final class RoadDistanceCacheTests: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        // Keychain persists across invocations, so a cache left by an earlier
+        // test or run would pollute these. Overwrite with an empty, far-away
+        // cache (source at (0,0)) so every test starts from a clean slate.
+        FuelStore.saveRoadDistances(sourceLat: 0, sourceLng: 0, entries: [:])
+    }
+
+    private func station(_ id: String, _ lat: Double, _ lng: Double) -> FuelStation {
+        FuelStation(id: id, name: id, brand: "X", address: "", postcode: "",
+                    lat: lat, lng: lng, prices: [:], priceUpdated: nil)
+    }
+
+    func testDisplayDistanceFallsBackToStraightLineWhenNoCache() {
+        // London user, station ~ London -> no cache -> straight-line haversine.
+        let s = station("a", 51.5074, -0.1278)
+        let km = FuelStore.displayDistanceKM(station: s, userLat: 51.6, userLng: -0.1)
+        XCTAssertEqual(km, s.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001)
+    }
+
+    func testRoadDistanceUsedWhenCachedNear() {
+        let s = station("a", 51.5074, -0.1278)
+        // Cache a road distance of 3.2 km for this station from the user's fix.
+        FuelStore.saveRoadDistances(sourceLat: 51.6, sourceLng: -0.1,
+                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
+        let km = FuelStore.displayDistanceKM(station: s, userLat: 51.6, userLng: -0.1)
+        XCTAssertEqual(km, 3.2, accuracy: 0.0001)
+    }
+
+    func testRoadDistanceNilWhenOriginFar() {
+        let s = station("a", 51.5074, -0.1278)
+        // Cache built in London, but the user is now ~200 km away -> stale.
+        FuelStore.saveRoadDistances(sourceLat: 51.5074, sourceLng: -0.1278,
+                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
+        let meters = FuelStore.roadDistanceMeters(for: s, userLat: 53.4808, userLng: -2.2426)
+        XCTAssertNil(meters)
+        // And display falls back to straight-line.
+        let km = FuelStore.displayDistanceKM(station: s, userLat: 53.4808, userLng: -2.2426)
+        XCTAssertEqual(km, s.distanceKM(to: 53.4808, lng2: -2.2426), accuracy: 0.0001)
+    }
+
+    func testRoadDistanceUsedForOtherStationNotFound() {
+        FuelStore.saveRoadDistances(sourceLat: 51.6, sourceLng: -0.1,
+                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
+        // A station that isn't in the cache falls back to straight-line.
+        let s = station("z", 51.51, -0.13)
+        let km = FuelStore.displayDistanceKM(station: s, userLat: 51.6, userLng: -0.1)
+        XCTAssertEqual(km, s.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001)
+    }
+
+    func testRoadDistanceNotServedWhenStationPinDiffers() {
+        // Route a road distance to station "a" at pin P1.
+        FuelStore.saveRoadDistances(sourceLat: 51.6, sourceLng: -0.1,
+                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
+        // The SAME station id appears with a moved pin (corrected coordinate /
+        // different embedded vs live source): the cached route to P1 must NOT
+        // be served — it belongs to a different location.
+        let moved = station("a", 51.5400, -0.1600)
+        let km = FuelStore.displayDistanceKM(station: moved, userLat: 51.6, userLng: -0.1)
+        XCTAssertEqual(km, moved.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001,
+                       "road value routed to the old pin leaked onto a different coordinate")
+    }
+}
+
+// MARK: - Install identity
+
+final class InstallIdentityTests: XCTestCase {
+    func testFreshInstallIsStableAfterFirstCall() {
+        // The first call seeds the common install id (local == keychain), so
+        // any subsequent call in the same process must report NOT-fresh. This
+        // holds regardless of persisted keychain/defaults state from prior runs.
+        _ = FuelStore.isFreshInstall()
+        XCTAssertFalse(FuelStore.isFreshInstall())
+    }
+}
@@ -1,13 +1,156 @@
 {
-  "images" : [
+  "images": [
    {
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
+      "filename": "Watch-NotificationCenter-48.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "24x24",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-NotificationCenter-55.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "27.5x27.5",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-NotificationCenter-66.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "33x33",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-CompanionSettings-58.png",
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "Watch-CompanionSettings-87.png",
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "filename": "Watch-AppLauncher-80.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "40x40",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-88.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "44x44",
+      "subtype": "40mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-92.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "46x46",
+      "subtype": "41mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-100.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "50x50",
+      "subtype": "44mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-102.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "51x51",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-108.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "54x54",
+      "subtype": "49mm"
+    },
+    {
+      "filename": "Watch-QuickLook-172.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "86x86",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-QuickLook-196.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "98x98",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-QuickLook-216.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "108x108",
+      "subtype": "44mm"
+    },
+    {
+      "filename": "Watch-QuickLook-234.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "117x117",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-QuickLook-258.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "129x129",
+      "subtype": "49mm"
+    },
+    {
+      "filename": "Watch-Marketing-1024.png",
+      "idiom": "watch-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
+    },
+    {
+      "filename": "Watch-LongLook-88.png",
+      "idiom": "watch",
+      "role": "longLook",
+      "scale": "2x",
+      "size": "44x44",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-LongLook-100.png",
+      "idiom": "watch",
+      "role": "longLook",
+      "scale": "2x",
+      "size": "50x50",
+      "subtype": "44mm"
    }
  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
  }
 }
@@ -1,5 +1,6 @@
 import SwiftUI
 import Foundation
+import MapKit

 private enum WatchFuelType: String, CaseIterable, Identifiable, Codable {
    case e10
@@ -26,19 +27,13 @@ private enum WatchFuelType: String, CaseIterable, Identifiable, Codable {

    var color: Color {
        switch self {
-        case .e10: return .green
-        case .e5: return .yellow
-        case .diesel: return .blue
+        case .e10: return Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0)      // #30D158
+        case .e5: return Color(red: 255/255.0, green: 214/255.0, blue: 10/255.0)      // #FFD60A
+        case .diesel: return Color(red: 100/255.0, green: 210/255.0, blue: 255/255.0) // #64D2FF
        }
    }

-    var symbol: String {
-        switch self {
-        case .e10: return "fuelpump.fill"
-        case .e5: return "fuelpump.circle.fill"
-        case .diesel: return "drop.fill"
-        }
-    }
+    var symbol: String { "fuelpump.fill" }
    
    var sortRank: Int {
        switch self {
@@ -108,6 +103,8 @@ private struct WatchFavouriteRow: Identifiable {
    let priceText: String
    let distanceText: String?
    let isCheapest: Bool
+    let latitude: Double
+    let longitude: Double
 }

 private enum WatchRefreshState {
@@ -115,6 +112,7 @@ private enum WatchRefreshState {
    case stale(lastUpdated: String)
    case checking
    case requested(lastUpdated: String)
+    case checkedNoNewData(lastUpdated: String)
    case needsPhone
    case noData

@@ -123,7 +121,8 @@ private enum WatchRefreshState {
        case .idle(let lastUpdated): return "Updated \(lastUpdated)"
        case .stale(let lastUpdated): return "Cache from \(lastUpdated)"
        case .checking: return "Checking…"
-        case .requested(let lastUpdated): return "Requested · \(lastUpdated)"
+        case .requested(let lastUpdated): return "Updated · \(lastUpdated)"
+        case .checkedNoNewData(let lastUpdated): return "No newer data · \(lastUpdated)"
        case .needsPhone: return "Refresh on iPhone"
        case .noData: return "No cached prices yet"
        }
@@ -135,6 +134,7 @@ private enum WatchRefreshState {
        case .stale: return .yellow
        case .checking: return .yellow
        case .requested: return .green
+        case .checkedNoNewData: return .secondary
        case .needsPhone: return .orange
        case .noData: return .secondary
        }
@@ -146,6 +146,7 @@ private enum WatchRefreshState {
        case .stale: return "exclamationmark.circle"
        case .checking: return "arrow.triangle.2.circlepath"
        case .requested: return "checkmark.circle"
+        case .checkedNoNewData: return "clock.badge.exclamationmark"
        case .needsPhone: return "iphone"
        case .noData: return "tray"
        }
@@ -280,6 +281,7 @@ private enum WatchFuelCache {
 }

 struct ContentView: View {
+    @Environment(\.scenePhase) private var scenePhase
    @State private var fuel: WatchFuelType = WatchFuelCache.loadSelectedFuel()
    @State private var refreshState: WatchRefreshState = .noData
    @State private var favourites: [WatchFavouriteEntry] = []
@@ -288,15 +290,43 @@ struct ContentView: View {
    @State private var distanceUnit: WatchDistanceUnit = WatchFuelCache.loadDistanceUnit()
    @State private var priceStyle: WatchPriceStyle = WatchFuelCache.loadPriceStyle()

+    private var displayedFuels: [WatchFuelType] {
+        let fuels = Set(favourites.map(\.fuel))
+        let sorted = fuels.sorted { $0.sortRank < $1.sortRank }
+        return sorted.isEmpty ? [fuel] : sorted
+    }
+
+    private var hasAnyFavourites: Bool {
+        !favourites.isEmpty
+    }
+
    var body: some View {
+        Group {
+            if hasAnyFavourites {
                TabView(selection: $fuel) {
-            ForEach(WatchFuelType.allCases) { fuelCase in
+                    ForEach(displayedFuels) { fuelCase in
                        fuelPage(for: fuelCase)
                            .tag(fuelCase)
                    }
                }
                .tabViewStyle(.verticalPage)
-        .onAppear(perform: reloadFromCache)
+            } else {
+                emptyStateView
+            }
+        }
+        .onAppear {
+            reloadFromCache()
+            WatchSyncManager.shared.requestSnapshot()
+        }
+        .onReceive(NotificationCenter.default.publisher(for: .fuelBoardWatchDataDidUpdate)) { _ in
+            reloadFromCache()
+        }
+        .onChange(of: scenePhase) { _, newPhase in
+            if newPhase == .active {
+                reloadFromCache()
+                WatchSyncManager.shared.requestSnapshot()
+            }
+        }
    }

    @ViewBuilder
@@ -311,8 +341,6 @@ struct ContentView: View {

                if let cheapest {
                    cheapestCard(for: fuelCase, favourite: cheapest)
-                } else {
-                    emptyCheapestCard(for: fuelCase)
                }

                statusRow
@@ -334,17 +362,11 @@ struct ContentView: View {
                    Text("Favourites")
                        .font(.headline)

-                    if rows.isEmpty {
-                        Text("No favourites for \(fuelCase.displayName.lowercased()) yet.")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                    } else {
                    ForEach(rows) { row in
                        favouriteRow(row, fuel: fuelCase)
                    }
                }
            }
-            }
            .padding(.horizontal, 10)
            .padding(.vertical, 12)
        }
@@ -366,7 +388,9 @@ struct ContentView: View {
                name: favourite.station.name,
                priceText: priceText,
                distanceText: distanceText,
-                isCheapest: favourite.id == cheapest?.id
+                isCheapest: favourite.id == cheapest?.id,
+                latitude: favourite.station.lat,
+                longitude: favourite.station.lng
            )
        }
    }
@@ -383,16 +407,55 @@ struct ContentView: View {
                    .foregroundStyle(.secondary)
            }
            Spacer()
-            Text(fuel.shortName)
+        }
+    }
+
+    private var emptyStateView: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 12) {
+                HStack(alignment: .center, spacing: 8) {
+                    Image(systemName: "fuelpump.fill")
+                        .foregroundStyle(Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0))
+                    Text("FuelBoard")
+                        .font(.headline)
+                    Spacer()
+                }
+
+                statusRow
+
+                Button {
+                    runCheckNow()
+                } label: {
+                    HStack {
+                        Image(systemName: refreshState.icon)
+                        Text("Check now")
+                            .fontWeight(.semibold)
+                    }
+                    .frame(maxWidth: .infinity)
+                }
+                .buttonStyle(.borderedProminent)
+                .tint(Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0))
+
+                VStack(alignment: .leading, spacing: 6) {
+                    Text("No favourites yet")
+                        .font(.headline)
+                    Text("Add favourites on iPhone and they’ll appear here.")
                        .font(.caption)
-                .fontWeight(.bold)
-                .padding(.horizontal, 8)
-                .padding(.vertical, 4)
-                .background(fuel.color.opacity(0.18), in: Capsule())
+                        .foregroundStyle(.secondary)
+                }
+                .padding(10)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .background(Color.white.opacity(0.06), in: RoundedRectangle(cornerRadius: 14, style: .continuous))
+            }
+            .padding(.horizontal, 10)
+            .padding(.vertical, 12)
        }
    }

    private func cheapestCard(for fuel: WatchFuelType, favourite: WatchFavouriteEntry) -> some View {
+        Button {
+            openMaps(latitude: favourite.station.lat, longitude: favourite.station.lng)
+        } label: {
            VStack(alignment: .leading, spacing: 6) {
                Text("Cheapest favourite")
                    .font(.caption2)
@@ -414,22 +477,9 @@ struct ContentView: View {
            }
            .padding(10)
            .frame(maxWidth: .infinity, alignment: .leading)
-        .background(fuel.color.opacity(0.15), in: RoundedRectangle(cornerRadius: 14, style: .continuous))
+            .contentShape(RoundedRectangle(cornerRadius: 14, style: .continuous))
        }
-
-    private func emptyCheapestCard(for fuel: WatchFuelType) -> some View {
-        VStack(alignment: .leading, spacing: 6) {
-            Text("Cheapest favourite")
-                .font(.caption2)
-                .foregroundStyle(.secondary)
-            Text("No favourite saved")
-                .font(.headline)
-            Text("Add favourites on iPhone to see them here.")
-                .font(.caption)
-                .foregroundStyle(.secondary)
-        }
-        .padding(10)
-        .frame(maxWidth: .infinity, alignment: .leading)
+        .buttonStyle(.plain)
        .background(fuel.color.opacity(0.15), in: RoundedRectangle(cornerRadius: 14, style: .continuous))
    }

@@ -441,6 +491,9 @@ struct ContentView: View {
    }

    private func favouriteRow(_ favourite: WatchFavouriteRow, fuel: WatchFuelType) -> some View {
+        Button {
+            openMaps(latitude: favourite.latitude, longitude: favourite.longitude)
+        } label: {
            HStack(spacing: 8) {
                VStack(alignment: .leading, spacing: 2) {
                    HStack(spacing: 4) {
@@ -469,6 +522,9 @@ struct ContentView: View {
            }
            .padding(.horizontal, 10)
            .padding(.vertical, 8)
+            .contentShape(RoundedRectangle(cornerRadius: 12, style: .continuous))
+        }
+        .buttonStyle(.plain)
        .background(Color.white.opacity(0.06), in: RoundedRectangle(cornerRadius: 12, style: .continuous))
    }

@@ -487,7 +543,9 @@ struct ContentView: View {
    }

    private func statusFromCache() -> WatchRefreshState {
-        guard !stations.isEmpty else { return .noData }
+        let hasUsablePrices = !stations.isEmpty
+            || favourites.contains { favourite in favourite.station.prices[fuel] != nil }
+        guard hasUsablePrices else { return .noData }
        guard let lastRefresh = WatchFuelCache.loadLastRefresh() else { return .stale(lastUpdated: "earlier") }
        let formatted = relativeRefreshText(for: lastRefresh)
        return WatchFuelCache.isCacheFresh(lastRefresh: lastRefresh)
@@ -497,16 +555,26 @@ struct ContentView: View {

    private func runCheckNow() {
        refreshState = .checking
+        let previousLastRefresh = WatchFuelCache.loadLastRefresh()
        let requestDate = Date()
        WatchFuelCache.requestRefresh(requestDate)
+        WatchSyncManager.shared.requestRefresh(at: requestDate)
        Task {
            for _ in 0..<12 {
                try? await Task.sleep(for: .seconds(1))
                if WatchFuelCache.wasRefreshHandled(since: requestDate) {
                    await MainActor.run {
                        reloadFromCache()
-                        let label = WatchFuelCache.loadLastRefresh().map(relativeRefreshText(for:)) ?? "just now"
-                        refreshState = .requested(lastUpdated: label)
+                        let currentLastRefresh = WatchFuelCache.loadLastRefresh()
+                        if let currentLastRefresh,
+                           currentLastRefresh >= requestDate,
+                           currentLastRefresh > (previousLastRefresh ?? .distantPast) {
+                            refreshState = .requested(lastUpdated: relativeRefreshText(for: currentLastRefresh))
+                        } else if let currentLastRefresh {
+                            refreshState = .checkedNoNewData(lastUpdated: relativeRefreshText(for: currentLastRefresh))
+                        } else {
+                            refreshState = .noData
+                        }
                    }
                    return
                }
@@ -523,6 +591,17 @@ struct ContentView: View {
        formatter.unitsStyle = .short
        return formatter.localizedString(for: date, relativeTo: Date())
    }
+
+    private func openMaps(latitude: Double, longitude: Double) {
+        let coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+        let destination = MKMapItem(placemark: MKPlacemark(coordinate: coordinate))
+        _ = MKMapItem.openMaps(
+            with: [MKMapItem.forCurrentLocation(), destination],
+            launchOptions: [
+                MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving
+            ]
+        )
+    }
 }

 #Preview {
@@ -2,6 +2,10 @@ import SwiftUI

@main
 struct FuelBoardWatchApp: App {
+    init() {
+        WatchSyncManager.shared.activate()
+    }
+
    var body: some Scene {
        WindowGroup {
            ContentView()
@@ -0,0 +1,101 @@
+import Foundation
+import WatchConnectivity
+
+extension Notification.Name {
+    static let fuelBoardWatchDataDidUpdate = Notification.Name("FuelBoardWatchDataDidUpdate")
+}
+
+final class WatchSyncManager: NSObject, WCSessionDelegate {
+    static let shared = WatchSyncManager()
+
+    private let suiteName = "group.com.apt.fuelboard"
+    private let snapshotRequestKey = "fuelboard.snapshotRequest"
+
+    private override init() {
+        super.init()
+    }
+
+    func activate() {
+        guard WCSession.isSupported() else { return }
+        let session = WCSession.default
+        if session.delegate !== self {
+            session.delegate = self
+        }
+        session.activate()
+    }
+
+    func requestRefresh(at date: Date = Date()) {
+        guard WCSession.isSupported() else { return }
+        let raw = String(date.timeIntervalSince1970)
+        let payload = ["fuelboard.watchRefreshRequest": raw]
+        let session = WCSession.default
+
+        if session.isReachable {
+            session.sendMessage(payload, replyHandler: nil, errorHandler: nil)
+        } else {
+            session.transferUserInfo(payload)
+        }
+    }
+
+    func requestSnapshot() {
+        guard WCSession.isSupported() else { return }
+        let payload = [snapshotRequestKey: String(Date().timeIntervalSince1970)]
+        let session = WCSession.default
+
+        if session.isReachable {
+            session.sendMessage(payload, replyHandler: nil, errorHandler: nil)
+        } else {
+            session.transferUserInfo(payload)
+        }
+    }
+
+    private func sharedDefaults() -> UserDefaults? {
+        UserDefaults(suiteName: suiteName)
+    }
+
+    private func storeSnapshot(_ payload: [String: Any]) {
+        guard let defaults = sharedDefaults() else { return }
+
+        if let favourites = payload["fuelboard.favourites"] as? Data {
+            defaults.set(favourites, forKey: "fuelboard.favourites")
+        }
+        if let fuel = payload["fuelboard.selectedFuel"] as? String {
+            defaults.set(fuel, forKey: "fuelboard.selectedFuel")
+        }
+        if let distanceUnit = payload["fuelboard.distanceUnit"] as? String {
+            defaults.set(distanceUnit, forKey: "fuelboard.distanceUnit")
+        }
+        if let priceStyle = payload["fuelboard.priceDisplayStyle"] as? String {
+            defaults.set(priceStyle, forKey: "fuelboard.priceDisplayStyle")
+        }
+        if let location = payload["fuelboard.lastLocation"] as? String {
+            defaults.set(location, forKey: "fuelboard.lastLocation")
+        }
+        if let lastRefresh = payload["fuelboard.lastRefresh"] as? String {
+            defaults.set(lastRefresh, forKey: "fuelboard.lastRefresh")
+        }
+        if let handled = payload["fuelboard.watchRefreshHandled"] as? String {
+            defaults.set(handled, forKey: "fuelboard.watchRefreshHandled")
+        }
+
+        NotificationCenter.default.post(name: .fuelBoardWatchDataDidUpdate, object: nil)
+    }
+
+    func session(_ session: WCSession, activationDidCompleteWith activationState: WCSessionActivationState, error: (any Error)?) {
+        if let error {
+            print("WATCH-SYNC activation failed: \(error.localizedDescription)")
+            return
+        }
+        if activationState == .activated {
+            requestSnapshot()
+        }
+    }
+
+    func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String : Any]) {
+        storeSnapshot(applicationContext)
+    }
+
+    func session(_ session: WCSession, didReceiveUserInfo userInfo: [String : Any] = [:]) {
+        storeSnapshot(userInfo)
+    }
+}
@@ -1,13 +1,140 @@
 {
-  "images" : [
+  "images": [
    {
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
+      "filename": "Watch-NotificationCenter-48.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "24x24",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-NotificationCenter-55.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "27.5x27.5",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-NotificationCenter-66.png",
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "33x33",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-CompanionSettings-58.png",
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "filename": "Watch-CompanionSettings-87.png",
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "filename": "Watch-AppLauncher-80.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "40x40",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-88.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "44x44",
+      "subtype": "40mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-92.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "46x46",
+      "subtype": "41mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-100.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "50x50",
+      "subtype": "44mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-102.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "51x51",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-AppLauncher-108.png",
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "54x54",
+      "subtype": "49mm"
+    },
+    {
+      "filename": "Watch-QuickLook-172.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "86x86",
+      "subtype": "38mm"
+    },
+    {
+      "filename": "Watch-QuickLook-196.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "98x98",
+      "subtype": "42mm"
+    },
+    {
+      "filename": "Watch-QuickLook-216.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "108x108",
+      "subtype": "44mm"
+    },
+    {
+      "filename": "Watch-QuickLook-234.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "117x117",
+      "subtype": "45mm"
+    },
+    {
+      "filename": "Watch-QuickLook-258.png",
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "129x129",
+      "subtype": "49mm"
+    },
+    {
+      "filename": "Watch-Marketing-1024.png",
+      "idiom": "watch-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
    }
  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
  }
 }
@@ -41,7 +41,7 @@ struct FuelBoardLiveActivity: Widget {
                }
            } compactLeading: {
                Image(systemName: "fuelpump.fill")
-                    .foregroundStyle(.green)
+                    .foregroundStyle(context.state.fuel.tintColor)
            } compactTrailing: {
                FuelBoardLiveActivityPriceView(context: context)
            } minimal: {
@@ -49,12 +49,15 @@ struct FuelBoardLiveActivity: Widget {
                    .font(.caption2.bold().monospacedDigit())
            }
        }
-        // NOTE: deliberately NO `.supplementalActivityFamilies([.small])`.
-        // That modifier makes iOS eligible to render this activity in the
-        // narrow `.small` form on the iPhone/iPad Lock Screen, which is what
-        // produced the squeezed, small-text card. Dropping it keeps the
-        // full-width Lock Screen card on iPhone/iPad; CarPlay still shows a
-        // small form via the Dynamic Island compact closures below.
+        .supplementalActivityFamilies([.small])
+        // Why `.small` is kept: it lets the SHARED body render a compact form
+        // in genuinely small slots (CarPlay small / Apple Watch smart stack)
+        // instead of falling back to the Dynamic Island compact closure —
+        // which could NOT show the station distance the user wants on CarPlay.
+        // The full-width iPhone/iPad card is protected by the `richMinWidth`
+        // gate on `richBody` + its flexible, truncating middle column, so
+        // iPhone/iPad still get the full card; only truly small space picks
+        // the compact strip below.
    }
 }

@@ -62,29 +65,59 @@ struct FuelBoardLiveActivity: Widget {
 private struct FuelBoardLiveActivityView: View {
    let context: ActivityViewContext<FuelBoardLiveActivityAttributes>

+    /// Below this ACTUAL proposed width we show the compact strip (CarPlay
+    /// small / Watch smart stack); at/above it we show the full card. The
+    /// decision is made from the real width the system hands the body, read
+    /// via a background GeometryReader — NOT ViewThatFits ideal-width
+    /// measurement (that's broken for truncating text: a long station name
+    /// inflated the "ideal" width past the iPhone Lock Screen and collapsed
+    /// the full card).
+    private let compactWidthThreshold: CGFloat = 280
+
+    /// Measured slot width (drives the rich-vs-compact branch). Measured in a
+    /// background GeometryReader so it does NOT act as the layout container:
+    /// a GeometryReader root pins content top-left, and forcing a
+    /// maxHeight:.infinity frame on it over-claims the whole proposed height,
+    /// centring the content below true vertical centre (bigger gap above) on
+    /// the Lock Screen. Measuring behind the scenes keeps the content
+    /// intrinsic-sized so the system vertically centres it itself.
+    @State private var slotWidth: CGFloat = 400
+
    var body: some View {
        Link(destination: context.state.mapsURL) {
-            // Always the full three-column card. The station caption is
-            // line-limited + scale-down + tail-truncated, so a LONG station
-            // name truncates in place instead of inflating this view's ideal
-            // width and tricking ViewThatFits into falling back to the compact
-            // strip (that is exactly what made 5-mi / long-named activities
-            // render small while 10-15-mi / short names stayed full).
-            //
-            // No ViewThatFits / compactBody: with `.supplementalActivityFamilies`
-            // removed, this body is only ever handed Lock-Screen width, so the
-            // compact fallback was both dead weight and the cause of the bug.
+            Group {
+                // Branch on the ACTUAL proposed width. iPhone/iPad offer the
+                // full Lock Screen width (>= threshold) → rich card, no matter
+                // how long the station name is. Truly small slots (CarPlay /
+                // Watch) offer much less → compact strip.
+                if slotWidth >= compactWidthThreshold {
                    richBody
+                } else {
+                    compactBody
+                }
+            }
+            // Fill the card width so the background measure reads the real
+            // slot, not the intrinsic content width.
+            .frame(maxWidth: .infinity)
+            // Side-channel width measurement — never the layout container.
+            .background(
+                GeometryReader { geo in
+                    Color.clear
+                        .onAppear { slotWidth = geo.size.width }
+                        .onChange(of: geo.size.width) { _, w in slotWidth = w }
+                }
+            )
        }
    }

    /// Full three-column design (unchanged): brand glyph · fuel+station · price.
    private var richBody: some View {
        HStack(spacing: 12) {
-            // LEFT — station brand glyph
-            Image(systemName: "fuelpump.circle.fill")
-                .font(.system(size: 32))
-                .foregroundStyle(.green, .white)
+            // LEFT — station brand glyph: the fuel-tinted pump on its own. No
+            // background circle behind it (user request).
+            Image(systemName: "fuelpump.fill")
+                .font(.system(size: 28, weight: .semibold))
+                .foregroundStyle(context.state.fuel.tintColor)
                .frame(width: 40, height: 40)

            // MIDDLE — fuel + station
@@ -113,7 +146,36 @@ private struct FuelBoardLiveActivityView: View {
        .padding()
    }

-    // NOTE: `compactBody` was removed — always render `richBody` (see body).
+    /// Minimal strip for small space (CarPlay small / Watch smart stack):
+    /// fuel type + distance + bold price on one line, station name below.
+    /// Deliberately no app name and no full address — the watch-sized slot is
+    /// too tight, so the second line is reserved for the station name only.
+    private var compactBody: some View {
+        VStack(alignment: .leading, spacing: 3) {
+            HStack(spacing: 5) {
+                Text(context.state.fuel.displayName)
+                    .font(.caption.bold())
+                    .lineLimit(1)
+                Spacer(minLength: 4)
+                Text(context.state.distanceText)
+                    .font(.caption2)
+                    .foregroundStyle(.secondary)
+                    .lineLimit(1)
+                Spacer(minLength: 4)
+                FuelStore.priceTextAttributed(context.state.pricePence,
+                                               style: context.state.priceDisplayStyle,
+                                               size: 15, weight: .bold)
+                    .lineLimit(1)
+            }
+            Text(context.state.stationName)
+                .font(.system(size: 10, weight: .medium))
+                .foregroundStyle(.secondary)
+                .lineLimit(1)
+                .minimumScaleFactor(0.75)
+                .truncationMode(.tail)
+        }
+        .padding(8)
+    }
 }

 /// Dynamic Island expanded regions + compact trailing — price only.
@@ -0,0 +1,39 @@
+# FuelBoard Release Notes
+
+## Next TestFlight build
+
+### Summary
+- Added a new Data checking setting with Standard and Smart modes.
+- Clarified the behavior and background-update expectations in Settings.
+
+### What changed
+- Added a dedicated **Data checking** section in Settings.
+- Added two user-facing modes:
+  - **Standard** — Saves battery. Refreshes price data up to twice daily.
+  - **Smart** — Checks for newer data more often in the background and refreshes full prices only when an update is available.
+- Smart mode now uses a lightweight metadata probe first, then only refreshes the full dataset if newer data is available.
+- Added clear explanatory copy that background checks are best-effort and happen only when iOS allows.
+- Kept larger refresh behavior conservative rather than implying exact hourly updates.
+
+### Why
+- The previous refresh model was conservative but not very configurable.
+- The new setting makes the behavior clearer and gives users a choice between battery-friendly default behavior and a smarter background-check mode.
+- The wording is designed to be honest about iOS background limits.
+
+### Suggested TestFlight notes
+- Added new Data checking modes in Settings: Standard and Smart.
+- Smart mode now checks for newer data more intelligently in the background when iOS allows.
+- Improved settings copy to better explain data freshness behavior.
+
+### Suggested What to Test
+- Open Settings and confirm **Data checking** appears as its own section.
+- Confirm the two options read clearly and feel understandable:
+  - Standard
+  - Smart
+- Switch between Standard and Smart and confirm the selection persists.
+- Confirm the explanatory copy feels accurate and not misleading about iOS background behavior.
+
+### Implementation note
+- Standard keeps the existing cache-first refresh behavior.
+- Smart adds a lightweight probe path before deciding whether to download the full data set.
+- Background timing remains best-effort under iOS scheduling.
@@ -0,0 +1,24 @@
+import Foundation
+
+enum DataRefreshMode: String, CaseIterable, Identifiable {
+    case standard
+    case smart
+
+    var id: String { rawValue }
+
+    var displayName: String {
+        switch self {
+        case .standard: return "Standard"
+        case .smart: return "Smart"
+        }
+    }
+
+    var summary: String {
+        switch self {
+        case .standard:
+            return "Saves battery. Refreshes price data up to twice daily."
+        case .smart:
+            return "Checks for newer data more often in the background and refreshes full prices only when an update is available."
+        }
+    }
+}
@@ -89,7 +89,7 @@ struct FuelPriceWidgetContent: View {
                FuelStore.priceTextAttributed(price, size: 26, weight: .bold, color: .green)
            }
            if let location = entry.location {
-                Text(entry.unit.format(station.distanceKM(to: location.lat, lng2: location.lng)) + " away")
+                Text(entry.unit.format(FuelStore.displayDistanceKM(station: station, userLat: location.lat, userLng: location.lng)) + " away")
                    .font(.caption2)
                    .foregroundStyle(.secondary)
            } else {
@@ -148,7 +148,7 @@ struct FuelPriceWidgetContent: View {
                .font(.caption.weight(.semibold))
                .lineLimit(1)
            if let location = entry.location {
-                Text(entry.unit.format(station.distanceKM(to: location.lat, lng2: location.lng)))
+                Text(entry.unit.format(FuelStore.displayDistanceKM(station: station, userLat: location.lat, userLng: location.lng)))
                    .font(.caption2)
                    .foregroundStyle(.secondary)
            }
@@ -8,6 +8,7 @@
 //   keychain → app-group defaults → fallback.

 import Foundation
+import SwiftUI
 import Security
 #if canImport(AppIntents)
 import AppIntents
@@ -99,6 +100,20 @@ enum FuelType: String, Codable, CaseIterable, Identifiable {
    }
 }

+/// Fuel colour wheel (user-chosen palette): green = unleaded (#30D158),
+/// yellow = premium (#FFD60A), cyan = diesel (#64D2FF). Lives here in Shared
+/// so the app, widget, and Live Activity all tint the pump/fuel glyphs from one
+/// definition.
+extension FuelType {
+    var tintColor: Color {
+        switch self {
+        case .e10: return Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0)      // #30D158
+        case .e5: return Color(red: 255/255.0, green: 214/255.0, blue: 10/255.0)      // #FFD60A
+        case .diesel: return Color(red: 100/255.0, green: 210/255.0, blue: 255/255.0) // #64D2FF
+        }
+    }
+}
+
 #if canImport(AppIntents)
 extension FuelType: AppEnum {}
 #endif
@@ -355,6 +370,8 @@ struct FuelStore {
    static let liveActivityRadiusKey = "fuelboard.liveActivityRadiusMiles" // Int miles (5/10/15)
    static let onboardingCompletedKey = "fuelboard.onboardingCompleted" // Bool
    static let lastRefreshKey = "fuelboard.lastRefresh"      // TimeInterval (seconds since 1970)
+    static let dataRefreshModeKey = "fuelboard.dataRefreshMode" // DataRefreshMode raw value
+    static let lastSmartProbeKey = "fuelboard.lastSmartProbe" // TimeInterval (seconds since 1970)
    static let watchRefreshRequestKey = "fuelboard.watchRefreshRequest" // TimeInterval (seconds since 1970)
    static let watchRefreshHandledKey = "fuelboard.watchRefreshHandled" // TimeInterval (seconds since 1970)
    static let relaySourceKey = "fuelboard.relaySource"      // String — "api" | "csv"
@@ -848,10 +865,24 @@ struct FuelStore {
        saveString(enabled ? "1" : "0", service: liveActivityFollowSearchKey)
    }

-    // MARK: Refresh policy — data is cached; the app only auto-refreshes
-    // twice a day (pull-to-refresh is the manual override).
+    // MARK: Refresh policy — Standard is cache-first/twice-daily; Smart keeps
+    // the same full-dump freshness cap but may probe the tiny mirror pointer
+    // more often in the background and only refresh the full dump if it changed.

    static let refreshInterval: TimeInterval = 12 * 60 * 60
+    static let smartProbeInterval: TimeInterval = 4 * 60 * 60
+
+    static func loadDataRefreshMode() -> DataRefreshMode {
+        if let raw = loadString(service: dataRefreshModeKey),
+           let mode = DataRefreshMode(rawValue: raw) {
+            return mode
+        }
+        return .standard
+    }
+
+    static func saveDataRefreshMode(_ mode: DataRefreshMode) {
+        saveString(mode.rawValue, service: dataRefreshModeKey)
+    }

    static func loadLastRefresh() -> Date? {
        if let raw = loadString(service: lastRefreshKey), let ts = TimeInterval(raw) {
@@ -864,6 +895,17 @@ struct FuelStore {
        saveString(String(date.timeIntervalSince1970), service: lastRefreshKey)
    }

+    static func loadLastSmartProbe() -> Date? {
+        if let raw = loadString(service: lastSmartProbeKey), let ts = TimeInterval(raw) {
+            return Date(timeIntervalSince1970: ts)
+        }
+        return nil
+    }
+
+    static func saveLastSmartProbe(_ date: Date = Date()) {
+        saveString(String(date.timeIntervalSince1970), service: lastSmartProbeKey)
+    }
+
    static func requestWatchRefresh(_ date: Date = Date()) {
        saveString(String(date.timeIntervalSince1970), service: watchRefreshRequestKey)
    }
@@ -944,20 +986,141 @@ struct FuelStore {
    /// True when the cached data is fresh enough that a scheduled auto-refresh
    /// should be skipped (twice-a-day policy).
    static var isCacheFresh: Bool {
+        isCacheFresh(now: Date())
+    }
+
+    static func isCacheFresh(now: Date) -> Bool {
        guard let last = loadLastRefresh() else { return false }
-        return Date().timeIntervalSince(last) < refreshInterval
+        return now.timeIntervalSince(last) < refreshInterval
+    }
+
+    static func isSmartProbeDue(now: Date = Date()) -> Bool {
+        guard let last = loadLastSmartProbe() else { return true }
+        return now.timeIntervalSince(last) >= smartProbeInterval
    }

    // MARK: Onboarding — the app shows the intro screen on first launch only
-    // (a test button in the Alerts tab re-opens it). Stored in the app group
-    // so the widget can see it too if ever needed.
+    // (a test button in the Alerts tab re-opens it). Stored KEYCHAIN-FIRST
+    // (with an app-group mirror) for the same reason as favourites/distance
+    // unit: free SideStore accounts don't provision the app-group container,
+    // so an app-group-only flag silently fails to save AND reloads as false,
+    // making onboarding re-appear on every launch. Keychain survives reinstall
+    // and is shared with the extension.

    static func loadHasCompletedOnboarding() -> Bool {
-        UserDefaults(suiteName: appGroupSuite)?.bool(forKey: onboardingCompletedKey) ?? false
+        (loadString(service: onboardingCompletedKey) ?? "0") == "1"
    }

    static func saveHasCompletedOnboarding(_ completed: Bool) {
-        UserDefaults(suiteName: appGroupSuite)?.set(completed, forKey: onboardingCompletedKey)
+        saveString(completed ? "1" : "0", service: onboardingCompletedKey)
+    }
+
+    // MARK: Install identity — distinguish a genuinely fresh install (where
+    // onboarding should replay) from later launches of the same install.
+
+    /// Keychain copy of the install id (survives reinstall).
+    private static let installIDKey = "fuelboard.installID"
+    /// Local (app-own container) copy — wiped on reinstall, persists across
+    /// normal launches. Free SideStore accounts have no app-group container,
+    /// so this app-own defaults domain is the reliable "same install" signal.
+    private static let localInstallIDKey = "fuelboard.installID.local"
+
+    /// True when this is a first-ever install OR the app was just reinstalled
+    /// (local install id missing/different from the keychain id). Seeds a fresh
+    /// id into both stores so the next launch within the same install is not a
+    /// "fresh install" any more.
+    static func isFreshInstall() -> Bool {
+        let local = UserDefaults.standard.string(forKey: localInstallIDKey)
+        let remote = loadString(service: installIDKey)
+        if let local, let remote, local == remote { return false }
+        // Fresh / mismatched install (or first launch). Pattern a common id so
+        // subsequent launches of this install are recognised as the same one.
+        let id = UUID().uuidString
+        UserDefaults.standard.set(id, forKey: localInstallIDKey)
+        saveString(id, service: installIDKey)
+        return true
+    }
+
+    /// Onboarding should present when it hasn't been completed in this install
+    /// OR this is a freshly-installed app (so the walkthrough replays on a new
+    /// install, e.g. after a SideStore reinstall, without re-showing on every
+    /// ordinary launch). The install check always runs (it seeds the id) rather
+    /// than short-circuiting, so a brand-new install is recorded before the
+    /// user ever fills in onboarding.
+    static func shouldShowOnboarding() -> Bool {
+        let fresh = isFreshInstall()
+        return !loadHasCompletedOnboarding() || fresh
+    }
+
+    // MARK: Road distances (Apple-Maps-matched, computed by the app)
+
+    /// Cached road/routed distances (metres) keyed by station ID, computed by
+    /// the app via MapKit `MKDirections`. Stored in KEYCHAIN (survives on free
+    /// SideStore accounts where the app-group container isn't provisioned) so
+    /// the widget extension can read it too. Widget + Live Activity prefer
+    /// these over straight-line haversine for the displayed distance.
+    static let roadDistancesKey = "fuelboard.roadDistances"
+
+    /// How far (metres) the cache's source location may be from the current
+    /// user position before a cached road distance is treated as stale.
+    static let roadDistanceOriginToleranceMeters: Double = 600
+
+    /// How far (degrees) a station's stored coordinate may drift from the pin
+    /// a road distance was actually routed to before that cached value is
+    /// treated as belonging to a different station. Guards against one data
+    /// source (live fetch, bundled offline dump, or a corrected pin) serving a
+    /// road distance that was computed for a different coordinate under the
+    /// same station ID. ~1e-4 deg ≈ 11 m — tolerates float/rounding jitter but
+    /// catches any real pin change.
+    static let roadDistancePinToleranceDegrees: Double = 1e-4
+
+    static func saveRoadDistances(sourceLat: Double, sourceLng: Double, entries: [String: CachedRoadDistance]) {
+        let cache = RoadDistanceCache(sourceLat: sourceLat, sourceLng: sourceLng,
+                                      updatedAt: Date().timeIntervalSince1970, entries: entries)
+        if let data = try? JSONEncoder().encode(cache) {
+            saveString(data.base64EncodedString(), service: roadDistancesKey)
+        }
+    }
+
+    static func loadRoadDistances() -> RoadDistanceCache? {
+        guard let raw = loadString(service: roadDistancesKey),
+              let data = Data(base64Encoded: raw),
+              let cache = try? JSONDecoder().decode(RoadDistanceCache.self, from: data)
+        else { return nil }
+        return cache
+    }
+
+    /// Cached road distance (metres) to a station from the user's location, or
+    /// nil when not cached / the cache was built too far from where the user
+    /// is now / the station's own pin doesn't match the coordinate that was
+    /// routed.
+    static func roadDistanceMeters(for station: FuelStation, userLat: Double, userLng: Double) -> Double? {
+        guard let cache = loadRoadDistances(),
+              let entry = cache.entries[station.id] else { return nil }
+        // The cache is only valid near the location it was built from.
+        let dLat = (userLat - cache.sourceLat) * .pi / 180
+        let dLng = (userLng - cache.sourceLng) * .pi / 180
+        let r = 6371000.0
+        let a = sin(dLat / 2) * sin(dLat / 2) +
+                cos(cache.sourceLat * .pi / 180) * cos(userLat * .pi / 180) *
+                sin(dLng / 2) * sin(dLng / 2)
+        let originDistanceMeters = r * 2 * atan2(sqrt(a), sqrt(1 - a))
+        guard originDistanceMeters <= roadDistanceOriginToleranceMeters else { return nil }
+        // Pin fingerprint: never serve a routed value for a coordinate we
+        // didn't actually route to. This is the guard that keeps embedded /
+        // live / cached station sets from injecting each other's road metres.
+        guard abs(entry.lat - station.lat) <= roadDistancePinToleranceDegrees,
+              abs(entry.lng - station.lng) <= roadDistancePinToleranceDegrees else { return nil }
+        return entry.meters
+    }
+
+    /// Distance (km) to display for a station: cached ROAD distance when
+    /// available (matches Apple Maps), else straight-line haversine.
+    static func displayDistanceKM(station: FuelStation, userLat: Double, userLng: Double) -> Double {
+        if let meters = roadDistanceMeters(for: station, userLat: userLat, userLng: userLng) {
+            return meters / 1000.0
+        }
+        return station.distanceKM(to: userLat, lng2: userLng)
    }

    // MARK: Low-level keychain helpers
@@ -1019,3 +1182,23 @@ struct FuelStore {
        loadString(service: "widget.diag.\(intentType)")
    }
 }
+
+/// Cached Apple-Maps road distances for nearby stations (see
+/// A single cached road distance plus the station pin it was routed to. Keeping
+/// the pin lets `roadDistanceMeters` refuse to serve a route computed for a
+/// *different* coordinate under the same ID — the guard that stops embedded /
+/// live / cached station sets cross-contaminating the distance display.
+struct CachedRoadDistance: Codable {
+    let meters: Double
+    let lat: Double
+    let lng: Double
+}
+
+/// `FuelStore.roadDistancesKey`). `entries` maps stationID → road metres +
+/// the routed pin.
+struct RoadDistanceCache: Codable {
+    let sourceLat: Double
+    let sourceLng: Double
+    let updatedAt: TimeInterval
+    let entries: [String: CachedRoadDistance]
+}
Author	SHA1	Message	Date
FuelBoard Contributor	abc737eb2d	test: symlink DataRefreshMode into test target FuelStore references DataRefreshMode; without the symlink the SPM test target fails to compile. 107 tests pass.	2026-09-14 21:39:14 +01:00
FuelBoard Contributor	3d5c999dc2	build: align embedded bundle versions for archive	2026-08-31 11:35:22 +01:00
FuelBoard Contributor	d899409b78	build: align all target build numbers to 3	2026-08-31 11:18:05 +01:00
FuelBoard Contributor	8bbcb0b4dc	watch: polish refresh status and compact live activity	2026-08-31 10:40:16 +01:00
FuelBoard Contributor	767080a983	watch: use MapKit directions handoff	2026-08-31 08:23:07 +01:00
FuelBoard Contributor	7a84364238	watch: fix snapshot sync and polish favourites UX	2026-08-31 07:48:20 +01:00
FuelBoard Contributor	486b8cff2e	Fix watch fuel icons and snapshot sync	2026-08-30 23:35:59 +01:00
FuelBoard Contributor	d40bcaeca0	Fix watch icon pixel sizes for archive validation	2026-08-30 23:11:27 +01:00
FuelBoard Contributor	f2fb075f2b	Fix watch app name and unify watch icon assets	2026-08-30 22:58:05 +01:00
FuelBoard Contributor	09740fca18	Fix watch build, status sync, and icon assets	2026-08-30 22:26:30 +01:00
FuelBoard Contributor	ebda21436d	Restore smart settings and sync watch favourites	2026-08-30 18:57:57 +01:00
FuelBoard Contributor	0997dcea45	Set watch app team for signing	2026-08-30 13:35:16 +01:00
FuelBoard Contributor	a59591d6ca	Merge main into feature/watch-app	2026-08-30 13:10:59 +01:00
FuelBoard Contributor	50036c8a67	Signing: set FuelBoard team for app and widget	2026-08-28 19:00:43 +01:00
FuelBoard Contributor	a71b7ae20e	Siri: remove Apple from App Intent descriptions	2026-08-28 17:48:51 +01:00
FuelBoard Contributor	98cf3a5736	Git: ignore build-watch output	2026-08-28 16:35:32 +01:00
FuelBoard Contributor	ed41df46de	siri: drop generic shortcut and broaden fuel-word phrases Siri was hit-and-miss on 'unleaded near me' (\u2018can't do that, searching in app\u2019 fallback). The generic parameterized AppShortcut ('cheapest ${fuel}') competed with the fixed-fuel literal-word shortcuts for the same intent, degrading NLU ranking; it was already documented as flaky. Remove it (now 9 shortcuts, under the 10 cap) and add natural phrase variants for unleaded/petrol ('What's the cheapest unleaded near me', 'Cheapest unleaded near me', 'Where's the cheapest petrol'). All phrases keep .applicationName per the iOS 26 metadata requirement. Build-verified in extract.actionsdata: generic gone, new phrases registered.	2026-08-20 19:27:34 +01:00
FuelBoard Contributor	9342ccc7c9	trends: redraw lines on 7/30/90 selection Callers previously morphed the existing lines on a reload, so picking a new range only glided in place. Now every range/fuel selection (the only reloads; the sheet has no periodic refetch) replays the staggered per-series draw-in via revealSeries(), so the lines visibly redraw left->right when the user switches 7/30/90. Price<->vs-cheapest still morphs (pure view toggle, no reload). Reduce Motion jump-cuts.	2026-08-20 18:49:54 +01:00
FuelBoard Contributor	508ccc3802	trends: staggered per-series line draw-in The single-waterline trace-in was invisible with sparse data (2 points draw in one step). Replace it with a per-series waterline: each station's line now traces left->right on first appearance, series revealed 0.18s apart in a cascade so the draw is clearly visible. Newly-added favourites get a full reveal immediately on reload; Reduce Motion still jump-cuts. Range/mode morphs and numeric headline transition unchanged.	2026-08-20 18:40:09 +01:00
FuelBoard Contributor	69c3c17606	trends: animate the price-history lines (subtle, Reduce-Motion aware) - Reloads (range/fuel switch, Price<->vs-cheapest) now glide the existing lines + y-axis to the new data via withAnimation/.animation(value: mode) instead of snapping. - One-time left->right trace-in on first data appearance by revealing an increasing prefix of each series' points (area + line stay in sync); later switches morph rather than re-trace. - Headline average rolls its digits with .contentTransition(.numericText). - All animation honours .accessibilityReduceMotion (jump-cut to final state). Kept two-pass area/line ordering, explicit series:, bounded fill bands, and tight chartYScale unchanged.	2026-08-20 17:54:55 +01:00
FuelBoard Contributor	0b27d3d4f6	road distance: pin-fingerprint guard so embedded/live/cached never cross-pollute The road-distance cache was keyed purely by station ID with no coordinate, so a value routed to one pin could be served for a same-ID station whose stored coordinate came from a different source (live fetch vs bundled offline dump vs a corrected pin), reproducing Maps mismatches. - RoadDistanceCache now stores each routed pin (CachedRoadDistance{meters, lat, lng}) and roadDistanceMeters() only serves a value when the displayed station's coordinate matches the pinned one (within ~11 m). - Kept the existing origin-distance staleness guard. - Verified embedded sample data (ids y1/se1/...) never collides with real relay IDs, and the widget STRICT radius filter drops far-offline samples, so no actual leak existed in practice — this closes the theoretical stale-pin channel and future-proofs against coordinate fixes.	2026-08-20 17:26:33 +01:00
FuelBoard Contributor	01517ba687	onboarding: replay on a fresh/reinstalled install, not every launch The keychain-first completed flag persists across reinstalls (same bundle id), so a new install was treated as already-completed and onboarding silently skipped while permissions still prompted. Add install identity: - Store an install id in BOTH the app-own container defaults (wiped on reinstall, persists across launches) and keychain (survives reinstall). - isFreshInstall() is true on first-ever launch or when the local id is missing/different from keychain (i.e. reinstalled); it seeds a fresh common id so the next launch of the same install is not 'fresh' again. - shouldShowOnboarding() = not completed \|\| fresh install -> onboarding now replays once per fresh/reinstall, never on ordinary launches. Works on free SideStore (no app-group), using the app's own defaults domain as the same-install signal.	2026-08-20 13:12:53 +01:00
FuelBoard Contributor	d73a64023f	road distance: trigger at launch + foreground, fall back to saved location Road-distance routing previously only fired once a fresh GPS fix arrived via the location hook/onChange. A returning user on a cold launch waited for that fix, and if onboarding/flag issues kept tracking from starting, distances stayed straight-line. Now: - refreshRoadDistancesIfNeeded() uses the last saved location when the live fix isn't set yet, so it can run immediately. - It's called explicitly on launch (already-onboarded branch), on foreground activation, and on the existing location paths.	2026-08-20 12:56:16 +01:00
FuelBoard Contributor	dc6d1fd724	Merge branch 'fix/onboarding-persistence' into test/road-onboarding	2026-08-20 12:50:38 +01:00
FuelBoard Contributor	10e3b54d0c	onboarding: persist completed flag keychain-first so it doesn't re-show The completed flag lived only in app-group UserDefaults (UserDefaults(suiteName: appGroupSuite)). On free SideStore accounts the app-group container isn't provisioned, so the suite read as nil: save was a silent no-op and load always returned false -> onboarding re-appeared on every launch even after finishing and granting all permissions. Switch to saveString/loadString (keychain-first, app-group mirror) under onboardingCompletedKey, matching favourites/distance-unit persistence which survives reinstall and works without a provisioning group. loadString falls back to the app-group mirror, so anyone who previously completed on a provisioned group keeps their flag; users on unprovisioned groups complete once more and then it sticks.	2026-08-20 12:27:09 +01:00
FuelBoard Contributor	90fb3b7385	road distance: cover all in-radius stations, not just nearest 12 Stations past the nearest-12 cutoff silently fell back to straight-line, which explained the remaining app-vs-Apple-Maps gaps (e.g. 3.5 straight-line vs 5.9 road). Raise the per-pass cap to 40 and route every station within a 25 km straight-line radius (covers the 15 mi max search window) so any station the widget/Live Activity/list can show gets a real road distance. Also harden the new cache tests against persistent keychain state across invocations (reset in setUp) so they pass deterministically.	2026-08-20 11:54:23 +01:00
FuelBoard Contributor	64ef260959	widget + live activity: prefer Apple-Maps road distance, computed by the app The widget/Live Activity showed straight-line haversine distance (0.8 mi) while Apple Maps routes 1.8 mi. Road routing is too heavy for the widget execution + ~40-70/day refresh budget, so the APP now computes it: - New RoadDistanceService (app target): for the nearest 12 stations each pass, calls MapKit MKDirections (free, no API key, matches Apple Maps) and caches metres keyed by station ID. - Cache stored in KEYCHAIN (fuelboard.roadDistances) so the widget reads it even on free SideStore accounts with no app-group container; only valid within 600 m of the location it was built from. - Throttled: recompute max every 10 min, or when the user moves > 400 m; wired into the location-update hook + location onChange. - Widget face, app station rows + Live Activity show the cached road distance, falling back to straight-line when absent. - 4 new cache tests (105 total).	2026-08-20 11:33:47 +01:00
FuelBoard Contributor	28bb245c93	live activity: fix vertical centering on lock screen GeometryReader as the layout root pinned content top-left, and forcing maxHeight:.infinity over-claimed the whole proposed height, centring the content below true vertical centre (bigger gap above) on the Lock Screen. Demote GeometryReader to a background side-channel that only measures the slot width for the rich-vs-compact branch; the content stays intrinsic-sized so the system vertically centres it itself.	2026-08-20 10:16:21 +01:00
FuelBoard Contributor	d8412c132a	live activity: remove the white/grey background circle behind the pump User: 'Remove the white background circle from the live activity'. Drop the explicit Circle badge and render the fuel-tinted fuelpump.fill on its own (sized up 19 -> 28 since it no longer sits inside a disc).	2026-08-19 22:52:50 +01:00
FuelBoard Contributor	1d62204a7a	live activity: explicit badge (dark circle + bright pump); fix alignment look fuelpump.circle.fill's first hierarchical style hits the PUMP, not the circle, so the earlier darkened colour landed on the pump and the circle stayed white (user: 'I didn't want the fuel pump darker I wanted the white circle darker'). Rebuild the brand glyph from two explicit shapes: a light-grey (.86) Circle badge + a bright fuel-tinted fuelpump.fill, so circle vs pump colours are unambiguous and the badge centres cleanly with the two-line text block. Add a DEBUG-only -qaLiveActivity <fuel> launch hook that starts a Live Activity with a long station name so the Lock Screen can be rendered in the Simulator and verified by pixels (pump bright green 43,193,81; badge grey 202,201,202).	2026-08-19 22:46:57 +01:00
FuelBoard Contributor	bdfbbc605f	live activity: centre content vertically + darken pump circle A GeometryReader hands its content the full proposed frame and pins it top-left, so the Lock Screen card sat high instead of vertically centred when the activity container offered extra height. Wrap the branch in .frame(maxWidth:.infinity, maxHeight:.infinity, alignment:.center). Also darken the pump circle to 82% of the raw fuel tint (mix 18% black) so the white pump symbol keeps contrast against bright Lock Screen/card, esp. for the light yellow premium / cyan diesel palette colours.	2026-08-19 22:26:37 +01:00
FuelBoard Contributor	2c6e63f6b1	live activity: tint pump glyph by monitored fuel Move FuelType.tintColor (green=unleaded #30D158, yellow=premium #FFD60A, cyan=diesel #64D2FF) into Shared/FuelStore.swift so the app, widget, and Live Activity all read one definition (was app-only in StationsView, so the widget couldn't see it). Tint the Live Activity rich card pump icon and the Dynamic Island compactLeading pump by context.state.fuel.tintColor.	2026-08-19 22:18:56 +01:00
FuelBoard Contributor	a6620d36f7	live activity: select rich vs compact by actual GeometryReader width ViewThatFits measures each child's IDEAL (untruncated) width to decide fit, and a flexible .frame(maxWidth:.infinity) middle column does not cap that ideal — so a long station name (e.g. 5-mi Phoenix Filling Stations) inflated richBody's ideal past the iPhone Lock Screen width and fell back to the compact strip. Replace the ViewThatFits branch with a GeometryReader that reads the ACTUAL proposed width and shows the full three-column card at/above 280pt, compact below. Content-independent, so a long name can no longer collapse the iPhone card.	2026-08-19 22:08:07 +01:00
FuelBoard Contributor	227cce4aa6	live activity: fix compact strip string interpolation (double backslash) The compact CarPlay/Watch strip's second line had escaped interpolation (\\( instead of \\() so it rendered the literal placeholder text "context.state.stationName · context.state.distanceText" instead of the actual station name and distance. Normalize to single-backslash interpolation.	2026-08-19 20:01:14 +01:00
FuelBoard Contributor	01bb3ba905	live activity: compact CarPlay strip shows fuel + price + station distance Restore .supplementalActivityFamilies([.small]) + a ViewThatFits compact fallback so CarPlay's small slot renders our shared compact strip (fuel type, bold price, station · distance) instead of falling back to the Dynamic Island compact closure, which showed the app name and omitted the distance the user wants. Full iPhone/iPad card is preserved via the richMinWidth gate on richBody plus its flexible, truncating middle column (long names can no longer collapse it).	2026-08-19 18:31:36 +01:00