diff --git a/FuelBoardWidgets/WidgetConfigIntent.swift b/FuelBoardWidgets/WidgetConfigIntent.swift index 7421b09..1dae805 100644 --- a/FuelBoardWidgets/WidgetConfigIntent.swift +++ b/FuelBoardWidgets/WidgetConfigIntent.swift @@ -248,21 +248,27 @@ struct FuelBoardSmallWidgetConfigurationIntent: WidgetConfigurationIntent, Widge static var title: LocalizedStringResource = "Fuel & Sort" static var description = IntentDescription("Which fuel, ordering, radius and pinned favourite this small widget shows.") + // Declared in display order for EVERY summary branch: iOS may fall back to + // declaration order when re-rendering the sheet after a parameter change, + // so the relative order here must match the wanted layout in all modes: + // Favourites → Fuel(favouriteFuel) · Sort by · Favourite + // Cheapest → Fuel · Sort by · Distance + // Closest → Fuel · Sort by + @Parameter(title: "Fuel", default: FavouriteFuel(fuel: .e10)) + var favouriteFuel: FavouriteFuel + @Parameter(title: "Fuel", default: .e10) var fuel: WidgetFuel @Parameter(title: "Sort by", default: .cheapest) var sort: WidgetSort - @Parameter(title: "Distance", default: WidgetDistance(id: 5)) - var distance: WidgetDistance - - @Parameter(title: "Fuel", default: FavouriteFuel(fuel: .e10)) - var favouriteFuel: FavouriteFuel - @Parameter(title: "Favourite", default: WidgetFavourite(fuel: .e10, stationID: "", stationName: "")) var favourite: WidgetFavourite + @Parameter(title: "Distance", default: WidgetDistance(id: 5)) + var distance: WidgetDistance + var favouriteChoice: WidgetFavourite? { favourite } var favouriteFuelChoice: FavouriteFuel? { favouriteFuel }