Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

add page control to the component #15

Open
wants to merge 2 commits into
base: swift-3
Choose a base branch
from
Open

add page control to the component #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93bab86
add page control to the component
frelei Nov 28, 2016
9e914a5
- pageControl currentIndex
frelei Nov 30, 2016
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
4 changes: 2 additions & 2 deletions Example/Optik/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal final class ViewController: UIViewController {
@IBAction private func presentLocalImageViewer(_ sender: UIButton) {
let viewController = Optik.imageViewer(withImages: localImages,
initialImageDisplayIndex: currentLocalImageIndex,
delegate: self)
delegate: self, enablePageControl: true)

present(viewController, animated: true, completion: nil)
}
Expand All @@ -62,7 +62,7 @@ internal final class ViewController: UIViewController {
let urls = [url1, url2, url3, url4]
let imageDownloader = AlamofireImageDownloader()

let viewController = Optik.imageViewer(withURLs: urls, imageDownloader: imageDownloader)
let viewController = Optik.imageViewer(withURLs: urls, imageDownloader: imageDownloader, enablePageControl: true)
present(viewController, animated: true, completion: nil)
}

Expand Down
94 changes: 90 additions & 4 deletions Optik/Classes/AlbumViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ internal final class AlbumViewController: UIViewController {
return viewControllers[0] as? ImageViewController
}

private var imageData: ImageData
fileprivate var imageData: ImageData
private var initialImageDisplayIndex: Int
private var activityIndicatorColor: UIColor?
private var dismissButtonImage: UIImage?
Expand All @@ -69,23 +69,33 @@ internal final class AlbumViewController: UIViewController {

private var transitionController: TransitionController = TransitionController()

fileprivate var pageControl: UIPageControl?

// MARK: - Init/Deinit

init(imageData: ImageData,
initialImageDisplayIndex: Int,
activityIndicatorColor: UIColor?,
dismissButtonImage: UIImage?,
dismissButtonPosition: DismissButtonPosition) {
dismissButtonPosition: DismissButtonPosition,
enablePageControl: Bool) {

self.imageData = imageData
self.initialImageDisplayIndex = initialImageDisplayIndex
self.activityIndicatorColor = activityIndicatorColor
self.dismissButtonImage = dismissButtonImage
self.dismissButtonPosition = dismissButtonPosition

pageViewController = UIPageViewController(transitionStyle: .scroll,
navigationOrientation: .horizontal,
if enablePageControl {
pageViewController = UIPageViewController(transitionStyle: .scroll,
navigationOrientation: .vertical,
options: [UIPageViewControllerOptionInterPageSpacingKey : Constants.SpacingBetweenImages])
pageControl = UIPageControl()
} else {
pageViewController = UIPageViewController(transitionStyle: .scroll,
navigationOrientation: .horizontal,
options: [UIPageViewControllerOptionInterPageSpacingKey : Constants.SpacingBetweenImages])
}

super.init(nibName: nil, bundle: nil)

Expand Down Expand Up @@ -147,6 +157,7 @@ internal final class AlbumViewController: UIViewController {
didMove(toParentViewController: pageViewController)

setupDismissButton()
setupPageControl()
setupPanGestureRecognizer()
}

Expand All @@ -163,6 +174,56 @@ internal final class AlbumViewController: UIViewController {
}
}

private func setupPageControl() {

if let page = pageControl {
page.currentPage = initialImageDisplayIndex
page.pageIndicatorTintColor = UIColor.red
page.translatesAutoresizingMaskIntoConstraints = false
page.transform = CGAffineTransform(rotationAngle: CGFloat(M_PI/2))
view.addSubview(page)

view.addConstraint(
NSLayoutConstraint(item: page,
attribute: .trailing,
relatedBy: .equal,
toItem: view,
attribute: .trailing,
multiplier: 1,
constant: -10)
)
view.addConstraint(
NSLayoutConstraint(item: page,
attribute: .centerY,
relatedBy: .equal,
toItem: view,
attribute: .centerY,
multiplier: 1,
constant: 0)
)
view.addConstraint(
NSLayoutConstraint(item: page,
attribute: .width,
relatedBy: .equal,
toItem: nil,
attribute: .notAnAttribute,
multiplier: 1,
constant: 30)
)
view.addConstraint(
NSLayoutConstraint(item: page,
attribute: .height,
relatedBy: .equal,
toItem: nil,
attribute: .notAnAttribute,
multiplier: 1,
constant: 25)
)
}

}


private func setupDismissButton() {
let dismissButton = UIButton(type: .custom)
dismissButton.translatesAutoresizingMaskIntoConstraints = false
Expand Down Expand Up @@ -226,12 +287,14 @@ internal final class AlbumViewController: UIViewController {
return nil
}

pageControl?.numberOfPages = images.count
return ImageViewController(image: images[index], index: index)
case .remote(let urls, let imageDownloader):
guard index >= 0 && index < urls.count else {
return nil
}

pageControl?.numberOfPages = urls.count
let imageViewController = ImageViewController(activityIndicatorColor: activityIndicatorColor, index: index)
let url = urls[index]

Expand All @@ -245,6 +308,7 @@ internal final class AlbumViewController: UIViewController {
imageViewController.image = image
})
}


return imageViewController
}
Expand Down Expand Up @@ -306,6 +370,28 @@ extension AlbumViewController: UIPageViewControllerDelegate {

if let currentImageIndex = currentImageViewController?.index {
imageViewerDelegate?.imageViewerDidDisplayImage(at: currentImageIndex)
pageControl?.currentPage = currentImageIndex
}
}

