CHANGELOG.md

@@ -1,29 +1,5 @@
 # Change Log
 
-## 3.1.2
-
-Released on 16-9-2016
-
-#### Fixed
-- Scrolling performance slowed #145
-
-## 3.1.1
-
-Released on 15-9-2016
-
-#### Fixed
-- Example crash in xcode8 fixed
-- Provides various UI configuration options via SKPhotoBrowserOptions. #144
-
-## 3.1.0
-
-Released on 9-2016
-
-#### Fixed
-- Issue with multiple actionButtonTitles #137
-- fix swiftlint warnings #140
-- Update for Xcode 8 GM (swift 2.3). #141
-
 ## 3.0.2
 
 Released on 9-2016
@@ -31,7 +7,7 @@ Released on 9-2016
 #### Fixed
 - Issue with multiple actionButtonTitles #137
 - Impossible to zoom when resolution is 1024x768 #134
-- Crash bug at zooming scrool view #133
+- unexpectedly found nil while unwrapping an Optional value #133
 
 ## 3.0.1 
 

README.md

@@ -1,7 +1,6 @@
 SKPhotoBrowser
 ========================
 
-![Language](https://img.shields.io/badge/language-Swift%202.3-orange.svg)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Cocoapods Compatible](https://img.shields.io/cocoapods/v/SKPhotoBrowser.svg?style=flat)](http://cocoadocs.org/docsets/SKPhotoBrowser)
 
@@ -107,39 +106,14 @@ func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath i
 You can customize Toolbar via SKPhotoBrowserOptions.
 
 ```swift
-SKPhotoBrowserOptions.displayToolbar = false                              // all tool bar will be hidden
+SKPhotoBrowserOptions.displayToolbar = false                // all tool bar will be hidden
-SKPhotoBrowserOptions.displayCounterLabel = false                         // counter label will be hidden
+SKPhotoBrowserOptions.displayCounterLabel = false           // counter label will be hidden
-SKPhotoBrowserOptions.displayBackAndForwardButton = false                 // back / forward button will be hidden
+SKPhotoBrowserOptions.displayBackAndForwardButton = false   // back / forward button will be hidden
-SKPhotoBrowserOptions.displayAction = false                               // action button will be hidden
+SKPhotoBrowserOptions.displayAction = false                 // action button will be hidden
-SKPhotoBrowserOptions.displayDeleteButton = true                          // delete button will be shown
+SKPhotoBrowserOptions.displayDeleteButton = true            // delete button will be shown
-SKPhotoBrowserOptions.displayHorizontalScrollIndicator = false            // horizontal scroll bar will be hidden
-SKPhotoBrowserOptions.displayVerticalScrollIndicator = false              // vertical scroll bar will be hidden
 let browser = SKPhotoBrowser(originImage: originImage, photos: images, animatedFromView: cell)
 ```
 
-#### Colors
-You can customize text, icon and background colors via SKPhotoBrowserOptions
-```swift
-SKPhotoBrowserOptions.backgroundColor = UIColor.whiteColor()               // browser view will be white
-SKPhotoBrowserOptions.textAndIconColor = UIColor.blackColor()              // text and icons will be black
-SKPhotoBrowserOptions.toolbarTextShadowColor = UIColor.clearColor()        // shadow of toolbar text will be removed
-SKPhotoBrowserOptions.toolbarFont = UIFont(name: "Futura", size: 16.0)     // font of toolbar will be 'Futura'
-SKPhotoBrowserOptions.captionFont = UIFont(name: "Helvetica", size: 18.0)  // font of toolbar will be 'Helvetica'
-```
-
-#### Images
-You can customize the padding of displayed images via SKPhotoBrowserOptions
-```swift
-SKPhotoBrowserOptions.imagePaddingX = 50                                   // image padding left and right will be 25
-SKPhotoBrowserOptions.imagePaddingY = 50                                   // image padding top and bottom will be 25
-```
-
-#### Statusbar
-You can customize the visibility of the Statusbar in browser view via SKPhotoBrowserOptions
-```swift
-SKPhotoBrowserOptions.displayStatusbar = false                             // status bar will be hidden
-```
-
 #### Custom Cache From Web URL
 You can use SKCacheable protocol if others are adaptable. (SKImageCacheable or SKRequestResponseCacheable)
 
@@ -156,8 +130,8 @@ SKCache.sharedCache.imageCache = CustomImageCache()
 #### CustomButton Image
 Close, Delete buttons are able to change image and frame.
 ``` swift
-browser.updateCloseButton(UIImage())
+browser.browser.updateCloseButton(UIImage())
-browser.updateUpdateButton(UIImage())
+browser.browser.updateUpdateButton(UIImage())
 ```
 
 #### Delete Photo
@@ -175,7 +149,8 @@ images.append(photo)
 #### SwipeGesture 
 vertical swipe can enable/disable:
 ``` swift
-SKPhotoBrowserOptions.disableVerticalSwipe = true 
+let browser = SKPhotoBrowser(originImage: originImage, photos: images, animatedFromView: cell)
+browser.disableVerticalSwipe = true 
 ``` 
 
 #### Delegate
@@ -208,12 +183,10 @@ func didDismissAtPageIndex(index: Int) {
 
 ```
 
-#### Options
+#### Minor Option
-You can access via `SKPhotoBrowserOptions`, which can use for browser control.
-- single tap handling, dismiss/noaction
 - blackArea handling which is appearing outside of photo
+- single tap handling, dismiss/noaction
 - bounce animation when appearing/dismissing
-- text color, font, or more
 ``` swift
 SKPhotoBrowserOptions.enableZoomBlackArea    = true  // default true
 SKPhotoBrowserOptions.enableSingleTapDismiss = true  // default false

SKPhotoBrowser.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SKPhotoBrowser"
-  s.version      = "3.1.2"
+  s.version      = "3.0.2"
   s.summary      = "Simple PhotoBrowser/Viewer inspired by facebook, twitter photo browsers written by swift2.0."
   s.homepage     = "https://github.com/suzuki-0000/SKPhotoBrowser"
   s.license      = { :type => "MIT", :file => "LICENSE" }

SKPhotoBrowser.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0AE527521DABB87500619FAD /* SKNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE527511DABB87500619FAD /* SKNavigationBar.swift */; };
 		210E53ED1C986D3A008DD5E3 /* UIView+Radius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210E53EC1C986D3A008DD5E3 /* UIView+Radius.swift */; };
 		210E53EF1C986D57008DD5E3 /* UIImage+Rotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 210E53EE1C986D57008DD5E3 /* UIImage+Rotation.swift */; };
 		26C97AD51D0EB6870039F6CB /* SKCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26C97AD41D0EB6870039F6CB /* SKCache.swift */; };
