Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e58dbb7833 | ||
|
|
6983fa83cc | ||
|
|
7ee1f06ce6 | ||
|
|
68139e6690 | ||
|
|
d537667aa3 |
@@ -29,6 +29,10 @@ struct StationDetailView: View {
|
|||||||
var onToggleFavourite: (() -> Void)? = nil
|
var onToggleFavourite: (() -> Void)? = nil
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
@State private var showingReportIssueConfirmation = false
|
@State private var showingReportIssueConfirmation = false
|
||||||
|
/// Transient "Copied" confirmation on the Address row. Cleared by a task so
|
||||||
|
/// the caption fades out on its own.
|
||||||
|
@State private var showingCopied = false
|
||||||
|
@State private var copyResetTask: Task<Void, Never>?
|
||||||
|
|
||||||
private let reportIssueURL = URL(string: "https://www.gov.uk/guidance/report-an-error-in-fuel-prices-or-forecourt-details")!
|
private let reportIssueURL = URL(string: "https://www.gov.uk/guidance/report-an-error-in-fuel-prices-or-forecourt-details")!
|
||||||
|
|
||||||
@@ -36,10 +40,61 @@ struct StationDetailView: View {
|
|||||||
CLLocationCoordinate2D(latitude: station.lat, longitude: station.lng)
|
CLLocationCoordinate2D(latitude: station.lat, longitude: station.lng)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The row's address text — the same shared line the listing row uses, with
|
||||||
|
/// any leading repeat of the station name stripped.
|
||||||
|
private var addressLine: String {
|
||||||
|
StationAddressLine.display(address: station.address,
|
||||||
|
postcode: station.postcode,
|
||||||
|
name: station.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The station's postcode, trimmed. Empty means there is nothing to copy and
|
||||||
|
/// the Address row stays inert.
|
||||||
|
private var postcodeForCopying: String {
|
||||||
|
station.postcode.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Opens Apple Maps driving directions — the same destination (and the same
|
||||||
|
/// URL) the Directions button below uses, so the map and the button can
|
||||||
|
/// never point at two different places.
|
||||||
|
private func openDirections() {
|
||||||
|
if let url = station.mapsDirectionsURL {
|
||||||
|
UIApplication.shared.open(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Copies ONLY the postcode, so it can be pasted into another navigation app
|
||||||
|
/// without dragging the station name and street along with it. Confirms with
|
||||||
|
/// a light haptic and a caption that fades after ~2s.
|
||||||
|
private func copyPostcode() {
|
||||||
|
let postcode = postcodeForCopying
|
||||||
|
guard !postcode.isEmpty else { return }
|
||||||
|
UIPasteboard.general.string = postcode
|
||||||
|
UINotificationFeedbackGenerator().notificationOccurred(.success)
|
||||||
|
withAnimation(.easeInOut(duration: 0.2)) { showingCopied = true }
|
||||||
|
copyResetTask?.cancel()
|
||||||
|
copyResetTask = Task {
|
||||||
|
try? await Task.sleep(nanoseconds: 2_000_000_000)
|
||||||
|
guard !Task.isCancelled else { return }
|
||||||
|
withAnimation(.easeInOut(duration: 0.3)) { showingCopied = false }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
List {
|
List {
|
||||||
Section {
|
Section {
|
||||||
|
// Tapping anywhere on the map opens the same Apple Maps
|
||||||
|
// directions the Directions button below opens.
|
||||||
|
//
|
||||||
|
// The tap target is an OVERLAY Button laid ON TOP of the
|
||||||
|
// Map, not a Button wrapping it. A Map runs its own UIKit
|
||||||
|
// view, and inside a List row the wrapped-Map form left the
|
||||||
|
// card untappable — the touch never reached the button. An
|
||||||
|
// overlay sits above the map, owns an explicit rounded-rect
|
||||||
|
// content shape, and cannot be intercepted by MapKit. The
|
||||||
|
// Map itself stays non-interactive: it is a preview, not
|
||||||
|
// something to pan.
|
||||||
Map(position: .constant(.region(MKCoordinateRegion(
|
Map(position: .constant(.region(MKCoordinateRegion(
|
||||||
center: stationCoordinate,
|
center: stationCoordinate,
|
||||||
span: MKCoordinateSpan(latitudeDelta: 0.02, longitudeDelta: 0.02)
|
span: MKCoordinateSpan(latitudeDelta: 0.02, longitudeDelta: 0.02)
|
||||||
@@ -50,16 +105,82 @@ struct StationDetailView: View {
|
|||||||
.frame(height: 180)
|
.frame(height: 180)
|
||||||
.clipShape(RoundedRectangle(cornerRadius: 12))
|
.clipShape(RoundedRectangle(cornerRadius: 12))
|
||||||
.allowsHitTesting(false)
|
.allowsHitTesting(false)
|
||||||
|
.overlay {
|
||||||
|
Button {
|
||||||
|
openDirections()
|
||||||
|
} label: {
|
||||||
|
Color.clear
|
||||||
|
.contentShape(RoundedRectangle(cornerRadius: 12))
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.accessibilityLabel(String(localized: "Directions to \(station.name)",
|
||||||
|
comment: "Accessibility label for the tappable map preview in the More info sheet"))
|
||||||
|
.accessibilityHint(String(localized: "Opens Apple Maps with driving directions",
|
||||||
|
comment: "Accessibility hint for the tappable map preview in the More info sheet"))
|
||||||
|
}
|
||||||
.listRowInsets(EdgeInsets())
|
.listRowInsets(EdgeInsets())
|
||||||
|
// Both actions sit on ONE line directly under the map: the
|
||||||
|
// two things you can DO with a station belong with the
|
||||||
|
// station, not stranded at the foot of the sheet. Equal
|
||||||
|
// halves, so neither reads as the primary action.
|
||||||
|
HStack(spacing: 12) {
|
||||||
|
Button {
|
||||||
|
openDirections()
|
||||||
|
} label: {
|
||||||
|
Label("Directions", systemImage: "arrow.triangle.turn.up.right.diamond.fill")
|
||||||
|
.frame(maxWidth: .infinity)
|
||||||
|
}
|
||||||
|
Button(role: .destructive) {
|
||||||
|
showingReportIssueConfirmation = true
|
||||||
|
} label: {
|
||||||
|
Label("Report issue", systemImage: "exclamationmark.bubble.fill")
|
||||||
|
.frame(maxWidth: .infinity)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Section {
|
Section {
|
||||||
// The station name is NOT repeated here: the sheet header
|
// The station name is NOT repeated here: the sheet header
|
||||||
// (navigationTitle, inline) already shows it, and the address
|
// (navigationTitle, inline) already shows it, and the address
|
||||||
// line below has any leading repeat of the name stripped, so
|
// line below has any leading repeat of the name stripped, so
|
||||||
// a "Name" row only said it twice.
|
// a "Name" row only said it twice.
|
||||||
LabeledContent("Address", value: StationAddressLine.display(address: station.address,
|
//
|
||||||
postcode: station.postcode,
|
// The whole row is a copy control: it puts JUST the postcode
|
||||||
name: station.name))
|
// on the clipboard so it can be pasted into another
|
||||||
|
// navigation app. The copy glyph and its "Copied"
|
||||||
|
// confirmation share a SECOND line that is always there, so
|
||||||
|
// the confirmation can never reflow the address above it.
|
||||||
|
Button {
|
||||||
|
copyPostcode()
|
||||||
|
} label: {
|
||||||
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
|
HStack(alignment: .firstTextBaseline, spacing: 8) {
|
||||||
|
Text("Address")
|
||||||
|
Spacer(minLength: 8)
|
||||||
|
Text(addressLine)
|
||||||
|
.multilineTextAlignment(.trailing)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
}
|
||||||
|
HStack(spacing: 4) {
|
||||||
|
Spacer(minLength: 0)
|
||||||
|
if showingCopied {
|
||||||
|
Text("Copied")
|
||||||
|
.foregroundStyle(.green)
|
||||||
|
.transition(.opacity)
|
||||||
|
}
|
||||||
|
Image(systemName: showingCopied ? "checkmark" : "doc.on.doc")
|
||||||
|
.foregroundStyle(showingCopied ? Color.green : Color.secondary)
|
||||||
|
}
|
||||||
|
.font(.footnote.weight(.semibold))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.disabled(postcodeForCopying.isEmpty)
|
||||||
|
.accessibilityLabel(String(localized: "Address: \(addressLine)",
|
||||||
|
comment: "Accessibility label for the address row in the More info sheet"))
|
||||||
|
.accessibilityHint(postcodeForCopying.isEmpty
|
||||||
|
? ""
|
||||||
|
: String(localized: "Copies the postcode",
|
||||||
|
comment: "Accessibility hint for the address row in the More info sheet"))
|
||||||
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
|
||||||
@@ -105,20 +226,6 @@ struct StationDetailView: View {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Section {
|
|
||||||
Button {
|
|
||||||
if let url = station.mapsDirectionsURL {
|
|
||||||
UIApplication.shared.open(url)
|
|
||||||
}
|
|
||||||
} label: {
|
|
||||||
Label("Directions", systemImage: "arrow.triangle.turn.up.right.diamond.fill")
|
|
||||||
}
|
|
||||||
Button(role: .destructive) {
|
|
||||||
showingReportIssueConfirmation = true
|
|
||||||
} label: {
|
|
||||||
Label("Report issue", systemImage: "exclamationmark.bubble.fill")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.navigationTitle(station.name)
|
.navigationTitle(station.name)
|
||||||
.navigationBarTitleDisplayMode(.inline)
|
.navigationBarTitleDisplayMode(.inline)
|
||||||
@@ -149,6 +256,18 @@ struct StationDetailView: View {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// The "Copied" fade-out task must not outlive the sheet.
|
||||||
|
.onDisappear { copyResetTask?.cancel() }
|
||||||
|
#if DEBUG
|
||||||
|
// QA hook: `-qaCopyPostcode` runs the REAL copy on open, so the
|
||||||
|
// clipboard value (read back with `xcrun simctl pbpaste`) and the
|
||||||
|
// "Copied" confirmation can be verified without a tap — simctl
|
||||||
|
// cannot drive taps into the Simulator.
|
||||||
|
.task {
|
||||||
|
guard ProcessInfo.processInfo.arguments.contains("-qaCopyPostcode") else { return }
|
||||||
|
copyPostcode()
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,6 +71,11 @@
|
|||||||
"Name" = "Name";
|
"Name" = "Name";
|
||||||
"Address" = "Address";
|
"Address" = "Address";
|
||||||
"Distance" = "Distance";
|
"Distance" = "Distance";
|
||||||
|
"Copied" = "Copied";
|
||||||
|
"Copies the postcode" = "Copies the postcode";
|
||||||
|
"Address: %@" = "Address: %@";
|
||||||
|
"Directions to %@" = "Directions to %@";
|
||||||
|
"Opens Apple Maps with driving directions" = "Opens Apple Maps with driving directions";
|
||||||
"Show introduction" = "Replay onboarding";
|
"Show introduction" = "Replay onboarding";
|
||||||
"Replay the welcome screen, including the location and notification permission prompts." = "Replay the welcome screen, including the location and notification permission prompts.";
|
"Replay the welcome screen, including the location and notification permission prompts." = "Replay the welcome screen, including the location and notification permission prompts.";
|
||||||
"Test alert notification (real data)" = "Test alert notification (real data)";
|
"Test alert notification (real data)" = "Test alert notification (real data)";
|
||||||
|
|||||||
Reference in New Issue
Block a user