Merge branch 'master' of github.com:suzuki-0000/SKPhotoBrowser

SKPhotoBrowser.xcodeproj/project.pbxproj

@@ -224,7 +224,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = suzuki_keishi;
 				TargetAttributes = {
 					8909B52F1BC791280060A053 = {
@@ -351,12 +351,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -407,12 +409,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -462,8 +466,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -483,8 +487,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.keishi.suzuki.SKPhotoBrowser;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

SKPhotoBrowser.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

SKPhotoBrowser.xcodeproj/xcshareddata/xcschemes/SKPhotoBrowser.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SKPhotoBrowser/SKActionView.swift

@@ -95,11 +95,13 @@ extension SKActionView {
             addSubview(closeButton)
         }
 
-        guard let size = size else { return }
-        closeButton.setFrameSize(size)
+        if let size = size {
+            closeButton.setFrameSize(size)
+        }
 
-        guard let image = image else { return }
-        closeButton.setImage(image, for: UIControlState())
+        if let image = image {
+            closeButton.setImage(image, for: for: .normal)
+        }
     }
 
     func configureDeleteButton(image: UIImage? = nil, size: CGSize? = nil) {
@@ -109,11 +111,13 @@ extension SKActionView {
             deleteButton.isHidden = !SKPhotoBrowserOptions.displayDeleteButton
             addSubview(deleteButton)
         }
-
-        guard let size = size else { return }
-        deleteButton.setFrameSize(size)
 
-        guard let image = image else { return }
-        deleteButton.setImage(image, for: UIControlState())
+        if let size = size {
+            deleteButton.setFrameSize(size)
+        }
+
+        if let image = image {
+            deleteButton.setImage(image, for: .normal)
+        }
     }
 }

SKPhotoBrowser/SKAnimator.swift

@@ -22,7 +22,7 @@ class SKAnimator: NSObject, SKPhotoBrowserAnimatorDelegate {
         guard let window = UIApplication.shared.preferredApplicationWindow else { fatalError() }
 
         let backgroundView = UIView(frame: window.frame)
-        backgroundView.backgroundColor = .black
+        backgroundView.backgroundColor = SKPhotoBrowserOptions.backgroundColor
         backgroundView.alpha = 0.0
         return backgroundView
     }()