func pageViewController(pageViewController: UIPageViewController, spineLocationForInterfaceOrientation orientation: UIInterfaceOrientation) -> UIPageViewControllerSpineLocation {
return .max
}

func presentationCountForPageViewController(pageViewController: UIPageViewController) -> Int {
return numberOfImages()
}

func presentationIndexForPageViewController(pageViewController: UIPageViewController) -> Int {
return currentImageViewController?.index ?? 0
}

private func numberOfImages() -> Int {
switch imageData {
case .local(images: let images):
return images.count
case .remote(urls: let urls, imageDownloader: _):
return urls.count
}
}

Expand Down
18 changes: 12 additions & 6 deletions Optik/Classes/Optik.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ public func imageViewer(withImages images: [UIImage],
initialImageDisplayIndex: Int = 0,
delegate: ImageViewerDelegate? = nil,
dismissButtonImage: UIImage? = nil,
dismissButtonPosition: DismissButtonPosition = .topLeading) -> UIViewController {
dismissButtonPosition: DismissButtonPosition = .topLeading,
enablePageControl: Bool) -> UIViewController {
let albumViewController = imageViewer(withData: .local(images: images),
initialImageDisplayIndex: initialImageDisplayIndex,
dismissButtonImage: dismissButtonImage,
dismissButtonPosition: dismissButtonPosition)
dismissButtonPosition: dismissButtonPosition,
enablePageControl: enablePageControl)
albumViewController.modalPresentationStyle = .custom
albumViewController.imageViewerDelegate = delegate

Expand All @@ -53,12 +55,14 @@ public func imageViewer(withURLs urls: [URL],
imageDownloader: ImageDownloader,
activityIndicatorColor: UIColor = .white,
dismissButtonImage: UIImage? = nil,
dismissButtonPosition: DismissButtonPosition = .topLeading) -> UIViewController {
dismissButtonPosition: DismissButtonPosition = .topLeading,
enablePageControl: Bool) -> UIViewController {
return imageViewer(withData: .remote(urls: urls, imageDownloader: imageDownloader),
initialImageDisplayIndex: initialImageDisplayIndex,
activityIndicatorColor: activityIndicatorColor,
dismissButtonImage: dismissButtonImage,
dismissButtonPosition: dismissButtonPosition)
dismissButtonPosition: dismissButtonPosition,
enablePageControl: enablePageControl)
}

// MARK: - Private functions
Expand All @@ -67,13 +71,15 @@ private func imageViewer(withData imageData: ImageData,
initialImageDisplayIndex: Int,
activityIndicatorColor: UIColor? = nil,
dismissButtonImage: UIImage?,
dismissButtonPosition: DismissButtonPosition) -> AlbumViewController {
dismissButtonPosition: DismissButtonPosition,
enablePageControl: Bool) -> AlbumViewController {
let bundle = Bundle(for: AlbumViewController.self)
let defaultDismissButtonImage = UIImage(named: "DismissIcon", in: bundle, compatibleWith: nil)

return AlbumViewController(imageData: imageData,
initialImageDisplayIndex: initialImageDisplayIndex,
activityIndicatorColor: activityIndicatorColor,
dismissButtonImage: dismissButtonImage ?? defaultDismissButtonImage,
dismissButtonPosition: dismissButtonPosition)
dismissButtonPosition: dismissButtonPosition,
enablePageControl: enablePageControl)
}