Support Vision Pro

Author: 1998code

Demo/What's New?.xcodeproj/project.pbxproj

@@ -304,7 +304,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "What's New?/What_s_New_.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -318,14 +318,17 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Debug;
 		};
@@ -336,7 +339,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "What's New?/What_s_New_.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -350,14 +353,17 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,7";
 			};
 			name = Release;
 		};

Demo/What's New?.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,4 +1,28 @@
 [
+    {
+        "version": "4.1",
+        "subVersion": "4.1.0",
+        "new": [
+            {
+                "icon": "eye",
+                "title": "Support Vision Pro",
+                "subtitle": "& visionOS",
+                "body": "Drops Framework is temp-disabled due to conflict."
+            },
+            {
+                "icon": "macpro.gen3.server",
+                "title": "Serverless",
+                "subtitle": "Design",
+                "body": "Free and open source! ❤️‍🔥"
+            },
+            {
+                "icon": "arrow.triangle.pull",
+                "title": "Contribute",
+                "subtitle": "Together",
+                "body": "Pull requests and make it better for everyone! 🎉"
+            }
+        ]
+    },
     {
         "version": "4.0",
         "subVersion": "4.0.0",

Demo/What's New?/en.lproj/data.json

@@ -1,4 +1,28 @@
 [
+    {
+        "version": "4.1",
+        "subVersion": "4.1.0",
+        "new": [
+            {
+                "icon": "eye",
+                "title": "支持 Vision Pro",
+                "subtitle": "和 visionOS",
+                "body": "Drops Framework 由於衝突而被臨時禁用。"
+            },
+            {
+                "icon": "macpro.gen3.server",
+                "title": "無服務器",
+                "subtitle": "設計",
+                "body": "免費開源! ❤️‍🔥"
+            },
+            {
+                "icon": "arrow.triangle.pull",
+                "title": "貢獻",
+                "subtitle": "一起",
+                "body": "提出請求，變得更好! 🎉"
+            }
+        ]
+    },
     {
         "version": "4.0",
         "subVersion": "4.0.0",

Demo/What's New?/zh-Hant.lproj/data.json

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.4
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 //
 //  Created by Ming on 11/6/2022.
@@ -11,7 +11,8 @@ let package = Package(
     platforms: [
         .iOS(.v14),
         .watchOS(.v7),
-        .macOS(.v11)
+        .macOS(.v11),
+        .custom("xros", versionString: "1.0")
     ],
     products: [
         .library(
@@ -20,14 +21,14 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "SwiftVB", url: "https://github.com/1998code/SwiftVBKit.git", .upToNextMinor(from: "1.4.0")),
-        .package(name: "Drops", url: "https://github.com/1998code/Drops.git", .upToNextMinor(from: "2.1.0"))
+//        .package(name: "Drops", url: "https://github.com/1998code/Drops.git", .upToNextMinor(from: "2.1.0"))
     ],
     targets: [
         .target(
             name: "SwiftNEW",
             dependencies: [
                 "SwiftVB",
-                "Drops"
+//                "Drops"
             ]
         )
     ]

Package.resolved

@@ -5,9 +5,9 @@
 import SwiftUI
 import SwiftVB
 
-#if os(iOS)
-import Drops
-#endif
+//#if os(iOS)
+//import Drops
+//#endif
 
 @available(iOS 14, watchOS 7.0, macOS 11.0, *)
 public struct SwiftNEW: View {
@@ -59,7 +59,7 @@ public struct SwiftNEW: View {
             else if size == "normal" {
                 Label(label, systemImage: labelImage)
                     .frame(width: 300, height: 50)
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
                     .foregroundColor(labelColor)
                     .background(color)
                     .cornerRadius(15)
@@ -71,6 +71,9 @@ public struct SwiftNEW: View {
                 .sheet(isPresented: $historySheet) {
                     sheetHistory
                 }
+            #if os(xrOS)
+                .padding()
+            #endif
         }
     }
 
@@ -182,7 +185,10 @@ public struct SwiftNEW: View {
                 Text("Show History")
                 Image(systemName: "arrow.up.bin")
             }.font(.body)
-        }.foregroundColor(color)
+        }
+#if !os(xrOS)
+        .foregroundColor(color)
+#endif
     }
     public var closeCurrentButton: some View {
         Button(action: { show = false }) {
@@ -197,11 +203,11 @@ public struct SwiftNEW: View {
                 }
             }.font(.body)
             .frame(width: 300, height: 50)
-            #if os(iOS)
+#if os(iOS) && !os(xrOS)
             .foregroundColor(.white)
             .background(color)
             .cornerRadius(15)
-            #endif
+#endif
         }
     }
 
@@ -331,13 +337,13 @@ public struct SwiftNEW: View {
 
     #if os(iOS)
     public func drop() {
-        let drop = Drop(title: "Tap", subtitle: "To See What's New.", icon: UIImage(systemName: labelImage),
-                        action: .init {
-                            Drops.hideCurrent()
-                            show = true
-                        },
-                        position: .top, duration: 3.0, accessibility: "Alert: Tap to see what's new." )
-        Drops.show(drop)
+//        let drop = Drop(title: "Tap", subtitle: "To See What's New.", icon: UIImage(systemName: labelImage),
+//                        action: .init {
+//                            Drops.hideCurrent()
+//                            show = true
+//                        },
+//                        position: .top, duration: 3.0, accessibility: "Alert: Tap to see what's new." )
+//        Drops.show(drop)
     }
     #endif
 }