diff --git a/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj b/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj index 369add4..f509974 100644 --- a/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj +++ b/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj @@ -241,7 +241,7 @@ TargetAttributes = { 24661CFB1F4EFFF5002CB883 = { CreatedOnToolsVersion = 8.3.2; - DevelopmentTeam = 385YL4KG69; + DevelopmentTeam = 4Q596JWQC5; LastSwiftMigration = 0920; ProvisioningStyle = Automatic; }; @@ -481,7 +481,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 385YL4KG69; + DEVELOPMENT_TEAM = 4Q596JWQC5; INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.LayoutFrameworkBenchmark; @@ -498,7 +498,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 385YL4KG69; + DEVELOPMENT_TEAM = 4Q596JWQC5; INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.LayoutFrameworkBenchmark; diff --git a/LayoutFrameworkBenchmark/Benchmarks/AutoLayout/FeedItemAutoLayoutView.swift b/LayoutFrameworkBenchmark/Benchmarks/AutoLayout/FeedItemAutoLayoutView.swift index 344871d..d132b98 100755 --- a/LayoutFrameworkBenchmark/Benchmarks/AutoLayout/FeedItemAutoLayoutView.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/AutoLayout/FeedItemAutoLayoutView.swift @@ -135,15 +135,25 @@ class MiniProfileView: UIView { return i }() - let posterNameLabel: UILabel = UILabel() + let posterNameLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow + return l + }() let posterHeadlineLabel: UILabel = { let l = UILabel() l.numberOfLines = 3 + l.backgroundColor = UIColor.yellow + return l + }() + + let posterTimeLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow return l }() - let posterTimeLabel: UILabel = UILabel() let posterCommentLabel: UILabel = UILabel() init() { @@ -176,14 +186,14 @@ class SocialActionsView: UIView { let likeLabel: UILabel = { let l = UILabel() l.text = "Like" - l.backgroundColor = UIColor(red: 0, green: 0.9, blue: 0, alpha: 1) + l.backgroundColor = .green return l }() let commentLabel: UILabel = { let l = UILabel() l.text = "Comment" - l.backgroundColor = UIColor(red: 0, green: 1.0, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .center return l }() @@ -192,7 +202,7 @@ class SocialActionsView: UIView { let l = UILabel() l.text = "Share" l.textAlignment = .right - l.backgroundColor = UIColor(red: 0, green: 0.8, blue: 0, alpha: 1) + l.backgroundColor = .green return l }() @@ -235,7 +245,6 @@ class TopBarView: UIView { init() { super.init(frame: .zero) - backgroundColor = UIColor.blue let views: [String: UIView] = ["actionLabel": actionLabel, "optionsLabel": optionsLabel] addAutoLayoutSubviews(views) addConstraints(withVisualFormat: "H:|-0-[actionLabel]-0-[optionsLabel]-0-|", views: views) diff --git a/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/FeedItemLayoutKitView.swift b/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/FeedItemLayoutKitView.swift index c2ddf96..05dcd37 100755 --- a/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/FeedItemLayoutKitView.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/FeedItemLayoutKitView.swift @@ -28,7 +28,6 @@ class FeedItemLayoutKitView: UIView, DataBinder { func setData(_ data: FeedItemData) { let posterProfile = ProfileCardLayout( name: data.posterName, - connectionDegree: "2nd", headline: data.posterHeadline, timestamp: data.posterTimestamp, profileImageName: "50x50.png") diff --git a/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/Layouts/ProfileCardLayout.swift b/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/Layouts/ProfileCardLayout.swift index 4f558fb..d4ee251 100755 --- a/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/Layouts/ProfileCardLayout.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/LayoutKit/Layouts/ProfileCardLayout.swift @@ -11,7 +11,7 @@ import LayoutKit open class ProfileCardLayout: StackLayout { - public init(name: String, connectionDegree: String, headline: String, timestamp: String, profileImageName: String) { + public init(name: String, headline: String, timestamp: String, profileImageName: String) { let labelConfig = { (label: UILabel) in label.backgroundColor = UIColor.yellow } @@ -21,9 +21,6 @@ open class ProfileCardLayout: StackLayout { spacing: 4, sublayouts: [ LabelLayout(text: name, viewReuseId: "name", config: labelConfig), - LabelLayout(text: connectionDegree, viewReuseId: "connectionDegree", config: { label in - label.backgroundColor = UIColor.gray - }), ] ) diff --git a/LayoutFrameworkBenchmark/Benchmarks/ManualLayout/FeedItemManualView.swift b/LayoutFrameworkBenchmark/Benchmarks/ManualLayout/FeedItemManualView.swift index d0a62f0..89656e8 100755 --- a/LayoutFrameworkBenchmark/Benchmarks/ManualLayout/FeedItemManualView.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/ManualLayout/FeedItemManualView.swift @@ -10,10 +10,10 @@ import UIKit /// A LinkedIn feed item that is implemented with manual layout code. class FeedItemManualView: UIView, DataBinder { + let hMargin: CGFloat = 8 let actionLabel: UILabel = { let l = UILabel() - l.backgroundColor = UIColor.blue return l }() @@ -33,15 +33,24 @@ class FeedItemManualView: UIView, DataBinder { return i }() - let posterNameLabel: UILabel = UILabel() + let posterNameLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow + return l + }() let posterHeadlineLabel: UILabel = { let l = UILabel() - l.numberOfLines = 3 + l.backgroundColor = UIColor.yellow + return l + }() + + let posterTimeLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow return l }() - let posterTimeLabel: UILabel = UILabel() let posterCommentLabel: UILabel = UILabel() let contentImageView: UIImageView = { @@ -57,7 +66,7 @@ class FeedItemManualView: UIView, DataBinder { let likeLabel: UILabel = { let l = UILabel() - l.backgroundColor = UIColor(red: 0, green: 0.9, blue: 0, alpha: 1) + l.backgroundColor = .green l.text = "Like" return l }() @@ -65,7 +74,7 @@ class FeedItemManualView: UIView, DataBinder { let commentLabel: UILabel = { let l = UILabel() l.text = "Comment" - l.backgroundColor = UIColor(red: 0, green: 1.0, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .center return l }() @@ -73,7 +82,7 @@ class FeedItemManualView: UIView, DataBinder { let shareLabel: UILabel = { let l = UILabel() l.text = "Share" - l.backgroundColor = UIColor(red: 0, green: 0.8, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .right return l }() @@ -112,9 +121,16 @@ class FeedItemManualView: UIView, DataBinder { func setData(_ data: FeedItemData) { actionLabel.text = data.actionText + posterNameLabel.text = data.posterName + posterNameLabel.sizeToFit() + posterHeadlineLabel.text = data.posterHeadline + posterHeadlineLabel.sizeToFit() + posterTimeLabel.text = data.posterTimestamp + posterTimeLabel.sizeToFit() + posterCommentLabel.text = data.posterComment contentTitleLabel.text = data.contentTitle contentDomainLabel.text = data.contentDomain @@ -124,57 +140,59 @@ class FeedItemManualView: UIView, DataBinder { override func layoutSubviews() { super.layoutSubviews() - optionsLabel.frame = CGRect(x: bounds.width-optionsLabel.frame.width, y: 0, width: optionsLabel.frame.width, height: optionsLabel.frame.height) - actionLabel.frame = CGRect(x: 0, y: 0, width: bounds.width-optionsLabel.frame.width, height: 0) + + let vMargin: CGFloat = 4 + let spacing: CGFloat = 1 + + optionsLabel.frame = CGRect(x: bounds.width-optionsLabel.frame.width - hMargin, y: hMargin, width: optionsLabel.frame.width, height: optionsLabel.frame.height) + actionLabel.frame = CGRect(x: hMargin, y: hMargin, width: bounds.width-optionsLabel.frame.width, height: 0) actionLabel.sizeToFit() - posterImageView.frame = CGRect(x: 0, y: actionLabel.frame.bottom, width: posterImageView.frame.width, height: 0) + posterImageView.frame = CGRect(x: hMargin, y: actionLabel.frame.bottom + 10, width: posterImageView.frame.width, height: 0) posterImageView.sizeToFit() - let contentInsets = UIEdgeInsets(top: 0, left: 1, bottom: 2, right: 3) - let posterLabelWidth = bounds.width-posterImageView.frame.width - contentInsets.left - contentInsets.right - posterNameLabel.frame = CGRect(x: posterImageView.frame.right + contentInsets.left, y: posterImageView.frame.origin.y + contentInsets.top, width: posterLabelWidth, height: 0) - posterNameLabel.sizeToFit() + let contentInsets = UIEdgeInsets(top: -10, left: 2, bottom: 2, right: 3) + posterNameLabel.frame = CGRect(x: posterImageView.frame.right + contentInsets.left, y: posterImageView.frame.origin.y + contentInsets.top, width: posterNameLabel.frame.width, height: posterNameLabel.frame.height) - let spacing: CGFloat = 1 - posterHeadlineLabel.frame = CGRect(x: posterImageView.frame.right + contentInsets.left, y: posterNameLabel.frame.bottom + spacing, width: posterLabelWidth, height: 0) - posterHeadlineLabel.sizeToFit() + posterHeadlineLabel.frame = CGRect(x: posterImageView.frame.right + contentInsets.left, y: posterNameLabel.frame.bottom + spacing, width: posterHeadlineLabel.frame.width, height: posterHeadlineLabel.frame.height) - posterTimeLabel.frame = CGRect(x: posterImageView.frame.right + contentInsets.left, y: posterHeadlineLabel.frame.bottom + spacing, width: posterLabelWidth, height: 0) - posterTimeLabel.sizeToFit() + posterTimeLabel.frame = CGRect(x: posterImageView.frame.right + contentInsets.left, y: posterHeadlineLabel.frame.bottom + spacing, width: posterTimeLabel.frame.width, height: posterTimeLabel.frame.height) - posterCommentLabel.frame = CGRect(x: 0, y: max(posterImageView.frame.bottom, posterTimeLabel.frame.bottom + contentInsets.bottom), width: frame.width, height: 0) + posterCommentLabel.frame = CGRect(x: hMargin, y: max(posterImageView.frame.bottom, posterTimeLabel.frame.bottom + contentInsets.bottom), width: frame.width, height: 0) posterCommentLabel.sizeToFit() - contentImageView.frame = CGRect(x: frame.width/2 - contentImageView.frame.width/2, y: posterCommentLabel.frame.bottom, width: frame.width, height: 0) + contentImageView.frame = CGRect(x: hMargin, y: posterCommentLabel.frame.bottom, width: frame.width, height: 0) contentImageView.sizeToFit() - contentTitleLabel.frame = CGRect(x: 0, y: contentImageView.frame.bottom, width: frame.width, height: 0) + contentTitleLabel.frame = CGRect(x: hMargin, y: contentImageView.frame.bottom, width: frame.width, height: 0) contentTitleLabel.sizeToFit() - contentDomainLabel.frame = CGRect(x: 0, y: contentTitleLabel.frame.bottom, width: frame.width, height: 0) + contentDomainLabel.frame = CGRect(x: hMargin, y: contentTitleLabel.frame.bottom, width: frame.width, height: 0) contentDomainLabel.sizeToFit() - likeLabel.frame = CGRect(x: 0, y: contentDomainLabel.frame.bottom, width: 0, height: 0) + likeLabel.frame = CGRect(x: hMargin, y: contentDomainLabel.frame.bottom + vMargin, width: 0, height: 0) likeLabel.sizeToFit() commentLabel.sizeToFit() - commentLabel.frame = CGRect(x: frame.width/2-commentLabel.frame.width/2, y: contentDomainLabel.frame.bottom, width: commentLabel.frame.width, height: commentLabel.frame.height) + commentLabel.frame = CGRect(x: frame.width / 2 - commentLabel.frame.width / 2, y: contentDomainLabel.frame.bottom + vMargin, width: commentLabel.frame.width, height: commentLabel.frame.height) shareLabel.sizeToFit() - shareLabel.frame = CGRect(x: frame.width-shareLabel.frame.width, y: contentDomainLabel.frame.bottom, width: shareLabel.frame.width, height: shareLabel.frame.height) + shareLabel.frame = CGRect(x: frame.width - shareLabel.frame.width - hMargin, y: contentDomainLabel.frame.bottom + vMargin, width: shareLabel.frame.width, height: shareLabel.frame.height) - actorImageView.frame = CGRect(x: 0, y: likeLabel.frame.bottom, width: 0, height: 0) + actorImageView.frame = CGRect(x: hMargin, y: likeLabel.frame.bottom + vMargin, width: 0, height: 0) actorImageView.sizeToFit() - actorCommentLabel.frame = CGRect(x: actorImageView.frame.right, y: likeLabel.frame.bottom, width: frame.width-actorImageView.frame.width, height: 0) + actorCommentLabel.frame = CGRect(x: actorImageView.frame.right + vMargin, + y: actorImageView.frame.minY + (actorImageView.frame.height - actorCommentLabel.frame.height) / 2, + width: frame.width-actorImageView.frame.width, + height: 0) actorCommentLabel.sizeToFit() } override func sizeThatFits(_ size: CGSize) -> CGSize { frame = CGRect(x: 0, y: 0, width: size.width, height: size.height) layoutSubviews() - return CGSize(width: size.width, height: max(actorImageView.frame.bottom, actorCommentLabel.frame.bottom)) + return CGSize(width: size.width, height: max(actorImageView.frame.bottom, actorCommentLabel.frame.bottom) + hMargin) } override var intrinsicContentSize: CGSize { diff --git a/LayoutFrameworkBenchmark/Benchmarks/NKFrameLayoutKit/NKFrameLayoutKitView.swift b/LayoutFrameworkBenchmark/Benchmarks/NKFrameLayoutKit/NKFrameLayoutKitView.swift index d2cca52..dfbd119 100644 --- a/LayoutFrameworkBenchmark/Benchmarks/NKFrameLayoutKit/NKFrameLayoutKitView.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/NKFrameLayoutKit/NKFrameLayoutKitView.swift @@ -15,7 +15,6 @@ class NKFrameLayoutKitView: UIView, DataBinder { let actionLabel: UILabel = { let l = UILabel() - l.backgroundColor = UIColor.blue return l }() @@ -33,7 +32,11 @@ class NKFrameLayoutKitView: UIView, DataBinder { return i }() - let posterNameLabel: UILabel = UILabel() + let posterNameLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow + return l + }() let posterHeadlineLabel: UILabel = { let l = UILabel() @@ -41,7 +44,12 @@ class NKFrameLayoutKitView: UIView, DataBinder { return l }() - let posterTimeLabel: UILabel = UILabel() + let posterTimeLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow + return l + }() + let posterCommentLabel: UILabel = UILabel() let contentImageView: UIImageView = { @@ -56,7 +64,7 @@ class NKFrameLayoutKitView: UIView, DataBinder { let likeLabel: UILabel = { let l = UILabel() - l.backgroundColor = UIColor(red: 0, green: 0.9, blue: 0, alpha: 1) + l.backgroundColor = .green l.text = "Like" return l }() @@ -64,7 +72,7 @@ class NKFrameLayoutKitView: UIView, DataBinder { let commentLabel: UILabel = { let l = UILabel() l.text = "Comment" - l.backgroundColor = UIColor(red: 0, green: 1.0, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .center return l }() @@ -72,7 +80,7 @@ class NKFrameLayoutKitView: UIView, DataBinder { let shareLabel: UILabel = { let l = UILabel() l.text = "Share" - l.backgroundColor = UIColor(red: 0, green: 0.8, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .right return l }() diff --git a/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift b/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift index 345f3df..214d9e4 100755 --- a/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift @@ -130,12 +130,22 @@ class FeedItemPinLayoutView: UIView, DataBinder { actionLabel.sizeToFit() posterNameLabel.text = data.posterName + posterNameLabel.sizeToFit() + posterHeadlineLabel.text = data.posterHeadline + posterHeadlineLabel.sizeToFit() + posterTimeLabel.text = data.posterTimestamp + posterTimeLabel.sizeToFit() posterCommentLabel.text = data.posterComment + contentTitleLabel.text = data.contentTitle + contentTitleLabel.sizeToFit() + contentDomainLabel.text = data.contentDomain + contentDomainLabel.sizeToFit() + actorCommentLabel.text = data.actorComment actorCommentLabel.sizeToFit() setNeedsLayout() @@ -145,29 +155,29 @@ class FeedItemPinLayoutView: UIView, DataBinder { super.layoutSubviews() let hMargin: CGFloat = 8 - let vMargin: CGFloat = 2 + let vMargin: CGFloat = 4 optionsLabel.pin.topRight().margin(hMargin) actionLabel.pin.topLeft().margin(hMargin) posterImageView.pin.below(of: actionLabel, aligned: .left).marginTop(10) - posterNameLabel.pin.right(of: posterImageView, aligned: .top).margin(-6, 6).right(hMargin).sizeToFit(.width) - posterHeadlineLabel.pin.below(of: posterNameLabel, aligned: .left).right(hMargin).marginTop(1).sizeToFit(.width) - posterTimeLabel.pin.below(of: posterHeadlineLabel, aligned: .left).right(hMargin).marginTop(1).sizeToFit(.width) + posterHeadlineLabel.pin.after(of: posterImageView, aligned: .center).marginLeft(4) + posterNameLabel.pin.above(of: posterHeadlineLabel, aligned: .left).marginBottom(vMargin) + posterTimeLabel.pin.below(of: posterHeadlineLabel, aligned: .left).marginTop(vMargin) - posterCommentLabel.pin.below(of: posterTimeLabel).left(hMargin).right(hMargin).marginTop(vMargin).sizeToFit(.width) + posterCommentLabel.pin.below(of: posterTimeLabel).left(hMargin).marginTop(vMargin) contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginTop(vMargin).marginRight(hMargin) - contentTitleLabel.pin.below(of: contentImageView).left().right().marginHorizontal(hMargin).sizeToFit(.width) - contentDomainLabel.pin.below(of: contentTitleLabel, aligned: .left).right().marginRight(hMargin).sizeToFit(.width) + contentTitleLabel.pin.below(of: contentImageView).left().marginHorizontal(hMargin) + contentDomainLabel.pin.below(of: contentTitleLabel, aligned: .left) likeLabel.pin.below(of: contentDomainLabel, aligned: .left).marginTop(vMargin) commentLabel.pin.top(to: likeLabel.edge.top).hCenter() shareLabel.pin.top(to: likeLabel.edge.top).right().marginRight(hMargin) actorImageView.pin.below(of: likeLabel, aligned: .left).marginTop(vMargin) - actorCommentLabel.pin.right(of: actorImageView, aligned: .center).marginLeft(4) + actorCommentLabel.pin.after(of: actorImageView, aligned: .center).marginLeft(4) } override func sizeThatFits(_ size: CGSize) -> CGSize { diff --git a/LayoutFrameworkBenchmark/Benchmarks/UIStackView/FeedItemUIStackView.swift b/LayoutFrameworkBenchmark/Benchmarks/UIStackView/FeedItemUIStackView.swift index b5ae751..6e20969 100755 --- a/LayoutFrameworkBenchmark/Benchmarks/UIStackView/FeedItemUIStackView.swift +++ b/LayoutFrameworkBenchmark/Benchmarks/UIStackView/FeedItemUIStackView.swift @@ -42,15 +42,24 @@ class FeedItemUIStackView: DebugStackView, DataBinder { return i }() - let posterNameLabel: UILabel = UILabel() + let posterNameLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow + return l + }() let posterHeadlineLabel: UILabel = { let l = UILabel() l.numberOfLines = 3 + l.backgroundColor = UIColor.yellow return l }() - let posterTimeLabel: UILabel = UILabel() + let posterTimeLabel: UILabel = { + let l = UILabel() + l.backgroundColor = UIColor.yellow + return l + }() lazy var posterLabels: DebugStackView = { let v = DebugStackView(arrangedSubviews: [self.posterNameLabel, self.posterHeadlineLabel, self.posterTimeLabel]) diff --git a/LayoutFrameworkBenchmark/FeedItemNotAutoLayoutView.swift b/LayoutFrameworkBenchmark/FeedItemNotAutoLayoutView.swift index bab9893..62c4001 100644 --- a/LayoutFrameworkBenchmark/FeedItemNotAutoLayoutView.swift +++ b/LayoutFrameworkBenchmark/FeedItemNotAutoLayoutView.swift @@ -140,7 +140,6 @@ private class ActionTitleView: UIView { let actionLabel: UILabel = { let l = UILabel() - l.backgroundColor = UIColor.blue return l }() @@ -301,7 +300,7 @@ private class ContentView: UIView { let likeLabel: UILabel = { let l = UILabel() - l.backgroundColor = UIColor(red: 0, green: 0.9, blue: 0, alpha: 1) + l.backgroundColor = .green l.text = "Like" return l }() @@ -309,7 +308,7 @@ private class ContentView: UIView { let commentLabel: UILabel = { let l = UILabel() l.text = "Comment" - l.backgroundColor = UIColor(red: 0, green: 1.0, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .center return l }() @@ -317,7 +316,7 @@ private class ContentView: UIView { let shareLabel: UILabel = { let l = UILabel() l.text = "Share" - l.backgroundColor = UIColor(red: 0, green: 0.8, blue: 0, alpha: 1) + l.backgroundColor = .green l.textAlignment = .right return l }() diff --git a/Podfile b/Podfile index a13273c..cb9a065 100755 --- a/Podfile +++ b/Podfile @@ -14,5 +14,5 @@ target 'LayoutFrameworkBenchmark' do pod 'PinLayout' pod 'Reveal-SDK' pod 'NotAutoLayout' - pod 'NKFrameLayoutKit' + pod 'NKFrameLayoutKit' end diff --git a/Podfile.lock b/Podfile.lock index 94770e2..eb077a2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -4,7 +4,7 @@ PODS: - NKFrameLayoutKit (2.1) - NotAutoLayout (3.1.1) - PinLayout (1.7.9) - - Reveal-SDK (14) + - Reveal-SDK (16) DEPENDENCIES: - FlexLayout @@ -29,8 +29,8 @@ SPEC CHECKSUMS: NKFrameLayoutKit: 6a2f6ac34f85d495e683ea0f7f1605903a4d3e00 NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84 PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf - Reveal-SDK: 55b5c5545233b680c2f8da734f202acc15d422b7 + Reveal-SDK: ed36bdbb3cbf90b94ae5da0dbcb3c7ae6738c51f -PODFILE CHECKSUM: 9565083f4813952a5a640666616b259832defa8b +PODFILE CHECKSUM: 2cdc011667a7f9e27a997f01bc1401d8830f418d COCOAPODS: 1.5.3 diff --git a/README.md b/README.md index 36022d0..35e122c 100644 --- a/README.md +++ b/README.md @@ -80,11 +80,10 @@ The benchmark layout UICollectionView cells in multiple pass, each pass contains ## Benchmark cell's layout Here are the benchmark rendering results to compare visual results: -* [Auto layout rendering result](docs_markdown/benchmark_result_Autolayout.png) -* [FlexLayout rendering result](docs_markdown/benchmark_result_FlexLayout.png) -* [PinLayout rendering result](docs_markdown/benchmark_result_PinLayout.png) * [LayoutKit rendering result](docs_markdown/benchmark_result_LayoutKit.png) +* [Manual layout rendering result](docs_markdown/benchmark_result_ManualLayout.png) * [NKFrameLayoutKit rendering result](docs_markdown/benchmark_result_NKFrameLayoutKit.png) +* [PinLayout rendering result](docs_markdown/benchmark_result_PinLayout.png) :pushpin: Some work would be required to adjust the layout so that they all match perfectly. diff --git a/docs_markdown/benchmark_result_Autolayout.png b/docs_markdown/benchmark_result_Autolayout.png deleted file mode 100644 index 016b9ce..0000000 Binary files a/docs_markdown/benchmark_result_Autolayout.png and /dev/null differ diff --git a/docs_markdown/benchmark_result_FlexLayout.png b/docs_markdown/benchmark_result_FlexLayout.png deleted file mode 100644 index b22f423..0000000 Binary files a/docs_markdown/benchmark_result_FlexLayout.png and /dev/null differ diff --git a/docs_markdown/benchmark_result_LayoutKit.png b/docs_markdown/benchmark_result_LayoutKit.png index 1e0e3ca..3642bd5 100644 Binary files a/docs_markdown/benchmark_result_LayoutKit.png and b/docs_markdown/benchmark_result_LayoutKit.png differ diff --git a/docs_markdown/benchmark_result_ManualLayout.png b/docs_markdown/benchmark_result_ManualLayout.png new file mode 100644 index 0000000..d6056be Binary files /dev/null and b/docs_markdown/benchmark_result_ManualLayout.png differ diff --git a/docs_markdown/benchmark_result_NKFrameLayoutKit.png b/docs_markdown/benchmark_result_NKFrameLayoutKit.png index 12ac171..a73d671 100644 Binary files a/docs_markdown/benchmark_result_NKFrameLayoutKit.png and b/docs_markdown/benchmark_result_NKFrameLayoutKit.png differ diff --git a/docs_markdown/benchmark_result_PinLayout.png b/docs_markdown/benchmark_result_PinLayout.png index 6fe1fd0..57f0898 100644 Binary files a/docs_markdown/benchmark_result_PinLayout.png and b/docs_markdown/benchmark_result_PinLayout.png differ