Merge pull request #678 from Esri/Ting/FixTearDownBranch

[Fix] Adjust the logic for Teardown > Non-Teardown and add missing source code files to build phase

Author: yo1995

Samples.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		0000FB6E2BBDB17600845921 /* Add3DTilesLayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0000FB6B2BBDB17600845921 /* Add3DTilesLayerView.swift */; };
 		0000FB712BBDC01400845921 /* Add3DTilesLayerView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 0000FB6B2BBDB17600845921 /* Add3DTilesLayerView.swift */; };
 		0005580A2817C51E00224BC6 /* SampleDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 000558092817C51E00224BC6 /* SampleDetailView.swift */; };
+		000B75702E33F67600C4B257 /* ControlAnnotationSublayerVisibilityView.Model.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C8438FA2DDCFCA9005CCBC7 /* ControlAnnotationSublayerVisibilityView.Model.swift */; };
+		000B75712E33F67600C4B257 /* GenerateGeodatabaseReplicaFromFeatureServiceView.Model.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C17E1CB2DE6456B00A012CB /* GenerateGeodatabaseReplicaFromFeatureServiceView.Model.swift */; };
 		000D43162B9918420003D3C2 /* ConfigureBasemapStyleParametersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 000D43132B9918420003D3C2 /* ConfigureBasemapStyleParametersView.swift */; };
 		000D43182B993A030003D3C2 /* ConfigureBasemapStyleParametersView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 000D43132B9918420003D3C2 /* ConfigureBasemapStyleParametersView.swift */; };
 		00181B462846AD7100654571 /* View+ErrorAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00181B452846AD7100654571 /* View+ErrorAlert.swift */; };
@@ -737,6 +739,10 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
+				000B75712E33F67600C4B257 /* GenerateGeodatabaseReplicaFromFeatureServiceView.Model.swift in Copy Source Code Files */,
+				1C17E1CA2DDFB6FB00A012CB /* GenerateGeodatabaseReplicaFromFeatureServiceView.swift in Copy Source Code Files */,
+				000B75702E33F67600C4B257 /* ControlAnnotationSublayerVisibilityView.Model.swift in Copy Source Code Files */,
+				1C8438F92DDBDE1F005CCBC7 /* ControlAnnotationSublayerVisibilityView.swift in Copy Source Code Files */,
 				951896BD2E29B20500144F9B /* ShowShapefileMetadataView.swift in Copy Source Code Files */,
 				95A86A5D2E1C51A9000BF570 /* ShowPortalUserInfoView.swift in Copy Source Code Files */,
 				9520B2B62E135AEE00B3BEF9 /* ShowLineOfSightBetweenGeoelementsView.swift in Copy Source Code Files */,
@@ -947,7 +953,6 @@
 				D769C2132A29057200030F61 /* SetUpLocationDrivenGeotriggersView.swift in Copy Source Code Files */,
 				1C19B4F72A578E69001D2506 /* CreateLoadReportView.Model.swift in Copy Source Code Files */,
 				1C19B4F82A578E69001D2506 /* CreateLoadReportView.swift in Copy Source Code Files */,
-				1C17E1CA2DDFB6FB00A012CB /* GenerateGeodatabaseReplicaFromFeatureServiceView.swift in Copy Source Code Files */,
 				1C986DA72DDD46E0005E2E0F /* DisplayRouteLayerView.swift in Copy Source Code Files */,
 				1C19B4F92A578E69001D2506 /* CreateLoadReportView.Views.swift in Copy Source Code Files */,
 				D752D9412A39162F003EB25E /* ManageOperationalLayersView.swift in Copy Source Code Files */,
@@ -999,7 +1004,6 @@
 				0042E24628E50EE4001F33D6 /* ShowViewshedFromPointInSceneView.swift in Copy Source Code Files */,
 				0042E24728E50EE4001F33D6 /* ShowViewshedFromPointInSceneView.Model.swift in Copy Source Code Files */,
 				0042E24828E50EE4001F33D6 /* ShowViewshedFromPointInSceneView.ViewshedSettingsView.swift in Copy Source Code Files */,
-				1C8438F92DDBDE1F005CCBC7 /* ControlAnnotationSublayerVisibilityView.swift in Copy Source Code Files */,
 				006C835528B40682004AEB7F /* BrowseBuildingFloorsView.swift in Copy Source Code Files */,
 				006C835628B40682004AEB7F /* DisplayMapFromMobileMapPackageView.swift in Copy Source Code Files */,
 				F1E71BFA28A479C70064C33F /* AddRasterFromFileView.swift in Copy Source Code Files */,

Shared/Supporting Files/Views/CategoriesView.swift

@@ -36,7 +36,7 @@ struct CategoriesView: View {
     }
 
     /// The name of the sample that currently needs torn down.
-    @State private var sampleNeedingTearDown: String?
+    @State private var sampleNeedingTeardown: String?
 
     var body: some View {
         ScrollView {
@@ -82,20 +82,18 @@ struct CategoriesView: View {
             .navigationDestination(for: String.self) { sampleName in
                 let sample = SamplesApp.samples.first(where: { $0.name == sampleName })!
 
-                if sample.hasTeardown {
-                    if sampleNeedingTearDown != nil, sampleNeedingTearDown != sampleName {
-                        ProgressView("Loading sample…")
-                    } else {
-                        SampleDetailView(sample: sample)
-                            .id(sampleName)
-                            .onAppear {
-                                sampleNeedingTearDown = sampleName
-                            }
-                            .environment(\.finishTeardown) {
-                                // Allows the next teardown sample to appear.
-                                sampleNeedingTearDown = nil
-                            }
-                    }
+                if sampleNeedingTeardown != nil && sampleNeedingTeardown != sampleName {
+                    ProgressView("Loading sample")
+                } else if sample.hasTeardown {
+                    SampleDetailView(sample: sample)
+                        .id(sampleName)
+                        .onAppear {
+                            sampleNeedingTeardown = sampleName
+                        }
+                        .environment(\.finishTeardown) {
+                            // Allows the next teardown sample to appear.
+                            sampleNeedingTeardown = nil
+                        }
                 } else {
                     SampleDetailView(sample: sample)
                         .id(sampleName)