Added support tvOS and macOS.

Author: k-o-d-e-n

CGLayout.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'CGLayout'
-  s.version          = '0.5.3'
+  s.version          = '0.5.5'
   s.summary          = 'Constraint-based autolayout system written on Swift. Not Autolayout wrapper.'
 
 # This description is used to generate tags and improve search results.
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 #   * Write the description between the DESC delimiters below.
 #   * Finally, don't worry about the indent, CocoaPods strips it!
 
-  s.description      = 'Powerful autolayout framework, that can manage UIView, CALayer and not rendered views. Has cross-hierarchy coordinate space. Implementation performed on rect-based constraints. Fast, asynchronous, declarative, cacheable, extensible.'
+  s.description      = 'Powerful autolayout framework, that can manage UIView(NSView), CALayer and not rendered views. Has cross-hierarchy coordinate space. Implementation performed on rect-based constraints. Fast, asynchronous, declarative, cacheable, extensible. Supported iOS, macOS, tvOS.'
 
   s.homepage         = 'https://github.com/k-o-d-e-n/CGLayout'
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
@@ -27,6 +27,8 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/K_o_D_e_N'
 
   s.ios.deployment_target = '9.0'
+  s.tvos.deployment_target = '10.0'
+  s.macos.deployment_target = '10.10'
 
   s.source_files = 'CGLayout/Classes/**/*'
 

CGLayout/Classes/CGLayout.swift

@@ -6,13 +6,18 @@
 //  Copyright © 2017 K-o-D-e-N. All rights reserved.
 //
 
+#if os(iOS) || os(tvOS)
 import UIKit
+#endif
+#if os(macOS)
+import Cocoa
+#endif
 
 // TODO: !! Comment all code
 // TODO: ! Add RTL (right to left language)
 // TODO: !! Implement behavior on remove view from hierarchy (Unwrapped LayoutItem, break result in ConstraintsItem). Probably need add `isActive` property.
 // TODO: ! Add support UITraitCollection
-// TODO: !!! Add MacOS, tvOS support
+// TODO: !! Optimization for macOS API
 // TODO: !!! Resolve problem with create offset for adjusted views.
 // TODO: ! Add CGRect.integral
 
@@ -155,9 +160,17 @@ public protocol LayoutItem: class, LayoutCoordinateSpace {
     weak var superItem: LayoutItem? { get }
     // TODO: Add subItems if will be need create layout sub elements. For instance, stack view.
 }
-extension UIView: AdjustableLayoutItem {
-    public weak var superItem: LayoutItem? { return superview }
-}
+#if os(iOS) || os(tvOS)
+    extension UIView: AdjustableLayoutItem {
+        public weak var superItem: LayoutItem? { return superview }
+    }
+#endif
+#if os(macOS)
+    extension NSView: LayoutItem {
+        public weak var superItem: LayoutItem? { return superview }
+    }
+    extension NSControl: AdjustableLayoutItem {}
+#endif
 extension CALayer: LayoutItem {
     public weak var superItem: LayoutItem? { return superlayer }
 }
@@ -575,9 +588,9 @@ public struct LayoutAnchor {
     ///
     /// - Parameter value: UIEdgeInsets value
     /// - Returns: Inset constraint
-    public static func insets(_ value: UIEdgeInsets) -> RectBasedConstraint { return Inset(insets: value) }
+    public static func insets(_ value: EdgeInsets) -> RectBasedConstraint { return Inset(insets: value) }
     private struct Inset: RectBasedConstraint {
-        let insets: UIEdgeInsets
+        let insets: EdgeInsets
         /// Main function for constrain source space by other rect
         ///
         /// - Parameters:

CGLayout/Classes/CGLayoutExtended.swift

@@ -27,6 +27,7 @@ open class LayoutGuide<Super: LayoutItem>: LayoutItem {
         self.bounds = CGRect(origin: .zero, size: frame.size)
     }
 }
+#if os(iOS) || os(tvOS)
 public extension LayoutGuide where Super: UIView {
     /// Fabric method for generation view with any type
     ///
@@ -46,6 +47,7 @@ public extension LayoutGuide where Super: UIView {
         return view
     }
 }
+#endif
 public extension LayoutGuide where Super: CALayer {
     /// Fabric method for generation layer with any type
     ///
@@ -86,6 +88,7 @@ extension LayoutGuide {
     }
 }
 
+#if os(iOS) || os(tvOS)
 /// Base class for any view placeholder that need dynamic position and/or size.
 /// Used UIViewController pattern for loading target view, therefore will be very simply use him.
 open class ViewPlaceholder<View: UIView>: LayoutGuide<UIView> {
@@ -162,6 +165,7 @@ open class UIViewPlaceholder<View: UIView>: UILayoutGuide {
         }
     }
 }
