Fixed a bug that prevented the SnapToPointLayoutBehavior from filteri… #83
Conversation
Codecov Report
@@ Coverage Diff @@
## master #83 +/- ##
=========================================
Coverage ? 93.76%
=========================================
Files ? 38
Lines ? 2997
Branches ? 0
=========================================
Hits ? 2810
Misses ? 187
Partials ? 0
Continue to review full report at Codecov.
|
| return !self.sectionsToIgnore.contains($0.indexPath.section) | ||
| } | ||
|
|
||
| guard !filteredAttributes.isEmpty else { |
There was a problem hiding this comment.
Is this check needed? Just returning filteredAttributes should be fine
| @@ -95,40 +95,58 @@ public class SnapToPointLayoutBehavior: BrickLayoutBehavior { | |||
| resetCollectionViewContentInset(collectionViewLayout) | |||
| } | |||
|
|
|||
| internal func getFilteredAttributes(layout collectionViewLayout: UICollectionViewLayout, frame: CGRect) -> [BrickLayoutAttributes] { | |||
There was a problem hiding this comment.
I don't like the get prefix. That's very java-like
Please rename to
filteredAttributes(layout collectionViewLayout: UICollectionViewLayout, frame: CGRect) -> [BrickLayoutAttributes]
| return | ||
| } | ||
|
|
||
| originalTopContentInset = collectionViewLayout.collectionView!.contentInset.top | ||
|
|
||
| switch scrollDirection { | ||
| case .Horizontal(let scrollLocation): | ||
| let firstAttributes = attributes.minElement { | ||
| let firstAttribute = filteredAttributes.minElement { |
There was a problem hiding this comment.
No need to rename firstAttributes to firstAttribute. The object contains BrickLayoutAttributes (with a S)
|
|
||
|
|
||
| let collection = CollectionViewController() |
There was a problem hiding this comment.
This test can be much simpeler by not using a CollectionViewController
Checkout BrickCollectionViewTests:testWithImageInCollectionBrick
let section1 = BrickSection(bricks: [
ImageBrick(width: .Ratio(ratio: 1/4), height: .Ratio(ratio: 1), dataSource: ImageBrickModel(image: image, contentMode: .ScaleAspectFill)),
])
let section = BrickSection(backgroundColor: .whiteColor(), bricks: [
CollectionBrick("Collection 1", backgroundColor: .orangeColor(), scrollDirection: .Horizontal, dataSource: CollectionBrickCellModel(section: section1), brickTypes: [ImageBrick.self]),
])
brickView.setupSectionAndLayout(section)
let cell1 = brickView.cellForItemAtIndexPath(NSIndexPath(forItem: 0, inSection: 1))
XCTAssertEqual(cell1?.frame, CGRect(x: 0, y: 0, width: 320, height: 80))
There was a problem hiding this comment.
There is also in CollectionBrickCellModel a configureHandler that you can use to add the behavior
…ng out the enclosing CollectionBrick layout attribute before calculating offsets. Fixes #82
…ng out the enclosing CollectionBrick layout attribute before calculating offsets. Fixes #82