@@ -84,7 +84,10 @@ class SKAnimator: NSObject, SKPhotoBrowserAnimatorDelegate {
             let scrollView = browser.pageDisplayedAtIndex(browser.currentPageIndex) else {
 
             senderViewForAnimation?.isHidden = false
-            browser.dismissPhotoBrowser(animated: false)
+            browser.dismissPhotoBrowser(animated: false) {
+                self.resizableImageView?.removeFromSuperview()
+                self.backgroundView.removeFromSuperview()
+            }
             return
         }
 
@@ -170,7 +173,7 @@ private extension SKAnimator {
             delay: 0,
             usingSpringWithDamping: animationDamping,
             initialSpringVelocity: 0,
-            options: UIViewAnimationOptions(),
+            options: UIView.AnimationOptions(),
             animations: {
                 browser.showButtons()
                 self.backgroundView.alpha = 1.0
@@ -192,7 +195,7 @@ private extension SKAnimator {
             delay: 0,
             usingSpringWithDamping: animationDamping,
             initialSpringVelocity: 0,
-            options: UIViewAnimationOptions(),
+            options: UIView.AnimationOptions(),
             animations: {
                 self.backgroundView.alpha = 0.0
                 self.resizableImageView?.layer.frame = finalFrame

SKPhotoBrowser/SKButtons.swift

@@ -34,7 +34,7 @@ class SKButton: UIButton {
         autoresizingMask = [.flexibleBottomMargin, .flexibleLeftMargin, .flexibleRightMargin, .flexibleTopMargin]
 
         let image = UIImage(named: "SKPhotoBrowser.bundle/images/\(imageName)", in: bundle, compatibleWith: nil) ?? UIImage()
-        setImage(image, for: UIControlState())
+        setImage(image, for: .normal)
     }
 
     func setFrameSize(_ size: CGSize? = nil) {

SKPhotoBrowser/SKCache.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 open class SKCache {
-    open static let sharedCache = SKCache()
+    public static let sharedCache = SKCache()
     open var imageCache: SKCacheable
 
     init() {

SKPhotoBrowser/SKCaptionView.swift

@@ -22,8 +22,7 @@ open class SKCaptionView: UIView {
     }
 
     public convenience init(photo: SKPhotoProtocol) {
-        let screenBound = UIScreen.main.bounds
-        self.init(frame: CGRect(x: 0, y: 0, width: screenBound.size.width, height: screenBound.size.height))
+        self.init(frame: CGRect(x: 0, y: 0, width: SKMesurement.screenWidth, height: SKMesurement.screenHeight))
         self.photo = photo
         setup()
     }
@@ -37,7 +36,7 @@ open class SKCaptionView: UIView {
         let width: CGFloat = size.width - photoLabelPadding * 2
         let height: CGFloat = photoLabel.font.lineHeight * CGFloat(photoLabel.numberOfLines)
 
-        let attributedText = NSAttributedString(string: text, attributes: [NSAttributedStringKey.font: font])
+        let attributedText = NSAttributedString(string: text, attributes: [NSAttributedString.Key.font: font])
         let textSize = attributedText.boundingRect(with: CGSize(width: width, height: height), options: .usesLineFragmentOrigin, context: nil).size
 
         return CGSize(width: textSize.width, height: textSize.height + photoLabelPadding * 2)
@@ -57,7 +56,7 @@ private extension SKCaptionView {
         photoLabel = UILabel(frame: CGRect(x: photoLabelPadding, y: 0, width: bounds.size.width - (photoLabelPadding * 2), height: bounds.size.height))
         photoLabel.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         photoLabel.isOpaque = false
-        photoLabel.backgroundColor = .clear
+        photoLabel.backgroundColor = SKCaptionOptions.backgroundColor
         photoLabel.textColor = SKCaptionOptions.textColor
         photoLabel.textAlignment = SKCaptionOptions.textAlignment
         photoLabel.lineBreakMode = SKCaptionOptions.lineBreakMode
@@ -66,6 +65,7 @@ private extension SKCaptionView {
         photoLabel.shadowColor = UIColor(white: 0.0, alpha: 0.5)
         photoLabel.shadowOffset = CGSize(width: 0.0, height: 1.0)
         photoLabel.text = photo?.caption
+
         addSubview(photoLabel)
     }
 }

SKPhotoBrowser/SKIndicatorView.swift

@@ -16,7 +16,7 @@ class SKIndicatorView: UIActivityIndicatorView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         center = CGPoint(x: frame.width / 2, y: frame.height / 2)
-        activityIndicatorViewStyle = SKPhotoBrowserOptions.indicatorStyle
+        style = SKPhotoBrowserOptions.indicatorStyle
         color = SKPhotoBrowserOptions.indicatorColor
     }
 }

SKPhotoBrowser/SKLocalPhoto.swift

@@ -13,7 +13,7 @@ open class SKLocalPhoto: NSObject, SKPhotoProtocol {
 
     open var underlyingImage: UIImage!
     open var photoURL: String!
-    open var contentMode: UIViewContentMode = .scaleToFill
+    open var contentMode: UIView.ContentMode = .scaleToFill
     open var shouldCachePhotoURLImage: Bool = false
     open var caption: String?
     open var index: Int = 0

SKPhotoBrowser/SKMesurement.swift

@@ -16,10 +16,10 @@ struct SKMesurement {
         return UIApplication.shared.statusBarFrame.height
     }
     static var screenHeight: CGFloat {
-        return UIScreen.main.bounds.height
+        return UIApplication.shared.preferredApplicationWindow?.bounds.height ?? UIScreen.main.bounds.height
     }
     static var screenWidth: CGFloat {
-        return UIScreen.main.bounds.width
+        return UIApplication.shared.preferredApplicationWindow?.bounds.width ?? UIScreen.main.bounds.width
     }
     static var screenScale: CGFloat {
         return UIScreen.main.scale

SKPhotoBrowser/SKPaginationView.swift

@@ -55,7 +55,7 @@ class SKPaginationView: UIView {
     }
 
     func updateFrame(frame: CGRect) {
-        self.frame = CGRect(x: 0, y: frame.height - margin - extraMargin, width: frame.width, height: 100)
+        self.frame = CGRect(x: 0, y: frame.height - margin, width: frame.width, height: 100)
     }
 
     func update(_ currentPageIndex: Int) {
@@ -145,7 +145,7 @@ class SKPaginationButton: UIButton {
 
         let image = UIImage(named: "SKPhotoBrowser.bundle/images/\(imageName)",
             in: bundle, compatibleWith: nil) ?? UIImage()
-        setImage(image, for: UIControlState())
+        setImage(image, for: .normal)
     }
 }
 

SKPhotoBrowser/SKPagingScrollView.swift

@@ -43,6 +43,7 @@ class SKPagingScrollView: UIScrollView {
         visiblePages.removeAll()
         recycledPages.removeAll()
     }
+
 
     func loadAdjacentPhotosIfNecessary(_ photo: SKPhotoProtocol, currentPageIndex: Int) {
         guard let browser = browser, let page = pageDisplayingAtPhoto(photo) else {
@@ -162,9 +163,18 @@ class SKPagingScrollView: UIScrollView {
         let pageFrame = frameForPageAtIndex(index)
         let captionSize = captionView.sizeThatFits(CGSize(width: pageFrame.size.width, height: 0))
         let paginationFrame = browser?.paginationView.frame ?? .zero
+        let toolbarFrame = browser?.toolbar.frame ?? .zero
+
+        var frameSet = CGRect.zero
+        switch SKCaptionOptions.captionLocation {
+        case .basic:
+            frameSet = paginationFrame
+        case .bottom:
+            frameSet = toolbarFrame
+        }
 
         return CGRect(x: pageFrame.origin.x,
-                      y: paginationFrame.minY - captionSize.height,
+                      y: pageFrame.size.height - captionSize.height - frameSet.height,
                       width: pageFrame.size.width, height: captionSize.height)
     }
 

SKPhotoBrowser/SKPhoto.swift

@@ -12,7 +12,7 @@ import UIKit
     var index: Int { get set }
     var underlyingImage: UIImage! { get }
     var caption: String? { get }
-    var contentMode: UIViewContentMode { get set }
+    var contentMode: UIView.ContentMode { get set }
     func loadUnderlyingImageAndNotify()
     func checkCache()
 }
@@ -22,7 +22,7 @@ open class SKPhoto: NSObject, SKPhotoProtocol {
     open var index: Int = 0
     open var underlyingImage: UIImage!
     open var caption: String?
-    open var contentMode: UIViewContentMode = .scaleAspectFill
+    open var contentMode: UIView.ContentMode = .scaleAspectFill
     open var shouldCachePhotoURLImage: Bool = false
     open var photoURL: String!
 

SKPhotoBrowser/SKPhotoBrowser.swift

@@ -26,7 +26,7 @@ open class SKPhotoBrowser: UIViewController {
 
     fileprivate var actionView: SKActionView!
     fileprivate(set) var paginationView: SKPaginationView!
-    fileprivate var toolbar: SKToolbar!
+    var toolbar: SKToolbar!
 
     // actions
     fileprivate var activityViewController: UIActivityViewController!
@@ -137,7 +137,12 @@ open class SKPhotoBrowser: UIViewController {
         actionView.updateFrame(frame: view.frame)
 
         // paging
-        paginationView.updateFrame(frame: view.frame)
+        switch SKCaptionOptions.captionLocation {
+        case .basic:
+            paginationView.updateFrame(frame: view.frame)
+        case .bottom:
+            paginationView.frame = frameForPaginationAtOrientation()
+        }
         pagingScrollView.updateFrame(view.bounds, currentPageIndex: currentPageIndex)
 
         isPerformingLayout = false
@@ -394,6 +399,12 @@ internal extension SKPhotoBrowser {
         return view.bounds.divided(atDistance: 44, from: .maxYEdge).slice.offsetBy(dx: 0, dy: 44)
     }
 
+    func frameForPaginationAtOrientation() -> CGRect {
+        let offset = UIInterfaceOrientationIsLandscape(UIApplication.shared.statusBarOrientation) ? 35 : 44
+
+        return CGRect(x: 0, y: self.view.bounds.size.height - CGFloat(offset), width: self.view.bounds.size.width, height: CGFloat(offset))
+    }
+
     func frameForPageAtIndex(_ index: Int) -> CGRect {
         let bounds = pagingScrollView.bounds
         var pageFrame = bounds
@@ -456,7 +467,7 @@ internal extension SKPhotoBrowser {
 
                 UIView.beginAnimations(nil, context: nil)
                 UIView.setAnimationDuration(animationDuration)
-                UIView.setAnimationCurve(UIViewAnimationCurve.easeIn)
+                UIView.setAnimationCurve(UIView.AnimationCurve.easeIn)
                 zoomingScrollView.center = CGPoint(x: finalX, y: finalY)
                 UIView.commitAnimations()
             }

SKPhotoBrowser/SKPhotoBrowserOptions.swift

@@ -30,7 +30,7 @@ public struct SKPhotoBrowserOptions {
 
     public static var backgroundColor: UIColor = .black
     public static var indicatorColor: UIColor = .white
-    public static var indicatorStyle: UIActivityIndicatorViewStyle = .whiteLarge
+    public static var indicatorStyle: UIActivityIndicatorView.Style = .whiteLarge
 
     /// By default close button is on left side and delete button is on right.
     ///
@@ -55,11 +55,18 @@ public struct SKButtonOptions {
 }
 
 public struct SKCaptionOptions {
+    public enum CaptionLocation {
+        case basic
+        case bottom
+    }
+
     public static var textColor: UIColor = .white
     public static var textAlignment: NSTextAlignment = .center
     public static var numberOfLine: Int = 3
     public static var lineBreakMode: NSLineBreakMode = .byTruncatingTail
     public static var font: UIFont = .systemFont(ofSize: 17.0)
+    public static var backgroundColor: UIColor = .clear
+    public static var captionLocation: CaptionLocation = .basic
 }
 
 public struct SKToolbarOptions {