Features/right nav bar item and some bug fixes (#80)

- Right nav bar item and some bug fixes
- added spacing between images

Author: michaelhenry

Example/Demo/BasicViewController.swift

@@ -5,7 +5,7 @@ class BasicViewController:UIViewController {
 
     lazy var imageView:UIImageView = {
         let iv = UIImageView()
-        iv.image = Data.images[0].resize(targetSize: .thumbnail)
+        iv.image = Data.images[0]
 
         // Setup Image Viewer
         iv.setupImageViewer()

Example/Demo/Data.swift

@@ -7,7 +7,22 @@ struct Data {
         "cat2",
         "cat3",
         "cat4",
-        "cat5"
+        "cat5",
+        "cat1",
+        "cat2",
+        "cat3",
+        "cat4",
+        "cat5",
+        "cat1",
+        "cat2",
+        "cat3",
+        "cat4",
+        "cat5",
+        "cat1",
+        "cat2",
+        "cat3",
+        "cat4",
+        "cat5",
     ]
 
     static let images:[UIImage] = Self.imageNames.compactMap { UIImage(named: $0)! }

Example/Demo/ExampleListViewController.swift

@@ -38,6 +38,11 @@ class ExampleListViewController:UITableViewController {
 
     var items:[ExampleType] = ExampleType.allCases
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "ImageViewer.swift"
+    }
+    
     override func numberOfSections(in tableView: UITableView) -> Int {
         return 1
     }

Example/Demo/WithURLsViewController.swift

@@ -92,8 +92,18 @@ extension WithURLsViewController:UICollectionViewDataSource {
         // Setup Image Viewer with [URL]
         cell.imageView.setupImageViewer(
             urls: Data.imageUrls,
-            initialIndex: indexPath.item)
+            initialIndex: indexPath.item,
+            options: [
+                .theme(.dark),
+                .rightNavItemTitle("Info", delegate: self)
+            ])
 
         return cell
     }
 }
+
+extension WithURLsViewController:RightNavItemDelegate {
+    func imageViewer(_ imageViewer: ImageCarouselViewController, didTapRightNavItem index: Int) {
+        print("TAPPED", index)
+    }
+}

Sources/ImageCarouselViewController.swift

@@ -5,7 +5,7 @@ public protocol ImageDataSource:class {
     func imageItem(at index:Int) -> ImageItem
 }
 
-class ImageCarouselViewController:UIPageViewController {
+public class ImageCarouselViewController:UIPageViewController {
 
     weak var imageDatasource:ImageDataSource?
     var initialIndex = 0
@@ -19,6 +19,8 @@ class ImageCarouselViewController:UIPageViewController {
 
     var options:[ImageViewerOption] = []
 
+    weak var rightNavItemDelegate:RightNavItemDelegate?
+    
     private(set) lazy var navBar:UINavigationBar = {
         let _navBar = UINavigationBar(frame: .zero)
         _navBar.isTranslucent = true
@@ -61,15 +63,29 @@ class ImageCarouselViewController:UIPageViewController {
 
         options.forEach {
             switch $0 {
-            case .theme(let theme):
-                self.theme = theme
-            case .closeIcon(let icon):
-                navItem.leftBarButtonItem?.image = icon
+                case .theme(let theme):
+                    self.theme = theme
+                case .closeIcon(let icon):
+                    navItem.leftBarButtonItem?.image = icon
+                case .rightNavItemTitle(let title, let delegate):
+                    navItem.rightBarButtonItem = UIBarButtonItem(
+                        title: title,
+                        style: .plain,
+                        target: self,
+                        action: #selector(diTapRightNavBarItem(_:)))
+                    rightNavItemDelegate = delegate
+                case .rightNavItemIcon(let icon, let delegate):
+                    navItem.rightBarButtonItem = UIBarButtonItem(
+                        image: icon,
+                        style: .plain,
+                        target: self,
+                        action: #selector(diTapRightNavBarItem(_:)))
+                    rightNavItemDelegate = delegate
             }
         }
     }
 
-    override func viewDidLoad() {
+    override public func viewDidLoad() {
         super.viewDidLoad()
 
         addBackgroundView()
@@ -92,24 +108,36 @@ class ImageCarouselViewController:UIPageViewController {
         setViewControllers([initialVC], direction: .forward, animated: true, completion: nil)
     }
 
-    override func viewDidAppear(_ animated: Bool) {
+    override public func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         UIView.animate(withDuration: 0.235) {
             self.navBar.alpha = 1.0
         }
     }
 
     @objc
-    func dismiss(_ sender:UIBarButtonItem?) {
+    private func dismiss(_ sender:UIBarButtonItem) {
+        dismissMe(completion: nil)
+    }
+    
+    public func dismissMe(completion: (() -> Void)? = nil) {
         sourceView.alpha = 1.0
         UIView.animate(withDuration: 0.235, animations: {
             self.view.alpha = 0.0
         }) { _ in
-            self.dismiss(animated: false, completion: nil)
+            self.dismiss(animated: false, completion: completion)
         }
     }
 
-    override var preferredStatusBarStyle: UIStatusBarStyle {
+    @objc
+    func diTapRightNavBarItem(_ sender:UIBarButtonItem) {
+        guard let _delegate = rightNavItemDelegate,
+            let _firstVC = viewControllers?.first as? ImageViewerController
+            else { return }
+        _delegate.imageViewer(self, didTapRightNavItem: _firstVC.index)
+    }
+    
+    override public var preferredStatusBarStyle: UIStatusBarStyle {
         if theme == .dark {
             return .lightContent
         }
@@ -118,7 +146,7 @@ class ImageCarouselViewController:UIPageViewController {
 }
 
 extension ImageCarouselViewController:UIPageViewControllerDataSource {
-    func pageViewController(
+    public func pageViewController(
         _ pageViewController: UIPageViewController,
         viewControllerBefore viewController: UIViewController) -> UIViewController? {
 
@@ -135,7 +163,7 @@ extension ImageCarouselViewController:UIPageViewControllerDataSource {
             delegate: self)
     }
 
-    func pageViewController(
+    public func pageViewController(
         _ pageViewController: UIPageViewController,
         viewControllerAfter viewController: UIViewController) -> UIViewController? {
 

Sources/ImageViewerController.swift

@@ -116,6 +116,7 @@ class ImageViewerController:UIViewController, UIGestureRecognizerDelegate {
 
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
+        updateConstraintsForSize(view.bounds.size)
         updateMinMaxZoomScaleForSize(view.bounds.size)
     }
 

Sources/ImageViewerOption.swift

@@ -4,4 +4,6 @@ public enum ImageViewerOption {
 
     case theme(ImageViewerTheme)
     case closeIcon(UIImage)
+    case rightNavItemTitle(String, delegate: RightNavItemDelegate?)
+    case rightNavItemIcon(UIImage, delegate: RightNavItemDelegate?)
 }

Sources/RightNavItemDelegate.swift

@@ -0,0 +1,4 @@
+
+public protocol RightNavItemDelegate:class {
+    func imageViewer(_ imageViewer: ImageCarouselViewController, didTapRightNavItem index:Int)
+}

Sources/UIImageView_Extensions.swift

@@ -109,10 +109,14 @@ extension UIImageView {
     @objc
     private func showImageViewer(_ sender:TapWithDataRecognizer) {
         guard let sourceView = sender.view as? UIImageView else { return }
+        
+        let options = [UIPageViewController.OptionsKey.interPageSpacing: 20]
+        
         let imageCarousel = ImageCarouselViewController(
             transitionStyle: .scroll,
             navigationOrientation: .horizontal,
-            options: nil)
+            options: options)
+        
         imageCarousel.sourceView = sourceView
         imageCarousel.imageDatasource = sender.imageDatasource
         imageCarousel.initialIndex = sender.initialIndex