Merge pull request #541 from Esri/df/buildFix_redo

[Fix] Samples unavailable on Mac Catalyst

Author: dfeinzimer

Scripts/GenerateSampleViewSourceCode.swift

@@ -111,7 +111,6 @@ private let sampleMetadata: [SampleMetadata] = {
                     exit(1)
                 }
             }
-            .sorted { $0.title < $1.title }
     } catch {
         print("error: Decoding Samples: \(error.localizedDescription)")
         exit(1)
@@ -123,6 +122,7 @@ private let sampleStructs = sampleMetadata
         let portalItemIDs = (sample.offlineData ?? [])
             .map { #"PortalItem.ID("\#($0)")!"# }
         return """
+        \(sample.category == "Augmented Reality" ? "@available(macCatalyst, unavailable)" : "")
         struct \(sample.structName): Sample {
             var name: String { \"\(sample.title)\" }
             var category: String { \"\(sample.category)\" }
@@ -136,25 +136,44 @@ private let sampleStructs = sampleMetadata
     }
     .joined(separator: "\n")
 
-private let entries = sampleMetadata
+// The set of samples supported on all supported platforms.
+private let commonSamples = sampleMetadata
+    .filter { $0.category != "Augmented Reality" }
     .map { sample in "\(sample.structName)()" }
-    .joined(separator: ",\n        ")
-private let arrayRepresentation = """
+    .joined(separator: ",\n            ")
+
+// The set of samples supported only on iOS.
+private let iOSSpecificSamples = sampleMetadata
+    .filter { $0.category == "Augmented Reality" }
+    .map { sample in "\(sample.structName)()" }
+    .joined(separator: ",\n                ")
+
+private let commonSamplesArrayRepresentation = """
     [
-            \(entries)
-        ]
-    #if targetEnvironment(macCatalyst) || targetEnvironment(simulator)
-        // Exclude AR samples from Mac Catalyst and Simulator targets
-        // as they don't have camera and sensors available.
-        .filter { $0.category != "Augmented Reality" }
+                \(commonSamples)
+            ]
+    """
+
+private let iOSSamplesArrayRepresentation = """
+    {
+    #if !targetEnvironment(macCatalyst) && !targetEnvironment(simulator)
+                // Exclude AR samples from Mac Catalyst and Simulator targets
+                // as they don't have camera and sensors available.
+                [
+                    \(iOSSpecificSamples)
+                ]
+    #else
+                []
     #endif
+            }()
     """
 
 do {
     let templateFile = try String(contentsOf: templateURL, encoding: .utf8)
     // Replaces the empty array code stub, i.e. [], with the array representation.
     let content = templateFile
-        .replacingOccurrences(of: "[/* samples */]", with: arrayRepresentation)
+        .replacingOccurrences(of: "[/* common_samples */]", with: commonSamplesArrayRepresentation)
+        .replacingOccurrences(of: "[/* ios_samples */]", with: iOSSamplesArrayRepresentation)
         .replacingOccurrences(of: "/* structs */", with: sampleStructs)
     try content.write(to: outputFileURL, atomically: true, encoding: .utf8)
 } catch {

Shared/Samples/Augment reality to collect data/AugmentRealityToCollectDataView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import ArcGISToolkit
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 struct AugmentRealityToCollectDataView: View {
     /// The view model for this sample.
     @StateObject private var model = Model()
@@ -98,6 +99,7 @@ struct AugmentRealityToCollectDataView: View {
     }
 }
 
+@available(macCatalyst, unavailable)
 private extension AugmentRealityToCollectDataView {
     @MainActor
     class Model: ObservableObject {
@@ -176,6 +178,7 @@ private extension AugmentRealityToCollectDataView {
     }
 }
 
+@available(macCatalyst, unavailable)
 private extension AugmentRealityToCollectDataView {
     /// The health of a tree.
     enum TreeHealth: Int16, CaseIterable, Equatable {
@@ -196,7 +199,3 @@ private extension AugmentRealityToCollectDataView {
         }
     }
 }
-
-#Preview {
-    AugmentRealityToCollectDataView()
-}

Shared/Samples/Augment reality to fly over scene/AugmentRealityToFlyOverSceneView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import ArcGISToolkit
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 struct AugmentRealityToFlyOverSceneView: View {
     /// A scene with an imagery basemap, a world elevation source, and a mesh layer of Girona, Spain.
     @State private var scene: ArcGIS.Scene = {
@@ -58,7 +59,3 @@ private extension URL {
         .init(string: "https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer")!
     }
 }
-
-#Preview {
-    AugmentRealityToFlyOverSceneView()
-}

Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.ARSceneView.swift

@@ -17,6 +17,7 @@ import ArcGISToolkit
 import AVFAudio
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 extension AugmentRealityToNavigateRouteView {
     /// A world scale scene view displaying route graphics from a given model.
     struct ARRouteSceneView: View {
@@ -84,6 +85,7 @@ extension AugmentRealityToNavigateRouteView {
     }
 }
 
+@available(macCatalyst, unavailable)
 extension AugmentRealityToNavigateRouteView {
     // MARK: Scene Model
 

Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import CoreLocation
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 struct AugmentRealityToNavigateRouteView: View {
     /// The view model for the map view in the sample.
     @StateObject private var model = MapModel()
@@ -99,6 +100,7 @@ struct AugmentRealityToNavigateRouteView: View {
     }
 }
 
+@available(macCatalyst, unavailable)
 private extension AugmentRealityToNavigateRouteView {
     // MARK: Map Model
 

Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.ARSceneView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import ArcGISToolkit
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 extension AugmentRealityToShowHiddenInfrastructureView {
     /// A world scale scene view displaying pipe graphics from a given model.
     struct ARPipesSceneView: View {
@@ -67,6 +68,7 @@ extension AugmentRealityToShowHiddenInfrastructureView {
     }
 }
 
+@available(macCatalyst, unavailable)
 extension AugmentRealityToShowHiddenInfrastructureView {
     // MARK: Scene Model
 

Shared/Samples/Augment reality to show hidden infrastructure/AugmentRealityToShowHiddenInfrastructureView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import CoreLocation
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 struct AugmentRealityToShowHiddenInfrastructureView: View {
     /// The view model for the map view in the sample.
     @StateObject private var model = MapModel()
@@ -128,6 +129,7 @@ struct AugmentRealityToShowHiddenInfrastructureView: View {
     }
 }
 
+@available(macCatalyst, unavailable)
 private extension AugmentRealityToShowHiddenInfrastructureView {
     // MARK: Map Model
 
@@ -241,6 +243,7 @@ private extension AugmentRealityToShowHiddenInfrastructureView {
     }
 }
 
+@available(macCatalyst, unavailable)
 private extension View {
     /// Presents an alert that allows the user to enter an elevation offset for a pipe.
     /// - Parameters:

Shared/Samples/Augment reality to show tabletop scene/AugmentRealityToShowTabletopSceneView.swift

@@ -16,6 +16,7 @@ import ArcGIS
 import ArcGISToolkit
 import SwiftUI
 
+@available(macCatalyst, unavailable)
 struct AugmentRealityToShowTabletopSceneView: View {
     /// The scene used to create the scene view.
     @State private var scene = ArcGIS.Scene()

Shared/SamplesApp+Samples.swift.tache

@@ -15,8 +15,16 @@
 import SwiftUI
 
 extension SamplesApp {
+    /// The common samples for this app.
+    static var commonSamples: [Sample] {
+        [/* common_samples */]
+    }
+    /// The iOS samples for this app.
+    static var iOSSamples: [Sample] {
+        [/* ios_samples */]
+    }
     /// The samples for this app.
-    static let samples: [Sample] = [/* samples */]
+    static let samples = (commonSamples + iOSSamples).sorted { $0.name < $1.name }
 }
 
 // MARK: Sample Structs