apt/fuelboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/more-info-map-and-postcode-copy' into integration/more-info-and-best-value

Browse Source
This commit is contained in:
FuelBoard Contributor
2026-10-14 13:57:21 +01:00
parent 13967c3782 7dbb3d1a15
commit 78b43ce6d7
1 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FuelBoard/StationDetailView.swift
+35 -43
View File
@@ -118,58 +118,27 @@ struct StationDetailView: View {
.accessibilityHint(String(localized: "Opens Apple Maps with driving directions", .accessibilityHint(String(localized: "Opens Apple Maps with driving directions",
comment: "Accessibility hint for the tappable map preview in the More info sheet")) comment: "Accessibility hint for the tappable map preview in the More info sheet"))
} }
// Floating "Copied" confirmation: a capsule hovering over the
// bottom of the map, directly above the Address row and
// horizontally centred. It is an overlay, so nothing moves
// while it is up, and `allowsHitTesting(false)` keeps the
// map's tap target live underneath. The map's clipShape is
// applied BEFORE this, so the capsule is not clipped to the
// map's rounded rect.
.overlay(alignment: .bottom) {
if showingCopied {
HStack(spacing: 4) {
Image(systemName: "checkmark")
Text("Copied")
}
.font(.footnote.weight(.semibold))
.foregroundStyle(.green)
.padding(.horizontal, 10)
.padding(.vertical, 6)
// A material base keeps it legible over map tiles: a
// 14% green wash alone (the notice-capsule recipe)
// vanishes against the map.
.background {
Capsule()
.fill(.regularMaterial)
.overlay(Capsule().fill(Color.green.opacity(0.22)))
}
.padding(.bottom, 12)
.allowsHitTesting(false)
.accessibilityHidden(true)
.transition(.opacity)
}
}
// No hairline between the map and the Address row: the map // No hairline between the map and the Address row: the map
// already reads as its own block, so the line only added // already reads as its own block, so the line only added
// clutter. The Address/Distance and Distance/actions lines // clutter. The Address/Distance and Distance/actions lines
// stay. // stay.
.listRowSeparator(.hidden, edges: .bottom) .listRowSeparator(.hidden, edges: .bottom)
// The map, the address, the distance, any notices and the two // The map, the address, the distance, any notices and the two
// station actions all share ONE card. The list's own row // station actions all share ONE card (the list's own row
// hairlines separate them (inset, the same line that already // hairlines separate them), so no hand-rolled Divider here —
// separates Address from Distance), so no hand-rolled Divider is // adding one would double the line.
// needed — adding one would double the line. //
// The station name is NOT repeated here: the sheet header // The station name is NOT repeated: the sheet header already
// (navigationTitle, inline) already shows it, and the address // shows it.
// line below has any leading repeat of the name stripped, so
// a "Name" row only said it twice.
// //
// The whole row is a copy control: it puts JUST the postcode // The whole row is a copy control: it puts JUST the postcode
// on the clipboard so it can be pasted into another // on the clipboard so it can be pasted into another
// navigation app. The copy glyph sits ON the address line, // navigation app. The copy glyph sits ON the address line,
// and the "Copied" confirmation is a floating capsule over // and the "Copied" confirmation is a capsule that floats OVER
// the map's bottom edge (see the map overlay above), so the // THIS ROW — it confirms the address, so it must not hover
// confirmation can never reflow this row. // over the map. It is an overlay, so nothing moves while it is
// up, and `allowsHitTesting(false)` keeps the row tappable
// through the capsule.
Button { Button {
copyPostcode() copyPostcode()
} label: { } label: {
@@ -195,6 +164,29 @@ struct StationDetailView: View {
? "" ? ""
: String(localized: "Copies the postcode", : String(localized: "Copies the postcode",
comment: "Accessibility hint for the address row in the More info sheet")) comment: "Accessibility hint for the address row in the More info sheet"))
// Horizontally centred over the address line itself.
.overlay(alignment: .center) {
if showingCopied {
HStack(spacing: 4) {
Image(systemName: "checkmark")
Text("Copied")
}
.font(.footnote.weight(.semibold))
.foregroundStyle(.green)
.padding(.horizontal, 10)
.padding(.vertical, 6)
// A material base keeps it legible where the tint
// alone (the notice-capsule recipe) washes out.
.background {
Capsule()
.fill(.regularMaterial)
.overlay(Capsule().fill(Color.green.opacity(0.22)))
}
.allowsHitTesting(false)
.accessibilityHidden(true)
.transition(.opacity)
}
}
if let location { if let location {
let distance = FuelStore.stationDistanceDisplay( let distance = FuelStore.stationDistanceDisplay(
station: station, userLat: location.lat, userLng: location.lng station: station, userLat: location.lat, userLng: location.lng