Merge pull request #28 from harlanhaskins/harlan/visions-of-sugarplums

Fix build on visionOS

Author: simonbs

Examples/Example.xcodeproj/project.pbxproj

@@ -401,8 +401,11 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dk.shape.Spices.SwiftUIExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Debug;
 		};
@@ -430,8 +433,11 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dk.shape.Spices.SwiftUIExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Release;
 		};
@@ -457,8 +463,11 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dk.shape.Spices.UIKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Debug;
 		};
@@ -484,8 +493,11 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = dk.shape.Spices.UIKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Release;
 		};

Examples/SwiftUIExample/ContentView.swift

@@ -3,6 +3,7 @@ import SwiftUI
 
 struct ContentView: View {
     @EnvironmentObject private var spiceStore: AppSpiceStore
+    @State private var isShowingEditorPopover = false
 
     var body: some View {
         NavigationStack {
@@ -46,6 +47,18 @@ struct ContentView: View {
                 }
             }
             .navigationTitle("Example")
+            .toolbar {
+                #if os(visionOS)
+                ToolbarItem(placement: .topBarTrailing) {
+                    Button("Edit spices") {
+                        isShowingEditorPopover = true
+                    }
+                    .popover(isPresented: $isShowingEditorPopover) {
+                        SpiceEditor(editing: spiceStore)
+                    }
+                }
+                #endif
+            }
         }
         #if DEBUG
         .presentSpiceEditorOnShake(editing: spiceStore)

Examples/UIKitExample/ContentViewController.swift

@@ -65,6 +65,7 @@ final class ContentViewController: UIViewController {
         this.translatesAutoresizingMaskIntoConstraints = false
         return this
     }()
+    private lazy var editSpicesItem = UIBarButtonItem(title: "Edit spices", style: .plain, target: self, action: #selector(editSpicesButtonPressed))
 
     override func loadView() {
         view = tableView
@@ -77,6 +78,7 @@ final class ContentViewController: UIViewController {
         setupDataSource()
         updateSnapshot()
         observeSpices()
+        updateNavigationItem()
     }
 }
 
@@ -146,6 +148,19 @@ private extension ContentViewController {
         }
         .store(in: &cancellables)
     }
+
+    private func updateNavigationItem() {
+        #if os(visionOS)
+        navigationItem.rightBarButtonItem = editSpicesItem
+        #endif
+    }
+
+    @objc private func editSpicesButtonPressed() {
+        let editor = SpiceEditorViewController(editing: spiceStore)
+        editor.modalPresentationStyle = .popover
+        editor.popoverPresentationController?.sourceItem = editSpicesItem
+        present(editor, animated: true)
+    }
 }
 
 extension ContentViewController: UITableViewDelegate {

Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 
 let package = Package(
     name: "Spices",
-    platforms: [.iOS(.v15)],
+    platforms: [.iOS(.v15), .visionOS(.v1)],
     products: [
         .library(name: "Spices", targets: ["Spices"])
     ],

Sources/Spices/SpiceEditorViewController.swift

@@ -37,7 +37,9 @@ public final class SpiceEditorViewController: UIHostingController<SpiceEditor> {
 
 private extension SpiceEditorViewController {
     private func configureSheetPresentation() {
+        #if !os(visionOS)
         sheetPresentationController?.detents = [.medium(), .large()]
+        #endif
     }
 }
 #endif

Sources/Spices/View+SpiceEditor.swift

@@ -91,7 +91,9 @@ private struct PresentSpiceEditorOnShakeViewModifier<Editor: View>: ViewModifier
                     return
                 }
                 let viewController = UIHostingController(rootView: editor)
+                #if !os(visionOS)
                 viewController.sheetPresentationController?.detents = [.medium(), .large()]
+                #endif
                 window.rootViewController?.shp_topViewController.present(viewController, animated: true)
                 PresentedSpiceEditorBox.viewController = viewController
             }