Commit 75c4665b by Daniel Dahan

development: updated leftControls and rightControls to leftViews and rightViews, respectively

parent 09cdb27c
......@@ -201,8 +201,8 @@ open class NavigationBar: UINavigationBar {
var lc = 0
var rc = 0
let l = (CGFloat(item.leftControls.count) * interimSpace)
let r = (CGFloat(item.rightControls.count) * interimSpace)
let l = (CGFloat(item.leftViews.count) * interimSpace)
let r = (CGFloat(item.rightViews.count) * interimSpace)
let p = width - l - r - contentEdgeInsets.left - contentEdgeInsets.right
let columns = Int(ceil(p / gridFactor))
......@@ -210,7 +210,7 @@ open class NavigationBar: UINavigationBar {
item.titleView!.grid.views.removeAll()
item.titleView!.grid.axis.columns = columns
for v in item.leftControls {
for v in item.leftViews {
(v as? UIButton)?.contentEdgeInsets = .zero
v.sizeToFit()
v.grid.columns = Int(ceil(v.width / gridFactor)) + 1
......@@ -222,7 +222,7 @@ open class NavigationBar: UINavigationBar {
item.titleView!.grid.views.append(item.contentView)
for v in item.rightControls {
for v in item.rightViews {
(v as? UIButton)?.contentEdgeInsets = .zero
v.sizeToFit()
v.grid.columns = Int(ceil(v.width / gridFactor)) + 1
......@@ -239,7 +239,7 @@ open class NavigationBar: UINavigationBar {
item.contentView.grid.offset.columns = rc - lc
} else {
item.contentView.grid.columns = columns - 2 * lc
item.rightControls.first?.grid.offset.columns = lc - rc
item.rightViews.first?.grid.offset.columns = lc - rc
}
} else {
item.contentView.grid.columns = columns - lc - rc
......
......@@ -138,7 +138,7 @@ extension NavigationController: UINavigationBarDelegate {
backButton.addTarget(self, action: #selector(handleBackButton), for: .touchUpInside)
item.backButton = backButton
item.leftControls.append(backButton)
item.leftViews.append(backButton)
v.layoutNavigationItem(item: item)
}
return true
......
......@@ -54,15 +54,15 @@ public class NavigationItem: NSObject {
/// Detail label.
public private(set) lazy var detailLabel = UILabel()
/// Left controls.
public var leftControls = [UIView]() {
/// Left items.
public var leftViews = [UIView]() {
didSet {
navigationBar?.layoutSubviews()
}
}
/// Right controls.
public var rightControls = [UIView]() {
/// Right items.
public var rightViews = [UIView]() {
didSet {
navigationBar?.layoutSubviews()
}
......@@ -176,22 +176,22 @@ extension UINavigationItem {
}
/// Left side UIViews.
public var leftControls: [UIView] {
public var leftViews: [UIView] {
get {
return navigationItem.leftControls
return navigationItem.leftViews
}
set(value) {
navigationItem.leftControls = value
navigationItem.leftViews = value
}
}
/// Right side UIViews.
public var rightControls: [UIView] {
public var rightViews: [UIView] {
get {
return navigationItem.rightControls
return navigationItem.rightViews
}
set(value) {
navigationItem.rightControls = value
navigationItem.rightViews = value
}
}
}
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