Skip to content

Fix compatibility with AsyncDisplayKit #12

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compatibility with AsyncDisplayKit #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
250f929
Works around crash seen when using layout with AsyncDisplayKit.
sstigler-phunware Oct 9, 2016
cff2cfd
Adds test for zero-sections fix.
sstigler-phunware Oct 9, 2016
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
4 changes: 4 additions & 0 deletions Source/SFFocusViewLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ public class SFFocusViewLayout: UICollectionViewLayout {
private extension UICollectionViewLayout {

var numberOfItems: Int {
guard collectionView?.numberOfSections() > 0 else {
return 0
}

return collectionView!.numberOfItemsInSection(0)
}

Expand Down
4 changes: 3 additions & 1 deletion Tests/CollectionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ private let reuseIdentifier = "Cell"
class CollectionViewController: UICollectionViewController {

var items = [Int]()

var numberOfSectionsToReturn = 1

override func viewDidLoad() {
super.viewDidLoad()
Expand All @@ -23,7 +25,7 @@ class CollectionViewController: UICollectionViewController {
// MARK: UICollectionViewDataSource

override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
return 1
return numberOfSectionsToReturn
}


Expand Down
5 changes: 5 additions & 0 deletions Tests/Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,10 @@ class Tests: XCTestCase {
func testLayoutShouldInvalidateLayoutForBoundsChange() {
XCTAssertTrue(focusViewLayout.shouldInvalidateLayoutForBoundsChange(CGRect()))
}

func testCanPrepareLayoutForCollectionViewWithZeroSections() {
collectionViewController?.numberOfSectionsToReturn = 0
focusViewLayout.prepareLayout()
}

}