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 249 additions and 243 deletions
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/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