Merge pull request #12 from antonmartinsson/2.4.1

Add support for visionOS

Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "GaugeKit",
 	 platforms: [
-		.macOS(.v11), .iOS(.v13), .watchOS(.v6)
+        .macOS(.v11), .iOS(.v13), .watchOS(.v6), .visionOS(.v1)
   ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

Sources/GaugeKit/CrossPlatform.swift

@@ -8,27 +8,13 @@
 import SwiftUI
 
 class CrossPlatform {
-  static func mainScreenSize() -> CGSize {
-#if os(macOS)
-    if let screenSize = NSScreen.main?.frame.size {
-      return screenSize
-    }
-    else {
-      // Use a generic FHD size so any calculations will still work
-      return CGSize(width: 1920, height: 1080)
-    }
-#elseif os(iOS)
-    return UIScreen.main.bounds.size
-#elseif os(watchOS)
-    return WKInterfaceDevice.current().screenBounds.size
-#endif
-  }
-
   static func systemBackgroundColor() -> Color {
 #if os(macOS)
     Color(NSColor.windowBackgroundColor)
 #elseif os(iOS)
     Color(UIColor.systemBackground)
+#elseif os(visionOS)
+      Color.primary
 #elseif os(watchOS)
     Color.black
 #endif
@@ -38,7 +24,9 @@ class CrossPlatform {
 #if os(macOS)
     Color(NSColor.labelColor)
 #elseif os(iOS)
-    Color(UIColor.label)
+    Color(.label)
+#elseif os(visionOS)
+      Color(.label)
 #elseif os(watchOS)
     Color.black
 #endif