-
Notifications
You must be signed in to change notification settings - Fork 57
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.
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
BrickCell width provider #162
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // | ||
| // FrameCalculationTests.swift | ||
| // BrickKit | ||
| // | ||
| // Created by Ruben Cagnie on 7/17/17. | ||
| // Copyright © 2017 Wayfair. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| @testable import BrickKit | ||
|
|
||
| class FrameCalculationTests: XCTestCase { | ||
| var brickView: BrickCollectionView! | ||
|
|
||
| override func setUp() { | ||
| super.setUp() | ||
|
|
||
| brickView = BrickCollectionView(frame: CGRect(x: 0, y: 0, width: 320, height: 480)) | ||
| } | ||
|
|
||
| func testFrameInfoAutoHeight() { | ||
| brickView.setupSingleBrickAndLayout(FrameInfoBrick("FrameInfo", width: .fixed(size: 50))) | ||
| let indexPath = brickView.indexPathsForBricksWithIdentifier("FrameInfo").first! | ||
| let frameCell = brickView.cellForItem(at: indexPath) as! FrameInfoBrickCell | ||
| frameCell.layoutIfNeeded() | ||
|
|
||
| XCTAssertEqual(frameCell.firstReportedImageViewFrame, CGRect(x: 20, y: 20, width: 25, height: 25)) | ||
| } | ||
|
|
||
| func testFrameInfoFixedHeight() { | ||
| brickView.setupSingleBrickAndLayout(FrameInfoBrick("FrameInfo", width: .fixed(size: 50), height: .fixed(size: 50))) | ||
| let indexPath = brickView.indexPathsForBricksWithIdentifier("FrameInfo").first! | ||
| let frameCell = brickView.cellForItem(at: indexPath) as! FrameInfoBrickCell | ||
| frameCell.layoutIfNeeded() | ||
|
|
||
| XCTAssertEqual(frameCell.firstReportedImageViewFrame, CGRect(x: 20, y: 20, width: 25, height: 25)) | ||
| } | ||
|
|
||
| func testGenericBrick() { | ||
| let genericBrick = GenericBrick<TestView>("FrameInfo", size: BrickSize(width: .fixed(size: 50), height: .fixed(size: 50))) { (view, cell) in | ||
| } | ||
| brickView.setupSingleBrickAndLayout( | ||
| genericBrick | ||
| ) | ||
| let indexPath = brickView.indexPathsForBricksWithIdentifier("FrameInfo").first! | ||
| let cell = brickView.cellForItem(at: indexPath) as! GenericBrickCell | ||
| cell.layoutIfNeeded() | ||
|
|
||
| let testView = cell.genericContentView as! TestView | ||
|
|
||
| XCTAssertTrue(testView.didUpdateFramesCalled) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| class TestView: UIView { | ||
| var didUpdateFramesCalled: Bool = false | ||
| } | ||
|
|
||
| extension TestView: UpdateFramesListener { | ||
| func didUpdateFrames() { | ||
| didUpdateFramesCalled = true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // | ||
| // FrameInfoBrick.swift | ||
| // BrickKit | ||
| // | ||
| // Created by Ruben Cagnie on 7/17/17. | ||
| // Copyright © 2017 Wayfair. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
| import BrickKit | ||
|
|
||
| class FrameInfoBrick: Brick { | ||
| } | ||
|
|
||
| class FrameInfoBrickCell: BrickCell, Bricklike { | ||
| typealias BrickType = FrameInfoBrick | ||
|
|
||
| @IBOutlet weak var imageView: UIImageView! | ||
|
|
||
| var firstReportedImageViewFrame: CGRect? | ||
|
|
||
| override open func framesDidLayout() { | ||
| if firstReportedImageViewFrame == nil { | ||
| firstReportedImageViewFrame = self.imageView.frame | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> | ||
| <device id="retina4_7" orientation="portrait"> | ||
| <adaptation id="fullscreen"/> | ||
| </device> | ||
| <dependencies> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/> | ||
| <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> | ||
| <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> | ||
| <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| </dependencies> | ||
| <objects> | ||
| <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="FrameInfoBrickCell" customModule="BrickKitTests_iOS" customModuleProvider="target"> | ||
| <rect key="frame" x="0.0" y="0.0" width="500" height="500"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> | ||
| <rect key="frame" x="0.0" y="0.0" width="500" height="500"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <subviews> | ||
| <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0P8-dt-dAa"> | ||
| <rect key="frame" x="20" y="20" width="250" height="250"/> | ||
| <constraints> | ||
| <constraint firstAttribute="width" secondItem="0P8-dt-dAa" secondAttribute="height" id="bSa-5e-b3E"/> | ||
| </constraints> | ||
| </imageView> | ||
| </subviews> | ||
| </view> | ||
| <constraints> | ||
| <constraint firstItem="0P8-dt-dAa" firstAttribute="bottom" secondItem="gTV-IL-0wX" secondAttribute="bottom" priority="250" constant="-230" id="2PD-ZL-rBm"/> | ||
| <constraint firstItem="0P8-dt-dAa" firstAttribute="width" secondItem="gTV-IL-0wX" secondAttribute="width" multiplier="1:2" id="BBv-fV-hC0"/> | ||
| <constraint firstItem="0P8-dt-dAa" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="20" id="EZ1-7V-WfK"/> | ||
| <constraint firstItem="0P8-dt-dAa" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="20" id="tf4-Y7-P0c"/> | ||
| </constraints> | ||
| <size key="customSize" width="301" height="50"/> | ||
| <connections> | ||
| <outlet property="imageView" destination="0P8-dt-dAa" id="hd8-DO-G61"/> | ||
| </connections> | ||
| <point key="canvasLocation" x="159.5" y="54"/> | ||
| </collectionViewCell> | ||
| </objects> | ||
| </document> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that called by
super.layoutSubviews()?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think I understand the question
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does calling layoutIfNeeded(), also call layoutSubviews()? or does the "if needed" mean only if self.bounds has changed? Just trying to make sure that there isn't a condition that this can get into an infinite loop.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It won't. The reason it's there is that when the view is laid out, the subviews aren't at this case. If we remove this line, the unit tests will fail