Merge pull request #62 from RougeWare/feature/56-Compiler-error-SwiftUI-previews_v2.10.0

Treating SwiftUI as a native framework

Author: KyNorthstar

README.md

@@ -1,3 +1,9 @@
 # Swift Rectangle Tools #
 
 A set of Swift utilities for dealing with rectangles, including a way to generically build your own!
+
+
+
+## SwiftUI ##
+
+If you're using this with SwiftUI, you can also `import RectangleTools_SwiftUI` to gain SwiftUI-specific rectangle tools!

Sources/RectangleTools/Default Conformances/EdgeInsets + FourSided + SwiftUI.swift

@@ -6,7 +6,13 @@
 //  Copyright © 2020 Ben Leggiero. All rights reserved.
 //
 
-#if canImport(WatchKit)
+#if canImport(SwiftUI)
+    import SwiftUI
+
+    public typealias NativeEdgeInsets = SwiftUI.EdgeInsets
+    @available(watchOS 2.1, *)
+    public typealias UserInterfaceLayoutDirection = SwiftUI.LayoutDirection
+#elseif canImport(WatchKit)
     import WatchKit
 
     public typealias NativeEdgeInsets = UIEdgeInsets
@@ -28,6 +34,56 @@
 
 @available(watchOS 2.1, *)
 extension NativeEdgeInsets: FourSidedAbsolute {
+    
+    #if canImport(SwiftUI)
+    
+    public init(top: CGFloat, right: CGFloat, bottom: CGFloat, left: CGFloat) {
+        switch UserInterfaceLayoutDirection.current {
+        case .leftToRight:
+            self.init(top: top, leading: left, bottom: bottom, trailing: right)
+            
+        case .rightToLeft:
+            self.init(top: top, leading: right, bottom: bottom, trailing: left)
+            
+        @unknown default:
+            assertionFailure("Unknown user interface layout direction (will assume LTR): \(UserInterfaceLayoutDirection.current)")
+            self.init(top: top, leading: left, bottom: bottom, trailing: right)
+        }
+    }
+    
+    
+    public init(top: CGFloat, trailing: CGFloat, bottom: CGFloat, leading: CGFloat) {
+        self.init(top: top, leading: leading, bottom: bottom, trailing: trailing)
+    }
+    
+    
+    public var left: CGFloat {
+        switch UserInterfaceLayoutDirection.current {
+        case .leftToRight: return leading
+        case .rightToLeft: return trailing
+            
+        @unknown default:
+            assertionFailure("Unknown user interface layout direction (will assume LTR): \(UserInterfaceLayoutDirection.current)")
+            return leading
+        }
+    }
+    
+    
+    public var right: CGFloat {
+        switch UserInterfaceLayoutDirection.current {
+        case .leftToRight: return trailing
+        case .rightToLeft: return leading
+            
+        @unknown default:
+            assertionFailure("Unknown user interface layout direction (will assume LTR): \(UserInterfaceLayoutDirection.current)")
+            return trailing
+        }
+    }
+    
+    
+    #else
+    
+    
     @available(watchOS 2.1, *)
     public init(top: CGFloat, right: CGFloat, bottom: CGFloat, left: CGFloat) {
         self.init(top: top, left: left, bottom: bottom, right: right)
@@ -47,10 +103,13 @@ extension NativeEdgeInsets: FourSidedAbsolute {
             self.init(top: top, right: trailing, bottom: bottom, left: leading)
         }
     }
+    
+    #endif
 }
 
 
 
+#if !canImport(SwiftUI)
 @available(watchOS 2.1, *)
 public extension NativeEdgeInsets {
     /// The value of whichever edge inset is leading in the current app's UI direction
@@ -76,11 +135,19 @@ public extension NativeEdgeInsets {
         }
     }
 }
+#endif
 
 
 
 #if !canImport(UIKit) && canImport(AppKit)
-extension NSEdgeInsets: Equatable {}
+extension NSEdgeInsets: Equatable {
+    public static func == (lhs: Self, rhs: Self) -> Bool {
+        return lhs.top == rhs.top
+            && lhs.right == rhs.right
+            && lhs.bottom == rhs.bottom
+            && lhs.left == rhs.left
+    }
+}
 #endif
 
 