@@ -45,7 +44,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		0AE527511DABB87500619FAD /* SKNavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SKNavigationBar.swift; sourceTree = "<group>"; };
 		210E53EC1C986D3A008DD5E3 /* UIView+Radius.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+Radius.swift"; path = "extensions/UIView+Radius.swift"; sourceTree = "<group>"; };
 		210E53EE1C986D57008DD5E3 /* UIImage+Rotation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIImage+Rotation.swift"; path = "extensions/UIImage+Rotation.swift"; sourceTree = "<group>"; };
 		26C97AD41D0EB6870039F6CB /* SKCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SKCache.swift; sourceTree = "<group>"; };
@@ -138,7 +136,6 @@
 				8909B5411BC791510060A053 /* SKPhotoBrowser.swift */,
 				89C24A811D657AD1005F09A9 /* SKPhotoBrowserOptions.swift */,
 				890A6F1F1D5D9E53003B01F0 /* SKToolbar.swift */,
-				0AE527511DABB87500619FAD /* SKNavigationBar.swift */,
 				8909B5331BC791280060A053 /* SKPhotoBrowser.h */,
 				8917B1AF1D5A13DE000CE1C4 /* SKPhotoBrowserDelegate.swift */,
 				89D0BA481D59966B002A811B /* SKMesurement.swift */,
@@ -227,7 +224,6 @@
 					};
 					A64B89321CB04222000071B9 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -303,7 +299,6 @@
 				8917B1B41D5A14B0000CE1C4 /* SKButtons.swift in Sources */,
 				89C24A821D657AD1005F09A9 /* SKPhotoBrowserOptions.swift in Sources */,
 				26C97AD51D0EB6870039F6CB /* SKCache.swift in Sources */,
-				0AE527521DABB87500619FAD /* SKNavigationBar.swift in Sources */,
 				210E53EF1C986D57008DD5E3 /* UIImage+Rotation.swift in Sources */,
 				8909B5431BC791510060A053 /* SKCaptionView.swift in Sources */,
 				8909B5491BC791510060A053 /* SKPhotoBrowser.swift in Sources */,
