From 81643910cc50ac890a950edc3b6ddfbd46690b58 Mon Sep 17 00:00:00 2001
From: Vinny Carpenter <vscarpenter@gmail.com>
Date: Sun, 16 Nov 2014 18:09:25 -0600
Subject: [PATCH 1/3] Create README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..dcb799c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+Swift-Tutorial
+==============
+
+Code for the Swift Tutorial forked from jamesonquave.com

From 32175b3676d9a16d190f83aa5d5973970511dbf0 Mon Sep 17 00:00:00 2001
From: Vinny Carpenter <vscarpenter@gmail.com>
Date: Sun, 16 Nov 2014 18:17:08 -0600
Subject: [PATCH 2/3] minor changes to compile

---
 MusicPlayer/APIController.swift               |  2 +-
 MusicPlayer/Album.swift                       |  2 +-
 MusicPlayer/Base.lproj/Main.storyboard        | 23 ++++++++++++-------
 MusicPlayer/DetailsViewController.swift       |  2 +-
 MusicPlayer/SearchResultsViewController.swift | 10 ++++----
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/MusicPlayer/APIController.swift b/MusicPlayer/APIController.swift
index aec4266..bedc8f1 100644
--- a/MusicPlayer/APIController.swift
+++ b/MusicPlayer/APIController.swift
@@ -23,7 +23,7 @@ class APIController {
     func get(path: String) {
         let url = NSURL(string: path)
         let session = NSURLSession.sharedSession()
-        let task = session.dataTaskWithURL(url, completionHandler: {data, response, error -> Void in
+        let task = session.dataTaskWithURL(url!, completionHandler: {data, response, error -> Void in
             println("Task completed")
             if(error != nil) {
                 // If there is an error in the web request, print it to the console
diff --git a/MusicPlayer/Album.swift b/MusicPlayer/Album.swift
index 466b5fb..7455812 100644
--- a/MusicPlayer/Album.swift
+++ b/MusicPlayer/Album.swift
@@ -52,7 +52,7 @@ class Album {
                         var nf: NSNumberFormatter = NSNumberFormatter()
                         nf.maximumFractionDigits = 2
                         if priceFloat != nil {
-                            price = "$"+nf.stringFromNumber(priceFloat!)
+                            price = "$"+nf.stringFromNumber(priceFloat!)!
                         }
                     }
                 }
diff --git a/MusicPlayer/Base.lproj/Main.storyboard b/MusicPlayer/Base.lproj/Main.storyboard
index a257ec7..76181f5 100644
--- a/MusicPlayer/Base.lproj/Main.storyboard
+++ b/MusicPlayer/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="7E4-YX-Fm0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="7E4-YX-Fm0">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
@@ -74,16 +74,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tgX-ID-J9t">
-                                <rect key="frame" x="131" y="87" width="453" height="52"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tgX-ID-J9t">
+                                <rect key="frame" x="131" y="87" width="453" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kNM-6v-NNF">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kNM-6v-NNF">
                                 <rect key="frame" x="16" y="87" width="100" height="100"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="100" id="58Q-bu-gaa"/>
+                                    <constraint firstAttribute="width" constant="100" id="OeJ-RQ-v7T"/>
+                                </constraints>
                             </imageView>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="cNg-v9-bFx">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="cNg-v9-bFx">
                                 <rect key="frame" x="0.0" y="195" width="600" height="405"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
@@ -92,7 +96,7 @@
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pev-dG-cIl" id="2eV-zK-AfF">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="▶️" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G27-wX-fuE">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="▶️" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G27-wX-fuE">
                                                     <rect key="frame" x="13" y="11" width="23" height="23"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="23" id="70W-c5-Xqm"/>
@@ -102,7 +106,7 @@
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ryd-dB-0fM">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ryd-dB-0fM">
                                                     <rect key="frame" x="44" y="12" width="548" height="23"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -111,7 +115,10 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="G27-wX-fuE" firstAttribute="leading" secondItem="2eV-zK-AfF" secondAttribute="leadingMargin" constant="5" id="02m-zc-7iD"/>
+                                                <constraint firstItem="G27-wX-fuE" firstAttribute="top" secondItem="2eV-zK-AfF" secondAttribute="topMargin" constant="3" id="Ixt-66-kPB"/>
                                                 <constraint firstItem="Ryd-dB-0fM" firstAttribute="leading" secondItem="G27-wX-fuE" secondAttribute="trailing" constant="8" id="N3l-NE-wKz"/>
+                                                <constraint firstItem="Ryd-dB-0fM" firstAttribute="top" secondItem="2eV-zK-AfF" secondAttribute="topMargin" constant="4" id="YvC-bu-W04"/>
+                                                <constraint firstItem="Ryd-dB-0fM" firstAttribute="bottom" secondItem="2eV-zK-AfF" secondAttribute="bottomMargin" id="dhF-aa-WMO"/>
                                                 <constraint firstItem="Ryd-dB-0fM" firstAttribute="trailing" secondItem="2eV-zK-AfF" secondAttribute="trailingMargin" id="nAe-es-ekH"/>
                                             </constraints>
                                         </tableViewCellContentView>
diff --git a/MusicPlayer/DetailsViewController.swift b/MusicPlayer/DetailsViewController.swift
index 677a102..f1869b3 100644
--- a/MusicPlayer/DetailsViewController.swift
+++ b/MusicPlayer/DetailsViewController.swift
@@ -27,7 +27,7 @@ class DetailsViewController: UIViewController, APIControllerProtocol, UITableVie
     override func viewDidLoad() {
         super.viewDidLoad()
         titleLabel.text = self.album?.title
-        albumCover.image = UIImage(data: NSData(contentsOfURL: NSURL(string: self.album!.largeImageURL)))
+        albumCover.image = UIImage(data: NSData(contentsOfURL: NSURL(string: self.album!.largeImageURL)!)!)
         
         if self.album != nil {
             api.lookupAlbum(self.album!.collectionId)
diff --git a/MusicPlayer/SearchResultsViewController.swift b/MusicPlayer/SearchResultsViewController.swift
index 8e9cbfa..b8987ce 100644
--- a/MusicPlayer/SearchResultsViewController.swift
+++ b/MusicPlayer/SearchResultsViewController.swift
@@ -40,8 +40,8 @@ class SearchResultsViewController: UIViewController, UITableViewDataSource, UITa
         let cell: UITableViewCell = tableView.dequeueReusableCellWithIdentifier(kCellIdentifier) as UITableViewCell
         
         let album = self.albums[indexPath.row]
-        cell.textLabel?.text = album.title
-        cell.imageView?.image = UIImage(named: "Blank52")
+        cell.textLabel.text = album.title
+        cell.imageView.image = UIImage(named: "Blank52")
         
         // Get the formatted price string for display in the subtitle
         let formattedPrice = album.price
@@ -56,7 +56,7 @@ class SearchResultsViewController: UIViewController, UITableViewDataSource, UITa
         
         if( image == nil ) {
             // If the image does not exist, we need to download it
-            var imgURL: NSURL = NSURL(string: urlString)
+            var imgURL: NSURL = NSURL(string: urlString)!
             
             // Download an NSData representation of the image at the URL
             let request: NSURLRequest = NSURLRequest(URL: imgURL)
@@ -68,7 +68,7 @@ class SearchResultsViewController: UIViewController, UITableViewDataSource, UITa
                     self.imageCache[urlString] = image
                     dispatch_async(dispatch_get_main_queue(), {
                         if let cellToUpdate = tableView.cellForRowAtIndexPath(indexPath) {
-                            cellToUpdate.imageView?.image = image
+                            cellToUpdate.imageView.image = image
                         }
                     })
                 }
@@ -81,7 +81,7 @@ class SearchResultsViewController: UIViewController, UITableViewDataSource, UITa
         else {
             dispatch_async(dispatch_get_main_queue(), {
                 if let cellToUpdate = tableView.cellForRowAtIndexPath(indexPath) {
-                    cellToUpdate.imageView?.image = image
+                    cellToUpdate.imageView.image = image
                 }
             })
         }

From 7ce0667d2762b72c5721660b7f5321200b3eebe4 Mon Sep 17 00:00:00 2001
From: Vinny Carpenter <vscarpenter@gmail.com>
Date: Mon, 17 Aug 2015 09:25:44 -0500
Subject: [PATCH 3/3] minor tweaks

updated
---
 MusicPlayer/APIController.swift | 5 +++--
 MusicPlayer/Track.swift         | 3 +--
 MusicPlayer/TrackCell.swift     | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/MusicPlayer/APIController.swift b/MusicPlayer/APIController.swift
index bedc8f1..ff68c15 100644
--- a/MusicPlayer/APIController.swift
+++ b/MusicPlayer/APIController.swift
@@ -24,7 +24,9 @@ class APIController {
         let url = NSURL(string: path)
         let session = NSURLSession.sharedSession()
         let task = session.dataTaskWithURL(url!, completionHandler: {data, response, error -> Void in
+
             println("Task completed")
+
             if(error != nil) {
                 // If there is an error in the web request, print it to the console
                 println(error.localizedDescription)
@@ -55,6 +57,5 @@ class APIController {
     
     func lookupAlbum(collectionId: Int) {
         get("https://itunes.apple.com/lookup?id=\(collectionId)&entity=song")
-    }
-    
+    }   
 }
\ No newline at end of file
diff --git a/MusicPlayer/Track.swift b/MusicPlayer/Track.swift
index 19f03d0..09c8d0c 100644
--- a/MusicPlayer/Track.swift
+++ b/MusicPlayer/Track.swift
@@ -53,6 +53,5 @@ class Track {
             }
         }
         return tracks
-    }
-    
+    }  
 }
\ No newline at end of file
diff --git a/MusicPlayer/TrackCell.swift b/MusicPlayer/TrackCell.swift
index 0faab52..db8a6a6 100644
--- a/MusicPlayer/TrackCell.swift
+++ b/MusicPlayer/TrackCell.swift
@@ -20,8 +20,5 @@ class TrackCell: UITableViewCell {
 
     override func setSelected(selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
     }
-
 }