updated ToolbarController and SearchBarController to accept alignment properties

112992a8 · Daniel Dahan · 6fe0628b · 112992a8 · 112992a8 · 112992a8
Commit 112992a8 authored Aug 16, 2017 by Daniel Dahan
7 changed files
--- a/Material.xcodeproj/project.pbxproj
+++ b/Material.xcodeproj/project.pbxproj
--- a/README.md
+++ b/README.md
@@ -18,8 +18,6 @@ Take a look at a sample [Photos](https://github.com/CosmicMind/Samples/tree/mast
 ![Photos](http://www.cosmicmind.com/motion/projects/photos.gif)
-* [Photos Sample](https://github.com/CosmicMind/Samples/tree/master/Projects/Programmatic/Photos)
 ## Sample Projects
 Take a look at [Sample Projects](https://github.com/CosmicMind/Samples) to get your projects started.

--- a/Sources/iOS/ImageCard.swift
+++ b/Sources/iOS/ImageCard.swift
@@ -30,12 +30,6 @@
 import UIKit
-@objc(ToolbarAlignment)
-public enum ToolbarAlignment: Int {
-    case top
-    case bottom
-}
 open class ImageCard: Card {
    /**
     A Display value to indicate whether or not to

--- a/Sources/iOS/SearchBar.swift
+++ b/Sources/iOS/SearchBar.swift
@@ -148,7 +148,7 @@ open class SearchBar: Bar {
            return
        }
-        textField.frame = contentView.bounds
+        layoutTextField()
        layoutLeftView()
        layoutClearButton()
    }
@@ -161,10 +161,9 @@ open class SearchBar: Bar {
 }
 extension SearchBar {
-    /// Layout the clearButton.
+    /// Layout the textField.
-    open func layoutClearButton() {
+    open func layoutTextField() {
-        let h = textField.frame.height
+        textField.frame = contentView.bounds
-        clearButton.frame = CGRect(x: textField.frame.width - h - 4, y: 4, width: h, height: h - 8)
    }
    /// Layout the leftView.
@@ -178,12 +177,18 @@ extension SearchBar {
        (v as? UIImageView)?.contentMode = .scaleAspectFit
    }
+    /// Layout the clearButton.
+    open func layoutClearButton() {
+        let h = textField.frame.height
+        clearButton.frame = CGRect(x: textField.frame.width - h - 4, y: 4, width: h, height: h - 8)
+    }
 }
-extension SearchBar {
+fileprivate extension SearchBar {
    /// Clears the textField text.
    @objc
-    fileprivate func handleClearButton() {
+    func handleClearButton() {
        guard nil == textField.delegate?.textFieldShouldClear || true == textField.delegate?.textFieldShouldClear?(textField) else {
            return
        }
@@ -199,14 +204,14 @@ extension SearchBar {
    // Live updates the search results.
    @objc
-    fileprivate func handleEditingChanged(textField: UITextField) {
+    func handleEditingChanged(textField: UITextField) {
        delegate?.searchBar?(searchBar: self, didChange: textField, with: textField.text)
    }
 }
-extension SearchBar {
+fileprivate extension SearchBar {
    /// Prepares the textField.
-    fileprivate func prepareTextField() {
+    func prepareTextField() {
        textField.contentScaleFactor = Screen.scale
        textField.font = RobotoFont.regular(with: 17)
        textField.backgroundColor = Color.clear
@@ -219,7 +224,7 @@ extension SearchBar {
    }
    /// Prepares the clearButton.
-    fileprivate func prepareClearButton() {
+    func prepareClearButton() {
        clearButton = IconButton(image: Icon.cm.close, tintColor: placeholderColor)
        clearButton.contentEdgeInsets = .zero
        isClearButtonAutoHandleEnabled = true

--- a/Sources/iOS/SearchBarController.swift
+++ b/Sources/iOS/SearchBarController.swift
@@ -61,45 +61,62 @@ open class SearchBarController: StatusBarController {
 	open override func layoutSubviews() {
 		super.layoutSubviews()
+        layoutSearchBar()
-        let y = Application.shouldStatusBarBeHidden || statusBar.isHidden ? 0 : statusBar.height
+        layoutContainer()
+        layoutRootViewController()
-        searchBar.y = y
-        searchBar.width = view.width
-        switch displayStyle {
-        case .partial:
-            let h = y + searchBar.height
-            container.y = h
-            container.height = view.height - h
-        case .full:
-            container.frame = view.bounds
-        }
-        rootViewController.view.frame = container.bounds
 	}
 	open override func prepare() {
 		super.prepare()
        displayStyle = .partial
-        prepareStatusBar()
+    	prepareSearchBar()
-		prepareSearchBar()
 	}
 }
 fileprivate extension SearchBarController {
-    /// Prepares the statusBar.
-    func prepareStatusBar() {
-        shouldHideStatusBarOnRotation = false
-    }
    /// Prepares the searchBar.
    func prepareSearchBar() {
-        searchBar.depthPreset = .depth1
        searchBar.zPosition = 1000
+        searchBar.depthPreset = .depth1
        view.addSubview(searchBar)
    }
 }
+fileprivate extension SearchBarController {
+    /// Layout the container.
+    func layoutContainer() {
+        switch displayStyle {
+        case .partial:
+            let p = searchBar.height
+            let q = statusBarOffsetAdjustment
+            let h = view.height - p - q
+            switch searchBarAlignment {
+            case .top:
+                container.y = q + p
+                container.height = h
+            case .bottom:
+                container.y = q
+                container.height = h
+            }
+            container.width = view.width
+        case .full:
+            container.frame = view.bounds
+        }
+    }
+    /// Layout the searchBar.
+    func layoutSearchBar() {
+        searchBar.x = 0
+        searchBar.y = .top == searchBarAlignment ? statusBarOffsetAdjustment : view.height - searchBar.height
+        searchBar.width = view.width
+    }
+    /// Layout the rootViewController.
+    func layoutRootViewController() {
+        rootViewController.view.frame = container.bounds
+    }
+}
--- a/Sources/iOS/StatusBarController.swift
+++ b/Sources/iOS/StatusBarController.swift
@@ -74,8 +74,13 @@ open class StatusBarController: TransitionController {
        }
    }
+    /// An adjustment based on the rules for displaying the statusBar.
+    open var statusBarOffsetAdjustment: CGFloat {
+        return Application.shouldStatusBarBeHidden || statusBar.isHidden ? 0 : statusBar.height
+    }
    /// A boolean that indicates to hide the statusBar on rotation.
-    open var shouldHideStatusBarOnRotation = true
+    open var shouldHideStatusBarOnRotation = false
    /// A reference to the statusBar.
    open let statusBar = UIView()
@@ -99,7 +104,9 @@ open class StatusBarController: TransitionController {
        }
        rootViewController.view.frame = container.bounds
-	}
+        container.zPosition = statusBar.zPosition + (Application.shouldStatusBarBeHidden ? 1 : -1)
+    }
 	open override func prepare() {
        super.prepare()

--- a/Sources/iOS/ToolbarController.swift
+++ b/Sources/iOS/ToolbarController.swift
@@ -30,6 +30,12 @@
 import UIKit
+@objc(ToolbarAlignment)
+public enum ToolbarAlignment: Int {
+    case top
+    case bottom
+}
 public extension UIViewController {
    /**
     A convenience property that provides access to the ToolbarController.
@@ -47,6 +53,13 @@ open class ToolbarController: StatusBarController {
    @IBInspectable
    open let toolbar = Toolbar()
+    /// The toolbar alignment.
+    open var toolbarAlignment = ToolbarAlignment.top {
+        didSet {
+            layoutSubviews()
+        }
+    }
    open override func layoutSubviews() {
 		super.layoutSubviews()
        layoutToolbar()
@@ -57,44 +70,52 @@ open class ToolbarController: StatusBarController {
 	open override func prepare() {
 		super.prepare()
        displayStyle = .partial
-        prepareStatusBar()
        prepareToolbar()
 	}
 }
 fileprivate extension ToolbarController {
-    /// Prepares the statusBar.
-    func prepareStatusBar() {
-        shouldHideStatusBarOnRotation = false
-    }
    /// Prepares the toolbar.
    func prepareToolbar() {
+        toolbar.zPosition = 1000
        toolbar.depthPreset = .depth1
        view.addSubview(toolbar)
    }
 }
 fileprivate extension ToolbarController {
-    /// Layout the toolbar.
-    func layoutToolbar() {
-        toolbar.y = Application.shouldStatusBarBeHidden || statusBar.isHidden ? 0 : statusBar.height
-        toolbar.width = view.width
-    }
    /// Layout the container.
    func layoutContainer() {
        switch displayStyle {
        case .partial:
-            let h = toolbar.y + toolbar.height
+            let p = toolbar.height
-            container.y = h
+            let q = statusBarOffsetAdjustment
-            container.height = view.height - h
+            let h = view.height - p - q
+            switch toolbarAlignment {
+            case .top:
+                container.y = q + p
+                container.height = h
+            case .bottom:
+                container.y = q
+                container.height = h
+            }
+            container.width = view.width
        case .full:
            container.frame = view.bounds
        }
    }
+    /// Layout the toolbar.
+    func layoutToolbar() {
+        toolbar.x = 0
+        toolbar.y = .top == toolbarAlignment ? statusBarOffsetAdjustment : view.height - toolbar.height
+        toolbar.width = view.width
+    }
    /// Layout the rootViewController.
    func layoutRootViewController() {
        rootViewController.view.frame = container.bounds