Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Implementation of #112 (support contentMode .scaleAspectFit) #113

Closed
wants to merge 4 commits into from
+53 −48
Closed

Implementation of #112 (support contentMode .scaleAspectFit) #113

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8063d9e
* Remove RightNavItemDelegate
jangelsb Dec 24, 2020
9044e3c
* Update iOS SDK target to iOS 12
jangelsb Dec 24, 2020
d74d47b
* Add the ability to pass in contentMode (for the imageView and the a…
jangelsb Dec 24, 2020
43c8478
* Update framework to not embed
jangelsb Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 27 additions & 32 deletions ImageViewer.swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,62 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
032D118A259411D30001404D /* ImageViewerTransitionPresentationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 032D1189259411D30001404D /* ImageViewerTransitionPresentationManager.swift */; };
032D118F259412CA0001404D /* SDWebImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 032D118E259412CA0001404D /* SDWebImage.xcframework */; };
032D1190259412CA0001404D /* SDWebImage.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 032D118E259412CA0001404D /* SDWebImage.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3FBC5E8C24E5910E00E68938 /* UIImageView_Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8024E5910E00E68938 /* UIImageView_Extensions.swift */; };
3FBC5E8D24E5910E00E68938 /* ImageViewer_swift.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC5E8124E5910E00E68938 /* ImageViewer_swift.h */; settings = {ATTRIBUTES = (Public, ); }; };
3FBC5E8E24E5910E00E68938 /* UIView_Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8224E5910E00E68938 /* UIView_Extensions.swift */; };
3FBC5E8F24E5910E00E68938 /* UINavigationBar_Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8324E5910E00E68938 /* UINavigationBar_Extensions.swift */; };
3FBC5E9024E5910E00E68938 /* ImageCarouselViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8424E5910E00E68938 /* ImageCarouselViewController.swift */; };
3FBC5E9124E5910E00E68938 /* ImageViewerOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8524E5910E00E68938 /* ImageViewerOption.swift */; };
3FBC5E9224E5910E00E68938 /* RightNavItemDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8624E5910E00E68938 /* RightNavItemDelegate.swift */; };
3FBC5E9324E5910E00E68938 /* ImageItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8724E5910E00E68938 /* ImageItem.swift */; };
3FBC5E9424E5910E00E68938 /* ImageViewerTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8824E5910E00E68938 /* ImageViewerTheme.swift */; };
3FBC5E9524E5910E00E68938 /* ImageViewerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8924E5910E00E68938 /* ImageViewerController.swift */; };
3FBC5E9624E5910E00E68938 /* SimpleImageDatasource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC5E8A24E5910E00E68938 /* SimpleImageDatasource.swift */; };
3FBC5E9D24E595AB00E68938 /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FBC5E9C24E595AB00E68938 /* SDWebImage.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
032D1191259412CA0001404D /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
032D1190259412CA0001404D /* SDWebImage.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
032D1189259411D30001404D /* ImageViewerTransitionPresentationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewerTransitionPresentationManager.swift; sourceTree = "<group>"; };
032D118E259412CA0001404D /* SDWebImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SDWebImage.xcframework; path = Carthage/Build/SDWebImage.xcframework; sourceTree = SOURCE_ROOT; };
3FBC5E7424E5908400E68938 /* ImageViewer_swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ImageViewer_swift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3FBC5E8024E5910E00E68938 /* UIImageView_Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageView_Extensions.swift; sourceTree = "<group>"; };
3FBC5E8124E5910E00E68938 /* ImageViewer_swift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageViewer_swift.h; sourceTree = "<group>"; };
3FBC5E8224E5910E00E68938 /* UIView_Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIView_Extensions.swift; sourceTree = "<group>"; };
3FBC5E8324E5910E00E68938 /* UINavigationBar_Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UINavigationBar_Extensions.swift; sourceTree = "<group>"; };
3FBC5E8424E5910E00E68938 /* ImageCarouselViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCarouselViewController.swift; sourceTree = "<group>"; };
3FBC5E8524E5910E00E68938 /* ImageViewerOption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewerOption.swift; sourceTree = "<group>"; };
3FBC5E8624E5910E00E68938 /* RightNavItemDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RightNavItemDelegate.swift; sourceTree = "<group>"; };
3FBC5E8724E5910E00E68938 /* ImageItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageItem.swift; sourceTree = "<group>"; };
3FBC5E8824E5910E00E68938 /* ImageViewerTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewerTheme.swift; sourceTree = "<group>"; };
3FBC5E8924E5910E00E68938 /* ImageViewerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewerController.swift; sourceTree = "<group>"; };
3FBC5E8A24E5910E00E68938 /* SimpleImageDatasource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleImageDatasource.swift; sourceTree = "<group>"; };
3FBC5E9924E591CB00E68938 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3FBC5E9C24E595AB00E68938 /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/iOS/SDWebImage.framework; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
3FBC5E7124E5908400E68938 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3FBC5E9D24E595AB00E68938 /* SDWebImage.framework in Frameworks */,
032D118F259412CA0001404D /* SDWebImage.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -77,8 +92,8 @@
3FBC5E8324E5910E00E68938 /* UINavigationBar_Extensions.swift */,
3FBC5E8424E5910E00E68938 /* ImageCarouselViewController.swift */,
3FBC5E8524E5910E00E68938 /* ImageViewerOption.swift */,
3FBC5E8624E5910E00E68938 /* RightNavItemDelegate.swift */,
3FBC5E8724E5910E00E68938 /* ImageItem.swift */,
032D1189259411D30001404D /* ImageViewerTransitionPresentationManager.swift */,
3FBC5E8824E5910E00E68938 /* ImageViewerTheme.swift */,
3FBC5E8924E5910E00E68938 /* ImageViewerController.swift */,
3FBC5E8A24E5910E00E68938 /* SimpleImageDatasource.swift */,
Expand All @@ -97,7 +112,7 @@
3FBC5E9B24E5959C00E68938 /* Frameworks */ = {
isa = PBXGroup;
children = (
3FBC5E9C24E595AB00E68938 /* SDWebImage.framework */,
032D118E259412CA0001404D /* SDWebImage.xcframework */,
);
path = Frameworks;
sourceTree = "<group>";
Expand All @@ -124,7 +139,7 @@
3FBC5E7024E5908400E68938 /* Sources */,
3FBC5E7124E5908400E68938 /* Frameworks */,
3FBC5E7224E5908400E68938 /* Resources */,
3FBC5E9E24E595ED00E68938 /* ShellScript */,
032D1191259412CA0001404D /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -177,41 +192,19 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
3FBC5E9E24E595ED00E68938 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/SDWebImage.framework",
);
outputFileListPaths = (
);
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SDWebImage.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
3FBC5E7024E5908400E68938 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3FBC5E9024E5910E00E68938 /* ImageCarouselViewController.swift in Sources */,
3FBC5E9424E5910E00E68938 /* ImageViewerTheme.swift in Sources */,
032D118A259411D30001404D /* ImageViewerTransitionPresentationManager.swift in Sources */,
3FBC5E9524E5910E00E68938 /* ImageViewerController.swift in Sources */,
3FBC5E8E24E5910E00E68938 /* UIView_Extensions.swift in Sources */,
3FBC5E9624E5910E00E68938 /* SimpleImageDatasource.swift in Sources */,
3FBC5E8C24E5910E00E68938 /* UIImageView_Extensions.swift in Sources */,
3FBC5E9124E5910E00E68938 /* ImageViewerOption.swift in Sources */,
3FBC5E9224E5910E00E68938 /* RightNavItemDelegate.swift in Sources */,
3FBC5E9324E5910E00E68938 /* ImageItem.swift in Sources */,
3FBC5E8F24E5910E00E68938 /* UINavigationBar_Extensions.swift in Sources */,
);
Expand Down Expand Up @@ -354,6 +347,7 @@
);
INFOPLIST_FILE = "$(SRCROOT)/Config/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -382,6 +376,7 @@
);
INFOPLIST_FILE = "$(SRCROOT)/Config/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
29 changes: 18 additions & 11 deletions Sources/ImageCarouselViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class ImageCarouselViewController:UIPageViewController, ImageViewerTransitionVie
}
}

