Merge pull request #256 from Esri/des12437/Fix-visibility-in-dynamic-entity-layer-sample

[Update] Improve visibility of dynamic entities in sample

Author: des12437

Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.SettingsView.swift

@@ -19,8 +19,24 @@ extension AddDynamicEntityLayerView {
         /// The view model for the sample.
         @EnvironmentObject private var model: Model
 
+        /// The action to dismiss the settings sheet.
+        @Environment(\.dismiss) private var dismiss: DismissAction
+        
         var body: some View {
-            List {
+            if #available(iOS 16, *) {
+                NavigationStack {
+                    root
+                }
+            } else {
+                NavigationView {
+                    root
+                }
+                .navigationViewStyle(.stack)
+            }
+        }
+        
+        @ViewBuilder var root: some View {
+            Form {
                 Section("Track display properties") {
                     Toggle("Track Lines", isOn: $model.showsTrackLine)
                     Toggle("Previous Observations", isOn: $model.showsPreviousObservations)
@@ -47,6 +63,16 @@ extension AddDynamicEntityLayerView {
                     }
                 }
             }
+            .toggleStyle(.switch)
+            .navigationTitle("Dynamic Entity Settings")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done") {
+                        dismiss()
+                    }
+                }
+            }
         }
     }
 }

Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.swift

@@ -20,10 +20,10 @@ struct AddDynamicEntityLayerView: View {
     @StateObject private var model = Model()
 
     /// A Boolean value indicating whether the settings view should be presented.
-    @State var isShowingSettings = false
+    @State private var isShowingSettings = false
 
     /// The initial viewpoint for the map.
-    @State var viewpoint = Viewpoint(
+    @State private var viewpoint = Viewpoint(
         center: Point(x: -12452361.486, y: 4949774.965),
         scale: 200_000
     )
@@ -48,13 +48,7 @@ struct AddDynamicEntityLayerView: View {
                         }
                     }
                     Spacer()
-                    Button("Dynamic Entity Settings") {
-                        isShowingSettings = true
-                    }
-                    .sheet(isPresented: $isShowingSettings, detents: [.medium], dragIndicatorVisibility: .visible) {
-                        SettingsView()
-                            .environmentObject(model)
-                    }
+                    settingsButton
                 }
             }
             .overlay(alignment: .top) {
@@ -75,4 +69,29 @@ struct AddDynamicEntityLayerView: View {
                 }
             }
     }
+    
+    @ViewBuilder private var settingsButton: some View {
+        let button = Button("Dynamic Entity Settings") {
+            isShowingSettings = true
+        }
+        let settingsView = SettingsView()
+            .environmentObject(model)
+        if #available(iOS 16, *) {
+            button
+                .popover(isPresented: $isShowingSettings, arrowEdge: .bottom) {
+                    settingsView
+                        .presentationDetents([.fraction(0.5)])
+#if targetEnvironment(macCatalyst)
+                        .frame(minWidth: 300, minHeight: 270)
+#else
+                        .frame(minWidth: 320, minHeight: 390)
+#endif
+                }
+        } else {
+            button
+                .sheet(isPresented: $isShowingSettings, detents: [.medium]) {
+                    settingsView
+                }
+        }
+    }
 }