Revert "Address sample feedback"

This reverts commit 79b9fd5.

Author: des12437

Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.MapPicker.swift

@@ -67,10 +67,7 @@ extension DownloadPreplannedMapAreaView {
                 .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .confirmationAction) {
-                        Button("Done") {
-                            model.isShowingSelectMapView = false
-                            dismiss()
-                        }
+                        Button("Done") { dismiss() }
                     }
                 }
             }

Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.Model.swift

@@ -58,12 +58,6 @@ extension DownloadPreplannedMapAreaView {
         /// A Boolean value indicating if the offline content can be deleted.
         @Published private(set) var canRemoveDownloadedMaps = false
 
-        /// A Boolean value indicating whether to select a map.
-        @Published var isShowingSelectMapView = false
-        
-        /// A Boolean value indicating if the selected offline map just changed.
-        @Published var offlineMapDidChange = false
-        
         init() {
             // Creates temp directory.
             temporaryDirectory = FileManager.createTemporaryDirectory()
@@ -114,7 +108,6 @@ extension DownloadPreplannedMapAreaView {
                 } else if case .success(let mmpk) = info.result {
                     // If we have already downloaded, then open the map in the mmpk.
                     offlineMap = mmpk.maps.first
-                    offlineMapDidChange = true
                 } else {
                     // If we have a failure, then keep the online map selected.
                     selectedMap = oldValue

Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.swift

@@ -16,65 +16,53 @@ import ArcGIS
 import SwiftUI
 
 struct DownloadPreplannedMapAreaView: View {
+    /// A Boolean value indicating whether to select a map.
+    @State private var isShowingSelectMapView = false
+    
     /// A Boolean value indicating whether to show delete alert.
     @State private var isShowingDeleteAlert = false
 
     /// The view model for this sample.
     @StateObject private var model = Model()
 
     var body: some View {
-        MapViewReader { mapViewProxy in
-            MapView(map: model.currentMap)
-                .onVisibleAreaChanged { visibleArea in
-                    guard model.offlineMapDidChange else { return }
-                    model.offlineMapDidChange = false
+        MapView(map: model.currentMap)
+            .overlay(alignment: .top) {
+                mapNameOverlay
+            }
+            .toolbar {
+                ToolbarItemGroup(placement: .bottomBar) {
+                    Spacer()
 
-                    let builder = EnvelopeBuilder(envelope: visibleArea.extent)
-                    builder.expand(by: 0.5)
-                    let zoomEnvelope = builder.toGeometry()
+                    Button("Select Map") {
+                        isShowingSelectMapView.toggle()
+                    }
+                    .sheet(isPresented: $isShowingSelectMapView, detents: [.medium]) {
+                        MapPicker()
+                            .environmentObject(model)
+                    }
 
-                    Task {
-                        // Zooms offline map in to view all layer content.
-                        await mapViewProxy.setViewpointGeometry(zoomEnvelope)
+                    Spacer()
+                    
+                    Button {
+                        isShowingDeleteAlert = true
+                    } label: {
+                        Image(systemName: "trash")
                     }
-                }
-                .overlay(alignment: .top) {
-                    mapNameOverlay
-                }
-                .toolbar {
-                    ToolbarItemGroup(placement: .bottomBar) {
-                        Spacer()
-                        
-                        Button("Select Map") {
-                            model.isShowingSelectMapView = true
-                        }
-                        .sheet(isPresented: $model.isShowingSelectMapView, detents: [.medium]) {
-                            MapPicker()
-                                .environmentObject(model)
-                        }
-                      
-                        Spacer()
-                        
-                        Button {
-                            isShowingDeleteAlert = true
-                        } label: {
-                            Image(systemName: "trash")
-                        }
-                        .disabled(!model.canRemoveDownloadedMaps)
-                        .alert("Delete All Offline Areas", isPresented: $isShowingDeleteAlert) {
-                            Button("Delete", role: .destructive) {
-                                model.removeDownloadedMaps()
-                            }
-                        } message: {
-                            Text("Are you sure you want to delete all downloaded preplanned map areas?")
+                    .disabled(!model.canRemoveDownloadedMaps)
+                    .alert("Delete All Offline Areas", isPresented: $isShowingDeleteAlert) {
+                        Button("Delete", role: .destructive) {
+                            model.removeDownloadedMaps()
                         }
+                    } message: {
+                        Text("Are you sure you want to delete all downloaded preplanned map areas?")
                     }
                 }
-                .task {
-                    // Makes the offline map models when the view is first shown.
-                    await model.makeOfflineMapModels()
-                }
-        }
+            }
+            .task {
+                // Makes the offline map models when the view is first shown.
+                await model.makeOfflineMapModels()
+            }
     }
 
     var mapNameOverlay: some View {