@@ -468,7 +463,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "Alexsander-Khitev.SKPhotoBrowserTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -481,7 +475,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "Alexsander-Khitev.SKPhotoBrowserTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

SKPhotoBrowser/SKAnimator.swift

@@ -157,8 +157,6 @@ private extension SKAnimator {
                 self.resizableImageView?.frame = self.finalImageViewFrame
             },
             completion: { (Bool) -> Void in
-                UIApplication.sharedApplication().setStatusBarHidden(!SKPhotoBrowserOptions.displayStatusbar, withAnimation: .Fade)
-                
                 browser.view.hidden = false
                 browser.view.alpha = 1.0
                 browser.backgroundView.hidden = true

SKPhotoBrowser/SKButtons.swift

@@ -15,10 +15,8 @@ class SKButton: UIButton {
     var showFrame: CGRect!
     var hideFrame: CGRect!
     var insets: UIEdgeInsets {
-
-
         return UI_USER_INTERFACE_IDIOM() == .Phone
-            ?  UIEdgeInsets(top: 15.25, left: 15.25, bottom: 15.25, right: 15.25) : UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
+            ?  UIEdgeInsetsMake(15.25, 15.25, 15.25, 15.25) : UIEdgeInsetsMake(12, 12, 12, 12)
     }
     var size: CGSize = CGSize(width: 44, height: 44)
     var margin: CGFloat = 5
@@ -27,14 +25,13 @@ class SKButton: UIButton {
     
     func setup(imageName: String) {
         backgroundColor = .clearColor()
-        tintColor = SKPhotoBrowserOptions.textAndIconColor
         imageEdgeInsets = insets
 //        clipsToBounds = true
         translatesAutoresizingMaskIntoConstraints = true
         autoresizingMask = [.FlexibleBottomMargin, .FlexibleLeftMargin, .FlexibleRightMargin, .FlexibleTopMargin]
         
         let image = UIImage(named: "SKPhotoBrowser.bundle/images/\(imageName)",
-                            inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate) ?? UIImage()
+                            inBundle: bundle, compatibleWithTraitCollection: nil) ?? UIImage()
         setImage(image, forState: .Normal)
     }
   

SKPhotoBrowser/SKCaptionView.swift

@@ -61,13 +61,13 @@ private extension SKCaptionView {
         photoLabel.autoresizingMask = [.FlexibleWidth, .FlexibleHeight]
         photoLabel.opaque = false
         photoLabel.backgroundColor = .clearColor()
-        photoLabel.textColor = SKPhotoBrowserOptions.textAndIconColor
+        photoLabel.textColor = .whiteColor()
         photoLabel.textAlignment = .Center
         photoLabel.lineBreakMode = .ByTruncatingTail
         photoLabel.numberOfLines = 3
         photoLabel.shadowColor = UIColor(white: 0.0, alpha: 0.5)
         photoLabel.shadowOffset = CGSize(width: 0.0, height: 1.0)
-        photoLabel.font = SKPhotoBrowserOptions.captionFont
+        photoLabel.font = UIFont.systemFontOfSize(17.0)
         photoLabel.text = photo?.caption
         addSubview(photoLabel)
     }

SKPhotoBrowser/SKIndicatorView.swift

@@ -16,6 +16,6 @@ class SKIndicatorView: UIActivityIndicatorView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         center = CGPoint(x: frame.width / 2, y: frame.height / 2)
-        activityIndicatorViewStyle = SKPhotoBrowserOptions.backgroundColor.isEqual(UIColor.whiteColor()) ? .Gray : .WhiteLarge
+        activityIndicatorViewStyle = .WhiteLarge
     }
 }

SKPhotoBrowser/SKNavigationBar.swift