var imageContentMode: UIView.ContentMode = .scaleAspectFill
var options:[ImageViewerOption] = []

private var onRightNavBarTapped:((Int) -> Void)?
Expand All @@ -54,7 +55,7 @@ class ImageCarouselViewController:UIPageViewController, ImageViewerTransitionVie

private(set) lazy var navItem = UINavigationItem()

private let imageViewerPresentationDelegate = ImageViewerTransitionPresentationManager()
private let imageViewerPresentationDelegate: ImageViewerTransitionPresentationManager

public init(
sourceView:UIImageView,
Expand All @@ -67,6 +68,19 @@ class ImageCarouselViewController:UIPageViewController, ImageViewerTransitionVie
self.options = options
self.imageDatasource = imageDataSource
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,
Expand Down Expand Up @@ -109,6 +123,8 @@ class ImageCarouselViewController:UIPageViewController, ImageViewerTransitionVie
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):
Expand Down Expand Up @@ -148,16 +164,7 @@ class ImageCarouselViewController:UIPageViewController, ImageViewerTransitionVie

@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)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually allows for the animation transition to run and it looks really nice!

}

deinit {
Expand Down
1 change: 1 addition & 0 deletions Sources/ImageViewerOption.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?)
Expand Down
15 changes: 11 additions & 4 deletions Sources/ImageViewerTransitionPresentationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}

}

Expand All @@ -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)
}
}

Expand Down
13 changes: 12 additions & 1 deletion Sources/UIImageView_Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,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 {
Expand Down