From 9b77a817348da158979d88322c32cc6d76fcbd6d Mon Sep 17 00:00:00 2001 From: suzuki_keishi Date: Tue, 23 Aug 2016 15:12:46 +0900 Subject: [PATCH] clean code. --- SKPhotoBrowser/SKPhotoBrowser.swift | 6 +----- .../SKPhotoBrowserExample/FromWebViewController.swift | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/SKPhotoBrowser/SKPhotoBrowser.swift b/SKPhotoBrowser/SKPhotoBrowser.swift index 6880a41..54ace22 100644 --- a/SKPhotoBrowser/SKPhotoBrowser.swift +++ b/SKPhotoBrowser/SKPhotoBrowser.swift @@ -47,9 +47,6 @@ public class SKPhotoBrowser: UIViewController { private let animator = SKAnimator() public weak var delegate: SKPhotoBrowserDelegate? - // helpers which often used - private let bundle = NSBundle(forClass: SKPhotoBrowser.self) - // photos var photos: [SKPhotoProtocol] = [SKPhotoProtocol]() var numberOfPhotos: Int { @@ -77,7 +74,6 @@ public class SKPhotoBrowser: UIViewController { public convenience init(originImage: UIImage, photos: [SKPhotoProtocol], animatedFromView: UIView) { self.init(nibName: nil, bundle: nil) - animator.senderOriginImage = originImage animator.senderViewForAnimation = animatedFromView @@ -456,7 +452,6 @@ internal extension SKPhotoBrowser { return } - let photo = photos[currentPageIndex] if let titles = SKPhotoBrowserOptions.actionButtonTitles { let actionSheetController = UIAlertController(title: nil, message: nil, preferredStyle: .ActionSheet) actionSheetController.addAction(UIAlertAction(title: "Cancel", style: .Cancel, handler: { (action) -> Void in @@ -481,6 +476,7 @@ internal extension SKPhotoBrowser { }) } } else { + let photo = photos[currentPageIndex] guard let underlyingImage = photo.underlyingImage else { return } diff --git a/SKPhotoBrowserExample/SKPhotoBrowserExample/FromWebViewController.swift b/SKPhotoBrowserExample/SKPhotoBrowserExample/FromWebViewController.swift index 232e21b..a98ad39 100644 --- a/SKPhotoBrowserExample/SKPhotoBrowserExample/FromWebViewController.swift +++ b/SKPhotoBrowserExample/SKPhotoBrowserExample/FromWebViewController.swift @@ -44,7 +44,7 @@ extension FromWebViewController { private extension FromWebViewController { func createWebPhotos() -> [SKPhotoProtocol] { return (0..<10).map { (i: Int) -> SKPhotoProtocol in - let photo = SKPhoto.photoWithImageURL("https://placehold.jp/15\(i)x15\(i).png") + let photo = SKPhoto.photoWithImageURL("https://placehold.jp/150\(i)x150\(i).png") photo.caption = caption[i%10] photo.shouldCachePhotoURLImage = true return photo