Commit 55ab6425 by Daniel Dahan

development: moved PageBarController to PageTabBarController and PageBar to TabBar

parent d452c8b7
...@@ -32,15 +32,15 @@ import UIKit ...@@ -32,15 +32,15 @@ import UIKit
extension UIViewController { extension UIViewController {
/** /**
A convenience property that provides access to the PageBarController. A convenience property that provides access to the PageTabBarController.
This is the recommended method of accessing the PageBarController This is the recommended method of accessing the PageTabBarController
through child UIViewControllers. through child UIViewControllers.
*/ */
public var pageBarController: PageBarController? { public var pageTabBarController: PageTabBarController? {
var viewController: UIViewController? = self var viewController: UIViewController? = self
while nil != viewController { while nil != viewController {
if viewController is PageBarController { if viewController is PageTabBarController {
return viewController as? PageBarController return viewController as? PageTabBarController
} }
viewController = viewController?.parent viewController = viewController?.parent
} }
...@@ -48,18 +48,18 @@ extension UIViewController { ...@@ -48,18 +48,18 @@ extension UIViewController {
} }
} }
@objc(PageBarControllerDelegate) @objc(PageTabBarControllerDelegate)
public protocol PageBarControllerDelegate: MaterialDelegate { public protocol PageTabBarControllerDelegate: MaterialDelegate {
} }
@objc(PageBarController) @objc(PageTabBarController)
open class PageBarController: RootController { open class PageTabBarController: RootController {
/// Reference to the PageBar. /// Reference to the TabBar.
open internal(set) var pageBar: PageBar! open internal(set) var tabBar: TabBar!
/// Delegation handler. /// Delegation handler.
public weak var delegate: PageBarControllerDelegate? public weak var delegate: PageTabBarControllerDelegate?
/** /**
To execute in the order of the layout chain, override this To execute in the order of the layout chain, override this
...@@ -68,7 +68,7 @@ open class PageBarController: RootController { ...@@ -68,7 +68,7 @@ open class PageBarController: RootController {
*/ */
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard let v = pageBar else { guard let v = tabBar else {
return return
} }
...@@ -94,15 +94,15 @@ open class PageBarController: RootController { ...@@ -94,15 +94,15 @@ open class PageBarController: RootController {
*/ */
open override func prepareView() { open override func prepareView() {
super.prepareView() super.prepareView()
preparePageBar() prepareTabBar()
} }
/// Prepares the pageBar. /// Prepares the tabBar.
private func preparePageBar() { private func prepareTabBar() {
if nil == pageBar { if nil == tabBar {
pageBar = PageBar() tabBar = TabBar()
pageBar.zPosition = 1000 tabBar.zPosition = 1000
view.addSubview(pageBar) view.addSubview(tabBar)
} }
} }
} }
...@@ -30,18 +30,18 @@ ...@@ -30,18 +30,18 @@
import UIKit import UIKit
@objc(PageBarLineAlignment) @objc(TabBarLineAlignment)
public enum PageBarLineAlignment: Int { public enum TabBarLineAlignment: Int {
case top case top
case bottom case bottom
} }
open class PageBar: View { open class TabBar: View {
/// A reference to the line UIView. /// A reference to the line UIView.
open internal(set) var line: UIView! open internal(set) var line: UIView!
/// A value for the line alignment. /// A value for the line alignment.
open var lineAlignment: PageBarLineAlignment = .bottom { open var lineAlignment: TabBarLineAlignment = .bottom {
didSet { didSet {
layoutSubviews() layoutSubviews()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment