development: updated willRenderView to willLayout

Sources/iOS/BarView.swift

@@ -63,9 +63,10 @@ open class BarView: ContentView {
 	
     open override func layoutSubviews() {
         super.layoutSubviews()
-        if willRenderView {
-            divider.reload()
+        guard willLayout else {
+            return
         }
+        divider.reload()
     }
     
 	/**

Sources/iOS/ContentCard.swift

@@ -31,27 +31,71 @@
 import UIKit
 
 open class ContentCard: PulseView {
+    /// Will render the view.
+    open var willLayout: Bool {
+        return 0 < width && 0 < height && nil != superview
+    }
+    
+    /// A preset wrapper around contentInset.
+    open var contentEdgeInsetsPreset: EdgeInsetsPreset {
+        get {
+            return grid.contentEdgeInsetsPreset
+        }
+        set(value) {
+            grid.contentEdgeInsetsPreset = value
+        }
+    }
+    
+    /// A wrapper around grid.contentInset.
+    @IBInspectable
+    open var contentEdgeInsets: EdgeInsets {
+        get {
+            return grid.contentEdgeInsets
+        }
+        set(value) {
+            grid.contentEdgeInsets = value
+        }
+    }
+    
+    /// A preset wrapper around interimSpace.
+    open var interimSpacePreset = InterimSpacePreset.none {
+        didSet {
+            interimSpace = InterimSpacePresetToValue(preset: interimSpacePreset)
+        }
+    }
+    
+    /// A wrapper around grid.interimSpace.
+    @IBInspectable
+    open var interimSpace: InterimSpace {
+        get {
+            return grid.interimSpace
+        }
+        set(value) {
+            grid.interimSpace = value
+        }
+    }
+    
     /// An internal reference to the titleToolbar.
     internal var internalTitleToolbar: Toolbar?
     
+    /// An internal reference to the contentView.
+    internal var internalContentView: UIView?
+    
+    /// An internal reference to the detailToolbar.
+    internal var internalDetailToolbar: Toolbar?
+    
     /// A reference to the titleToolbar.
     open var titleToolbar: Toolbar {
         prepareTitleToolbar()
         return internalTitleToolbar!
     }
     
-    /// An internal reference to the contentView.
-    internal var internalContentView: UIView?
-    
     /// A reference to the contentView.
     open var contentView: UIView {
         prepareContentView()
         return internalContentView!
     }
     
-    /// An internal reference to the detailToolbar.
-    internal var internalDetailToolbar: Toolbar?
-    
     /// A reference to the detailToolbar.
     open var detailToolbar: Toolbar {
         prepareDetailToolbar()
@@ -70,15 +114,36 @@ open class ContentCard: PulseView {
         pulseAnimation = .none
     }
     
-    /// Reloads the
-    open func reload() {
+    open override func layoutSubviews() {
+        super.layoutSubviews()
+        guard willLayout else {
+            return
+        }
+        
         // clear constraints so new ones do not conflict
         removeConstraints(constraints)
         for v in subviews {
             v.removeFromSuperview()
         }
         
+        var h: CGFloat = 0
+        
+        if let v = internalTitleToolbar {
+            v.layoutIfNeeded()
+            h += v.height
+        }
+        
+        if let v = internalContentView {
+            v.layoutIfNeeded()
+            h += v.height
+        }
+        
+        if let v = internalDetailToolbar {
+            v.layoutIfNeeded()
+            h += v.height
+        }
         
+        height = h
     }
     
     /// Prepares the titleToolbar.

Sources/iOS/ContentView.swift

@@ -45,7 +45,7 @@ open class ContentView: View {
     }
     
 	/// Will render the view.
-	open var willRenderView: Bool {
+	open var willLayout: Bool {
 		return 0 < width && 0 < height && nil != superview
 	}
 	
@@ -162,7 +162,10 @@ open class ContentView: View {
 	
 	open override func layoutSubviews() {
 		super.layoutSubviews()
-		if willRenderView {
+        guard willLayout else {
+            return
+        }
+        
         var lc = 0
         var rc = 0
         let l = (CGFloat(leftControls.count) * interimSpace)
@@ -213,7 +216,6 @@ open class ContentView: View {
         grid.commit()
         contentView.grid.commit()
     }
-    }
     
 	/**
      Prepares the view instance when intialized. When subclassing,

Sources/iOS/Menu.swift

@@ -270,7 +270,7 @@ open class Menu: View {
                 usingSpringWithDamping: usingSpringWithDamping,
                 initialSpringVelocity: initialSpringVelocity,
                 options: options,
-                animations: { [weak self, base = base, v = views[i]] in
+                animations: { [base = base, v = views[i]] in
                     v.alpha = 0
                     v.y = base.y
                     
@@ -366,11 +366,7 @@ open class Menu: View {
                 usingSpringWithDamping: usingSpringWithDamping,
                 initialSpringVelocity: initialSpringVelocity,
                 options: options,
-                animations: { [weak self, base = base, v = views[i]] in
-                    guard let s = self else {
-                        return
-                    }
-                    
+                animations: { [base = base, v = views[i]] in
                     v.alpha = 0
                     v.y = base.y + h
                     
@@ -462,7 +458,7 @@ open class Menu: View {
                 usingSpringWithDamping: usingSpringWithDamping,
                 initialSpringVelocity: initialSpringVelocity,
                 options: options,
-                animations: { [weak self, v = views[i]] in
+                animations: { [v = views[i]] in
                     v.alpha = 0
                     v.x = base.x
                     
@@ -553,19 +549,14 @@ open class Menu: View {
         let w = baseSize.width
         
         for i in 1..<views.count {
-            
             UIView.animate(withDuration: Double(i) * duration,
                 delay: delay,
                 usingSpringWithDamping: usingSpringWithDamping,
                 initialSpringVelocity: initialSpringVelocity,
                 options: options,
-                animations: { [weak self, base = base, v = views[i]] in
-                    guard let s = self else {
-                        return
-                    }
-                    
+                animations: { [base = base, v = views[i]] in
                     v.alpha = 0
-                    v.x = s.x + w
+                    v.x = base.x + w
                     
                     animations?(v)
                 }) { [weak self, v = views[i]] _ in

Sources/iOS/MenuController.swift

@@ -67,11 +67,7 @@ open class MenuController: RootController {
                 }
                 s.rootViewController.view.alpha = 0.25
             })
-            menu.open { [weak self] (view) in
-                guard let s = self else {
-                    return
-                }
-                
+            menu.open { [completion = completion] (view) in
                 completion?(view)
             }
 		}

Sources/iOS/NavigationBar.swift

@@ -60,7 +60,7 @@ open class NavigationBar: UINavigationBar {
 	internal var animating = false
 	
 	/// Will render the view.
-	open var willRenderView: Bool {
+	open var willLayout: Bool {
 		return 0 < width && 0 < height && nil != superview
 	}
 	
@@ -190,7 +190,10 @@ open class NavigationBar: UINavigationBar {
      - Parameter item: A UINavigationItem to layout.
      */
 	internal func layoutNavigationItem(item: UINavigationItem) {
-        if willRenderView {
+        guard willLayout else {
+            return
+        }
+        
         prepareItem(item: item)
         prepareTitleView(item: item)
         
@@ -282,7 +285,6 @@ open class NavigationBar: UINavigationBar {
             item.detailLabel.removeFromSuperview()
         }
 	}
-	}
 	
 	/**
      Prepares the view instance when intialized. When subclassing,

Sources/iOS/SearchBar.swift

@@ -92,11 +92,13 @@ open class SearchBar: BarView {
 	
 	open override func layoutSubviews() {
 		super.layoutSubviews()
-		if willRenderView {
+        guard willLayout else {
+            return
+        }
+        
         textField.frame = contentView.bounds
         layoutClearButton()
 	}
-	}
 	
 	/**
 	An initializer that initializes the object with a NSCoder object.

Sources/iOS/Snackbar.swift

@@ -79,9 +79,11 @@ open class Snackbar: BarView {
     
     open override func layoutSubviews() {
         super.layoutSubviews()
-        if willRenderView {
-            textLabel.frame = contentView.bounds
+        guard willLayout else {
+            return
         }
+        
+        textLabel.frame = contentView.bounds
     }
     
     /**

Sources/iOS/TabBar.swift

@@ -129,7 +129,10 @@ open class TabBar: BarView {
     
     open override func layoutSubviews() {
 		super.layoutSubviews()
-		if willRenderView {
+        guard willLayout else {
+            return
+        }
+        
         guard 0 < buttons.count else {
             return
         }
@@ -152,7 +155,6 @@ open class TabBar: BarView {
             
         line.frame = CGRect(x: selected!.x, y: .bottom == lineAlignment ? height - lineHeight : 0, width: selected!.width, height: lineHeight)
 	}
-	}
 	
 	/// Handles the button touch event.
     @objc

Sources/iOS/Toolbar.swift

@@ -102,7 +102,10 @@ open class Toolbar: BarView {
     
     open override func layoutSubviews() {
         super.layoutSubviews()
-        if willRenderView {
+        guard willLayout else {
+            return
+        }
+        
         if nil != title && "" != title {
             if nil == titleLabel.superview {
                 contentView.addSubview(titleLabel)
@@ -136,7 +139,6 @@ open class Toolbar: BarView {
             detailLabel.removeFromSuperview()
         }
     }
-    }
 
 	/**
      Prepares the view instance when intialized. When subclassing,