Skip to content

Commit 78b3661

Browse files
mattneubmattneub
committed
update for Swift 1.2, Xcode 6.3
1 parent 38ba464 commit 78b3661

File tree

9 files changed

+50
-38
lines changed

9 files changed

+50
-38
lines changed

‎bk2ch17p697pickaMovieOrPhoto/ch30p960pickaMovie/ViewController.swift

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ViewController: UIViewController {
2222
}
2323
return Int(UIInterfaceOrientationMask.Landscape.rawValue)
2424
}
25-
25+
2626
func determineStatus() -> Bool {
2727
// access permission dialog will appear automatically if necessary...
2828
// ...when we try to present the UIImagePickerController
@@ -51,7 +51,7 @@ class ViewController: UIViewController {
5151
return false
5252
}
5353
}
54-
54+
5555
/*
5656
New authorization strategy: check for authorization when we first appear,
5757
when we are brought back to the front,
@@ -70,7 +70,9 @@ class ViewController: UIViewController {
7070
return
7171
}
7272

73-
let src = UIImagePickerControllerSourceType.SavedPhotosAlbum
73+
// horrible
74+
// let src = UIImagePickerControllerSourceType.SavedPhotosAlbum
75+
let src = UIImagePickerControllerSourceType.PhotoLibrary
7476
let ok = UIImagePickerController.isSourceTypeAvailable(src)
7577
if !ok {
7678
println("alas")
@@ -96,7 +98,7 @@ class ViewController: UIViewController {
9698
self.presentViewController(picker, animated: true, completion: nil)
9799
// ignore:
98100
if let pop = picker.popoverPresentationController {
99-
let v = sender as UIView
101+
let v = sender as! UIView
100102
pop.sourceView = v
101103
pop.sourceRect = v.bounds
102104
}
@@ -118,8 +120,8 @@ extension ViewController : UIImagePickerControllerDelegate, UINavigationControll
118120
}
119121

120122

121-
func imagePickerController(picker: UIImagePickerController!,
122-
didFinishPickingMediaWithInfo info: [NSObject : AnyObject]!) {
123+
func imagePickerController(picker: UIImagePickerController,
124+
didFinishPickingMediaWithInfo info: [NSObject : AnyObject]) {
123125
println(info[UIImagePickerControllerReferenceURL])
124126
let url = info[UIImagePickerControllerMediaURL] as? NSURL
125127
var im = info[UIImagePickerControllerOriginalImage] as? UIImage
@@ -131,11 +133,11 @@ extension ViewController : UIImagePickerControllerDelegate, UINavigationControll
131133
let type = info[UIImagePickerControllerMediaType] as? String
132134
if type != nil {
133135
switch type! {
134-
case kUTTypeImage:
136+
case kUTTypeImage as! String:
135137
if im != nil {
136138
self.showImage(im!)
137139
}
138-
case kUTTypeMovie:
140+
case kUTTypeMovie as! String:
139141
if url != nil {
140142
self.showMovie(url!)
141143
}
@@ -147,12 +149,12 @@ extension ViewController : UIImagePickerControllerDelegate, UINavigationControll
147149

148150
func clearAll() {
149151
if self.childViewControllers.count > 0 {
150-
let av = self.childViewControllers[0] as AVPlayerViewController
152+
let av = self.childViewControllers[0] as! AVPlayerViewController
151153
av.willMoveToParentViewController(nil)
152154
av.view.removeFromSuperview()
153155
av.removeFromParentViewController()
154156
}
155-
self.redView.subviews.map { ($0 as UIView).removeFromSuperview() }
157+
self.redView.subviews.map { ($0 as! UIView).removeFromSuperview() }
156158
}
157159

158160
func showImage(im:UIImage) {

‎bk2ch17p699photoKitData/PhotoKitData.xcodeproj/project.pbxproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
TargetAttributes = {
159159
324285F319A0100800231054 = {
160160
CreatedOnToolsVersion = 6.0;
161+
DevelopmentTeam = W3LHX5RGV2;
161162
};
162163
3242860519A0100800231054 = {
163164
CreatedOnToolsVersion = 6.0;
@@ -325,9 +326,12 @@
325326
buildSettings = {
326327
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
327328
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
329+
CODE_SIGN_IDENTITY = "iPhone Developer";
330+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
328331
INFOPLIST_FILE = PhotoKitData/Info.plist;
329332
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
330333
PRODUCT_NAME = "$(TARGET_NAME)";
334+
PROVISIONING_PROFILE = "";
331335
TARGETED_DEVICE_FAMILY = "1,2";
332336
};
333337
name = Debug;
@@ -337,9 +341,12 @@
337341
buildSettings = {
338342
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
339343
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
344+
CODE_SIGN_IDENTITY = "iPhone Developer";
345+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
340346
INFOPLIST_FILE = PhotoKitData/Info.plist;
341347
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
342348
PRODUCT_NAME = "$(TARGET_NAME)";
349+
PROVISIONING_PROFILE = "";
343350
TARGETED_DEVICE_FAMILY = "1,2";
344351
};
345352
name = Release;

‎bk2ch17p699photoKitData/PhotoKitData/ViewController.swift

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ class ViewController: UIViewController {
6060
.MomentList, subtype: .MomentListYear, options: opts)
6161
result.enumerateObjectsUsingBlock {
6262
(obj:AnyObject!, ix:Int, stop:UnsafeMutablePointer<ObjCBool>) in
63-
let list = obj as PHCollectionList
63+
let list = obj as! PHCollectionList
6464
let f = NSDateFormatter()
6565
f.dateFormat = "\nyyyy"
6666
println(f.stringFromDate(list.startDate))
6767
if list.collectionListType == .MomentList {
6868
let result = PHAssetCollection.fetchMomentsInMomentList(list, options: nil)
6969
result.enumerateObjectsUsingBlock {
7070
(obj:AnyObject!, ix:Int, stop:UnsafeMutablePointer<ObjCBool>) in
71-
let coll = obj as PHAssetCollection
71+
let coll = obj as! PHAssetCollection
7272
if ix == 0 {
7373
println("======= \(result.count) clusters")
7474
}
@@ -90,7 +90,7 @@ class ViewController: UIViewController {
9090
.Album, subtype: .AlbumSyncedAlbum, options: nil)
9191
result.enumerateObjectsUsingBlock {
9292
(obj:AnyObject!, ix:Int, stop:UnsafeMutablePointer<ObjCBool>) in
93-
let album = obj as PHAssetCollection
93+
let album = obj as! PHAssetCollection
9494
println("\(album.localizedTitle): approximately \(album.estimatedAssetCount) photos")
9595
}
9696
}
@@ -107,13 +107,13 @@ class ViewController: UIViewController {
107107
.Album, subtype: .AlbumSyncedAlbum, options: nil)
108108
result.enumerateObjectsUsingBlock {
109109
(obj:AnyObject!, ix:Int, stop:UnsafeMutablePointer<ObjCBool>) in
110-
let album = obj as PHAssetCollection
110+
let album = obj as! PHAssetCollection
111111
alert.addAction(UIAlertAction(title: album.localizedTitle, style: .Default, handler: {
112112
(_:UIAlertAction!) in
113113
let result = PHAsset.fetchAssetsInAssetCollection(album, options: nil)
114114
result.enumerateObjectsUsingBlock {
115115
(obj:AnyObject!, ix:Int, stop:UnsafeMutablePointer<ObjCBool>) in
116-
let asset = obj as PHAsset
116+
let asset = obj as! PHAsset
117117
println(asset)
118118
}
119119
}))
@@ -170,13 +170,15 @@ class ViewController: UIViewController {
170170
// add first photo from it to a new album
171171
let result = PHAssetCollection.fetchAssetCollectionsWithType(
172172
.SmartAlbum, subtype: .SmartAlbumRecentlyAdded, options: nil)
173-
let rec = result.firstObject as PHAssetCollection!
173+
let rec = result.firstObject as! PHAssetCollection!
174174
if rec == nil {
175+
println("no recently added album")
175176
return
176177
}
177178
let result2 = PHAsset.fetchAssetsInAssetCollection(rec, options: nil)
178-
let ph = result2.firstObject as PHAsset!
179+
let ph = result2.firstObject as! PHAsset!
179180
if ph == nil {
181+
println("no first item in recently added album")
180182
return
181183
}
182184
PHPhotoLibrary.sharedPhotoLibrary().performChanges({

‎bk2ch17p700PhotoKitImages/PhotoKitImages/ModelController.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ModelController: NSObject {
1919
let result = PHAssetCollection.fetchAssetCollectionsWithType(
2020
.SmartAlbum, subtype: .SmartAlbumUserLibrary, options: nil)
2121
self.recentAlbums = result
22-
let rec = result.firstObject as PHAssetCollection!
22+
let rec = result.firstObject as! PHAssetCollection!
2323
if rec == nil {
2424
return
2525
}
@@ -40,8 +40,8 @@ class ModelController: NSObject {
4040
if self.photos == nil || self.photos.count == 0 || index >= self.photos.count {
4141
return nil
4242
}
43-
let dvc = storyboard.instantiateViewControllerWithIdentifier("DataViewController") as DataViewController
44-
dvc.dataObject = self.photos[index] as PHAsset
43+
let dvc = storyboard.instantiateViewControllerWithIdentifier("DataViewController") as! DataViewController
44+
dvc.dataObject = self.photos[index] as! PHAsset
4545
// dvc.index = index
4646
return dvc
4747
}
@@ -58,15 +58,15 @@ class ModelController: NSObject {
5858
extension ModelController : UIPageViewControllerDataSource {
5959

6060
func pageViewController(pageViewController: UIPageViewController, viewControllerBeforeViewController viewController: UIViewController) -> UIViewController? {
61-
let ix = self.indexOfViewController(viewController as DataViewController)
61+
let ix = self.indexOfViewController(viewController as! DataViewController)
6262
if ix == 0 {
6363
return nil
6464
}
6565
return self.viewControllerAtIndex(ix-1, storyboard:viewController.storyboard!)
6666
}
6767

6868
func pageViewController(pageViewController: UIPageViewController, viewControllerAfterViewController viewController: UIViewController) -> UIViewController? {
69-
let ix = self.indexOfViewController(viewController as DataViewController)
69+
let ix = self.indexOfViewController(viewController as! DataViewController)
7070
if ix + 1 >= self.photos.count {
7171
return nil
7272
}

‎bk2ch17p700PhotoKitImages/PhotoKitImages/RootViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class RootViewController: UIViewController {
6868
self.modelController = ModelController()
6969
if let dvc = self.modelController.viewControllerAtIndex(0, storyboard: self.storyboard!) {
7070
let viewControllers: NSArray = [dvc]
71-
self.pageViewController!.setViewControllers(viewControllers, direction: .Forward, animated: false, completion: nil)
71+
self.pageViewController!.setViewControllers(viewControllers as [AnyObject], direction: .Forward, animated: false, completion: nil)
7272
self.pageViewController!.dataSource = self.modelController
7373
}
7474
}

‎bk2ch17p702takeAPicture/ch30p962takeAPicture/ViewController.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
5656
println("no camera")
5757
return
5858
}
59-
let desiredType = kUTTypeImage
59+
let desiredType = kUTTypeImage as! String
6060
// let desiredType = kUTTypeMovie
61-
let arr = UIImagePickerController.availableMediaTypesForSourceType(.Camera) as [String]
61+
let arr = UIImagePickerController.availableMediaTypesForSourceType(.Camera) as! [String]
6262
println(arr)
6363
if find(arr, desiredType) == nil {
6464
println("no capture")
@@ -77,7 +77,7 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
7777
self.presentViewController(picker, animated: true, completion: nil)
7878
}
7979

80-
func imagePickerControllerDidCancel(picker: UIImagePickerController!) {
80+
func imagePickerControllerDidCancel(picker: UIImagePickerController) {
8181
self.dismissViewControllerAnimated(true, completion: nil)
8282
}
8383

@@ -94,11 +94,11 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
9494
let type = info[UIImagePickerControllerMediaType] as? String
9595
if type != nil {
9696
switch type! {
97-
case kUTTypeImage:
97+
case kUTTypeImage as! String:
9898
if im != nil {
9999
self.showImage(im!)
100100
}
101-
case kUTTypeMovie:
101+
case kUTTypeMovie as! String:
102102
if url != nil {
103103
self.showMovie(url!)
104104
}
@@ -110,12 +110,12 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
110110

111111
func clearAll() {
112112
if self.childViewControllers.count > 0 {
113-
let av = self.childViewControllers[0] as AVPlayerViewController
113+
let av = self.childViewControllers[0] as! AVPlayerViewController
114114
av.willMoveToParentViewController(nil)
115115
av.view.removeFromSuperview()
116116
av.removeFromParentViewController()
117117
}
118-
self.redView.subviews.map { ($0 as UIView).removeFromSuperview() }
118+
self.redView.subviews.map { ($0 as! UIView).removeFromSuperview() }
119119
}
120120

121121
func showImage(im:UIImage) {

‎bk2ch17p704takeAPicture2/ch30p962takeAPicture2/SecondViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SecondViewController: UIViewController {
3030
}
3131

3232
func doUse(sender:AnyObject) {
33-
let vc = self.presentingViewController as ViewController
33+
let vc = self.presentingViewController as! ViewController
3434
vc.doUse(self.image)
3535
}
3636
}

‎bk2ch17p704takeAPicture2/ch30p962takeAPicture2/ViewController.swift

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,15 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
6464
println("no camera")
6565
return
6666
}
67-
let arr = UIImagePickerController.availableMediaTypesForSourceType(.Camera) as [String]
68-
if find(arr, kUTTypeImage) == nil {
67+
let arr = UIImagePickerController.availableMediaTypesForSourceType(.Camera) as! [String]
68+
let desiredType = kUTTypeImage as! String
69+
if find(arr, desiredType) == nil {
6970
println("no stills")
7071
return
7172
}
7273
let picker = MyImagePickerController()
7374
picker.sourceType = .Camera
74-
picker.mediaTypes = [kUTTypeImage]
75+
picker.mediaTypes = [desiredType]
7576
picker.allowsEditing = true
7677
picker.delegate = self
7778

@@ -91,11 +92,11 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
9192
self.presentViewController(picker, animated: true, completion: nil)
9293
}
9394

94-
func imagePickerControllerDidCancel(picker: UIImagePickerController!) {
95+
func imagePickerControllerDidCancel(picker: UIImagePickerController) {
9596
self.dismissViewControllerAnimated(true, completion: nil)
9697
}
9798

98-
func imagePickerController(picker: UIImagePickerController!, didFinishPickingMediaWithInfo info: [NSObject : AnyObject]!) {
99+
func imagePickerController(picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [NSObject : AnyObject]) {
99100
var im = info[UIImagePickerControllerOriginalImage] as? UIImage
100101
if im == nil {
101102
return
@@ -108,7 +109,7 @@ UINavigationControllerDelegate, UIImagePickerControllerDelegate {
108109
self.picker.takePicture()
109110
}
110111

111-
func navigationController(nc: UINavigationController!, didShowViewController vc: UIViewController!, animated: Bool) {
112+
func navigationController(nc: UINavigationController, didShowViewController vc: UIViewController, animated: Bool) {
112113
if vc is SecondViewController {
113114
nc.toolbarHidden = true
114115
return

‎bk2ch17p707takeAPicAVFoundation/ch30p966takeAPicAVFoundation/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class ViewController: UIViewController {
5454
dispatch_async(dispatch_get_main_queue()) {
5555

5656
self.previewLayer.removeFromSuperlayer()
57-
self.previewLayer = nil
5857
self.sess.stopRunning()
58+
self.sess = nil
5959

6060
let iv = UIImageView(frame:self.previewLayer.frame)
6161
iv.contentMode = .ScaleAspectFit

0 commit comments

Comments
 (0)