From b5fc2f46e31d278acf7fecd8860d772c5af76b91 Mon Sep 17 00:00:00 2001 From: Raffi Date: Thu, 6 Jul 2017 18:32:54 -0400 Subject: [PATCH 1/5] Ability to inherit from TZStackView --- TZStackView/TZStackView.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TZStackView/TZStackView.swift b/TZStackView/TZStackView.swift index c5fba83..3c5adc8 100644 --- a/TZStackView/TZStackView.swift +++ b/TZStackView/TZStackView.swift @@ -17,7 +17,7 @@ func ==(lhs: TZAnimationDidStopQueueEntry, rhs: TZAnimationDidStopQueueEntry) -> return lhs.view === rhs.view } -public class TZStackView: UIView { +open class TZStackView: UIView { public var distribution: TZStackViewDistribution = .fill { didSet { @@ -95,7 +95,7 @@ public class TZStackView: UIView { } } - public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { + open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) { if let view = object as? UIView, let change = change, keyPath == "hidden" { let hidden = view.isHidden let previousValue = change[.oldKey] as! Bool @@ -165,11 +165,11 @@ public class TZStackView: UIView { arrangedSubviews.insert(view, at: stackIndex) } - override public func willRemoveSubview(_ subview: UIView) { + override open func willRemoveSubview(_ subview: UIView) { removeArrangedSubview(subview) } - override public func updateConstraints() { + override open func updateConstraints() { removeConstraints(stackViewConstraints) stackViewConstraints.removeAll() From 4ea39cda070ef3f4201230a7f9197d6bcdf19866 Mon Sep 17 00:00:00 2001 From: Raffi Senerol Date: Fri, 23 Feb 2018 17:01:31 -0500 Subject: [PATCH 2/5] Swift 4 migration --- TZStackView.xcodeproj/project.pbxproj | 28 ++++++++++++++----- .../xcschemes/TZStackView.xcscheme | 4 ++- TZStackView/TZStackView.swift | 4 +-- TZStackViewDemo/AppDelegate.swift | 2 +- .../ExplicitIntrinsicContentSizeView.swift | 2 +- TZStackViewDemo/ViewController.swift | 24 ++++++++-------- 6 files changed, 40 insertions(+), 24 deletions(-) diff --git a/TZStackView.xcodeproj/project.pbxproj b/TZStackView.xcodeproj/project.pbxproj index 93b6619..b2ca626 100644 --- a/TZStackView.xcodeproj/project.pbxproj +++ b/TZStackView.xcodeproj/project.pbxproj @@ -264,7 +264,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Tom van Zummeren"; TargetAttributes = { 5F50E36345E94CFC65ED7270 = { @@ -381,14 +381,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -417,6 +423,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -428,14 +435,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -456,6 +469,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -469,7 +483,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "nl.tomvanzummeren.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -485,7 +499,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "nl.tomvanzummeren.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUNDLE_LOADER)"; }; name = Release; @@ -502,7 +516,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "nl.tomvanzummeren.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TEST_HOST = "$(BUNDLE_LOADER)"; }; name = Debug; @@ -516,7 +530,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "nl.tomvanzummeren.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -539,7 +553,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -563,7 +577,7 @@ PRODUCT_BUNDLE_IDENTIFIER = nl.tomvanzummeren.TZStackView; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme b/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme index 165c1b2..d340a4b 100644 --- a/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme +++ b/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/TZStackView/TZStackView.swift b/TZStackView/TZStackView.swift index 3c5adc8..9cc0607 100644 --- a/TZStackView/TZStackView.swift +++ b/TZStackView/TZStackView.swift @@ -131,7 +131,7 @@ open class TZStackView: UIView { addHiddenListener(arrangedSubview) } - func hiddenAnimationStopped() { + @objc func hiddenAnimationStopped() { var queueEntriesToRemove = [TZAnimationDidStopQueueEntry]() for entry in animationDidStopQueueEntries { let view = entry.view @@ -595,7 +595,7 @@ open class TZStackView: UIView { let attribute2 = attr2 != nil ? attr2! : attr1 let constraint = NSLayoutConstraint(item: view1, attribute: attr1, relatedBy: relation, toItem: view2, attribute: attribute2, multiplier: multiplier, constant: c) - constraint.priority = priority + constraint.priority = UILayoutPriority(rawValue: priority) return constraint } diff --git a/TZStackViewDemo/AppDelegate.swift b/TZStackViewDemo/AppDelegate.swift index 57fc143..62975bc 100644 --- a/TZStackViewDemo/AppDelegate.swift +++ b/TZStackViewDemo/AppDelegate.swift @@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { //Appearance proxy for the UISegmentedControl font UISegmentedControl.appearance().setTitleTextAttributes( - [NSFontAttributeName:UIFont(name: "HelveticaNeue-Light", size:10.0)!], + [NSAttributedStringKey.font:UIFont(name: "HelveticaNeue-Light", size:10.0)!], for: UIControlState()) //Launch the application diff --git a/TZStackViewDemo/ExplicitIntrinsicContentSizeView.swift b/TZStackViewDemo/ExplicitIntrinsicContentSizeView.swift index 0af9816..615bead 100644 --- a/TZStackViewDemo/ExplicitIntrinsicContentSizeView.swift +++ b/TZStackViewDemo/ExplicitIntrinsicContentSizeView.swift @@ -20,7 +20,7 @@ class ExplicitIntrinsicContentSizeView: UIView { isUserInteractionEnabled = true } - func tap() { + @objc func tap() { UIView.animate(withDuration: 0.6, delay: 0, usingSpringWithDamping: 0.7, initialSpringVelocity: 0, options: .allowUserInteraction, animations: { self.isHidden = true }, completion: nil) diff --git a/TZStackViewDemo/ViewController.swift b/TZStackViewDemo/ViewController.swift index 9b4a57b..d451a51 100644 --- a/TZStackViewDemo/ViewController.swift +++ b/TZStackViewDemo/ViewController.swift @@ -44,28 +44,28 @@ class ViewController: UIViewController { instructionLabel.text = "Tap any of the boxes to set hidden=true" instructionLabel.textColor = UIColor.white instructionLabel.numberOfLines = 0 - instructionLabel.setContentCompressionResistancePriority(900, for: .horizontal) - instructionLabel.setContentHuggingPriority(1000, for: .vertical) + instructionLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal) + instructionLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 1000), for: .vertical) view.addSubview(instructionLabel) resetButton.translatesAutoresizingMaskIntoConstraints = false resetButton.setTitle("Reset", for: UIControlState()) resetButton.addTarget(self, action: #selector(ViewController.reset), for: .touchUpInside) - resetButton.setContentCompressionResistancePriority(1000, for: .horizontal) - resetButton.setContentHuggingPriority(1000, for: .horizontal) - resetButton.setContentHuggingPriority(1000, for: .vertical) + resetButton.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 1000), for: .horizontal) + resetButton.setContentHuggingPriority(UILayoutPriority(rawValue: 1000), for: .horizontal) + resetButton.setContentHuggingPriority(UILayoutPriority(rawValue: 1000), for: .vertical) view.addSubview(resetButton) axisSegmentedControl = UISegmentedControl(items: ["Vertical", "Horizontal"]) axisSegmentedControl.selectedSegmentIndex = 0 axisSegmentedControl.addTarget(self, action: #selector(ViewController.axisChanged(_:)), for: .valueChanged) - axisSegmentedControl.setContentCompressionResistancePriority(900, for: .horizontal) + axisSegmentedControl.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal) axisSegmentedControl.tintColor = UIColor.lightGray alignmentSegmentedControl = UISegmentedControl(items: ["Fill", "Center", "Leading", "Top", "Trailing", "Bottom", "FirstBaseline"]) alignmentSegmentedControl.selectedSegmentIndex = 0 alignmentSegmentedControl.addTarget(self, action: #selector(ViewController.alignmentChanged(_:)), for: .valueChanged) - alignmentSegmentedControl.setContentCompressionResistancePriority(1000, for: .horizontal) + alignmentSegmentedControl.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 1000), for: .horizontal) alignmentSegmentedControl.tintColor = UIColor.lightGray distributionSegmentedControl = UISegmentedControl(items: ["Fill", "FillEqually", "FillProportionally", "EqualSpacing", "EqualCentering"]) @@ -77,7 +77,7 @@ class ViewController: UIViewController { controlsLayoutContainer.axis = .vertical controlsLayoutContainer.translatesAutoresizingMaskIntoConstraints = false controlsLayoutContainer.spacing = 5 - controlsLayoutContainer.setContentHuggingPriority(1000, for: .vertical) + controlsLayoutContainer.setContentHuggingPriority(UILayoutPriority(rawValue: 1000), for: .vertical) view.addSubview(controlsLayoutContainer) let views: [String:AnyObject] = [ @@ -122,7 +122,7 @@ class ViewController: UIViewController { //MARK: - Button Actions //-------------------------------------------------------------------------- - func reset() { + @objc func reset() { UIView.animate(withDuration: 0.6, delay: 0, usingSpringWithDamping: 0.7, initialSpringVelocity: 0, options: .allowUserInteraction, animations: { for view in self.tzStackView.arrangedSubviews { view.isHidden = false @@ -133,7 +133,7 @@ class ViewController: UIViewController { //MARK: - Segmented Control Actions //-------------------------------------------------------------------------- - func axisChanged(_ sender: UISegmentedControl) { + @objc func axisChanged(_ sender: UISegmentedControl) { switch sender.selectedSegmentIndex { case 0: tzStackView.axis = .vertical @@ -142,7 +142,7 @@ class ViewController: UIViewController { } } - func alignmentChanged(_ sender: UISegmentedControl) { + @objc func alignmentChanged(_ sender: UISegmentedControl) { switch sender.selectedSegmentIndex { case 0: tzStackView.alignment = .fill @@ -162,7 +162,7 @@ class ViewController: UIViewController { tzStackView.setNeedsUpdateConstraints() } - func distributionChanged(_ sender: UISegmentedControl) { + @objc func distributionChanged(_ sender: UISegmentedControl) { switch sender.selectedSegmentIndex { case 0: tzStackView.distribution = .fill From 6709688158c2e90f69b5b13ca5081caf2dd5fc55 Mon Sep 17 00:00:00 2001 From: Raffi Date: Tue, 24 Apr 2018 10:49:38 -0400 Subject: [PATCH 3/5] Update TZStackView.podspec --- TZStackView.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TZStackView.podspec b/TZStackView.podspec index 410dde2..5ae0e78 100644 --- a/TZStackView.podspec +++ b/TZStackView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "TZStackView" - s.version = "1.3.0" + s.version = "1.3.1" s.summary = "TZStackView is a replica of iOS 9's new UIStackView for use in iOS 7 and iOS 8" s.homepage = "https://github.com/tomvanzummeren/TZStackView.git" s.license = { :type => "MIT" } From f8eecfd0b854760019b04f9d0cc1a4bdf0123743 Mon Sep 17 00:00:00 2001 From: Raffi Date: Tue, 5 Feb 2019 15:45:46 -0500 Subject: [PATCH 4/5] Converted to Swift 4.2 --- TZStackView.xcodeproj/project.pbxproj | 10 +++++++--- .../xcshareddata/xcschemes/TZStackView.xcscheme | 4 +--- TZStackView/TZStackView.swift | 12 ++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/TZStackView.xcodeproj/project.pbxproj b/TZStackView.xcodeproj/project.pbxproj index b2ca626..0e2bf75 100644 --- a/TZStackView.xcodeproj/project.pbxproj +++ b/TZStackView.xcodeproj/project.pbxproj @@ -264,7 +264,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Tom van Zummeren"; TargetAttributes = { 5F50E36345E94CFC65ED7270 = { @@ -385,12 +385,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -439,12 +441,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -553,7 +557,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -577,7 +581,7 @@ PRODUCT_BUNDLE_IDENTIFIER = nl.tomvanzummeren.TZStackView; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme b/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme index d340a4b..05860f8 100644 --- a/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme +++ b/TZStackView.xcodeproj/xcshareddata/xcschemes/TZStackView.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/TZStackView/TZStackView.swift b/TZStackView/TZStackView.swift index 9cc0607..6a712d0 100644 --- a/TZStackView/TZStackView.swift +++ b/TZStackView/TZStackView.swift @@ -25,7 +25,7 @@ open class TZStackView: UIView { } } - public var axis: UILayoutConstraintAxis = .horizontal { + public var axis: NSLayoutConstraint.Axis = .horizontal { didSet { setNeedsUpdateConstraints() } @@ -348,10 +348,10 @@ open class TZStackView: UIView { } var topPriority: Float = 1000 - var topRelation: NSLayoutRelation = .lessThanOrEqual + var topRelation: NSLayoutConstraint.Relation = .lessThanOrEqual var bottomPriority: Float = 1000 - var bottomRelation: NSLayoutRelation = .greaterThanOrEqual + var bottomRelation: NSLayoutConstraint.Relation = .greaterThanOrEqual if alignment == .top || alignment == .leading { topPriority = 999.5 @@ -437,7 +437,7 @@ open class TZStackView: UIView { } // Chains together the given views using Leading/Trailing or Top/Bottom - private func createFillConstraints(_ views: [UIView], priority: Float = 1000, relatedBy relation: NSLayoutRelation = .equal, constant: CGFloat) -> [NSLayoutConstraint] { + private func createFillConstraints(_ views: [UIView], priority: Float = 1000, relatedBy relation: NSLayoutConstraint.Relation = .equal, constant: CGFloat) -> [NSLayoutConstraint] { var constraints = [NSLayoutConstraint]() var previousView: UIView? @@ -567,7 +567,7 @@ open class TZStackView: UIView { return constraints } - private func equalAttributes(views: [UIView], attribute: NSLayoutAttribute, priority: Float = 1000) -> [NSLayoutConstraint] { + private func equalAttributes(views: [UIView], attribute: NSLayoutConstraint.Attribute, priority: Float = 1000) -> [NSLayoutConstraint] { var currentPriority = priority var constraints = [NSLayoutConstraint]() if views.count > 0 { @@ -590,7 +590,7 @@ open class TZStackView: UIView { } // Convenience method to help make NSLayoutConstraint in a less verbose way - private func constraint(item view1: AnyObject, attribute attr1: NSLayoutAttribute, relatedBy relation: NSLayoutRelation = .equal, toItem view2: AnyObject?, attribute attr2: NSLayoutAttribute? = nil, multiplier: CGFloat = 1, constant c: CGFloat = 0, priority: Float = 1000) -> NSLayoutConstraint { + private func constraint(item view1: AnyObject, attribute attr1: NSLayoutConstraint.Attribute, relatedBy relation: NSLayoutConstraint.Relation = .equal, toItem view2: AnyObject?, attribute attr2: NSLayoutConstraint.Attribute? = nil, multiplier: CGFloat = 1, constant c: CGFloat = 0, priority: Float = 1000) -> NSLayoutConstraint { let attribute2 = attr2 != nil ? attr2! : attr1 From 3962b3bd0f2aaef8d9cfa9b81b23dfda70d87106 Mon Sep 17 00:00:00 2001 From: Raffi Date: Tue, 5 Feb 2019 15:46:04 -0500 Subject: [PATCH 5/5] Fix unit tests --- TZStackViewTests/TZStackViewTestCase.swift | 6 +- TZStackViewTests/TZStackViewTests.swift | 420 ++++++++++----------- 2 files changed, 213 insertions(+), 213 deletions(-) diff --git a/TZStackViewTests/TZStackViewTestCase.swift b/TZStackViewTests/TZStackViewTestCase.swift index cc6b3e3..254a9b6 100644 --- a/TZStackViewTests/TZStackViewTestCase.swift +++ b/TZStackViewTests/TZStackViewTestCase.swift @@ -119,8 +119,8 @@ class TZStackViewTestCase: XCTestCase { return false } if layoutConstraint1.priority != layoutConstraint2.priority { - if layoutConstraint1.priority < 100 || layoutConstraint1.priority > 150 - || layoutConstraint2.priority < 100 || layoutConstraint2.priority > 150 { + if layoutConstraint1.priority.rawValue < 100.0 || layoutConstraint1.priority.rawValue > 150.0 + || layoutConstraint2.priority.rawValue < 100.0 || layoutConstraint2.priority.rawValue > 150.0 { return false } } @@ -169,7 +169,7 @@ class TZStackViewTestCase: XCTestCase { if object1 == nil && object2 == nil { return true } - if let view1 = object1 as? UIView, let view2 = object2 as? UIView , view1 == view2 { + if let view1 = object1 as? UIView, let view2 = object2 as? UIView, view1.frame == view2.frame && view1.description == view2.description { return true } if object1 is UIStackView && object2 is TZStackView { diff --git a/TZStackViewTests/TZStackViewTests.swift b/TZStackViewTests/TZStackViewTests.swift index b4c0461..5a518f9 100644 --- a/TZStackViewTests/TZStackViewTests.swift +++ b/TZStackViewTests/TZStackViewTests.swift @@ -36,9 +36,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .fill - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Fill + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -50,9 +50,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .fill - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Fill + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -64,9 +64,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .fill - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .Fill + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -78,9 +78,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .fill - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .Fill + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -92,9 +92,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .fill - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Fill + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -106,9 +106,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .fill - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Fill + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -120,9 +120,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .fill - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Fill + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -134,9 +134,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .fill - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Fill + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -148,9 +148,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .fill - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Fill + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -162,9 +162,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .fill - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Fill + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .fill uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -176,9 +176,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .center - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Center + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -190,9 +190,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .center - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Center + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -204,9 +204,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .center - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .Center + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -218,9 +218,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .center - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .Center + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -232,9 +232,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .center - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Center + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -246,9 +246,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .center - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Center + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -260,9 +260,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .center - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Center + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -274,9 +274,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .center - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Center + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -288,9 +288,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .center - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Center + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -302,9 +302,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .center - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Center + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .center uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -316,9 +316,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .leading - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Leading + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -330,9 +330,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .leading - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .Leading + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -344,9 +344,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .leading - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Leading + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -358,9 +358,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .leading - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Leading + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -372,9 +372,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .leading - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Leading + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -386,9 +386,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .leading - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Leading + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -400,9 +400,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .leading - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .Leading + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -414,9 +414,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .leading - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Leading + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -428,9 +428,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .leading - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Leading + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -442,9 +442,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .leading - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Leading + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .leading uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -456,9 +456,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .top - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Top + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -470,9 +470,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .top - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .Top + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -484,9 +484,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .top - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Top + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -498,9 +498,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .top - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Top + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -512,9 +512,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .top - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Top + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -526,9 +526,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .top - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Top + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -540,9 +540,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .top - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .Top + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -554,9 +554,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .top - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Top + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -568,9 +568,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .top - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Top + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -582,9 +582,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .top - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Top + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .top uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -596,9 +596,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .trailing - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Trailing + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -610,9 +610,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .trailing - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .Trailing + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -624,9 +624,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .trailing - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Trailing + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -638,9 +638,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .trailing - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Trailing + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -652,9 +652,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .trailing - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Trailing + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -666,9 +666,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .trailing - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Trailing + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -680,9 +680,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .trailing - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .Trailing + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -694,9 +694,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .trailing - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Trailing + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -708,9 +708,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .trailing - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Trailing + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -722,9 +722,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .trailing - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Trailing + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .trailing uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -736,9 +736,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .bottom - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Bottom + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -750,9 +750,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .bottom - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .Bottom + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -764,9 +764,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .bottom - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Bottom + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -778,9 +778,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .bottom - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Bottom + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -792,9 +792,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .bottom - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Bottom + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -806,9 +806,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .bottom - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .Bottom + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -820,9 +820,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .bottom - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .Bottom + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -834,9 +834,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .bottom - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .Bottom + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -848,9 +848,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .bottom - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .Bottom + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -862,9 +862,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .bottom - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .Bottom + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .bottom uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -876,9 +876,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillEqually uiStackView.alignment = .firstBaseline - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillEqually - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .horizontal + tzStackView.distribution = .fillEqually + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -890,9 +890,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fill uiStackView.alignment = .firstBaseline - tzStackView.axis = .Horizontal - tzStackView.distribution = .Fill - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .horizontal + tzStackView.distribution = .fill + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -904,9 +904,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .fillProportionally uiStackView.alignment = .firstBaseline - tzStackView.axis = .Horizontal - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .horizontal + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -918,9 +918,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalSpacing uiStackView.alignment = .firstBaseline - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .horizontal + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -932,9 +932,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .horizontal uiStackView.distribution = .equalCentering uiStackView.alignment = .firstBaseline - tzStackView.axis = .Horizontal - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .horizontal + tzStackView.distribution = .equalCentering + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -946,9 +946,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillEqually uiStackView.alignment = .firstBaseline - tzStackView.axis = .Vertical - tzStackView.distribution = .FillEqually - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .vertical + tzStackView.distribution = .fillEqually + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -961,9 +961,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fill uiStackView.alignment = .firstBaseline - tzStackView.axis = .Vertical - tzStackView.distribution = .Fill - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .vertical + tzStackView.distribution = .fill + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -975,9 +975,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .fillProportionally uiStackView.alignment = .firstBaseline - tzStackView.axis = .Vertical - tzStackView.distribution = .FillProportionally - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .vertical + tzStackView.distribution = .fillProportionally + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -989,9 +989,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalSpacing uiStackView.alignment = .firstBaseline - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualSpacing - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .vertical + tzStackView.distribution = .equalSpacing + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10 @@ -1003,9 +1003,9 @@ class TZStackViewTests: TZStackViewTestCase { uiStackView.axis = .vertical uiStackView.distribution = .equalCentering uiStackView.alignment = .firstBaseline - tzStackView.axis = .Vertical - tzStackView.distribution = .EqualCentering - tzStackView.alignment = .FirstBaseline + tzStackView.axis = .vertical + tzStackView.distribution = .equalCentering + tzStackView.alignment = .firstBaseline uiStackView.spacing = 10 tzStackView.spacing = 10