Merge pull request #126 from sunshinejr/example-swift-containers

[Containers] Update Swift examples.

Author: appleguy

docs/_docs/containers-ascollectionnode.md

@@ -22,7 +22,7 @@ nextPage: containers-aspagernode.html
   </pre>
 
   <pre lang="swift" class = "swiftCode hidden">
-override func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell
+override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell
   </pre>
 </div>
 </div>
@@ -37,7 +37,7 @@ with your choice of **_one_** of the following methods
 - (ASCellNode *)collectionNode:(ASCollectionNode *)collectionNode nodeForItemAtIndexPath:(NSIndexPath *)indexPath
 </pre>
   <pre lang="swift" class = "swiftCode hidden">
-override func collectionNode(collectionNode: ASCollectionNode, nodeForItemAtIndexPath indexPath: NSIndexPath) -> ASCellNode
+override func collectionNode(_ collectionNode: ASCollectionNode, nodeForItemAt indexPath: IndexPath) -> ASCellNode
   </pre>
 </div>
 </div>
@@ -54,7 +54,7 @@ or
 - (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath
 </pre>
   <pre lang="swift" class = "swiftCode hidden">
-override func collectionNode(collectionNode: ASCollectionNode, nodeBlockForItemAtIndexPath indexPath: NSIndexPath) -> ASCellNodeBlock
+override func collectionNode(_ collectionNode: ASCollectionNode, nodeBlockForItemAt indexPath: IndexPath) -> ASCellNodeBlock
   </pre>
 </div>
 </div>
@@ -96,7 +96,7 @@ Consider the following `-collectionNode:nodeBlockForItemAtIndexPath:` method.
   </pre>
 
   <pre lang="swift" class = "swiftCode hidden">
-func tableNode(_ collectionNode: ASCollectionNode, nodeBlockForItemAt indexPath: IndexPath) -> ASCellNodeBlock {
+func collectionNode(_ collectionNode: ASCollectionNode, nodeBlockForItemAt indexPath: IndexPath) -> ASCellNodeBlock {
   guard photoFeed.count > indexPath.row else { return { ASCellNode() } }
 
   let photoModel = photoFeed[indexPath.row]
@@ -130,13 +130,13 @@ An ASCollectionNode is assigned to be managed by an `ASViewController` in its `-
   <pre lang="objc" class="objcCode">
 - (instancetype)init
 {
-  _flowLayout     = [[UICollectionViewFlowLayout alloc] init];
+  _flowLayout = [[UICollectionViewFlowLayout alloc] init];
   _collectionNode = [[ASCollectionNode alloc] initWithCollectionViewLayout:_flowLayout];
 
   self = [super initWithNode:_collectionNode];
   if (self) {
-    _flowLayout.minimumInteritemSpacing  = 1;
-    _flowLayout.minimumLineSpacing       = 1;
+    _flowLayout.minimumInteritemSpacing = 1;
+    _flowLayout.minimumLineSpacing = 1;
   }
 
   return self;
@@ -145,13 +145,13 @@ An ASCollectionNode is assigned to be managed by an `ASViewController` in its `-
 
 <pre lang="swift" class = "swiftCode hidden">
 init() {
-  flowLayout     = UICollectionViewFlowLayout()
+  flowLayout = UICollectionViewFlowLayout()
   collectionNode = ASCollectionNode(collectionViewLayout: flowLayout)
 
   super.init(node: collectionNode)
 
-  flowLayout.minimumInteritemSpacing  = 1
-  flowLayout.minimumLineSpacing       = 1
+  flowLayout.minimumInteritemSpacing = 1
+  flowLayout.minimumLineSpacing = 1
 }
 </pre>
 </div>
@@ -178,7 +178,7 @@ The `LocationCollectionNodeController` above accesses the `ASCollectionView` dir
 {
   [super viewDidLoad];
 
-  _collectionNode.delegate   = self;
+  _collectionNode.delegate = self;
   _collectionNode.dataSource = self;
   _collectionNode.view.allowsSelection = NO;
   _collectionNode.view.backgroundColor = [UIColor whiteColor];
@@ -189,10 +189,10 @@ The `LocationCollectionNodeController` above accesses the `ASCollectionView` dir
 override func viewDidLoad() {
   super.viewDidLoad()
 
-  collectionNode.delegate   = self
+  collectionNode.delegate = self
   collectionNode.dataSource = self
   collectionNode.view.allowsSelection = false
-  collectionNode.view.backgroundColor = UIColor.whiteColor()
+  collectionNode.view.backgroundColor = .white
 }
 </pre>
 </div>

docs/_docs/containers-aspagernode.md

@@ -20,7 +20,7 @@ The main dataSource methods are:
 </pre>
 
 <pre lang="swift" class = "swiftCode hidden">
-func numberOfPagesInPagerNode(pagerNode: ASPagerNode!) -> Int 
+func numberOfPages(in pagerNode: ASPagerNode) -> Int
 </pre>
 </div>
 </div>
@@ -35,7 +35,7 @@ and
 </pre>
 
 <pre lang="swift" class = "swiftCode hidden">
-func pagerNode(pagerNode: ASPagerNode!, nodeAtIndex index: Int) -> ASCellNode!
+func pagerNode(_ pagerNode: ASPagerNode, nodeAt index: Int) -> ASCellNode
 </pre>
 </div>
 </div>
@@ -50,7 +50,7 @@ or
 </pre>
 
 <pre lang="swift" class = "swiftCode hidden">
-func pagerNode(pagerNode: ASPagerNode!, nodeBlockAtIndex index: Int) -> ASCellNodeBlock!
+func pagerNode(_ pagerNode: ASPagerNode, nodeBlockAt index: Int) -> ASCellNodeBlock
 </pre>
 </div>
 </div>
@@ -86,8 +86,8 @@ In the example below, you can see how the index is used to access the photo mode
 </pre>
 
 <pre lang="swift" class = "swiftCode hidden">
-func pagerNode(pagerNode: ASPagerNode!, nodeBlockAtIndex index: Int) -> ASCellNodeBlock! {
-    guard photoFeed.count > index else { return nil }
+func pagerNode(_ pagerNode: ASPagerNode, nodeBlockAt index: Int) -> ASCellNodeBlock {
+    guard photoFeed.count > index else { return { ASCellNode() } }
 
     let photoModel = photoFeed[index]
     let cellNodeBlock = { () -> ASCellNode in
@@ -123,8 +123,8 @@ One especially useful pattern is to return an `ASCellNode` that is initialized w
 </pre>
 
 <pre lang="swift" class = "swiftCode hidden">
-func pagerNode(pagerNode: ASPagerNode!, nodeAtIndex index: Int) -> ASCellNode! {
-    guard animals.count > index else { return nil }
+func pagerNode(_ pagerNode: ASPagerNode, nodeAt index: Int) -> ASCellNode {
+    guard animals.count > index else { return ASCellNode() }
 
     let animal = animals[index]
     let node = ASCellNode(viewControllerBlock: { () -> UIViewController in

docs/_docs/containers-asviewcontroller.md

@@ -45,18 +45,16 @@ This table node is assigned to the `ASViewController` in its `-initWithNode:` de
   </pre>
 
   <pre lang="swift" class = "swiftCode hidden">
-func initWithModel(models: Array&lt;Model&gt;) {
-	let tableNode = ASTableNode(style:.Plain)
+init(models: [Model]) {
+  let tableNode = ASTableNode(style: .plain)
 
-    super.initWithNode(tableNode)
+  super.init(node: tableNode)
 
-    self.models = models
-    
-    self.tableNode = tableNode
-    self.tableNode.delegate = self
-    self.tableNode.dataSource = self
-    
-    return self
+  self.models = models
+  
+  self.tableNode = tableNode
+  self.tableNode.delegate = self
+  self.tableNode.dataSource = self
 }
 </pre>
 </div>