Merge pull request #669 from Esri/Caleb/Fix-SomeSampleIssues

[Fix] `Manage features` certification issues

Author: CalebRas

Shared/Samples/Manage features/ManageFeaturesView.swift

@@ -34,6 +34,9 @@ struct ManageFeaturesView: View {
     /// The current viewpoint of the map view.
     @State private var currentViewpoint: Viewpoint?
 
+    /// A Boolean value indicating whether the update attribute dialog is displayed.
+    @State private var isShowingUpdateAttributeDialog = false
+    
     var body: some View {
         Group {
             switch data {
@@ -62,10 +65,12 @@ struct ManageFeaturesView: View {
         MapViewReader { mapView in
             MapView(map: data.map)
                 .onSingleTapGesture { tapLocation, tapMapPoint in
-                    // Store state and clear selection on tap.
-                    self.tapLocation = tapLocation
-                    self.tapMapPoint = tapMapPoint
-                    clearSelection()
+                    if calloutPlacement == nil {
+                        self.tapLocation = tapLocation
+                        self.tapMapPoint = tapMapPoint
+                    } else {
+                        clearSelection()
+                    }
                 }
                 .callout(placement: $calloutPlacement) { placement in
                     if let feature = placement.geoElement as? Feature {
@@ -125,15 +130,10 @@ struct ManageFeaturesView: View {
                     .foregroundStyle(.secondary)
             }
             Menu {
-                Button {
-                    Task {
-                        clearSelection()
-                        await updateAttribute(for: feature)
-                    }
-                } label: {
-                    Text("Update Attribute")
+                Button("Update Attribute") {
+                    isShowingUpdateAttributeDialog = true
                 }
-                Button {
+                Button("Update Geometry") {
                     // Hide callout, leave feature selected.
                     calloutPlacement = nil
                     Task {
@@ -144,24 +144,36 @@ struct ManageFeaturesView: View {
                         // Update callout location after moving feature.
                         calloutPlacement = .geoElement(feature)
                     }
-                } label: {
-                    Text("Update Geometry")
                 }
-                Button {
+                Button("Delete Feature") {
                     Task {
                         clearSelection()
                         await delete(feature: feature)
                     }
-                } label: {
-                    Text("Delete Feature")
                 }
             } label: {
-                Image(systemName: "ellipsis")
-                    .padding(.leading)
+                Label("Edit Feature", systemImage: "ellipsis")
+                    .padding()
+                    .contentShape(.rect)
+                    .labelStyle(.iconOnly)
             }
             .fixedSize()
+            .confirmationDialog("Update Attribute", isPresented: $isShowingUpdateAttributeDialog) {
+                ForEach(DamageKind.allCases, id: \.self) { damageKind in
+                    Button(damageKind.rawValue) {
+                        isShowingUpdateAttributeDialog = false
+                        clearSelection()
+                        
+                        Task {
+                            await updateAttribute(for: feature, damageKind: damageKind)
+                        }
+                    }
+                }
+            } message: {
+                Text("Choose a damage kind for the feature.")
+            }
         }
-        .padding()
+        .padding([.leading, .vertical])
     }
 
     /// Overlay with instructions for the user.
@@ -247,13 +259,15 @@ extension ManageFeaturesView {
     }
 
     /// Updates the attributes of a feature and applies edits to the service.
-    /// - Parameter feature: The feature to update.
-    func updateAttribute(for feature: Feature) async {
+    /// - Parameters:
+    ///   - feature: The feature to update.
+    ///   - damageKind: The kind used to set the feature's damage assessment attribute.
+    func updateAttribute(for feature: Feature, damageKind: DamageKind) async {
         guard case .success(let data) = data else { return }
         let table = data.featureTable
 
         do {
-            feature.damageKind = feature.damageKind?.next ?? .inaccessible
+            feature.damageKind = damageKind
             try await table.update(feature)
             _ = try await table.serviceGeodatabase?.applyEdits()
             status = "Update attribute succeeded."
@@ -319,14 +333,6 @@ extension ManageFeaturesView {
         case minor = "Minor"
         case major = "Major"
         case destroyed = "Destroyed"
-        
-        /// The next damage kind to set on a feature.
-        var next: Self {
-            let allCases = Self.allCases
-            let index = allCases.firstIndex(of: self)!
-            let nextIndex = allCases.index(after: index)
-            return allCases[nextIndex == allCases.count ? 0 : nextIndex]
-        }
     }
 }