From 97dfae3eff7f2697ad81b4b8bc14a796bda6b793 Mon Sep 17 00:00:00 2001 From: Traton Gossink <79613749+TratonGossink@users.noreply.github.com> Date: Tue, 21 Nov 2023 11:44:30 -0600 Subject: [PATCH] - change button to allow isEditingVehicle to equal true. --- .../Shared/Localizable.xcstrings | 2 +- .../Shared/Models/EditVehicleEvent.swift | 2 +- .../Shared/Settings/Views/SettingsView.swift | 31 +++++++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Basic-Car-Maintenance/Shared/Localizable.xcstrings b/Basic-Car-Maintenance/Shared/Localizable.xcstrings index 3887d1a4..57c7c3a2 100644 --- a/Basic-Car-Maintenance/Shared/Localizable.xcstrings +++ b/Basic-Car-Maintenance/Shared/Localizable.xcstrings @@ -1518,7 +1518,7 @@ } }, "Edit" : { - "comment" : "Button label to edit this maintenance", + "comment" : "Button label to edit this vehicle\nButton label to edit this maintenance", "localizations" : { "be" : { "stringUnit" : { diff --git a/Basic-Car-Maintenance/Shared/Models/EditVehicleEvent.swift b/Basic-Car-Maintenance/Shared/Models/EditVehicleEvent.swift index 535f116d..272050bd 100644 --- a/Basic-Car-Maintenance/Shared/Models/EditVehicleEvent.swift +++ b/Basic-Car-Maintenance/Shared/Models/EditVehicleEvent.swift @@ -18,5 +18,5 @@ struct EditVehicleEvent: Codable, Identifiable, Hashable { let color: String let VIN: String let licenseplatenumber: String - var vehicle: Vehicle + var vehicle: Vehicle? } diff --git a/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift b/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift index f743f63f..35576dba 100644 --- a/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift +++ b/Basic-Car-Maintenance/Shared/Settings/Views/SettingsView.swift @@ -24,7 +24,7 @@ struct SettingsView: View { @State private var copiedAppVersion: Bool = false @State private var selectedVehicleEvent: EditVehicleEvent? - @Binding private var isEditingVehicle: Bool + @State private var isEditingVehicle: Bool = false @State var editViewModel: EditVehicleView? @State private var vehicleToEdit: Vehicle? @@ -129,24 +129,38 @@ struct SettingsView: View { } label: { Text("Delete", comment: "Label to delete a vehicle") } +// Button { +// Task { +// selectedVehicleEvent = vehicle +// isEditingVehicle = true +// } +// } +// } label: { +// VStack { +// Text("Edit", comment: "Button label to edit this vehicle") +// Image(systemName: SFSymbol.pencil) +// } +// .sheet(isPresented: $isEditingVehicle) { +// EditVehicleView( +// selectedEvent: $selectedVehicleEvent, viewModel: viewModel) +// } + Button { Task { - selectedVehicleEvent = vehicle +// selectedVehicleEvent = vehicle isEditingVehicle = true + EditVehicleView(selectedEvent: $selectedVehicleEvent, viewModel: viewModel) } - } - } label: { - VStack { + } label: { Text("Edit", comment: "Button label to edit this vehicle") Image(systemName: SFSymbol.pencil) } .sheet(isPresented: $isEditingVehicle) { - EditVehicleView( - selectedEvent: $selectedVehicleEvent, viewModel: viewModel) + EditVehicleView( + selectedEvent: $selectedVehicleEvent, viewModel: viewModel) } } } - Button { isShowingAddVehicle = true } label: { @@ -227,7 +241,6 @@ struct SettingsView: View { } } } - // swiftlint:disable:next line_length .alert(Text("Failed To Delete Vehicle", comment: "Label to dsplay title of the delete vehicle alert"), isPresented: $showDeleteVehicleError) {