@@ -90,12 +157,25 @@ public extension UserInterfaceLayoutDirection {
     // TODO: Move this to some other package
     @inline(__always)
     static var current: UserInterfaceLayoutDirection {
-        #if canImport(WatchKit)
-        return WKInterfaceDevice.current().layoutDirection
+        #if canImport(SwiftUI)
+            #if canImport(UIKit)
+                let legacyCurrent = UIApplication.shared.userInterfaceLayoutDirection
+            #elseif canImport(AppKit)
+                let legacyCurrent = NSApp?.userInterfaceLayoutDirection ?? .leftToRight
+            #endif
+            switch legacyCurrent {
+            case .leftToRight: return .leftToRight
+            case .rightToLeft: return .rightToLeft
+            @unknown default:
+                assertionFailure("Unknown user interface layout direction (will assume LTR): \(UserInterfaceLayoutDirection.current)")
+                return .leftToRight
+            }
+        #elseif canImport(WatchKit)
+            return WKInterfaceDevice.current().layoutDirection
         #elseif canImport(UIKit)
-        return UIApplication.shared.userInterfaceLayoutDirection
+            return UIApplication.shared.userInterfaceLayoutDirection
         #elseif canImport(AppKit)
-        return NSApp?.userInterfaceLayoutDirection ?? .leftToRight
+            return NSApp?.userInterfaceLayoutDirection ?? .leftToRight
         #endif
     }
 }

Sources/RectangleTools/Default Conformances/EdgeInsets + FourSided.swift

@@ -100,11 +100,8 @@ extension Size2DCollectionIndex: Point2D {
 
 
 
-public extension Size2DCollection
-    where
-        Length: BinaryInteger,
-        Element == Index
-{
+public extension Size2DCollection where Element == Index {
+    
     var startIndex: Index { Index(x: 0, y: 0) }
     var endIndex: Index { Index(x: width, y: height) }
     var lastValidIndex: Index { Index(x: width - 1, y: height - 1) }

Sources/RectangleTools/Synthesized Conveniences/Size2DCollection.swift

@@ -24,7 +24,7 @@ final class FourSidedTests: XCTestCase {
 
 extension FourSidedTests {
 
-    private static let insets_raw_1_2_3_4 = NativeEdgeInsets(top: 1, left: 2, bottom: 3, right: 4)
+    private static let insets_raw_1_2_3_4 = NativeEdgeInsets(top: 1, right: 4, bottom: 3, left: 2)
     private static let insets_synth_5_6_7_8 = NativeEdgeInsets(top: 5, right: 6, bottom: 7, left: 8)
 
     func testFourSidedAbsoluteFields_EdgeInsets() {
@@ -44,11 +44,11 @@ extension FourSidedTests {
 
 
     func testInitializers_EdgeInsets() {
-        XCTAssertEqual(NativeEdgeInsets(top: 5, right: 6, bottom: 7, left: 8), NativeEdgeInsets(top: 5, left: 8, bottom: 7, right: 6))
-        XCTAssertEqual(NativeEdgeInsets(top: 9, eachHorizontal: 10, bottom: 11), NativeEdgeInsets(top: 9, left: 10, bottom: 11, right: 10))
-        XCTAssertEqual(NativeEdgeInsets(eachVertical: 12, eachHorizontal: 13), NativeEdgeInsets(top: 12, left: 13, bottom: 12, right: 13))
-        XCTAssertEqual(NativeEdgeInsets(each: 14), NativeEdgeInsets(top: 14, left: 14, bottom: 14, right: 14))
-        XCTAssertEqual(NativeEdgeInsets.zero, NativeEdgeInsets(top: 0, left: 0, bottom: 0, right: 0))
+        XCTAssertEqual(NativeEdgeInsets(top: 5, right: 6, bottom: 7, left: 8), NativeEdgeInsets(top: 5, right: 6, bottom: 7, left: 8))
+        XCTAssertEqual(NativeEdgeInsets(top: 9, eachHorizontal: 10, bottom: 11), NativeEdgeInsets(top: 9, right: 10, bottom: 11, left: 10))
+        XCTAssertEqual(NativeEdgeInsets(eachVertical: 12, eachHorizontal: 13), NativeEdgeInsets(top: 12, right: 13, bottom: 12, left: 13))
+        XCTAssertEqual(NativeEdgeInsets(each: 14), NativeEdgeInsets(top: 14, right: 14, bottom: 14, left: 14))
+        XCTAssertEqual(NativeEdgeInsets.zero, NativeEdgeInsets(top: 0, right: 0, bottom: 0, left: 0))
     }