Skip to content

Implement layoutMarginsRelativeArrangement and support iOS 7 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CosynPa wants to merge 4 commits into from
Closed

Implement layoutMarginsRelativeArrangement and support iOS 7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b448ae8
Separate different kinds of spacer views
CosynPa Nov 15, 2015
f1aaa08
Test whether spacer guides are the same
CosynPa Nov 15, 2015
a0d84b9
Implement layoutMarginsRelativeArrangement
CosynPa Nov 21, 2015
1a69b80
Test layoutMarginsRelativeArrangement
CosynPa Nov 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TZStackView/TZSpacerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import UIKit

public class TZSpacerView: UIView {

public var identifier: String = ""
}
217 changes: 137 additions & 80 deletions TZStackView/TZStackView.swift
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,26 @@ public class TZStackView: UIView {
public var spacing: CGFloat = 0

public var layoutMarginsRelativeArrangement = false

override public var layoutMargins: UIEdgeInsets {
get {
if #available(iOS 8, *) {
return super.layoutMargins
} else {
return _layoutMargins
}
}
set {
if #available(iOS 8, *) {
super.layoutMargins = newValue
} else {
_layoutMargins = newValue
setNeedsUpdateConstraints()
}
}
}

private var _layoutMargins = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)

public private(set) var arrangedSubviews: [UIView] = [] {
didSet {
Expand All @@ -48,8 +68,10 @@ public class TZStackView: UIView {

private var stackViewConstraints = [NSLayoutConstraint]()
private var subviewConstraints = [NSLayoutConstraint]()

private var spacerViews = [UIView]()

private var layoutMarginsView: TZSpacerView?
private var alignmentSpanner: TZSpacerView?
private var distributionSpacers: [TZSpacerView] = []

private var animationDidStopQueueEntries = [TZAnimationDidStopQueueEntry]()

Expand Down Expand Up @@ -177,6 +199,22 @@ public class TZStackView: UIView {
arrangedSubview.removeConstraints(subviewConstraints)
}
subviewConstraints.removeAll()

if let spacerView = layoutMarginsView {
spacerView.removeFromSuperview()
layoutMarginsView = nil
}

if let spacerView = alignmentSpanner {
spacerView.removeFromSuperview()
alignmentSpanner = nil
}

for spacerView in distributionSpacers {
spacerView.removeFromSuperview()
}
distributionSpacers.removeAll()

for arrangedSubview in arrangedSubviews {

if alignment != .Fill {
Expand Down Expand Up @@ -204,24 +242,22 @@ public class TZStackView: UIView {
}
}

for spacerView in spacerViews {
spacerView.removeFromSuperview()
}
spacerViews.removeAll()

if arrangedSubviews.count > 0 {
if layoutMarginsRelativeArrangement {
layoutMarginsView = addSpacerView("TZViewLayoutMarginsGuide")
}

if alignment != .Fill {
alignmentSpanner = addSpacerView("TZSV-alignment-spanner")
}

stackViewConstraints += createMatchEdgesContraints(arrangedSubviews)
stackViewConstraints += createFirstAndLastViewMatchEdgesContraints()

let visibleArrangedSubviews = arrangedSubviews.filter({!self.isHidden($0)})

switch distribution {
case .FillEqually, .Fill, .FillProportionally:
if alignment != .Fill || layoutMarginsRelativeArrangement {
addSpacerView()
}

stackViewConstraints += createMatchEdgesContraints(arrangedSubviews)
stackViewConstraints += createFirstAndLastViewMatchEdgesContraints()

if alignment == .FirstBaseline && axis == .Horizontal {
stackViewConstraints.append(constraint(item: self, attribute: .Height, toItem: nil, attribute: .NotAnAttribute, priority: 49))
}
Expand All @@ -242,17 +278,13 @@ public class TZStackView: UIView {
continue
}
if index > 0 {
views.append(addSpacerView())
let spacerView = addSpacerView("TZSV-distributing")
distributionSpacers.append(spacerView)
views.append(spacerView)
}
views.append(arrangedSubview)
index++
}
if spacerViews.count == 0 {
addSpacerView()
}

stackViewConstraints += createMatchEdgesContraints(arrangedSubviews)
stackViewConstraints += createFirstAndLastViewMatchEdgesContraints()

switch axis {
case .Horizontal:
Expand All @@ -265,20 +297,14 @@ public class TZStackView: UIView {
}

stackViewConstraints += createFillConstraints(views, constant: 0)
stackViewConstraints += createFillEquallyConstraints(spacerViews)
stackViewConstraints += createFillEquallyConstraints(distributionSpacers)
stackViewConstraints += createFillConstraints(arrangedSubviews, relatedBy: .GreaterThanOrEqual, constant: spacing)
case .EqualCentering:
for (index, _) in visibleArrangedSubviews.enumerate() {
if index > 0 {
addSpacerView()
distributionSpacers.append(addSpacerView("TZSV-distributing"))
}
}
if spacerViews.count == 0 {
addSpacerView()
}

stackViewConstraints += createMatchEdgesContraints(arrangedSubviews)
stackViewConstraints += createFirstAndLastViewMatchEdgesContraints()

switch axis {
case .Horizontal:
Expand All @@ -293,7 +319,7 @@ public class TZStackView: UIView {
var previousArrangedSubview: UIView?
for (index, arrangedSubview) in visibleArrangedSubviews.enumerate() {
if let previousArrangedSubview = previousArrangedSubview {
let spacerView = spacerViews[index - 1]
let spacerView = distributionSpacers[index - 1]

switch axis {
case .Horizontal:
Expand All @@ -307,22 +333,38 @@ public class TZStackView: UIView {
previousArrangedSubview = arrangedSubview
}

stackViewConstraints += createFillEquallyConstraints(spacerViews, priority: 150)
stackViewConstraints += createFillEquallyConstraints(distributionSpacers, priority: 150)
stackViewConstraints += createFillConstraints(arrangedSubviews, relatedBy: .GreaterThanOrEqual, constant: spacing)
}

if spacerViews.count > 0 {
stackViewConstraints += createSurroundingSpacerViewConstraints(spacerViews[0], views: visibleArrangedSubviews)
if let spanner = alignmentSpanner {
stackViewConstraints += createSurroundingSpacerViewConstraints(spanner, views: visibleArrangedSubviews)
}

if layoutMarginsRelativeArrangement {
if spacerViews.count > 0 {
stackViewConstraints.append(constraint(item: self, attribute: .BottomMargin, toItem: spacerViews[0]))
stackViewConstraints.append(constraint(item: self, attribute: .LeftMargin, toItem: spacerViews[0]))
stackViewConstraints.append(constraint(item: self, attribute: .RightMargin, toItem: spacerViews[0]))
stackViewConstraints.append(constraint(item: self, attribute: .TopMargin, toItem: spacerViews[0]))
if let layoutMarginsView = layoutMarginsView {
let bottomConstraint: NSLayoutConstraint
let leftConstraint: NSLayoutConstraint
let rightConstraint: NSLayoutConstraint
let topConstraint: NSLayoutConstraint
if #available(iOS 8.0, *) {
bottomConstraint = constraint(item: self, attribute: .BottomMargin, toItem: layoutMarginsView, attribute: .Bottom)
leftConstraint = constraint(item: self, attribute: .LeftMargin, toItem: layoutMarginsView, attribute: .Left)
rightConstraint = constraint(item: self, attribute: .RightMargin, toItem: layoutMarginsView, attribute: .Right)
topConstraint = constraint(item: self, attribute: .TopMargin, toItem: layoutMarginsView, attribute: .Top)
} else {
bottomConstraint = constraint(item: self, attribute: .Bottom, toItem: layoutMarginsView, attribute: .Bottom, constant: _layoutMargins.bottom)
leftConstraint = constraint(item: self, attribute: .Left, toItem: layoutMarginsView, attribute: .Left, constant: -_layoutMargins.left)
rightConstraint = constraint(item: self, attribute: .Right, toItem: layoutMarginsView, attribute: .Right, constant: _layoutMargins.right)
topConstraint = constraint(item: self, attribute: .Top, toItem: layoutMarginsView, attribute: .Top, constant: -_layoutMargins.top)
}

bottomConstraint.identifier = "TZView-bottomMargin-guide-constraint"
leftConstraint.identifier = "TZView-leftMargin-guide-constraint"
rightConstraint.identifier = "TZView-rightMargin-guide-constraint"
topConstraint.identifier = "TZView-topMargin-guide-constraint"
stackViewConstraints += [bottomConstraint, leftConstraint, rightConstraint, topConstraint]
}

addConstraints(stackViewConstraints)
}

Expand All @@ -333,11 +375,11 @@ public class TZStackView: UIView {
super.init(coder: aDecoder)!
}

private func addSpacerView() -> TZSpacerView {
private func addSpacerView(identifier: String = "") -> TZSpacerView {
let spacerView = TZSpacerView()
spacerView.translatesAutoresizingMaskIntoConstraints = false
spacerView.identifier = identifier

spacerViews.append(spacerView)
insertSubview(spacerView, atIndex: 0)
return spacerView
}
Expand Down Expand Up @@ -481,7 +523,9 @@ public class TZStackView: UIView {
case .Trailing, .Bottom:
constraints += equalAttributes(views: views, attribute: .Bottom)
case .FirstBaseline:
constraints += equalAttributes(views: views, attribute: .FirstBaseline)
if #available(iOS 8.0, *) {
constraints += equalAttributes(views: views, attribute: .FirstBaseline)
}
}

case .Vertical:
Expand Down Expand Up @@ -509,58 +553,71 @@ public class TZStackView: UIView {
let visibleViews = arrangedSubviews.filter({!self.isHidden($0)})
let firstView = visibleViews.first
let lastView = visibleViews.last

var topView = arrangedSubviews.first!
var bottomView = arrangedSubviews.first!
if spacerViews.count > 0 {
if alignment == .Center {
topView = spacerViews[0]
bottomView = spacerViews[0]
} else if alignment == .Top || alignment == .Leading {
bottomView = spacerViews[0]
} else if alignment == .Bottom || alignment == .Trailing {
topView = spacerViews[0]
} else if alignment == .FirstBaseline {
switch axis {
case .Horizontal:
bottomView = spacerViews[0]
case .Vertical:
topView = spacerViews[0]
bottomView = spacerViews[0]
}
}
}

let firstItem = layoutMarginsRelativeArrangement ? spacerViews[0] : self

let edgeItem = layoutMarginsView ?? self
switch axis {
case .Horizontal:
if let firstView = firstView {
constraints.append(constraint(item: firstItem, attribute: .Leading, toItem: firstView))
constraints.append(constraint(item: edgeItem, attribute: .Leading, toItem: firstView))
}
if let lastView = lastView {
constraints.append(constraint(item: firstItem, attribute: .Trailing, toItem: lastView))
}

constraints.append(constraint(item: firstItem, attribute: .Top, toItem: topView))
constraints.append(constraint(item: firstItem, attribute: .Bottom, toItem: bottomView))

if alignment == .Center {
constraints.append(constraint(item: firstItem, attribute: .CenterY, toItem: arrangedSubviews.first!))
constraints.append(constraint(item: edgeItem, attribute: .Trailing, toItem: lastView))
}
case .Vertical:
if let firstView = firstView {
constraints.append(constraint(item: firstItem, attribute: .Top, toItem: firstView))
constraints.append(constraint(item: edgeItem, attribute: .Top, toItem: firstView))
}
if let lastView = lastView {
constraints.append(constraint(item: firstItem, attribute: .Bottom, toItem: lastView))
constraints.append(constraint(item: edgeItem, attribute: .Bottom, toItem: lastView))
}
}

constraints.append(constraint(item: firstItem, attribute: .Leading, toItem: topView))
constraints.append(constraint(item: firstItem, attribute: .Trailing, toItem: bottomView))
let firstArrangedView = arrangedSubviews.first!

let topView: UIView
let bottomView: UIView
var centerView: UIView?

switch alignment {
case .Fill:
topView = firstArrangedView
bottomView = firstArrangedView
case .Center:
topView = alignmentSpanner!
bottomView = alignmentSpanner!
centerView = firstArrangedView
case .Leading, .Top:
topView = firstArrangedView
bottomView = alignmentSpanner!
case .Trailing, .Bottom:
topView = alignmentSpanner!
bottomView = firstArrangedView
case .FirstBaseline:
switch axis {
case .Horizontal:
topView = firstArrangedView
bottomView = alignmentSpanner!
case .Vertical:
topView = alignmentSpanner!
bottomView = alignmentSpanner!
}
}

switch axis {
case .Horizontal:
constraints.append(constraint(item: edgeItem, attribute: .Top, toItem: topView))
constraints.append(constraint(item: edgeItem, attribute: .Bottom, toItem: bottomView))

if let centerView = centerView {
constraints.append(constraint(item: edgeItem, attribute: .CenterY, toItem: centerView))
}
case .Vertical:
constraints.append(constraint(item: edgeItem, attribute: .Leading, toItem: topView))
constraints.append(constraint(item: edgeItem, attribute: .Trailing, toItem: bottomView))

if alignment == .Center {
constraints.append(constraint(item: firstItem, attribute: .CenterX, toItem: arrangedSubviews.first!))
if let centerView = centerView {
constraints.append(constraint(item: edgeItem, attribute: .CenterX, toItem: centerView))
}
}

Expand Down
Loading