Skip to content

M
Material
Commit bdea9aba by Daniel Dahan Committed by GitHub
Options

Merge pull request #1038 from intoxicated/master 

Removed NavigationBar margin for iOS 11
parents 904324b9 17733f51
Showing with 610 additions and 604 deletions
Sources/iOS/Bar.swift
...@@ -32,245 +32,245 @@ import UIKit ...@@ -32,245 +32,245 @@ import UIKit
@objc(ContentViewAlignment) @objc(ContentViewAlignment)
public enum ContentViewAlignment: Int { public enum ContentViewAlignment: Int {
case full case full
case center case center
} }
open class Bar: View { open class Bar: View {
/// Will layout the view. /// Will layout the view.
open var willLayout: Bool { open var willLayout: Bool {
return 0 < bounds.width && 0 < bounds.height && nil != superview && !grid.isDeferred return 0 < bounds.width && 0 < bounds.height && nil != superview && !grid.isDeferred
}
open override var intrinsicContentSize: CGSize {
return bounds.size
}
/// Should center the contentView.
open var contentViewAlignment = ContentViewAlignment.full {
didSet {
layoutSubviews()
} }
}
open override var intrinsicContentSize: CGSize {
return bounds.size /// A preset wrapper around contentEdgeInsets.
open var contentEdgeInsetsPreset: EdgeInsetsPreset {
get {
return grid.contentEdgeInsetsPreset
} }
set(value) {
/// Should center the contentView. grid.contentEdgeInsetsPreset = value
open var contentViewAlignment = ContentViewAlignment.full {
didSet {
layoutSubviews()
}
} }
}
/// A preset wrapper around contentEdgeInsets.
open var contentEdgeInsetsPreset: EdgeInsetsPreset { /// A reference to EdgeInsets.
get { @IBInspectable
return grid.contentEdgeInsetsPreset open var contentEdgeInsets: EdgeInsets {
} get {
set(value) { return grid.contentEdgeInsets
grid.contentEdgeInsetsPreset = value
}
} }
set(value) {
/// A reference to EdgeInsets. grid.contentEdgeInsets = value
@IBInspectable
open var contentEdgeInsets: EdgeInsets {
get {
return grid.contentEdgeInsets
}
set(value) {
grid.contentEdgeInsets = value
}
} }
}
/// A preset wrapper around interimSpace.
open var interimSpacePreset: InterimSpacePreset { /// A preset wrapper around interimSpace.
get { open var interimSpacePreset: InterimSpacePreset {
return grid.interimSpacePreset get {
} return grid.interimSpacePreset
set(value) {
grid.interimSpacePreset = value
}
} }
set(value) {
/// A wrapper around grid.interimSpace. grid.interimSpacePreset = value
@IBInspectable
open var interimSpace: InterimSpace {
get {
return grid.interimSpace
}
set(value) {
grid.interimSpace = value
}
} }
}
/// Grid cell factor.
@IBInspectable /// A wrapper around grid.interimSpace.
open var gridFactor: CGFloat = 12 { @IBInspectable
didSet { open var interimSpace: InterimSpace {
assert(0 < gridFactor, "[Material Error: gridFactor must be greater than 0.]") get {
layoutSubviews() return grid.interimSpace
} }
set(value) {
grid.interimSpace = value
}
}
/// Grid cell factor.
@IBInspectable
open var gridFactor: CGFloat = 12 {
didSet {
assert(0 < gridFactor, "[Material Error: gridFactor must be greater than 0.]")
layoutSubviews()
}
}
/// ContentView that holds the any desired subviews.
open let contentView = UIView()
/// Left side UIViews.
open var leftViews = [UIView]() {
didSet {
oldValue.forEach {
$0.removeFromSuperview()
}
layoutSubviews()
}
}
/// Right side UIViews.
open var rightViews = [UIView]() {
didSet {
oldValue.forEach {
$0.removeFromSuperview()
}
layoutSubviews()
}
}
/// Center UIViews.
open var centerViews: [UIView] {
get {
return contentView.grid.views
}
set(value) {
contentView.grid.views = value
}
}
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
/**
An initializer that initializes the object with a CGRect object.
If AutoLayout is used, it is better to initilize the instance
using the init() initializer.
- Parameter frame: A CGRect instance.
*/
public override init(frame: CGRect) {
super.init(frame: frame)
}
/// Convenience initializer.
public convenience init() {
self.init(frame: .zero)
}
/**
A convenience initializer with parameter settings.
- Parameter leftViews: An Array of UIViews that go on the left side.
- Parameter rightViews: An Array of UIViews that go on the right side.
- Parameter centerViews: An Array of UIViews that go in the center.
*/
public convenience init(leftViews: [UIView]? = nil, rightViews: [UIView]? = nil, centerViews: [UIView]? = nil) {
self.init()
self.leftViews = leftViews ?? []
self.rightViews = rightViews ?? []
self.centerViews = centerViews ?? []
}
open override func layoutSubviews() {
super.layoutSubviews()
guard willLayout else {
return
} }
/// ContentView that holds the any desired subviews. var lc = 0
open let contentView = UIView() var rc = 0
/// Left side UIViews. grid.begin()
open var leftViews = [UIView]() { grid.views.removeAll()
didSet {
oldValue.forEach {
$0.removeFromSuperview()
}
layoutSubviews()
}
}
/// Right side UIViews. for v in leftViews {
open var rightViews = [UIView]() { if let b = v as? UIButton {
didSet { b.contentEdgeInsets = .zero
oldValue.forEach { b.titleEdgeInsets = .zero
$0.removeFromSuperview() }
}
v.frame.size.width = v.intrinsicContentSize.width
layoutSubviews() v.sizeToFit()
} v.grid.columns = Int(ceil(v.bounds.width / gridFactor)) + 2
lc += v.grid.columns
grid.views.append(v)
} }
/// Center UIViews. grid.views.append(contentView)
open var centerViews: [UIView] {
get {
return contentView.grid.views
}
set(value) {
contentView.grid.views = value
}
}
/** for v in rightViews {
An initializer that initializes the object with a NSCoder object. if let b = v as? UIButton {
- Parameter aDecoder: A NSCoder instance. b.contentEdgeInsets = .zero
*/ b.titleEdgeInsets = .zero
public required init?(coder aDecoder: NSCoder) { }
super.init(coder: aDecoder)
v.frame.size.width = v.intrinsicContentSize.width
v.sizeToFit()
v.grid.columns = Int(ceil(v.bounds.width / gridFactor)) + 2
rc += v.grid.columns
grid.views.append(v)
} }
/** contentView.grid.begin()
An initializer that initializes the object with a CGRect object. contentView.grid.offset.columns = 0
If AutoLayout is used, it is better to initilize the instance
using the init() initializer.
- Parameter frame: A CGRect instance.
*/
public override init(frame: CGRect) {
super.init(frame: frame)
}
/// Convenience initializer. var l: CGFloat = 0
public convenience init() { var r: CGFloat = 0
self.init(frame: .zero)
}
/** if .center == contentViewAlignment {
A convenience initializer with parameter settings. if leftViews.count < rightViews.count {
- Parameter leftViews: An Array of UIViews that go on the left side. r = CGFloat(rightViews.count) * interimSpace
- Parameter rightViews: An Array of UIViews that go on the right side. l = r
- Parameter centerViews: An Array of UIViews that go in the center. } else {
*/ l = CGFloat(leftViews.count) * interimSpace
public convenience init(leftViews: [UIView]? = nil, rightViews: [UIView]? = nil, centerViews: [UIView]? = nil) { r = l
self.init() }
self.leftViews = leftViews ?? []
self.rightViews = rightViews ?? []
self.centerViews = centerViews ?? []
} }
open override func layoutSubviews() { let p = bounds.width - l - r - contentEdgeInsets.left - contentEdgeInsets.right
super.layoutSubviews() let columns = Int(ceil(p / gridFactor))
guard willLayout else {
return
}
var lc = 0
var rc = 0
grid.begin()
grid.views.removeAll()
for v in leftViews {
if let b = v as? UIButton {
b.contentEdgeInsets = .zero
b.titleEdgeInsets = .zero
}
v.frame.size.width = v.intrinsicContentSize.width
v.sizeToFit()
v.grid.columns = Int(ceil(v.bounds.width / gridFactor)) + 2
lc += v.grid.columns
grid.views.append(v)
}
grid.views.append(contentView)
for v in rightViews {
if let b = v as? UIButton {
b.contentEdgeInsets = .zero
b.titleEdgeInsets = .zero
}
v.frame.size.width = v.intrinsicContentSize.width
v.sizeToFit()
v.grid.columns = Int(ceil(v.bounds.width / gridFactor)) + 2
rc += v.grid.columns
grid.views.append(v)
}
contentView.grid.begin()
contentView.grid.offset.columns = 0
var l: CGFloat = 0
var r: CGFloat = 0
if .center == contentViewAlignment {
if leftViews.count < rightViews.count {
r = CGFloat(rightViews.count) * interimSpace
l = r
} else {
l = CGFloat(leftViews.count) * interimSpace
r = l
}
}
let p = bounds.width - l - r - contentEdgeInsets.left - contentEdgeInsets.right
let columns = Int(ceil(p / gridFactor))
if .center == contentViewAlignment {
if lc < rc {
contentView.grid.columns = columns - 2 * rc
contentView.grid.offset.columns = rc - lc
} else {
contentView.grid.columns = columns - 2 * lc
rightViews.first?.grid.offset.columns = lc - rc
}
} else {
contentView.grid.columns = columns - lc - rc
}
grid.axis.columns = columns
grid.commit()
contentView.grid.commit()
layoutDivider()
}
open override func prepare() { if .center == contentViewAlignment {
super.prepare() if lc < rc {
heightPreset = .normal contentView.grid.columns = columns - 2 * rc
autoresizingMask = .flexibleWidth contentView.grid.offset.columns = rc - lc
interimSpacePreset = .interimSpace3 } else {
contentEdgeInsetsPreset = .square1 contentView.grid.columns = columns - 2 * lc
rightViews.first?.grid.offset.columns = lc - rc
prepareContentView() }
} else {
contentView.grid.columns = columns - lc - rc
} }
grid.axis.columns = columns
grid.commit()
contentView.grid.commit()
layoutDivider()
}
open override func prepare() {
super.prepare()
heightPreset = .normal
autoresizingMask = .flexibleWidth
interimSpacePreset = .interimSpace3
contentEdgeInsetsPreset = .square1
prepareContentView()
}
} }
extension Bar { extension Bar {
/// Prepares the contentView. /// Prepares the contentView.
fileprivate func prepareContentView() { fileprivate func prepareContentView() {
contentView.contentScaleFactor = Screen.scale contentView.contentScaleFactor = Screen.scale
} }
} }
Sources/iOS/NavigationBar.swift
...@@ -31,177 +31,183 @@ ...@@ -31,177 +31,183 @@
import UIKit import UIKit
open class NavigationBar: UINavigationBar { open class NavigationBar: UINavigationBar {
/// Will layout the view. /// Will layout the view.
open var willLayout: Bool { open var willLayout: Bool {
return 0 < bounds.width && 0 < bounds.height && nil != superview return 0 < bounds.width && 0 < bounds.height && nil != superview
}
/// Detail UILabel when in landscape for iOS 11.
fileprivate var toolbarToText: [Toolbar: String?]?
open override var intrinsicContentSize: CGSize {
return CGSize(width: bounds.width, height: bounds.height)
}
/// A preset wrapper around contentEdgeInsets.
open var contentEdgeInsetsPreset = EdgeInsetsPreset.none {
didSet {
contentEdgeInsets = EdgeInsetsPresetToValue(preset: contentEdgeInsetsPreset)
} }
}
/// Detail UILabel when in landscape for iOS 11.
fileprivate var toolbarToText: [Toolbar: String?]? /// A reference to EdgeInsets.
@IBInspectable
open override var intrinsicContentSize: CGSize { open var contentEdgeInsets = EdgeInsets.zero {
return CGSize(width: bounds.width, height: bounds.height) didSet {
layoutSubviews()
}
}
/// A preset wrapper around interimSpace.
open var interimSpacePreset = InterimSpacePreset.interimSpace3 {
didSet {
interimSpace = InterimSpacePresetToValue(preset: interimSpacePreset)
}
}
/// A wrapper around grid.interimSpace.
@IBInspectable
open var interimSpace: InterimSpace = 0 {
didSet {
layoutSubviews()
}
}
/**
The back button image writes to the backIndicatorImage property and
backIndicatorTransitionMaskImage property.
*/
@IBInspectable
open var backButtonImage: UIImage? {
get {
return backIndicatorImage
}
set(value) {
let image: UIImage? = value
backIndicatorImage = image
backIndicatorTransitionMaskImage = image
}
}
/// A property that accesses the backing layer's background
@IBInspectable
open override var backgroundColor: UIColor? {
get {
return barTintColor
} }
set(value) {
barTintColor = value
}
}
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
prepare()
}
/**
An initializer that initializes the object with a CGRect object.
If AutoLayout is used, it is better to initilize the instance
using the init() initializer.
- Parameter frame: A CGRect instance.
*/
public override init(frame: CGRect) {
super.init(frame: frame)
prepare()
}
/// A convenience initializer.
public convenience init() {
self.init(frame: .zero)
}
open override func sizeThatFits(_ size: CGSize) -> CGSize {
return intrinsicContentSize
}
open override func layoutSubviews() {
super.layoutSubviews()
layoutShape()
layoutShadowPath()
/// A preset wrapper around contentEdgeInsets. //iOS 11 added left/right layout margin in subviews of UINavigationBar
open var contentEdgeInsetsPreset = EdgeInsetsPreset.none { //since we do not want to unsafely access private view directly
didSet { //iterate subviews to set `layoutMargin` to zero
contentEdgeInsets = EdgeInsetsPresetToValue(preset: contentEdgeInsetsPreset) for view in subviews {
} view.layoutMargins = .zero
} }
/// A reference to EdgeInsets. if let v = topItem {
@IBInspectable layoutNavigationItem(item: v)
open var contentEdgeInsets = EdgeInsets.zero {
didSet {
layoutSubviews()
}
} }
/// A preset wrapper around interimSpace. if let v = backItem {
open var interimSpacePreset = InterimSpacePreset.interimSpace3 { layoutNavigationItem(item: v)
didSet {
interimSpace = InterimSpacePresetToValue(preset: interimSpacePreset)
}
} }
layoutDivider()
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepare method
to initialize property values and other setup operations.
The super.prepare method should always be called immediately
when subclassing.
*/
open func prepare() {
barStyle = .black
isTranslucent = false
depthPreset = .none
contentScaleFactor = Screen.scale
contentEdgeInsetsPreset = .none
interimSpacePreset = .none
backButtonImage = Icon.cm.arrowBack
/// A wrapper around grid.interimSpace. if #available(iOS 11, *) {
@IBInspectable toolbarToText = [:]
open var interimSpace: InterimSpace = 0 {
didSet {
layoutSubviews()
}
} }
/**
The back button image writes to the backIndicatorImage property and
backIndicatorTransitionMaskImage property.
*/
@IBInspectable
open var backButtonImage: UIImage? {
get {
return backIndicatorImage
}
set(value) {
let image: UIImage? = value
backIndicatorImage = image
backIndicatorTransitionMaskImage = image
}
}
/// A property that accesses the backing layer's background
@IBInspectable
open override var backgroundColor: UIColor? {
get {
return barTintColor
}
set(value) {
barTintColor = value
}
}
/**
An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance.
*/
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
prepare()
}
/**
An initializer that initializes the object with a CGRect object.
If AutoLayout is used, it is better to initilize the instance
using the init() initializer.
- Parameter frame: A CGRect instance.
*/
public override init(frame: CGRect) {
super.init(frame: frame)
prepare()
}
/// A convenience initializer.
public convenience init() {
self.init(frame: .zero)
}
open override func sizeThatFits(_ size: CGSize) -> CGSize {
return intrinsicContentSize
}
open override func layoutSubviews() { let image = UIImage()
super.layoutSubviews() shadowImage = image
layoutShape() setBackgroundImage(image, for: .default)
layoutShadowPath() backgroundColor = .white
}
if let v = topItem {
layoutNavigationItem(item: v)
}
if let v = backItem {
layoutNavigationItem(item: v)
}
layoutDivider()
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepare method
to initialize property values and other setup operations.
The super.prepare method should always be called immediately
when subclassing.
*/
open func prepare() {
barStyle = .black
isTranslucent = false
depthPreset = .depth1
contentScaleFactor = Screen.scale
contentEdgeInsetsPreset = .square1
interimSpacePreset = .interimSpace3
backButtonImage = Icon.cm.arrowBack
if #available(iOS 11, *) {
toolbarToText = [:]
}
let image = UIImage()
shadowImage = image
setBackgroundImage(image, for: .default)
backgroundColor = .white
}
} }
internal extension NavigationBar { internal extension NavigationBar {
/** /**
Lays out the UINavigationItem. Lays out the UINavigationItem.
- Parameter item: A UINavigationItem to layout. - Parameter item: A UINavigationItem to layout.
*/ */
func layoutNavigationItem(item: UINavigationItem) { func layoutNavigationItem(item: UINavigationItem) {
guard willLayout else { guard willLayout else {
return return
} }
let toolbar = item.toolbar let toolbar = item.toolbar
toolbar.backgroundColor = .clear toolbar.backgroundColor = .clear
toolbar.interimSpace = interimSpace toolbar.interimSpace = interimSpace
toolbar.contentEdgeInsets = contentEdgeInsets toolbar.contentEdgeInsets = contentEdgeInsets
if #available(iOS 11, *) {
if Application.shouldStatusBarBeHidden {
toolbar.contentEdgeInsetsPreset = .none
if #available(iOS 11, *) { if nil != toolbar.detailLabel.text {
if Application.shouldStatusBarBeHidden { toolbarToText?[toolbar] = toolbar.detailLabel.text
toolbar.contentEdgeInsetsPreset = .none toolbar.detailLabel.text = nil
if nil != toolbar.detailLabel.text {
toolbarToText?[toolbar] = toolbar.detailLabel.text
toolbar.detailLabel.text = nil
}
} else if nil != toolbarToText?[toolbar] {
toolbar.detailLabel.text = toolbarToText?[toolbar] ?? nil
toolbarToText?[toolbar] = nil
}
} }
} else if nil != toolbarToText?[toolbar] {
item.titleView = toolbar toolbar.detailLabel.text = toolbarToText?[toolbar] ?? nil
item.titleView!.frame = bounds toolbarToText?[toolbar] = nil
}
} }
item.titleView = toolbar
item.titleView!.frame = bounds
}
} }
Sources/iOS/NavigationController.swift
...@@ -32,173 +32,173 @@ import UIKit ...@@ -32,173 +32,173 @@ import UIKit
import Motion import Motion
extension NavigationController { extension NavigationController {
/// Device status bar style. /// Device status bar style.
open var statusBarStyle: UIStatusBarStyle { open var statusBarStyle: UIStatusBarStyle {
get { get {
return Application.statusBarStyle return Application.statusBarStyle
}
set(value) {
Application.statusBarStyle = value
}
} }
set(value) {
Application.statusBarStyle = value
}
}
} }
open class NavigationController: UINavigationController { open class NavigationController: UINavigationController {
/** /**
An initializer that initializes the object with a NSCoder object. An initializer that initializes the object with a NSCoder object.
- Parameter aDecoder: A NSCoder instance. - Parameter aDecoder: A NSCoder instance.
*/ */
public required init?(coder aDecoder: NSCoder) { public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder) super.init(coder: aDecoder)
} }
/** /**
An initializer that initializes the object with an Optional nib and bundle. An initializer that initializes the object with an Optional nib and bundle.
- Parameter nibNameOrNil: An Optional String for the nib. - Parameter nibNameOrNil: An Optional String for the nib.
- Parameter bundle: An Optional NSBundle where the nib is located. - Parameter bundle: An Optional NSBundle where the nib is located.
*/ */
public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil) super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
} }
/** /**
An initializer that initializes the object with a rootViewController. An initializer that initializes the object with a rootViewController.
- Parameter rootViewController: A UIViewController for the rootViewController. - Parameter rootViewController: A UIViewController for the rootViewController.
*/ */
public override init(rootViewController: UIViewController) { public override init(rootViewController: UIViewController) {
super.init(navigationBarClass: NavigationBar.self, toolbarClass: nil) super.init(navigationBarClass: NavigationBar.self, toolbarClass: nil)
setViewControllers([rootViewController], animated: false) setViewControllers([rootViewController], animated: false)
} }
open override func viewWillAppear(_ animated: Bool) { open override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
guard let v = interactivePopGestureRecognizer else { guard let v = interactivePopGestureRecognizer else {
return return
} }
guard let x = navigationDrawerController else {
return
}
if let l = x.leftPanGesture {
l.require(toFail: v)
}
if let r = x.rightPanGesture {
r.require(toFail: v)
}
}
open override func viewDidLoad() {
super.viewDidLoad()
prepare()
}
open override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
guard let v = navigationBar as? NavigationBar else {
return
}
guard let item = v.topItem else {
return
}
v.layoutNavigationItem(item: item)
}
open override func viewWillLayoutSubviews() { guard let x = navigationDrawerController else {
super.viewWillLayoutSubviews() return
layoutSubviews()
} }
/** if let l = x.leftPanGesture {
Prepares the view instance when intialized. When subclassing, l.require(toFail: v)
it is recommended to override the prepare method }
to initialize property values and other setup operations.
The super.prepare method should always be called immediately
when subclassing.
*/
open func prepare() {
navigationBar.frame.size.width = view.bounds.width
navigationBar.heightPreset = .normal
view.clipsToBounds = true
view.backgroundColor = .white
view.contentScaleFactor = Screen.scale
// This ensures the panning gesture is available when going back between views.
if let v = interactivePopGestureRecognizer {
v.isEnabled = true
v.delegate = self
}
}
/// Calls the layout functions for the view heirarchy. if let r = x.rightPanGesture {
open func layoutSubviews() { r.require(toFail: v)
navigationBar.setNeedsUpdateConstraints() }
navigationBar.updateConstraintsIfNeeded() }
navigationBar.setNeedsLayout()
navigationBar.layoutIfNeeded() open override func viewDidLoad() {
super.viewDidLoad()
prepare()
}
open override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
guard let v = navigationBar as? NavigationBar else {
return
} }
guard let item = v.topItem else {
return
}
v.layoutNavigationItem(item: item)
}
open override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
layoutSubviews()
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepare method
to initialize property values and other setup operations.
The super.prepare method should always be called immediately
when subclassing.
*/
open func prepare() {
navigationBar.frame.size.width = view.bounds.width
navigationBar.heightPreset = .normal
view.clipsToBounds = true
view.backgroundColor = .white
view.contentScaleFactor = Screen.scale
// This ensures the panning gesture is available when going back between views.
if let v = interactivePopGestureRecognizer {
v.isEnabled = true
v.delegate = self
}
}
/// Calls the layout functions for the view heirarchy.
open func layoutSubviews() {
navigationBar.setNeedsUpdateConstraints()
navigationBar.updateConstraintsIfNeeded()
navigationBar.setNeedsLayout()
navigationBar.layoutIfNeeded()
}
} }
extension NavigationController: UINavigationBarDelegate { extension NavigationController: UINavigationBarDelegate {
/** /**
Delegation method that is called when a new UINavigationItem is about to be pushed. 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. This is used to prepare the transitions between UIViewControllers on the stack.
- Parameter navigationBar: A UINavigationBar that is used in the NavigationController. - Parameter navigationBar: A UINavigationBar that is used in the NavigationController.
- Parameter item: The UINavigationItem that will be pushed on the stack. - 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. - Returns: A Boolean value that indicates whether to push the item on to the stack or not.
True is yes, false is no. True is yes, false is no.
*/ */
public func navigationBar(_ navigationBar: UINavigationBar, shouldPush item: UINavigationItem) -> Bool { public func navigationBar(_ navigationBar: UINavigationBar, shouldPush item: UINavigationItem) -> Bool {
if let v = navigationBar as? NavigationBar { if let v = navigationBar as? NavigationBar {
if nil == item.backButton.image && nil == item.backButton.title { if nil == item.backButton.image && nil == item.backButton.title {
item.backButton.image = v.backButtonImage item.backButton.image = v.backButtonImage
} }
if !item.backButton.isHidden { if !item.backButton.isHidden {
item.leftViews.insert(item.backButton, at: 0) item.leftViews.insert(item.backButton, at: 0)
} }
item.backButton.addTarget(self, action: #selector(handle(backButton:)), for: .touchUpInside) item.backButton.addTarget(self, action: #selector(handle(backButton:)), for: .touchUpInside)
item.hidesBackButton = false item.hidesBackButton = false
item.setHidesBackButton(true, animated: false) item.setHidesBackButton(true, animated: false)
v.layoutNavigationItem(item: item) v.layoutNavigationItem(item: item)
}
return true
} }
public func navigationBar(_ navigationBar: UINavigationBar, didPop item: UINavigationItem) { return true
if let index = item.leftViews.index(of: item.backButton) { }
item.leftViews.remove(at: index)
} public func navigationBar(_ navigationBar: UINavigationBar, didPop item: UINavigationItem) {
if let index = item.leftViews.index(of: item.backButton) {
item.backButton.removeTarget(self, action: #selector(handle(backButton:)), for: .touchUpInside) item.leftViews.remove(at: index)
} }
item.backButton.removeTarget(self, action: #selector(handle(backButton:)), for: .touchUpInside)
}
} }
internal extension NavigationController { internal extension NavigationController {
/// Handler for the backbutton. /// Handler for the backbutton.
@objc @objc
func handle(backButton: UIButton) { func handle(backButton: UIButton) {
popViewController(animated: true) popViewController(animated: true)
} }
} }
extension NavigationController: UIGestureRecognizerDelegate { extension NavigationController: UIGestureRecognizerDelegate {
/** /**
Detects the gesture recognizer being used. This is necessary when using Detects the gesture recognizer being used. This is necessary when using
NavigationDrawerController. It eliminates the conflict in panning. NavigationDrawerController. It eliminates the conflict in panning.
- Parameter gestureRecognizer: A UIGestureRecognizer to detect. - Parameter gestureRecognizer: A UIGestureRecognizer to detect.
- Parameter touch: The UITouch event. - Parameter touch: The UITouch event.
- Returns: A Boolean of whether to continue the gesture or not, true yes, false no. - Returns: A Boolean of whether to continue the gesture or not, true yes, false no.
*/ */
public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool { public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
return interactivePopGestureRecognizer == gestureRecognizer && nil != navigationBar.backItem return interactivePopGestureRecognizer == gestureRecognizer && nil != navigationBar.backItem
} }
} }
Sources/iOS/NavigationItem.swift
...@@ -36,105 +36,105 @@ fileprivate var NavigationItemKey: UInt8 = 0 ...@@ -36,105 +36,105 @@ fileprivate var NavigationItemKey: UInt8 = 0
fileprivate var NavigationItemContext: UInt8 = 0 fileprivate var NavigationItemContext: UInt8 = 0
fileprivate class NavigationItem: NSObject { fileprivate class NavigationItem: NSObject {
/// A reference to the toolbar. /// A reference to the toolbar.
@objc @objc
let toolbar = Toolbar() let toolbar = Toolbar()
/// Back Button. /// Back Button.
lazy var backButton = IconButton() lazy var backButton = IconButton()
/// An optional reference to the NavigationBar. /// An optional reference to the NavigationBar.
var navigationBar: NavigationBar? { var navigationBar: NavigationBar? {
var v = toolbar.contentView.superview var v = toolbar.contentView.superview
while nil != v { while nil != v {
if let navigationBar = v as? NavigationBar { if let navigationBar = v as? NavigationBar {
return navigationBar return navigationBar
} }
v = v?.superview v = v?.superview
}
return nil
} }
return nil
}
} }
fileprivate extension UINavigationItem { fileprivate extension UINavigationItem {
/// NavigationItem reference. /// NavigationItem reference.
var navigationItem: NavigationItem { var navigationItem: NavigationItem {
get { get {
return AssociatedObject.get(base: self, key: &NavigationItemKey) { return AssociatedObject.get(base: self, key: &NavigationItemKey) {
return NavigationItem() return NavigationItem()
} }
}
set(value) {
AssociatedObject.set(base: self, key: &NavigationItemKey, value: value)
}
} }
set(value) {
AssociatedObject.set(base: self, key: &NavigationItemKey, value: value)
}
}
} }
internal extension UINavigationItem { internal extension UINavigationItem {
/// A reference to the NavigationItem Toolbar. /// A reference to the NavigationItem Toolbar.
var toolbar: Toolbar { var toolbar: Toolbar {
return navigationItem.toolbar return navigationItem.toolbar
} }
} }
extension UINavigationItem { extension UINavigationItem {
/// Should center the contentView. /// Should center the contentView.
open var contentViewAlignment: ContentViewAlignment { open var contentViewAlignment: ContentViewAlignment {
get { get {
return toolbar.contentViewAlignment return toolbar.contentViewAlignment
} }
set(value) { set(value) {
toolbar.contentViewAlignment = value toolbar.contentViewAlignment = value
} }
}
/// Content View.
open var contentView: UIView {
return toolbar.contentView
}
/// Back Button.
open var backButton: IconButton {
return navigationItem.backButton
}
/// Title Label.
open var titleLabel: UILabel {
return toolbar.titleLabel
}
/// Detail Label.
open var detailLabel: UILabel {
return toolbar.detailLabel
}
/// Left side UIViews.
open var leftViews: [UIView] {
get {
return toolbar.leftViews
}
set(value) {
toolbar.leftViews = value
}
}
/// Right side UIViews.
open var rightViews: [UIView] {
get {
return toolbar.rightViews
}
set(value) {
toolbar.rightViews = value
} }
}
/// Content View.
open var contentView: UIView { /// Center UIViews.
return toolbar.contentView open var centerViews: [UIView] {
get {
return toolbar.centerViews
} }
set(value) {
/// Back Button. toolbar.centerViews = value
open var backButton: IconButton {
return navigationItem.backButton
}
/// Title Label.
open var titleLabel: UILabel {
return toolbar.titleLabel
}
/// Detail Label.
open var detailLabel: UILabel {
return toolbar.detailLabel
}
/// Left side UIViews.
open var leftViews: [UIView] {
get {
return toolbar.leftViews
}
set(value) {
toolbar.leftViews = value
}
}
/// Right side UIViews.
open var rightViews: [UIView] {
get {
return toolbar.rightViews
}
set(value) {
toolbar.rightViews = value
}
}
/// Center UIViews.
open var centerViews: [UIView] {
get {
return toolbar.centerViews
}
set(value) {
toolbar.centerViews = 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