@@ -1,55 +0,0 @@
-//
-//  SKNavigationBar.swift
-//  SKPhotoBrowser
-//
-//  Created by Григорий Уланов on 10.10.16.
-//  Copyright © 2016 suzuki_keishi. All rights reserved.
-//
-
-import UIKit
-
-class SKNavigationBar: UINavigationBar {
-    var showFrame: CGRect!
-    var hideFrame: CGRect!
-
-    private static let toolBarHeight: CGFloat = 64.0
-
-    private weak var browser: SKPhotoBrowser?
-
-    convenience init(browser: SKPhotoBrowser) {
-        self.init(frame: CGRect.zero)
-
-        self.browser = browser
-
-        translucent = false
-        tintColor = UIColor.whiteColor()
-        barTintColor = UIColor.blackColor()
-        titleTextAttributes = [NSForegroundColorAttributeName: UIColor.whiteColor()]
-
-        let navigationItem = UINavigationItem()
-        pushNavigationItem(navigationItem, animated: false)
-    }
-
-    func updateNavigationBar(currentPageIndex: Int) {
-        guard let browser = browser else { return }
-
-        if browser.numberOfPhotos > 1 {
-            self.topItem?.title = "\(currentPageIndex + 1) \(SKPhotoBrowserOptions.navigationBarCounterSepatator) \(browser.numberOfPhotos)"
-        } else {
-            self.topItem?.title = nil
-        }
-    }
-
-    func setNewFrame(rect: CGRect) {
-        self.frame = rect
-        showFrame = rect
-
-        hideFrame = CGRect(x: rect.origin.x, y: rect.origin.y - 20, width: rect.size.width, height: rect.size.height)
-    }
-
-    func updateFrame(parentSize: CGSize) {
-        let newRect = CGRect(x: 0, y: 0, width: parentSize.width, height: SKNavigationBar.toolBarHeight)
-        setNewFrame(newRect)
-    }
-
-}

SKPhotoBrowser/SKPagingScrollView.swift

