@@ -12,6 +12,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
1212
1313 /// UI
1414 private var closeButton : UIButton ?
15+ private var seeAllButton : UIButton ?
1516 /// You can set any UIView subclass here. If set, it will be integrated into view hierachy and laid out
1617 /// following either the default pinning settings or settings from a custom configuration.
1718 public var headerView : UIView ?
@@ -47,7 +48,8 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
4748 private let toggleHeaderFooterAnimationDuration = 0.15
4849 private let closeAnimationDuration = 0.2
4950 private let rotationAnimationDuration = 0.2
50- private var closeLayout = CloseButtonLayout . PinRight ( 25 , 16 )
51+ private var closeLayout = ButtonLayout . PinLeft ( 8 , 16 )
52+ private var seeAllLayout = ButtonLayout . PinRight ( 8 , 16 )
5153 private var headerLayout = HeaderLayout . Center ( 25 )
5254 private var footerLayout = FooterLayout . Center ( 25 )
5355 private var statusBarHidden = true
@@ -92,10 +94,12 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
9294 case . SpinnerStyle( let style) : spinnerStyle = style
9395 case . SpinnerColor( let color) : spinnerColor = color
9496 case . CloseButton( let button) : closeButton = button
97+ case . SeeAllButton( let button) : seeAllButton = button
9598 case . PagingMode( let mode) : galleryPagingMode = mode
9699 case . HeaderViewLayout( let layout) : headerLayout = layout
97100 case . FooterViewLayout( let layout) : footerLayout = layout
98101 case . CloseLayout( let layout) : closeLayout = layout
102+ case . SeeAllLayout( let layout) : seeAllLayout = layout
99103 case . StatusBarHidden( let hidden) : statusBarHidden = hidden
100104 case . HideDecorationViewsOnLaunch( let hidden) : isDecorationViewsHidden = hidden
101105 case . BackgroundColor( let color) : backgroundColor = color
@@ -180,7 +184,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
180184
181185 func configureInitialImageController( ) {
182186
183- let initialImageController = ImageViewController ( imageProvider : imageProvider , configuration : configuration , imageCount : imageCount , displacedView : displacedView , startIndex: startIndex , imageIndex : startIndex , showDisplacedImage : true , fadeInHandler : fadeInHandler , delegate : self )
187+ let initialImageController = self . imageControllerFactory . createImageViewController ( startIndex)
184188 self . setViewControllers ( [ initialImageController] , direction: UIPageViewControllerNavigationDirection . Forward, animated: false , completion: nil )
185189 initialImageController. view. hidden = true
186190
@@ -195,13 +199,21 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
195199
196200 closeButton? . addTarget ( self , action: #selector( GalleryViewController . interactiveClose) , forControlEvents: . TouchUpInside)
197201 }
198-
202+
203+ private func configureSeeAllButton( ) {
204+
205+ seeAllButton? . addTarget ( self , action: #selector( GalleryViewController . seeAll) , forControlEvents: . TouchUpInside)
206+ }
207+
199208 func createViewHierarchy( ) {
200209
201210 if let close = closeButton {
202-
203211 self . view. addSubview ( close)
204212 }
213+
214+ if let seeAllButton = seeAllButton {
215+ self . view. addSubview ( seeAllButton)
216+ }
205217 }
206218
207219 func configureHeaderView( ) {
@@ -223,6 +235,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
223235 self . presentTransition. headerView = self . headerView
224236 self . presentTransition. footerView = self . footerView
225237 self . presentTransition. closeView = self . closeButton
238+ self . presentTransition. seeAllView = self . seeAllButton
226239 }
227240
228241 public override func viewDidLoad( ) {
@@ -231,6 +244,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
231244 configureHeaderView ( )
232245 configureFooterView ( )
233246 configureCloseButton ( )
247+ configureSeeAllButton ( )
234248 configurePresentTransition ( )
235249 createViewHierarchy ( )
236250 }
@@ -241,6 +255,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
241255 super. viewDidLayoutSubviews ( )
242256
243257 layoutCloseButton ( )
258+ layoutSeeAll ( )
244259 layoutHeaderView ( )
245260 layoutFooterView ( )
246261 }
@@ -264,7 +279,23 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
264279 close. frame. origin. y = marginTop
265280 }
266281 }
267-
282+
283+ func layoutSeeAll( ) {
284+
285+ guard let seeAllButton = seeAllButton else { return }
286+
287+ switch seeAllLayout {
288+ case . PinRight( let marginTop, let marginRight) :
289+ seeAllButton. autoresizingMask = [ . FlexibleBottomMargin, . FlexibleLeftMargin]
290+ seeAllButton. frame. origin. x = self . view. bounds. size. width - marginRight - seeAllButton. bounds. size. width
291+ seeAllButton. frame. origin. y = marginTop
292+ case . PinLeft( let marginTop, let marginLeft) :
293+ seeAllButton. autoresizingMask = [ . FlexibleBottomMargin, . FlexibleRightMargin]
294+ seeAllButton. frame. origin. x = marginLeft
295+ seeAllButton. frame. origin. y = marginTop
296+ }
297+ }
298+
268299 func layoutHeaderView( ) {
269300
270301 guard let header = headerView else { return }
@@ -349,14 +380,52 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
349380
350381 closeWithAnimation ( closedCompletion)
351382 }
352-
383+
384+ func seeAll( ) {
385+ let seeAllController = ThumbnailsViewController ( imageProvider: self . imageProvider)
386+ let closeButton = UIButton ( frame: CGRect ( origin: CGPoint . zero, size: CGSize ( width: 50 , height: 50 ) ) )
387+ closeButton. setImage ( UIImage ( named: " close_normal " ) , forState: UIControlState . Normal)
388+ closeButton. setImage ( UIImage ( named: " close_highlighted " ) , forState: UIControlState . Highlighted)
389+ seeAllController. closeButton = closeButton
390+ seeAllController. closeLayout = closeLayout
391+ seeAllController. onItemSelected = { index in
392+ self . goToIndex ( index)
393+ }
394+ presentViewController ( seeAllController, animated: true , completion: nil )
395+ }
396+
397+ public func goToIndex( index: Int ) {
398+ guard currentIndex != index && index >= 0 && index < imageCount else { return }
399+
400+ let imageViewController = self . imageControllerFactory. createImageViewController ( index)
401+ let direction : UIPageViewControllerNavigationDirection = index > currentIndex ? . Forward : . Reverse
402+
403+ // workaround to make UIPageViewController happy
404+ if direction == . Forward {
405+ let previousVC = self . imageControllerFactory. createImageViewController ( index - 1 )
406+ setViewControllers ( [ previousVC] , direction: direction, animated: true , completion: { finished in
407+ dispatch_async ( dispatch_get_main_queue ( ) , { [ weak self] in
408+ self ? . setViewControllers ( [ imageViewController] , direction: direction, animated: false , completion: nil )
409+ } )
410+ } )
411+ } else {
412+ let nextVC = self . imageControllerFactory. createImageViewController ( index + 1 )
413+ setViewControllers ( [ nextVC] , direction: direction, animated: true , completion: { finished in
414+ dispatch_async ( dispatch_get_main_queue ( ) , { [ weak self] in
415+ self ? . setViewControllers ( [ imageViewController] , direction: direction, animated: false , completion: nil )
416+ } )
417+ } )
418+ }
419+ }
420+
353421 func closeWithAnimation( completion: ( ( ) -> Void ) ? ) {
354422
355423 UIView . animateWithDuration ( 0.1 , animations: { [ weak self] in
356424
357425 self ? . headerView? . alpha = 0.0
358426 self ? . footerView? . alpha = 0.0
359427 self ? . closeButton? . alpha = 0.0
428+ self ? . seeAllButton? . alpha = 0.0
360429
361430 } ) { [ weak self] done in
362431
@@ -399,6 +468,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
399468 let alpha = 1 - distance * swipeToDismissFadeOutAccelerationFactor
400469
401470 closeButton? . alpha = alpha
471+ seeAllButton? . alpha = alpha
402472 headerView? . alpha = alpha
403473 footerView? . alpha = alpha
404474 }
@@ -415,7 +485,7 @@ final public class GalleryViewController : UIPageViewController, UIViewControlle
415485 self ? . headerView? . alpha = alpha
416486 self ? . footerView? . alpha = alpha
417487 self ? . closeButton? . alpha = alpha
418-
488+ self ? . seeAllButton ? . alpha = alpha
419489 } )
420490 }
421491
0 commit comments