Merge branch 'Part6' of https://github.com/jquave/Swift-Tutorial into Part6

Conflicts:
	TestSwift/Classes/DetailsViewController.swift
	TestSwift/SearchResultsViewController.swift

Author: jquave

TestSwift/APIController.swift

@@ -6,17 +6,19 @@
 //  Copyright (c) 2014 JQ Software LLC. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 protocol APIControllerProtocol {
     func didRecieveAPIResults(results: NSDictionary)
 }
 
-class APIController: NSObject {
+class APIController {
 
     let data: NSMutableData = NSMutableData()
     var delegate: APIControllerProtocol?
 
+    init(){}
+    
     func searchItunesFor(searchTerm: String) {
 
         // The iTunes API wants multiple terms separated by + symbols, so replace spaces with + signs

TestSwift/Base.lproj/Main.storyboard

@@ -44,6 +44,9 @@
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
+                                <variation key="widthClass=compact" fixedFrame="YES">
+                                    <rect key="frame" x="0.0" y="37" width="320" height="443"/>
+                                </variation>
                                 <connections>
                                     <outlet property="dataSource" destination="BYZ-38-t0r" id="Rph-up-PTP"/>
                                     <outlet property="delegate" destination="BYZ-38-t0r" id="zEB-7D-wXK"/>
@@ -62,10 +65,10 @@
             </objects>
             <point key="canvasLocation" x="434" y="183"/>
         </scene>
-        <!--View Controller-->
+        <!--Details View Controller-->
         <scene sceneID="Iya-oL-ejU">
             <objects>
-                <viewController id="rSr-uw-pic" sceneMemberID="viewController">
+                <viewController id="rSr-uw-pic" customClass="DetailsViewController" customModule="TestSwift" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="smX-3l-Dxh"/>
                         <viewControllerLayoutGuide type="bottom" id="RoX-md-gkS"/>
@@ -79,6 +82,9 @@
                                 <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="33"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
+                                <variation key="widthClass=compact" fixedFrame="YES">
+                                    <rect key="frame" x="71" y="71" width="179" height="52"/>
+                                </variation>
                             </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>

TestSwift/Classes/DetailsViewController.swift

@@ -10,13 +10,12 @@ import UIKit
 
 class DetailsViewController: UIViewController {
 
-    var albumInfo: Album?
-
-    init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
-        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-        // Custom initialization
+    var detailInfo: NSDictionary?
+    
+    init(coder aDecoder: NSCoder!) {
+        super.init(coder: aDecoder)
     }
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 

TestSwift/SearchResultsViewController.swift

@@ -22,11 +22,34 @@ class SearchResultsViewController: UIViewController,/* UITableViewDataSource, UI
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        api.delegate = self
+        self.api.delegate = self
         UIApplication.sharedApplication().networkActivityIndicatorVisible = true
         api.searchItunesFor("Bob Dylan");
     }
 
+    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject) {
+        var detailsViewController: DetailsViewController = segue.destinationViewController as DetailsViewController
+    }
+    
+    /*
+    
+        if segue.identifier == "Details" {
+            //var detailsViewController: DetailsViewController? = segue.destinationViewController! as? DetailsViewController
+            
+            var destinationViewController: UIViewController = segue.destinationViewController as UIViewController
+
+         //   var detailsViewController: DetailsViewController = destinationViewController as DetailsViewController
+            
+            
+            //var destinationViewController: UIViewController! = segue.destinationViewController as UIViewController!
+            //var detailsViewController: DetailsViewController = destinationViewController as DetailsViewController
+/*            var selectedIndexPathRow = appsTableView.indexPathForSelectedRow().row
+            var selectedAppDetails: NSDictionary = self.tableData[selectedIndexPathRow] as NSDictionary
+            
+            detailsViewController.detailInfo = selectedAppDetails*/
+        }
+    }*/
+    
     func tableView(tableView: UITableView!, numberOfRowsInSection section: Int) -> Int {
         return albums.count
     }