* Add the ability to pass in contentMode (for the imageView and the animations)

* Explicitly set imageContentMode in the init
* Close button to do a normal dismiss which does the transition animation
* Minor clean up

Author: jangelsb

Sources/ImageViewer_swift/ImageCarouselViewController.swift

@@ -34,6 +34,7 @@ public class ImageCarouselViewController:UIPageViewController, ImageViewerTransi
         }
     }
 
+    var imageContentMode: UIView.ContentMode = .scaleAspectFill
     var options:[ImageViewerOption] = []
 
     private var onRightNavBarTapped:((Int) -> Void)?
@@ -55,7 +56,7 @@ public class ImageCarouselViewController:UIPageViewController, ImageViewerTransi
 
     private(set) lazy var navItem = UINavigationItem()
 
-    private let imageViewerPresentationDelegate = ImageViewerTransitionPresentationManager()
+    private let imageViewerPresentationDelegate: ImageViewerTransitionPresentationManager
 
     public init(
         sourceView:UIImageView,
@@ -70,6 +71,19 @@ public class ImageCarouselViewController:UIPageViewController, ImageViewerTransi
         self.imageDatasource = imageDataSource
         self.imageLoader = imageLoader
         let pageOptions = [UIPageViewController.OptionsKey.interPageSpacing: 20]
+        
+        var _imageContentMode = imageContentMode
+        options.forEach {
+            switch $0 {
+            case .contentMode(let contentMode):
+                _imageContentMode = contentMode
+            default:
+                break
+            }
+        }
+        imageContentMode = _imageContentMode
+        
+        self.imageViewerPresentationDelegate = ImageViewerTransitionPresentationManager(imageContentMode: imageContentMode)
         super.init(
             transitionStyle: .scroll,
             navigationOrientation: .horizontal,
@@ -112,6 +126,8 @@ public class ImageCarouselViewController:UIPageViewController, ImageViewerTransi
             switch $0 {
                 case .theme(let theme):
                     self.theme = theme
+                case .contentMode(let contentMode):
+                    self.imageContentMode = contentMode
                 case .closeIcon(let icon):
                     navItem.leftBarButtonItem?.image = icon
                 case .rightNavItemTitle(let title, let onTap):
@@ -152,16 +168,7 @@ public class ImageCarouselViewController:UIPageViewController, ImageViewerTransi
 
     @objc
     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: completion)
-        }
+        self.dismiss(animated: true, completion: nil)
     }
 
     deinit {

Sources/ImageViewer_swift/ImageViewerOption.swift

@@ -3,6 +3,7 @@ import UIKit
 public enum ImageViewerOption {
 
     case theme(ImageViewerTheme)
+    case contentMode(UIView.ContentMode)
     case closeIcon(UIImage)
     case rightNavItemTitle(String, onTap: ((Int) -> Void)?)
     case rightNavItemIcon(UIImage, onTap: ((Int) -> Void)?)

Sources/ImageViewer_swift/ImageViewerTransitionPresentationManager.swift

@@ -20,9 +20,11 @@ protocol ImageViewerTransitionViewControllerConvertible {
 final class ImageViewerTransitionPresentationAnimator:NSObject {
 
     let isPresenting: Bool
+    let imageContentMode: UIView.ContentMode
 
-    init(isPresenting: Bool) {
+    init(isPresenting: Bool, imageContentMode: UIView.ContentMode) {
         self.isPresenting = isPresenting
+        self.imageContentMode = imageContentMode
         super.init()
     }
 }
@@ -64,7 +66,7 @@ extension ImageViewerTransitionPresentationAnimator: UIViewControllerAnimatedTra
         -> UIImageView {
             let dummyImageView:UIImageView = UIImageView(frame: frame)
             dummyImageView.clipsToBounds = true
-            dummyImageView.contentMode = .scaleAspectFill
+            dummyImageView.contentMode = imageContentMode
             dummyImageView.alpha = 1.0
             dummyImageView.image = image
             return dummyImageView
@@ -155,6 +157,11 @@ final class ImageViewerTransitionPresentationController: UIPresentationControlle
 }
 
 final class ImageViewerTransitionPresentationManager: NSObject {
+    private let imageContentMode: UIView.ContentMode
+    
+    public init(imageContentMode: UIView.ContentMode) {
+        self.imageContentMode = imageContentMode
+    }
 
 }
 
@@ -177,13 +184,13 @@ extension ImageViewerTransitionPresentationManager: UIViewControllerTransitionin
         source: UIViewController
     ) -> UIViewControllerAnimatedTransitioning? {
 
-        return ImageViewerTransitionPresentationAnimator(isPresenting: true)
+        return ImageViewerTransitionPresentationAnimator(isPresenting: true, imageContentMode: imageContentMode)
     }
 
     func animationController(
         forDismissed dismissed: UIViewController
     ) -> UIViewControllerAnimatedTransitioning? {
-        return ImageViewerTransitionPresentationAnimator(isPresenting: false)
+        return ImageViewerTransitionPresentationAnimator(isPresenting: false, imageContentMode: imageContentMode)
     }
 }
 

Sources/ImageViewer_swift/UIImageView_Extensions.swift

@@ -118,7 +118,18 @@ extension UIImageView {
         }
 
         isUserInteractionEnabled = true
-        contentMode = .scaleAspectFill
+        
+        var imageContentMode: UIView.ContentMode = .scaleAspectFill
+        options.forEach {
+            switch $0 {
+            case .contentMode(let contentMode):
+                imageContentMode = contentMode
+            default:
+                break
+            }
+        }
+        contentMode = imageContentMode
+        
         clipsToBounds = true
 
         if _tapRecognizer == nil {