@@ -28,8 +28,8 @@ class SKPagingScrollView: UIScrollView {
         super.init(frame: frame)
         
         pagingEnabled = true
-        showsHorizontalScrollIndicator = SKPhotoBrowserOptions.displayHorizontalScrollIndicator
+        showsHorizontalScrollIndicator = true
-        showsVerticalScrollIndicator = SKPhotoBrowserOptions.displayHorizontalScrollIndicator
+        showsVerticalScrollIndicator = true
     }
     
     convenience init(frame: CGRect, browser: SKPhotoBrowser) {
@@ -210,7 +210,7 @@ private extension SKPagingScrollView {
     }
     
     func getFirstIndex() -> Int {
-        let firstIndex = Int(floor((bounds.minX + sideMargin * 2) / bounds.width))
+        let firstIndex = Int(floor((CGRectGetMinX(bounds) + sideMargin * 2) / CGRectGetWidth(bounds)))
         if firstIndex < 0 {
             return 0
         }
@@ -221,7 +221,7 @@ private extension SKPagingScrollView {
     }
     
     func getLastIndex() -> Int {
-        let lastIndex  = Int(floor((bounds.maxX - sideMargin * 2 - 1) / bounds.width))
+        let lastIndex  = Int(floor((CGRectGetMaxX(bounds) - sideMargin * 2 - 1) / CGRectGetWidth(bounds)))
         if lastIndex < 0 {
             return 0
         }

SKPhotoBrowser/SKPhoto.swift

@@ -88,7 +88,7 @@ public class SKPhoto: NSObject, SKPhotoProtocol {
                             }
                         }
                         
-                        if let res = response, image = UIImage(data: res) {
+                        if let res = response, let image = UIImage(data: res) {
                             if _self.shouldCachePhotoURLImage {
                                 if SKCache.sharedCache.imageCache is SKRequestResponseCacheable {
                                     SKCache.sharedCache.setImageData(response!, response: data!, request: task.originalRequest!)

SKPhotoBrowser/SKPhotoBrowser.swift

@@ -19,8 +19,6 @@ public class SKPhotoBrowser: UIViewController {
     private var deleteButton: SKDeleteButton!
     private var toolbar: SKToolbar!
     
-    private var navigationBar: SKNavigationBar!
-    
     // actions
     private var activityViewController: UIActivityViewController!
     private var panGesture: UIPanGestureRecognizer!
@@ -45,10 +43,6 @@ public class SKPhotoBrowser: UIViewController {
     // timer
     private var controlVisibilityTimer: NSTimer!
     
-    // blocks
-    public var willDismissPage: (() -> Void)?
-    public var didPresentPage: (() -> Void)?
-    
     // delegate
     private let animator = SKAnimator()
     public weak var delegate: SKPhotoBrowserDelegate?
@@ -58,10 +52,6 @@ public class SKPhotoBrowser: UIViewController {
     var numberOfPhotos: Int {
         return photos.count
     }
-    
-    // statusbar initial state
-    private var statusbarHidden: Bool = UIApplication.sharedApplication().statusBarHidden
-    
     // MARK - Initializer
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
@@ -118,13 +108,12 @@ public class SKPhotoBrowser: UIViewController {
         configureAppearance()
         configureCloseButton()
         configureDeleteButton()
-        configureNavigationBar()
         configureToolbar()
         
         animator.willPresent(self)
-        didPresentPage?()
     }
 
+    
     override public func viewWillAppear(animated: Bool) {
         super.viewWillAppear(true)
         reloadData()
@@ -142,7 +131,6 @@ public class SKPhotoBrowser: UIViewController {
         
         closeButton.updateFrame()
         deleteButton.updateFrame()
-        navigationBar.updateFrame(view.bounds.size)
         pagingScrollView.updateFrame(view.bounds, currentPageIndex: currentPageIndex)
         
         toolbar.frame = frameForToolbarAtOrientation()
@@ -165,7 +153,7 @@ public class SKPhotoBrowser: UIViewController {
         }
         
         dispatch_async(dispatch_get_main_queue(), {
-            guard let page = self.pagingScrollView.pageDisplayingAtPhoto(photo), photo = page.photo else {
+            guard let page = self.pagingScrollView.pageDisplayingAtPhoto(photo), let photo = page.photo else {
                 return
             }
             
@@ -192,7 +180,6 @@ public class SKPhotoBrowser: UIViewController {
         isPerformingLayout = true
         
         toolbar.updateToolbar(currentPageIndex)
-        navigationBar.updateNavigationBar(currentPageIndex)
         
         // reset local cache
         pagingScrollView.reload()
@@ -207,7 +194,6 @@ public class SKPhotoBrowser: UIViewController {
     }
     
     public func prepareForClosePhotoBrowser() {
-        UIApplication.sharedApplication().setStatusBarHidden(statusbarHidden, withAnimation: .None)
         cancelControlHiding()
         applicationWindow.removeGestureRecognizer(panGesture)
         NSObject.cancelPreviousPerformRequestsWithTarget(self)
@@ -229,7 +215,6 @@ public class SKPhotoBrowser: UIViewController {
     public func determineAndClose() {
         delegate?.willDismissAtPageIndex?(currentPageIndex)
         animator.willDismiss(self)
-        willDismissPage?()
     }
 }
 
@@ -286,7 +271,6 @@ public extension SKPhotoBrowser {
             }
             isEndAnimationByToolBar = false
             toolbar.updateToolbar(currentPageIndex)
-            navigationBar.updateNavigationBar(currentPageIndex)
             
             let pageFrame = frameForPageAtIndex(index)
             pagingScrollView.animate(pageFrame)
@@ -336,14 +320,14 @@ public extension SKPhotoBrowser {
         return toolbar.alpha == 0.0
     }
     
-    func popupShare(includeCaption includeCaption: Bool = true) {
+    func popupShare() {
         let photo = photos[currentPageIndex]
         guard let underlyingImage = photo.underlyingImage else {
             return
         }
         
         var activityItems: [AnyObject] = [underlyingImage]
-        if photo.caption != nil && includeCaption {
+        if photo.caption != nil {
             if let shareExtraCaption = SKPhotoBrowserOptions.shareExtraCaption {
                 activityItems.append(photo.caption + shareExtraCaption)
             } else {
@@ -391,7 +375,7 @@ internal extension SKPhotoBrowser {
         sender.layer.renderInContext(UIGraphicsGetCurrentContext()!)
         let result = UIGraphicsGetImageFromCurrentImageContext()
         UIGraphicsEndImageContext()
-        return result!
+        return result
     }
 }
 
@@ -456,7 +440,7 @@ internal extension SKPhotoBrowser {
             ? zoomingScrollView.center.y - viewHalfHeight
             : -(zoomingScrollView.center.y - viewHalfHeight)) / viewHalfHeight
         
-        view.alpha = max(0.7, offset)
+        view.backgroundColor = UIColor.blackColor().colorWithAlphaComponent(max(0.7, offset))
         
         // gesture end
         if sender.state == .Ended {
@@ -480,8 +464,7 @@ internal extension SKPhotoBrowser {
                 UIView.beginAnimations(nil, context: nil)
                 UIView.setAnimationDuration(animationDuration)
                 UIView.setAnimationCurve(UIViewAnimationCurve.EaseIn)
-                view.backgroundColor = SKPhotoBrowserOptions.backgroundColor
+                view.backgroundColor = UIColor.blackColor()
-                view.alpha = 1
                 zoomingScrollView.center = CGPoint(x: finalX, y: finalY)
                 UIView.commitAnimations()
             }
@@ -538,12 +521,12 @@ internal extension SKPhotoBrowser {
 // MARK: - Private Function 
 private extension SKPhotoBrowser {
     func configureAppearance() {
-        view.backgroundColor = SKPhotoBrowserOptions.backgroundColor
+        view.backgroundColor = .blackColor()
         view.clipsToBounds = true
         view.opaque = false
         
         backgroundView = UIView(frame: CGRect(x: 0, y: 0, width: SKMesurement.screenWidth, height: SKMesurement.screenHeight))
-        backgroundView.backgroundColor = SKPhotoBrowserOptions.backgroundColor
+        backgroundView.backgroundColor = .blackColor()
         backgroundView.alpha = 0.0
         applicationWindow.addSubview(backgroundView)
         
@@ -572,13 +555,6 @@ private extension SKPhotoBrowser {
         view.addSubview(deleteButton)
     }
     
-    func configureNavigationBar() {
-        navigationBar = SKNavigationBar(browser: self)
-        navigationBar.updateFrame(view.bounds.size)
-        navigationBar.hidden = !SKPhotoBrowserOptions.displayNavigationBar
-        view.addSubview(navigationBar)
-    }
-    
     func configureToolbar() {
         toolbar = SKToolbar(frame: frameForToolbarAtOrientation(), browser: self)
         view.addSubview(toolbar)
@@ -603,10 +579,6 @@ private extension SKPhotoBrowser {
                     self.deleteButton.alpha = alpha
                     self.deleteButton.frame = hidden ? self.deleteButton.hideFrame : self.deleteButton.showFrame
                 }
-                if SKPhotoBrowserOptions.displayNavigationBar {
-                    self.navigationBar.alpha = alpha
-                    self.navigationBar.frame = hidden ? self.navigationBar.hideFrame : self.navigationBar.showFrame
-                }
                 captionViews.forEach { $0.alpha = alpha }
             },
             completion: nil)
@@ -630,7 +602,6 @@ private extension SKPhotoBrowser {
                 gotoPreviousPage()
             }
             toolbar.updateToolbar(currentPageIndex)
-            navigationBar.updateNavigationBar(currentPageIndex)
             
         } else if photos.count == 1 {
             dismissPhotoBrowser(animated: false)
@@ -655,12 +626,11 @@ extension SKPhotoBrowser: UIScrollViewDelegate {
         // Calculate current page
         let previousCurrentPage = currentPageIndex
         let visibleBounds = pagingScrollView.bounds
-        currentPageIndex = min(max(Int(floor(visibleBounds.midX / visibleBounds.width)), 0), numberOfPhotos - 1)
+        currentPageIndex = min(max(Int(floor(CGRectGetMidX(visibleBounds) / CGRectGetWidth(visibleBounds))), 0), numberOfPhotos - 1)
         
         if currentPageIndex != previousCurrentPage {
             delegate?.didShowPhotoAtIndex?(currentPageIndex)
             toolbar.updateToolbar(currentPageIndex)
-            navigationBar.updateNavigationBar(currentPageIndex)
         }
     }
     

SKPhotoBrowser/SKPhotoBrowserDelegate.swift

@@ -71,6 +71,5 @@ import Foundation
      - Returns: the view to animate to
      */
     optional func viewForPhoto(browser: SKPhotoBrowser, index: Int) -> UIView?
-
 }
 

SKPhotoBrowser/SKPhotoBrowserOptions.swift

@@ -6,11 +6,9 @@
 //  Copyright © 2016年 suzuki_keishi. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 public struct SKPhotoBrowserOptions {
-    public static var displayStatusbar: Bool = false
-    
     public static var displayAction: Bool = true
     public static var shareExtraCaption: String? = nil
     public static var actionButtonTitles: [String]?
@@ -20,27 +18,10 @@ public struct SKPhotoBrowserOptions {
     public static var displayBackAndForwardButton: Bool = true
     public static var disableVerticalSwipe: Bool = false
     
-    public static var displayCloseButton: Bool = true
+    public static var displayCloseButton = true
-    public static var displayNavigationBar: Bool = true
+    public static var displayDeleteButton = false
-    public static var displayDeleteButton: Bool = false
     
-    public static var displayHorizontalScrollIndicator: Bool = true
+    public static var bounceAnimation = false
-    public static var displayVerticalScrollIndicator: Bool = true
+    public static var enableZoomBlackArea = true
-    
+    public static var enableSingleTapDismiss = false
-    public static var bounceAnimation: Bool = false
-    public static var enableZoomBlackArea: Bool = true
-    public static var enableSingleTapDismiss: Bool = false
-    
-    public static var backgroundColor = UIColor.blackColor()
-    public static var textAndIconColor = UIColor.whiteColor()
-    public static var toolbarTextShadowColor = UIColor.darkTextColor()
-
-    public static var navigationBarCounterSepatator: String = "из"
-    
-    public static var toolbarFont = UIFont(name: "Helvetica", size: 16.0)
-    public static var captionFont = UIFont.systemFontOfSize(17.0)
-    
-    // FIXED: Scrolling performance slowed #145
-    // public static var imagePaddingX: CGFloat = 0
-    // public static var imagePaddingY: CGFloat = 0
 }

SKPhotoBrowser/SKToolbar.swift

@@ -109,33 +109,32 @@ private extension SKToolbar {
         toolCounterLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 95, height: 40))
         toolCounterLabel.textAlignment = .Center
         toolCounterLabel.backgroundColor = .clearColor()
-        toolCounterLabel.font = SKPhotoBrowserOptions.toolbarFont
+        toolCounterLabel.font  = UIFont(name: "Helvetica", size: 16.0)
-        toolCounterLabel.textColor = SKPhotoBrowserOptions.textAndIconColor
+        toolCounterLabel.textColor = .whiteColor()
-        toolCounterLabel.shadowColor = SKPhotoBrowserOptions.toolbarTextShadowColor
+        toolCounterLabel.shadowColor = .darkTextColor()
         toolCounterLabel.shadowOffset = CGSize(width: 0.0, height: 1.0)
         toolCounterButton = UIBarButtonItem(customView: toolCounterLabel)
     }
     
     func setupActionButton() {
         toolActionButton = UIBarButtonItem(barButtonSystemItem: .Action, target: browser, action: #selector(SKPhotoBrowser.actionButtonPressed))
-        toolActionButton.tintColor = SKPhotoBrowserOptions.textAndIconColor
+        toolActionButton.tintColor = .whiteColor()
     }
 }
 
 
 class SKToolbarButton: UIButton {
-    let insets: UIEdgeInsets = UIEdgeInsets(top: 13.25, left: 17.25, bottom: 13.25, right: 17.25)
+    let insets: UIEdgeInsets = UIEdgeInsetsMake(13.25, 17.25, 13.25, 17.25)
     
     func setup(imageName: String) {
         backgroundColor = .clearColor()
-        tintColor = SKPhotoBrowserOptions.textAndIconColor
         imageEdgeInsets = insets
         translatesAutoresizingMaskIntoConstraints = true
         autoresizingMask = [.FlexibleBottomMargin, .FlexibleLeftMargin, .FlexibleRightMargin, .FlexibleTopMargin]
         contentMode = .Center
         
         let image = UIImage(named: "SKPhotoBrowser.bundle/images/\(imageName)",
-                            inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate) ?? UIImage()
+                            inBundle: bundle, compatibleWithTraitCollection: nil) ?? UIImage()
         setImage(image, forState: .Normal)
     }
 }

SKPhotoBrowser/SKZoomingScrollView.swift

@@ -48,7 +48,7 @@ public class SKZoomingScrollView: UIScrollView {
         // tap
         tapView = SKDetectingView(frame: bounds)
         tapView.delegate = self
-        tapView.backgroundColor = .clearColor()
+        tapView.backgroundColor = UIColor.clearColor()
         tapView.autoresizingMask = [.FlexibleHeight, .FlexibleWidth]
         addSubview(tapView)
         
@@ -183,24 +183,9 @@ public class SKZoomingScrollView: UIScrollView {
         
         if let image = photo.underlyingImage {
 
-            // FIXED: Scrolling performance slowed #145
- 
-            // create padding
-            // let width: CGFloat = image.size.width + SKPhotoBrowserOptions.imagePaddingX
-            // let height: CGFloat = image.size.height + SKPhotoBrowserOptions.imagePaddingY;
-            // UIGraphicsBeginImageContextWithOptions(CGSizeMake(width, height), false, 0.0);
-            // let context: CGContextRef = UIGraphicsGetCurrentContext()!;
-            // UIGraphicsPushContext(context);
-            // let origin: CGPoint = CGPointMake((width - image.size.width) / 2, (height - image.size.height) / 2);
-            // image.drawAtPoint(origin)
-            // UIGraphicsPopContext();
-            // let imageWithPadding = UIGraphicsGetImageFromCurrentImageContext();
-            // UIGraphicsEndImageContext();
-
             // image
             photoImageView.image = image
             photoImageView.contentMode = photo.contentMode
-            photoImageView.backgroundColor = SKPhotoBrowserOptions.backgroundColor
             
             var photoImageViewFrame = CGRect.zero
             photoImageViewFrame.origin = CGPoint.zero

SKPhotoBrowser/extensions/UIImage+Rotation.swift

@@ -15,33 +15,6 @@ extension UIImage {
             return self
         }
         
-        let transform = calculateAffineTransform()
-
-        // Now we draw the underlying CGImage into a new context, applying the transform
-        // calculated above.
-        let ctx = CGBitmapContextCreate(nil, Int(self.size.width), Int(self.size.height),
-            CGImageGetBitsPerComponent(self.CGImage!), 0,
-            CGImageGetColorSpace(self.CGImage!)!,
-            CGImageGetBitmapInfo(self.CGImage!).rawValue)
-        CGContextConcatCTM(ctx!, transform)
-        
-        switch self.imageOrientation {
-        case .Left, .LeftMirrored, .Right, .RightMirrored:
-            CGContextDrawImage(ctx!, CGRect(x: 0, y: 0, width: size.height, height: size.width), self.CGImage!)
-            
-        default:
-            CGContextDrawImage(ctx!, CGRect(x: 0, y: 0, width: size.width, height: size.height), self.CGImage!)
-        }
-        
-        // And now we just create a new UIImage from the drawing context
-        if let cgImage = CGBitmapContextCreateImage(ctx!) {
-            return UIImage(CGImage: cgImage)
-        } else {
-            return self
-        }
-    }
-
-    private func calculateAffineTransform() -> CGAffineTransform {
         // We need to calculate the proper transformation to make the image upright.
         // We do it in 2 steps: Rotate if Left/Right/Down, and then flip if Mirrored.
         var transform = CGAffineTransformIdentity
@@ -76,7 +49,28 @@ extension UIImage {
             break
         }
         
-        return transform
+        // Now we draw the underlying CGImage into a new context, applying the transform
+        // calculated above.
+        let ctx = CGBitmapContextCreate(nil, Int(self.size.width), Int(self.size.height),
+            CGImageGetBitsPerComponent(self.CGImage!), 0,
+            CGImageGetColorSpace(self.CGImage!)!,
+            CGImageGetBitmapInfo(self.CGImage!).rawValue)
+        CGContextConcatCTM(ctx!, transform)
+        
+        switch self.imageOrientation {
+        case .Left, .LeftMirrored, .Right, .RightMirrored:
+            CGContextDrawImage(ctx!, CGRect(x: 0, y: 0, width: size.height, height: size.width), self.CGImage!)
+            
+        default:
+            CGContextDrawImage(ctx!, CGRect(x: 0, y: 0, width: size.width, height: size.height), self.CGImage!)
+        }
+        
+        // And now we just create a new UIImage from the drawing context
+        if let cgImage = CGBitmapContextCreateImage(ctx!) {
+            return UIImage(CGImage: cgImage)
+        } else {
+            return self
+        }
     }
 }
 

SKPhotoBrowserExample/SKPhotoBrowserExample/FromWebViewController.swift

@@ -19,8 +19,7 @@ class FromWebViewController: UIViewController, SKPhotoBrowserDelegate {
         
         SKCache.sharedCache.imageCache = CustomImageCache()
         imageView.sd_setImageWithURL(NSURL(string: "https://placehold.jp/1500x1500.png")) {
-            guard let url = $0.3.absoluteString else { return }
+            SKCache.sharedCache.setImage($0.0, forKey: $0.3.absoluteString)
-            SKCache.sharedCache.setImage($0.0, forKey: url)
         }
     }
     

SKPhotoBrowserExample/SKPhotoBrowserExample/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>for example, this app accesses the user’s photo library</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -48,10 +46,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSAppTransportSecurity</key>
+    <key>NSAppTransportSecurity</key>
-	<dict>
+    <dict>
-		<key>NSAllowsArbitraryLoads</key>
+        <key>NSAllowsArbitraryLoads</key>
-		<true/>
+        <true/>
-	</dict>
+    </dict>
 </dict>
 </plist>