switch node added, nodes fixes

Author: psharanda

Demos/Demos/TableViewController.swift

@@ -162,7 +162,7 @@ class SampleCell: UITableViewCell {
 
         let attr = NSAttributedString(string: model.details, attributes: [NSFontAttributeName: UIFont.systemFontOfSize(12), NSParagraphStyleAttributeName: p])
 
-        let detailsNode = LabelNode(tag: Tags.Details, text: .Attributed(attr), numberOfLines: 4) {
+        let detailsNode = LabelNode(tag: Tags.Details, text: .Attributed(attr), numberOfLines: 2) {
             let v = $0 ?? UILabel()
             v.textColor = UIColor.grayColor()
             v.backgroundColor = UIColor.lightGrayColor().colorWithAlphaComponent(0.2)

LayoutOps/LayoutOps.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		1B11ECF71DE4F915001FEBE7 /* Node.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B11ECF61DE4F915001FEBE7 /* Node.swift */; };
 		1B11ECFE1DE57CC6001FEBE7 /* LabelNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B11ECFD1DE57CC6001FEBE7 /* LabelNode.swift */; };
 		1B11ED001DE57D03001FEBE7 /* ImageNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B11ECFF1DE57D03001FEBE7 /* ImageNode.swift */; };
+		1B20DAE31DEF386600FE6643 /* SwitchNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B20DAE21DEF386600FE6643 /* SwitchNode.swift */; };
 		1B2B82981DCD1F90008B6450 /* Anchor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B2B82971DCD1F90008B6450 /* Anchor.swift */; };
 		1B49D7101DB8D02800823FF3 /* SizeToFit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B49D7091DB8D02800823FF3 /* SizeToFit.swift */; };
 		1B49D7111DB8D02800823FF3 /* LayoutOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B49D70A1DB8D02800823FF3 /* LayoutOperation.swift */; };
@@ -28,6 +29,7 @@
 		1B11ECF61DE4F915001FEBE7 /* Node.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Node.swift; sourceTree = "<group>"; };
 		1B11ECFD1DE57CC6001FEBE7 /* LabelNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelNode.swift; sourceTree = "<group>"; };
 		1B11ECFF1DE57D03001FEBE7 /* ImageNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageNode.swift; sourceTree = "<group>"; };
+		1B20DAE21DEF386600FE6643 /* SwitchNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwitchNode.swift; sourceTree = "<group>"; };
 		1B2B82971DCD1F90008B6450 /* Anchor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Anchor.swift; sourceTree = "<group>"; };
 		1B49D7091DB8D02800823FF3 /* SizeToFit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SizeToFit.swift; sourceTree = "<group>"; };
 		1B49D70A1DB8D02800823FF3 /* LayoutOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutOperation.swift; sourceTree = "<group>"; };
@@ -87,6 +89,7 @@
 				1B11ECF61DE4F915001FEBE7 /* Node.swift */,
 				1B11ECFD1DE57CC6001FEBE7 /* LabelNode.swift */,
 				1B11ECFF1DE57D03001FEBE7 /* ImageNode.swift */,
+				1B20DAE21DEF386600FE6643 /* SwitchNode.swift */,
 			);
 			path = LayoutOps;
 			sourceTree = "<group>";
@@ -170,6 +173,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1B49D7121DB8D02800823FF3 /* Viewport.swift in Sources */,
+				1B20DAE31DEF386600FE6643 /* SwitchNode.swift in Sources */,
 				1B49D7101DB8D02800823FF3 /* SizeToFit.swift in Sources */,
 				1B49D7131DB8D02800823FF3 /* Follow.swift in Sources */,
 				1B11ECF71DE4F915001FEBE7 /* Node.swift in Sources */,

LayoutOps/LayoutOps/ImageNode.swift

@@ -7,8 +7,8 @@ import UIKit
 
 public class ImageNode: AnyNode {
 
-    private let image: UIImage
-    public init<T: UIImageView>(tag: Taggable, image: UIImage, subnodes: [AnyNode] = [], initializer: (T?)->T) {
+    private let image: UIImage?
+    public init<T: UIImageView>(tag: Taggable, image: UIImage?, subnodes: [AnyNode] = [], initializer: (T?)->T) {
         self.image = image
         super.init(tag: tag, subnodes: subnodes) { (imageView: T?) -> T in
             let imgView = initializer(imageView)
@@ -18,6 +18,11 @@ public class ImageNode: AnyNode {
     }
 
     public override func sizeThatFits(size: CGSize) -> CGSize {
-        return image.size
+        
+        struct Cache {
+            static let imageView = UIImageView()
+        }
+        Cache.imageView.image = image
+        return Cache.imageView.sizeThatFits(size)
     }
 }

LayoutOps/LayoutOps/LabelNode.swift

@@ -6,8 +6,8 @@
 import UIKit
 
 public enum LabelNodeString {
-    case Regular(String, UIFont)
-    case Attributed(NSAttributedString)
+    case Regular(String?, UIFont)
+    case Attributed(NSAttributedString?)
 }
 
 public class LabelNode: AnyNode {
@@ -65,12 +65,12 @@ extension LabelNode: Baselinable {
             switch type {
             case .First:
                 var ptr = NSRange()
-                if attr.length > 0 {
+                if let attr = attr where attr.length > 0 {
                     font = attr.attribute(NSFontAttributeName, atIndex: 0, effectiveRange: &ptr) as? UIFont
                 }
             case .Last:
                 var ptr = NSRange()
-                if attr.length > 0 {
+                if let attr = attr where attr.length > 0 {
                     font = attr.attribute(NSFontAttributeName, atIndex: attr.length - 1, effectiveRange: &ptr) as? UIFont
                 }
             }
@@ -91,7 +91,7 @@ extension LabelNode: LayoutableWithFont {
     public var font: UIFont! {
         switch text {
         case .Attributed(let attr):
-            if attr.length > 0 {
+            if let attr = attr where attr.length > 0 {
                 var ptr = NSRange()
                 return attr.attribute(NSFontAttributeName, atIndex: 0, effectiveRange: &ptr) as? UIFont
             } else {

LayoutOps/LayoutOps/SwitchNode.swift

@@ -0,0 +1,26 @@
+//
+//  Created by Pavel Sharanda on 23.11.16.
+//  Copyright © 2016 Pavel Sharanda. All rights reserved.
+//
+
+import UIKit
+
+public class SwitchNode: AnyNode {
+    
+    
+    public init<T: UISwitch>(tag: Taggable, image: UIImage?, subnodes: [AnyNode] = [], initializer: (T?)->T) {
+    
+        super.init(tag: tag, subnodes: subnodes) { (imageView: T?) -> T in
+            return initializer(imageView)
+        }
+    }
+    
+    public override func sizeThatFits(size: CGSize) -> CGSize {
+        
+        struct Cache {
+            static let switchView = UISwitch()
+        }
+        
+        return Cache.switchView.sizeThatFits(size)
+    }
+}