development: updated ControlView and NavigationBar grid layouts

51a7d750 · Daniel Dahan · 9efac5ec · 51a7d750 · 51a7d750 · 51a7d750
Commit 51a7d750 authored Aug 28, 2016 by Daniel Dahan
7 changed files
--- a/Sources/iOS/ControlView.swift
+++ b/Sources/iOS/ControlView.swift
@@ -48,7 +48,7 @@ open class ControlView: View {
 	/// A wrapper around grid.contentInset.
 	@IBInspectable
-    open var contentInset: EdgeInsets {
+    open var contentEdgeInsets: EdgeInsets {
 		get {
 			return grid.contentEdgeInsets
 		}
@@ -151,49 +151,48 @@ open class ControlView: View {
 		if willRenderView {
 			layoutIfNeeded()
-			let g = Int(width / gridFactor)
+            let l = (CGFloat(leftControls.count) * interimSpace)
-            let columns = g + 1
+            let r = (CGFloat(rightControls.count) * interimSpace)
+            let p = width - l - r - contentEdgeInsets.left - contentEdgeInsets.right
+			let columns = Int(p / gridFactor)
-            grid.views = []
+            grid.views.removeAll()
            grid.axis.columns = columns
            contentView.grid.columns = columns
-            // leftControls
+            for v in leftControls {
-            for c in leftControls {
+                var w: CGFloat = 0
-                let w: CGFloat = c.intrinsicContentSize.width
+                if let b = v as? UIButton {
-                (c as? UIButton)?.contentEdgeInsets = .zero
+                    b.contentEdgeInsets = .zero
-                c.height = frame.size.height - contentInset.top - contentInset.bottom
+                    b.sizeToFit()
+                    w = b.width
+                }
+                v.height = frame.size.height - contentEdgeInsets.top - contentEdgeInsets.bottom
+                v.grid.columns = Int(ceil(w / gridFactor)) + 1
-                let q: Int = Int(w / gridFactor)
+                contentView.grid.columns -= v.grid.columns
-                c.grid.columns = q + 1
-                contentView.grid.columns -= c.grid.columns
+                grid.views.append(v)
-                addSubview(c)
-                grid.views.append(c)
            }
-            addSubview(contentView)
            grid.views.append(contentView)
-            // rightControls
+            for v in rightControls {
-            for c in rightControls {
+                var w: CGFloat = 0
-                let w = c.intrinsicContentSize.width
+                if let b = v as? UIButton {
-                (c as? UIButton)?.contentEdgeInsets = .zero
+                    b.contentEdgeInsets = .zero
-                c.height = frame.size.height - contentInset.top - contentInset.bottom
+                    b.sizeToFit()
+                    w = b.width
-                let q: Int = Int(w / gridFactor)
+                }
-                c.grid.columns = q + 1
+                v.height = frame.size.height - contentEdgeInsets.top - contentEdgeInsets.bottom
+                v.grid.columns = Int(ceil(w / gridFactor)) + 1
-                contentView.grid.columns -= c.grid.columns
+                contentView.grid.columns -= v.grid.columns
-                addSubview(c)
+                grid.views.append(v)
-                grid.views.append(c)
            }
-            grid.contentEdgeInsets = contentInset
-            grid.interimSpace = interimSpace
            contentView.grid.reload()
        }
    }

--- a/Sources/iOS/NavigationBar.swift
+++ b/Sources/iOS/NavigationBar.swift
@@ -61,19 +61,19 @@ open class NavigationBar: UINavigationBar {
 	/// Will render the view.
 	open var willRenderView: Bool {
-		return 0 < width && 0 < height && nil != superview
+		return 0 < width && 0 < height
 	}
 	/// A preset wrapper around contentInset.
 	open var contentEdgeInsetsPreset = EdgeInsetsPreset.none {
 		didSet {
-            contentInset = EdgeInsetsPresetToValue(preset: contentEdgeInsetsPreset)
+            contentEdgeInsets = EdgeInsetsPresetToValue(preset: contentEdgeInsetsPreset)
 		}
 	}
 	/// A wrapper around grid.contentInset.
 	@IBInspectable
-    open var contentInset = EdgeInsets.zero {
+    open var contentEdgeInsets = EdgeInsets.zero {
 		didSet {
 			layoutSubviews()
 		}
@@ -175,7 +175,9 @@ open class NavigationBar: UINavigationBar {
 			layoutNavigationItem(item: v)
 		}
-        divider?.reload()
+        if let v = divider {
+            v.reload()
+        }
 	}
 	open override func pushItem(_ item: UINavigationItem, animated: Bool) {
@@ -194,52 +196,51 @@ open class NavigationBar: UINavigationBar {
 			let titleView = prepareTitleView(item: item)
            let contentView = prepareContentView(item: item)
-            let g = Int(width / gridFactor)
+            let l = (CGFloat(item.leftControls.count) * interimSpace)
-            let columns = g + 1
+            let r = (CGFloat(item.rightControls.count) * interimSpace)
+            let p = width - l - r - contentEdgeInsets.left - contentEdgeInsets.right
+            let columns = Int(p / gridFactor)
            titleView.frame.origin = .zero
            titleView.frame.size = intrinsicContentSize
-            titleView.grid.views = []
+            titleView.grid.views.removeAll()
            titleView.grid.axis.columns = columns
            contentView.grid.columns = columns
-            // leftControls
+            for v in item.leftControls {
-            if let v = item.leftControls {
+                var w: CGFloat = 0
-                for c in v {
+                if let b = v as? UIButton {
-                    let w = c.intrinsicContentSize.width
+                    b.contentEdgeInsets = .zero
-                    (c as? UIButton)?.contentEdgeInsets = .zero
+                    b.sizeToFit()
-                    c.height = titleView.height - contentInset.top - contentInset.bottom
+                    w = b.width
-                    c.grid.columns = Int(w / gridFactor) + 1
-                    contentView.grid.columns -= c.grid.columns
-                    titleView.addSubview(c)
-                    titleView.grid.views.append(c)
                }
+                v.height = frame.size.height - contentEdgeInsets.top - contentEdgeInsets.bottom
+                v.grid.columns = Int(ceil(w / gridFactor)) + 1
+                contentView.grid.columns -= v.grid.columns
+                titleView.grid.views.append(v)
            }
-            titleView.addSubview(contentView)
            titleView.grid.views.append(contentView)
-            // rightControls
+            for v in item.rightControls {
-            if let v = item.rightControls {
+                var w: CGFloat = 0
-                for c in v {
+                if let b = v as? UIButton {
-                    let w = c.intrinsicContentSize.width
+                    b.contentEdgeInsets = .zero
-                    (c as? UIButton)?.contentEdgeInsets = .zero
+                    b.sizeToFit()
-                    c.height = titleView.height - contentInset.top - contentInset.bottom
+                    w = b.width
-                    c.grid.columns = Int(w / gridFactor) + 1
-                    contentView.grid.columns -= c.grid.columns
-                    titleView.addSubview(c)
-                    titleView.grid.views.append(c)
                }
+                v.height = frame.size.height - contentEdgeInsets.top - contentEdgeInsets.bottom
+                v.grid.columns = Int(ceil(w / gridFactor)) + 1
+                contentView.grid.columns -= v.grid.columns
+                titleView.grid.views.append(v)
            }
-            titleView.grid.contentEdgeInsets = contentInset
+            titleView.grid.contentEdgeInsets = contentEdgeInsets
            titleView.grid.interimSpace = interimSpace
            titleView.grid.reload()

--- a/Sources/iOS/NavigationController.swift
+++ b/Sources/iOS/NavigationController.swift
@@ -43,7 +43,7 @@ extension UINavigationController {
 }
 @IBDesignable
-open class NavigationController: UINavigationController, UIGestureRecognizerDelegate {
+open class NavigationController: UINavigationController {
    /**
     An initializer that initializes the object with a NSCoder object.
     - Parameter aDecoder: A NSCoder instance.
@@ -72,15 +72,20 @@ open class NavigationController: UINavigationController, UIGestureRecognizerDele
 	open override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
-		if let v = interactivePopGestureRecognizer {
+		guard let v = interactivePopGestureRecognizer else {
-			if let x = navigationDrawerController {
+            return
-				if let l = x.leftPanGesture {
+        }
-					l.require(toFail: v)
-				}
+        guard let x = navigationDrawerController else {
-				if let r = x.rightPanGesture {
+            return
-					r.require(toFail: v)
+        }
-				}
-			}
+        if let l = x.leftPanGesture {
+            l.require(toFail: v)
+        }
+        if let r = x.rightPanGesture {
+            r.require(toFail: v)
 		}
 	}
@@ -100,49 +105,6 @@ open class NavigationController: UINavigationController, UIGestureRecognizerDele
 	}
 	/**
-     Detects the gesture recognizer being used. This is necessary when using
-     NavigationDrawerController. It eliminates the conflict in panning.
-     - Parameter gestureRecognizer: A UIGestureRecognizer to detect.
-     - Parameter touch: The UITouch event.
-     - Returns: A Boolean of whether to continue the gesture or not, true yes, false no.
-     */
-	open func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
-		return interactivePopGestureRecognizer == gestureRecognizer && nil != navigationBar.backItem
-	}
-	/**
-     Delegation method that is called when a new UINavigationItem is about to be pushed.
-     This is used to prepare the transitions between UIViewControllers on the stack.
-     - Parameter navigationBar: A UINavigationBar that is used in the NavigationController.
-     - Parameter item: The UINavigationItem that will be pushed on the stack.
-     - Returns: A Boolean value that indicates whether to push the item on to the stack or not.
-     True is yes, false is no.
-     */
-	open func navigationBar(navigationBar: UINavigationBar, shouldPushItem item: UINavigationItem) -> Bool {
-		if let v = navigationBar as? NavigationBar {
-            let backButton = IconButton(image: v.backButtonImage)
-			backButton.pulseColor = Color.white
-            backButton.addTarget(self, action: #selector(handleBackButton), for: .touchUpInside)
-			if var c = item.leftControls {
-				c.append(backButton)
-				item.leftControls = c
-			} else {
-				item.leftControls = [backButton]
-			}
-			item.backButton = backButton
-			v.layoutNavigationItem(item: item)
-		}
-		return true
-	}
-	/// Handler for the back button.
-	internal func handleBackButton() {
-		popViewController(animated: true)
-	}
-	/**
     Prepares the view instance when intialized. When subclassing,
     it is recommended to override the prepareView method
     to initialize property values and other setup operations.
@@ -153,10 +115,51 @@ open class NavigationController: UINavigationController, UIGestureRecognizerDele
 		view.clipsToBounds = true
 		view.contentScaleFactor = Device.scale
-		// This ensures the panning gesture is available when going back between views.
+        // This ensures the panning gesture is available when going back between views.
 		if let v = interactivePopGestureRecognizer {
 			v.isEnabled = true
 			v.delegate = self
 		}
 	}
 }
+extension NavigationController: UINavigationBarDelegate {
+    /**
+     Delegation method that is called when a new UINavigationItem is about to be pushed.
+     This is used to prepare the transitions between UIViewControllers on the stack.
+     - Parameter navigationBar: A UINavigationBar that is used in the NavigationController.
+     - Parameter item: The UINavigationItem that will be pushed on the stack.
+     - Returns: A Boolean value that indicates whether to push the item on to the stack or not.
+     True is yes, false is no.
+     */
+    public func navigationBar(_ navigationBar: UINavigationBar, shouldPush item: UINavigationItem) -> Bool {
+        if let v = navigationBar as? NavigationBar {
+            let backButton = IconButton(image: v.backButtonImage, tintColor: Color.blue.base)
+            backButton.pulseColor = Color.white
+            backButton.addTarget(self, action: #selector(handleBackButton), for: .touchUpInside)
+            item.leftControls.append(backButton)
+            item.backButton = backButton
+            v.layoutNavigationItem(item: item)
+        }
+        return true
+    }
+    /// Handler for the back button.
+    internal func handleBackButton() {
+        popViewController(animated: true)
+    }
+}
+extension NavigationController: UIGestureRecognizerDelegate {
+    /**
+     Detects the gesture recognizer being used. This is necessary when using
+     NavigationDrawerController. It eliminates the conflict in panning.
+     - Parameter gestureRecognizer: A UIGestureRecognizer to detect.
+     - Parameter touch: The UITouch event.
+     - Returns: A Boolean of whether to continue the gesture or not, true yes, false no.
+     */
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        return interactivePopGestureRecognizer == gestureRecognizer && nil != navigationBar.backItem
+    }
+}
--- a/Sources/iOS/NavigationItem.swift
+++ b/Sources/iOS/NavigationItem.swift
@@ -53,10 +53,10 @@ public class NavigationItem {
 	public private(set) var detailLabel: UILabel!
 	/// Left controls.
-	public var leftControls: [UIView]?
+	public var leftControls = [UIView]()
 	/// Right controls.
-	public var rightControls: [UIView]?
+	public var rightControls = [UIView]()
 	/// Initializer.
 	public init() {
@@ -153,7 +153,7 @@ extension UINavigationItem {
 	}
 	/// Left side UIViews.
-	public var leftControls: [UIView]? {
+	public var leftControls: [UIView] {
 		get {
 			return navigationItem.leftControls
 		}
@@ -163,7 +163,7 @@ extension UINavigationItem {
 	}
 	/// Right side UIViews.
-	public var rightControls: [UIView]? {
+	public var rightControls: [UIView] {
 		get {
 			return navigationItem.rightControls
 		}

--- a/Sources/iOS/Snackbar.swift
+++ b/Sources/iOS/Snackbar.swift
@@ -49,7 +49,7 @@ open class Snackbar: BarView {
    }
    /// Text label.
-    public private(set) var textLabel: UILabel!
+    public internal(set) var textLabel: UILabel!
    open override var intrinsicContentSize: CGSize {
        return CGSize(width: width, height: 49)
@@ -58,22 +58,6 @@ open class Snackbar: BarView {
    /// The status of the snackbar.
    open internal(set) var status = SnackbarStatus.notVisible
-    open override func layoutSubviews() {
-        super.layoutSubviews()
-        if willRenderView {
-            if nil != text && "" != text {
-                if nil == textLabel.superview {
-                    contentView.addSubview(textLabel)
-                }
-                textLabel.frame = contentView.bounds
-            } else {
-                textLabel.removeFromSuperview()
-            }
-            contentView.grid.reload()
-        }
-    }
    /**
     Prepares the view instance when intialized. When subclassing,
     it is recommended to override the prepareView method
@@ -83,9 +67,10 @@ open class Snackbar: BarView {
     */
    open override func prepareView() {
        super.prepareView()
+        interimSpace = 24
+        contentEdgeInsets.left = interimSpace
+        contentEdgeInsets.right = interimSpace
        backgroundColor = Color.grey.darken3
-        grid.contentEdgeInsets = EdgeInsets(top: 0, left: 24, bottom: 0, right: 24)
-        grid.interimSpace = 24
        prepareTextLabel()
    }
@@ -96,5 +81,6 @@ open class Snackbar: BarView {
        textLabel.font = RobotoFont.medium(with: 14)
        textLabel.textAlignment = .left
        textLabel.textColor = Color.white
+        contentView.grid.views.append(textLabel)
    }
 }
--- a/Sources/iOS/SnackbarController.swift
+++ b/Sources/iOS/SnackbarController.swift
@@ -92,6 +92,7 @@ open class SnackbarController: RootController {
     */
    open func animate(snackbar status: SnackbarStatus, animations: (@escaping (Snackbar) -> Void)? = nil, completion: (@escaping (Snackbar) -> Void)? = nil) {
        isAnimating = true
+        isUserInteractionEnabled = false
        UIView.animate(withDuration: 0.25, animations: { [weak self, status = status, animations = animations] in
            guard let s = self else {
                return
@@ -105,6 +106,7 @@ open class SnackbarController: RootController {
            }
            s.isAnimating = false
+            s.isUserInteractionEnabled = true
            s.snackbar.status = status
            completion?(s.snackbar)
        }

--- a/Sources/iOS/Toolbar.swift
+++ b/Sources/iOS/Toolbar.swift
@@ -43,7 +43,7 @@ open class Toolbar: BarView {
 	}
 	/// Title label.
-	open private(set) var titleLabel: UILabel!
+	open internal(set) var titleLabel: UILabel!
 	/// A convenience property to set the detailLabel text.
 	open var detail: String? {
@@ -57,7 +57,7 @@ open class Toolbar: BarView {
 	}
 	/// Detail label.
-	open private(set) var detailLabel: UILabel!
+	open internal(set) var detailLabel: UILabel!
 	open override func layoutSubviews() {
 		super.layoutSubviews()