Swift 2.0 edits to exercise files for Lesson 1 and Lesson 2

Gabrielle Miller-Messner · Gabrielle Miller-Messner · commit 105a648d0c5f · 2015-09-02T15:14:00.000-07:00
diff --git a/Lessons /Lesson1/Lesson1_Exercises.playground/Contents.swift b/Lessons /Lesson1/Lesson1_Exercises.playground/Contents.swift
@@ -20,7 +20,7 @@ let didYouKnowString = "Did you know that the Swift String class comes with lots
 let whisperString = "psst" + ", " + didYouKnowString.lowercaseString
 let shoutString =  "HEY! DID YOU KNOW THAT THE SWIFT STRING CLASS COMES WITH LOTS OF USEFUL METHODS?"
 //: ### Exercise 3
-//: How many characters are in this string? Hint: One solution starts with casting the string as an array.
+//: How many characters are in this string? 
 let howManyCharacters = "How much wood could a woodchuck chuck if a woodchuck could chuck wood?"
 //: ### Exercise 4
 //: How many times does the letter "g" or "G" appear in the following string? Use a for-in loop to find out!
diff --git a/Lessons /Lesson1/Lesson1_Exercises.playground/contents.xcplayground b/Lessons /Lesson1/Lesson1_Exercises.playground/contents.xcplayground
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='ios' display-mode='rendered'/>
+<playground version='5.0' target-platform='ios' requires-full-environment='true' display-mode='rendered'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>
diff --git a/Lessons /Lesson1/Lesson1_Exercises.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate b/Lessons /Lesson1/Lesson1_Exercises.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Lessons /Lesson1/Lesson1_Exercises.playground/timeline.xctimeline b/Lessons /Lesson1/Lesson1_Exercises.playground/timeline.xctimeline
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Timeline
+   version = "3.0">
+   <TimelineItems>
+   </TimelineItems>
+</Timeline>
diff --git a/Lessons /Lesson2/Lesson2_DowncastingWithOptionals.playground/Contents.swift b/Lessons /Lesson2/Lesson2_DowncastingWithOptionals.playground/Contents.swift
@@ -37,15 +37,15 @@ var drinkChoices = [
 
 // Generic drink offer
 for beverage in drinkChoices {
-    println ("Can I get you a \(beverage.category)")
+    print ("Can I get you a \(beverage.category)")
 }
 //: Type cast operators: __as?__ and __as!__
 // Specific drink offer
 for beverage in drinkChoices {
     if let coldDrink = beverage as? ColdDrink {
-        println ("Can I offer you a \(coldDrink.vessel) of \(coldDrink.category)?")
+        print ("Can I offer you a \(coldDrink.vessel) of \(coldDrink.category)?")
     } else if let hotDrink = beverage as? HotDrink {
-        println ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")
+        print ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")
     }
 }
 //: ### Downcasting with as!
@@ -57,5 +57,5 @@ var coffeeArray: [Beverage] = [
 
 for beverage in coffeeArray {
     let hotDrink = beverage as! HotDrink
-        println ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")
+        print ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")
 }
diff --git a/Lessons /Lesson2/Lesson2_DowncastingWithOptionals.playground/contents.xcplayground b/Lessons /Lesson2/Lesson2_DowncastingWithOptionals.playground/contents.xcplayground
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='ios' display-mode='rendered'>
+<playground version='5.0' target-platform='ios' requires-full-environment='true' display-mode='rendered'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>
diff --git a/Lessons /Lesson2/Lesson2_DowncastingWithOptionals.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate b/Lessons /Lesson2/Lesson2_DowncastingWithOptionals.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Lessons /Lesson2/Lesson2_Exercises.playground/Contents.swift b/Lessons /Lesson2/Lesson2_Exercises.playground/Contents.swift
@@ -18,22 +18,22 @@ class LoginViewController: UIViewController {
 }
 
 //: ### Exercise 3
-//: The toInt() method of the Swift String class returns an optional of type Int?.
+//: The Swift Int type has an initializer that takes a string as a parameter and returns an optional of type Int?.
 //:
 //: 3a) Finish the code below by safely unwrapping the constant, `number`.
 var numericalString = "3"
-var number = numericalString.toInt()
+var number = Int(numericalString)
 //TODO: Unwrap number to make the following print statement more readable.
-println("\(number) is the magic number.")
+print("\(number) is the magic number.")
 //: 3b) Change the value of numericalString to "three" and execute the playground again.
 
 //: ### Exercise 4
 //: The class UIViewController has a property called tabBarController.  The tabBarController property is an optional of type UITabBarController?. The tabBarController itself holds a tabBar as a property. Complete the code below by filling in the appropriate use of optional chaining to access the tab bar property.
 var viewController = UIViewController()
 //if let tabBar = //TODO: Optional chaining here {
-//    println("Here's the tab bar.")
+//    print("Here's the tab bar.")
 //} else {
-//    println("No tab bar controller found.")
+//    print("No tab bar controller found.")
 //}
 //: ### Exercise 5
 //: Below is a dictionary of paintings and artists.
diff --git a/Lessons /Lesson2/Lesson2_Exercises.playground/contents.xcplayground b/Lessons /Lesson2/Lesson2_Exercises.playground/contents.xcplayground
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='ios' display-mode='rendered'>
+<playground version='5.0' target-platform='ios' requires-full-environment='true' display-mode='rendered'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>
diff --git a/Lessons /Lesson2/Lesson2_Exercises.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate b/Lessons /Lesson2/Lesson2_Exercises.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Lessons /Lesson2/Lesson2_Exercises_withSolutions.playground/Contents.swift b/Lessons /Lesson2/Lesson2_Exercises_withSolutions.playground/Contents.swift
@@ -12,10 +12,10 @@ var director = moviesDict[movie]
 //: 1b) Test your code by inserting different values for the variable `movie`.
 // Solution
 //if let director = moviesDict[movie] {
-//    println ("\(director) directed \(movie)")
+//    print ("\(director) directed \(movie)")
 //}
 //else {
-//    println("No director found")
+//    print("No director found")
 //}
 //: ### Exercise 2 
 //: The LoginViewController class below needs a UITextField to hold a user's name. Declare a variable for this text field as a property of the class LoginViewController. Keep in mind that the textfield property will not be initialized until after the view controller is constructed.
@@ -27,43 +27,43 @@ class LoginViewController: UIViewController {
 //    var nameTextfield:UITextField!
 //}
 //: ### Exercise 3 
-//: The toInt() method of the Swift String class returns an optional of type Int?.
+//: The Swift Int type has an initializer that takes a string as a parameter and returns an optional of type Int?.
 //:
 //: 3a) Finish the code below by safely unwrapping the constant, `number`.
 var numericalString = "3"
-var number = numericalString.toInt()
+var number = Int(numericalString)
 //TODO: Unwrap number to make the following print statement more readable.
-println("\(number) is the magic number.")
+print("\(number) is the magic number.")
 
 // Solution
 if let number = number {
-    println("\(number) is the magic number.")
+    print("\(number) is the magic number.")
 } else {
-    println("No magic numbers here.")
+    print("No magic numbers here.")
 }
 //: 3b) Change the value of numericalString to "three" and execute the playground again.
 // Solution
 numericalString = "three"
-number = numericalString.toInt()
+number = Int(numericalString)
 if let number = number {
-    println("\(number) is the magic number.")
+    print("\(number) is the magic number.")
 } else {
-    println("No magic numbers here.")
+    print("No magic numbers here.")
 }
 //: ### Exercise 4 
 //: The class UIViewController has a property called tabBarController.  The tabBarController property is an optional of type UITabBarController?. The tabBarController itself holds a tabBar as a property. Complete the code below by filling in the appropriate use of optional chaining to access the tab bar property.
 var viewController = UIViewController()
 //if let tabBar = //TODO: Optional chaining here {
-//    println("Here's the tab bar.")
+//    print("Here's the tab bar.")
 //} else {
-//    println("No tab bar controller found.")
+//    print("No tab bar controller found.")
 //}
 
 // Solution
 if let tabBar = viewController.tabBarController?.tabBar {
-    println("Here's the tab bar.")
+    print("Here's the tab bar.")
 } else {
-    println("No tab bar controller found.")
+    print("No tab bar controller found.")
 }
 
 //: ### Exercise 5
@@ -77,10 +77,10 @@ var artist = paintingDict[painting]
 //: 5b) Test your code by inserting different values for the variable `painting`.
 // Solution
 //if let artist = paintingDict[painting] {
-//    println ("\(artist) painted \(painting)")
+//    print ("\(artist) painted \(painting)")
 //}
 //else {
-//    println("No director found")
+//    print("No director found")
 //}
 //: ### Exercise 6
 //: Set the width of the cancel button below.  Notice that the cancelButton variable is declared as an implicitly unwrapped optional.
@@ -99,9 +99,9 @@ var childViewController = UIViewController()
 
 // Solution
 if let parentVC = childViewController.parentViewController {
-    println("Here's the parentViewController")
+    print("Here's the parentViewController")
 } else {
-    println("No parents, let's party!")
+    print("No parents, let's party!")
 }
 
 
diff --git a/Lessons /Lesson2/Lesson2_Exercises_withSolutions.playground/contents.xcplayground b/Lessons /Lesson2/Lesson2_Exercises_withSolutions.playground/contents.xcplayground
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='ios' display-mode='rendered'>
+<playground version='5.0' target-platform='ios' requires-full-environment='true' display-mode='rendered'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>
diff --git a/Lessons /Lesson2/Lesson2_Exercises_withSolutions.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate b/Lessons /Lesson2/Lesson2_Exercises_withSolutions.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Lessons /Lesson2/Lesson2_Optionals.playground/Contents.swift b/Lessons /Lesson2/Lesson2_Optionals.playground/Contents.swift
@@ -72,7 +72,7 @@ imageView.image = UIImage(named:"puppy_in_box")
 if let image = imageView.image {
     let size = image.size
 } else {
-    println("This image hasn't been set.")
+    print("This image hasn't been set.")
 }
 
 imageView.image
@@ -82,23 +82,23 @@ var anotherImageView = UIImageView()
 anotherImageView.image = UIImage(named:"puppy_in_box")
 
 if let imageSize = imageView.image?.size {
-    println("\(imageSize)")
+    print("\(imageSize)")
 } else {
-    println("This image hasn't been set.")
+    print("This image hasn't been set.")
 }
 
 // Example 2
 var animal = Animal(name: "Lenny", species: "lemur", tailLength: 12)
 animal = Animal(name: "Gilbert", species: "Gorilla", tailLength: nil )
 
 if let tailLength = animal.tail?.length {
-    println("\(animal.name)'s tail is \(tailLength) long")
+    print("\(animal.name)'s tail is \(tailLength) long")
 } else {
-    println("\(animal.name) doesn't have a tail.")
+    print("\(animal.name) doesn't have a tail.")
 }
 //: ### Implicitly Unwrapped Optionals
 // Example 1
-let w =  "123".toInt()
+let w =  Int("123")
 w! * 2
 
 // Example 2
diff --git a/Lessons /Lesson2/Lesson2_Optionals.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate b/Lessons /Lesson2/Lesson2_Optionals.playground/playground.xcworkspace/xcuserdata/gabriellemiller-messner.xcuserdatad/UserInterfaceState.xcuserstate

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ var drinkChoices = [`
`37`	`37`
`38`	`38`	`// Generic drink offer`
`39`	`39`	`for beverage in drinkChoices {`
`40`		`- println ("Can I get you a \(beverage.category)")`
	`40`	`+ print ("Can I get you a \(beverage.category)")`
`41`	`41`	`}`
`42`	`42`	`//: Type cast operators: __as?__ and __as!__`
`43`	`43`	`// Specific drink offer`
`44`	`44`	`for beverage in drinkChoices {`
`45`	`45`	`if let coldDrink = beverage as? ColdDrink {`
`46`		`- println ("Can I offer you a \(coldDrink.vessel) of \(coldDrink.category)?")`
	`46`	`+ print ("Can I offer you a \(coldDrink.vessel) of \(coldDrink.category)?")`
`47`	`47`	`} else if let hotDrink = beverage as? HotDrink {`
`48`		`- println ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")`
	`48`	`+ print ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`//: ### Downcasting with as!`
`@@ -57,5 +57,5 @@ var coffeeArray: [Beverage] = [`
`57`	`57`
`58`	`58`	`for beverage in coffeeArray {`
`59`	`59`	`let hotDrink = beverage as! HotDrink`
`60`		`- println ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")`
	`60`	`+ print ("Can I get you some \(hotDrink.category) with \(hotDrink.pairing)?")`
`61`	`61`	`}`