Only dismiss the measurements sheet when we are saving the last one

Sources/SpeziDevicesUI/Measurements/MeasurementsRecordedSheet.swift

@@ -65,7 +65,7 @@
     public var body: some View {
         NavigationStack {
             Group {
-                if measurements.pendingMeasurements.isEmpty {
+                if measurements.pendingMeasurements.isEmpty && selectedMeasurement == nil {
                     ContentUnavailableView(
                         "No Pending Measurements",
                         systemImage: "heart.text.square",
@@ -120,7 +120,7 @@
             }
                 .tabViewStyle(.page)
                 .indexViewStyle(.page(backgroundDisplayMode: .always))
-        } else if let measurement = measurements.pendingMeasurements.first {
+        } else if let measurement = selectedMeasurement {
             MeasurementLayer(measurement: measurement)
         }
     }
@@ -140,7 +140,6 @@
 
 
             logger.info("Saved measurement: \(String(describing: selectedMeasurement))")
-            dismiss()
 
             discardSelectedMeasurement(selectedMeasurement)
         } discard: {
@@ -149,10 +148,6 @@
             }
 
             discardSelectedMeasurement(selectedMeasurement)
-
-            if measurements.pendingMeasurements.isEmpty {
-                dismiss()
-            }
         }
     }
 
@@ -170,19 +165,27 @@
         }
 
         measurements.discardMeasurement(measurement)
-        if index >= measurements.pendingMeasurements.count {
-            selectedMeasurement = measurements.pendingMeasurements.last
-        } else {
+
+        if index < measurements.pendingMeasurements.count {
             selectedMeasurement = measurements.pendingMeasurements[index]
+        } else if let last = measurements.pendingMeasurements.last {
+            // we do not set `selectedMeasurement` to nil if we are discarding the last measurement to have the
+            // last measurement still display when the sheet is in its dismiss animation.
+            selectedMeasurement = last
+        }
+
+        if measurements.pendingMeasurements.isEmpty {
+            dismiss()
         }
     }
 }
 
 
 #if DEBUG
 #Preview {
-    Text(verbatim: "")
-        .sheet(isPresented: .constant(true)) {
+    @State var isPresented = true
+    return Text(verbatim: "")
+        .sheet(isPresented: $isPresented) {
             MeasurementsRecordedSheet { samples in
                 print("Saving samples \(samples)")
             }
@@ -193,8 +196,9 @@
 }
 
 #Preview {
-    Text(verbatim: "")
-        .sheet(isPresented: .constant(true)) {
+    @State var isPresented = true
+    return Text(verbatim: "")
+        .sheet(isPresented: $isPresented) {
             MeasurementsRecordedSheet { samples in
                 print("Saving samples \(samples)")
             }
@@ -205,8 +209,9 @@
 }
 
 #Preview {
-    Text(verbatim: "")
-        .sheet(isPresented: .constant(true)) {
+    @State var isPresented = true
+    return Text(verbatim: "")
+        .sheet(isPresented: $isPresented) {
             MeasurementsRecordedSheet { samples in
                 print("Saving samples \(samples)")
             }
@@ -217,8 +222,9 @@
 }
 
 #Preview {
-    Text(verbatim: "")
-        .sheet(isPresented: .constant(true)) {
+    @State var isPresented = true
+    return Text(verbatim: "")
+        .sheet(isPresented: $isPresented) {
             MeasurementsRecordedSheet { samples in
                 print("Saving samples \(samples)")
             }
@@ -233,8 +239,9 @@
 }
 
 #Preview {
-    Text(verbatim: "")
-        .sheet(isPresented: .constant(true)) {
+    @State var isPresented = true
+    return Text(verbatim: "")
+        .sheet(isPresented: $isPresented) {
             MeasurementsRecordedSheet { samples in
                 print("Saving samples \(samples)")
             }