+#endif
 
 // MARK: Additional constraints
 
@@ -209,6 +213,7 @@ public struct AnonymConstraint: LayoutConstraintProtocol {
 // TODO: Create constraint for attributed string and other data oriented constraints
 
 /// Size-based constraint for constrain source rect by size of string. The size to draw gets from restrictive rect.
+@available(OSX 10.11, *)
 public struct StringLayoutConstraint: RectBasedConstraint {
     let string: String?
     let attributes: [String: Any]?
@@ -245,6 +250,7 @@ public extension String {
     ///   - attributes: String attributes
     ///   - context: Drawing context
     /// - Returns: String-based constraint
+    @available(OSX 10.11, *)
     func layoutConstraint(with options: NSStringDrawingOptions = .usesLineFragmentOrigin, attributes: [String: Any]? = nil, context: NSStringDrawingContext? = nil) -> StringLayoutConstraint {
         return StringLayoutConstraint(string: self, options: options, attributes: attributes, context: context)
     }

CGLayout/Classes/CommonExtensions.swift

@@ -8,28 +8,40 @@
 
 import Foundation
 
+#if os(iOS) || os(tvOS)
+    typealias EdgeInsets = UIEdgeInsets
+#endif
+
 extension CGRect {
     var left: CGFloat { return minX }
     var right: CGFloat { return maxX }
     var top: CGFloat { return minY }
     var bottom: CGFloat { return maxY }
-
-    mutating func apply(edgeInsets: UIEdgeInsets) {
-        self = UIEdgeInsetsInsetRect(self, edgeInsets)
+}
+extension CGRect {
+    mutating func apply(edgeInsets: EdgeInsets) {
+        #if os(iOS) || os(tvOS)
+            self = UIEdgeInsetsInsetRect(self, edgeInsets)
+        #else
+            self = CGRect(x: origin.x + edgeInsets.left, y: origin.y + edgeInsets.top,
+                          width: size.width - edgeInsets.horizontal, height: size.height - edgeInsets.vertical)
+        #endif
     }
 }
 
-extension UIEdgeInsets {
+extension EdgeInsets {
     var horizontal: CGFloat { return left + right }
     var vertical: CGFloat { return top + bottom }
 }
 
+#if os(iOS) || os(tvOS)
 @available(iOS 9.0, *)
 extension UILayoutGuide: LayoutItem {
     public var frame: CGRect { get { return layoutFrame } set {} }
     public var bounds: CGRect { get { return CGRect(origin: .zero, size: layoutFrame.size) } set {} }
     public var superItem: LayoutItem? { return owningView }
 }
+#endif
 
 public extension CALayer {
     convenience init(frame: CGRect) {

CGLayout/Classes/MultiCoordinateSpace.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-// TODO: !!! Add MacOS support (conversions more complex)
+// TODO: !!! Implement macOS coordinate space (conversions more complex)
 
 // MARK: LayoutCoordinateSpace
 
@@ -25,6 +25,7 @@ public protocol LayoutCoordinateSpace {
     var bounds: CGRect { get }
     var frame: CGRect { get }
 }
+#if os(iOS) || os(tvOS)
 extension LayoutCoordinateSpace where Self: UICoordinateSpace, Self: LayoutItem {
     public func convert(point: CGPoint, to item: LayoutItem) -> CGPoint {
         guard !(item is UICoordinateSpace) else { return convert(point, to: item as! UICoordinateSpace) }
@@ -79,6 +80,7 @@ extension LayoutCoordinateSpace where Self: UIView {
         return rect
     }
 }
+#endif
 extension LayoutCoordinateSpace where Self: CALayer {
     public func convert(point: CGPoint, to item: LayoutItem) -> CGPoint {
         guard !(item is CALayer) else { return convert(point, to: item as? CALayer) }
@@ -105,6 +107,7 @@ extension LayoutCoordinateSpace where Self: CALayer {
         return rect
     }
 }
+#if os(iOS) || os(tvOS)
 @available(iOS 9.0, *)
 extension LayoutCoordinateSpace where Self: UILayoutGuide {
     public func convert(point: CGPoint, to item: LayoutItem) -> CGPoint {
@@ -148,6 +151,7 @@ extension LayoutCoordinateSpace where Self: UILayoutGuide {
         return CGRect(x: rectInSuper.origin.x - frame.origin.x, y: rectInSuper.origin.y - frame.origin.y, width: rectInSuper.width, height: rectInSuper.height)
     }
 }
+#endif
 
 fileprivate struct LinkedList<T>: Sequence {
     private let startObject: T
@@ -208,6 +212,7 @@ extension LayoutCoordinateSpace where Self: LayoutItem {
 
 // MARK: LayoutGuide convertions
 
+#if os(iOS) || os(tvOS)
 extension LayoutGuide where Super: UICoordinateSpace {
     public func convert(point: CGPoint, to item: LayoutItem) -> CGPoint {
         guard !(item is UICoordinateSpace) else { return convert(point, to: item as! UICoordinateSpace) }
@@ -262,6 +267,7 @@ extension LayoutGuide where Super: UIView {
         return rect
     }
 }
+#endif
 extension LayoutGuide where Super: CALayer {
     public func convert(point: CGPoint, to item: LayoutItem) -> CGPoint {
         guard !(item is CALayer) else { return convert(point, to: item as! CALayer) }
@@ -288,6 +294,7 @@ extension LayoutGuide where Super: CALayer {
         return rect
     }
 }
+#if os(iOS) || os(tvOS)
 extension LayoutGuide where Super: UICoordinateSpace {
     @available(iOS 8.0, *)
     public func convert(_ point: CGPoint, to coordinateSpace: UICoordinateSpace) -> CGPoint {
@@ -338,6 +345,7 @@ extension LayoutGuide where Super: UIView {
         return CGRect(x: rectInSuper.origin.x - frame.origin.x + bounds.origin.x, y: rectInSuper.origin.y - frame.origin.y + bounds.origin.y, width: rectInSuper.width, height: rectInSuper.height)
     }
 }
+#endif
 extension LayoutGuide where Super: CALayer {
     @available(iOS 8.0, *)
     public func convert(_ point: CGPoint, to coordinateSpace: CALayer) -> CGPoint {

Example/CGLayout-macOS/AppDelegate.swift

@@ -0,0 +1,26 @@
+//
+//  AppDelegate.swift
+//  CGLayout-macOS
+//
+//  Created by Denis Koryttsev on 02/10/2017.
+//  Copyright © 2017 CocoaPods. All rights reserved.
+//
+
+import Cocoa
+
+@NSApplicationMain
+class AppDelegate: NSObject, NSApplicationDelegate {
+
+
+
+    func applicationDidFinishLaunching(_ aNotification: Notification) {
+        // Insert code here to initialize your application
+    }
+
+    func applicationWillTerminate(_ aNotification: Notification) {
+        // Insert code here to tear down your application
+    }
+
+
+}
+

Example/CGLayout-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,58 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}