Replace EditButton with Select mode for saved measurements · 45253c1

+11 -1

USB Meter/Views/Meter/Tabs/Live/ChargerStandbyPowerWizardView.swift

@@ -604,6 +604,7 @@ private struct StandbyPowerHistogramView: View {
 struct ChargerStandbyPowerMeasurementsView: View {
     @EnvironmentObject private var appData: AppData
     @State private var selectedMeasurementIDs = Set<UUID>()
+    @State private var editMode: EditMode = .inactive
 
     let chargerID: UUID
 
@@ -666,10 +667,18 @@ struct ChargerStandbyPowerMeasurementsView: View {
                 }
             }
         }
+        .environment(\.editMode, $editMode)
         .navigationTitle("Saved Measurements")
         .toolbar {
             ToolbarItem(placement: .primaryAction) {
-                EditButton()
+                Button(editMode.isEditing ? "Done" : "Select") {
+                    if editMode.isEditing {
+                        editMode = .inactive
+                        selectedMeasurementIDs.removeAll()
+                    } else {
+                        editMode = .active
+                    }
+                }
             }
         }
 
@@ -711,6 +720,7 @@ struct ChargerStandbyPowerMeasurementsView: View {
             _ = appData.deleteChargerStandbyMeasurement(id: id, chargerID: chargerID)
         }
         selectedMeasurementIDs.removeAll()
+        editMode = .inactive
     }
 }
 


	@@ -604,6 +604,7 @@ private struct StandbyPowerHistogramView: View {
604	604	struct ChargerStandbyPowerMeasurementsView: View {
605	605	@EnvironmentObject private var appData: AppData
606	606	@State private var selectedMeasurementIDs = Set<UUID>()
	607	+ @State private var editMode: EditMode = .inactive
607	608
608	609	let chargerID: UUID
609	610
	@@ -666,10 +667,18 @@ struct ChargerStandbyPowerMeasurementsView: View {
666	667	}
667	668	}
668	669	}
	670	+ .environment(\.editMode, $editMode)
669	671	.navigationTitle("Saved Measurements")
670	672	.toolbar {
671	673	ToolbarItem(placement: .primaryAction) {
672		- EditButton()
	674	+ Button(editMode.isEditing ? "Done" : "Select") {
	675	+ if editMode.isEditing {
	676	+ editMode = .inactive
	677	+ selectedMeasurementIDs.removeAll()
	678	+ } else {
	679	+ editMode = .active
	680	+ }
	681	+ }
673	682	}
674	683	}
675	684
	@@ -711,6 +720,7 @@ struct ChargerStandbyPowerMeasurementsView: View {
711	720	_ = appData.deleteChargerStandbyMeasurement(id: id, chargerID: chargerID)
712	721	}
713	722	selectedMeasurementIDs.removeAll()
	723	+ editMode = .inactive
714	724	}
715	725	}
716	726