added a reference to the gallery image view controller to the action handler

Michael Skiba · Michael Skiba · commit b102d4524e1a · 2016-07-14T09:45:13.000-04:00
added a
diff --git a/RIGImageGallery/RIGImageGalleryViewController.swift b/RIGImageGallery/RIGImageGalleryViewController.swift
@@ -11,7 +11,7 @@ import UIKit
 public class RIGImageGalleryViewController: UIPageViewController {
 
     /// An optional closure to execute if the action button is tapped
-    public var actionButtonHandler: (RIGImageGalleryItem -> ())?
+    public var actionButtonHandler: ((gallery: RIGImageGalleryViewController, item:RIGImageGalleryItem) -> ())?
 
     /// An optional closure to allow cutom trait collection change handling
     public var traitCollectionChangeHandler: (RIGImageGalleryViewController -> ())? {
@@ -225,7 +225,7 @@ extension RIGImageGalleryViewController {
 
     func performAction(sender: UIBarButtonItem) {
         if let item = currentImageViewController?.viewerItem {
-            actionButtonHandler?(item)
+            actionButtonHandler?(gallery: self, item: item)
         }
     }
 
diff --git a/RIGImageGalleryDemo/View Controller/ViewController.swift b/RIGImageGalleryDemo/View Controller/ViewController.swift
@@ -51,6 +51,7 @@ private extension ViewController {
         let photoViewController = loadImages()
         photoViewController.dismissHandler = dismissPhotoViewer
         photoViewController.actionButtonHandler = actionButtonHandler
+        photoViewController.actionButton = UIBarButtonItem(barButtonSystemItem: .Action, target: nil, action: nil)
         photoViewController.traitCollectionChangeHandler = traitCollectionChangeHandler
         photoViewController.countUpdateHandler = updateCount
         let navigationController = navBarWrappedViewController(photoViewController)
@@ -65,7 +66,7 @@ private extension ViewController {
         dismissViewControllerAnimated(true, completion: nil)
     }
 
-    func actionButtonHandler(galleryItem: RIGImageGalleryItem) {
+    func actionButtonHandler(_: RIGImageGalleryViewController,galleryItem: RIGImageGalleryItem) {
     }
 
     func updateCount(gallery: RIGImageGalleryViewController, position: Int, total: Int) {
diff --git a/RIGImageGalleryTests/ImageGalleryViewControllerTests.swift b/RIGImageGalleryTests/ImageGalleryViewControllerTests.swift
@@ -66,7 +66,7 @@ class ImageGalleryViewControllerTests: XCTestCase {
         waitForExpectationsWithTimeout(1.0, handler: nil)
         imageGallery.doneButton = UIBarButtonItem()
         let dismissFired = expectationWithDescription("dismiss handler will fire on completion")
-        imageGallery.dismissHandler = {
+        imageGallery.dismissHandler = { _ in
             dismissFired.fulfill()
         }
         imageGallery.performSelector((imageGallery.navigationItem.leftBarButtonItem?.action)!, withObject: imageGallery)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import UIKit`
`11`	`11`	`public class RIGImageGalleryViewController: UIPageViewController {`
`12`	`12`
`13`	`13`	`/// An optional closure to execute if the action button is tapped`
`14`		`- public var actionButtonHandler: (RIGImageGalleryItem -> ())?`
	`14`	`+ public var actionButtonHandler: ((gallery: RIGImageGalleryViewController, item:RIGImageGalleryItem) -> ())?`
`15`	`15`
`16`	`16`	`/// An optional closure to allow cutom trait collection change handling`
`17`	`17`	`public var traitCollectionChangeHandler: (RIGImageGalleryViewController -> ())? {`
`@@ -225,7 +225,7 @@ extension RIGImageGalleryViewController {`
`225`	`225`
`226`	`226`	`func performAction(sender: UIBarButtonItem) {`
`227`	`227`	`if let item = currentImageViewController?.viewerItem {`
`228`		`- actionButtonHandler?(item)`
	`228`	`+ actionButtonHandler?(gallery: self, item: item)`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ private extension ViewController {`
`51`	`51`	`let photoViewController = loadImages()`
`52`	`52`	`photoViewController.dismissHandler = dismissPhotoViewer`
`53`	`53`	`photoViewController.actionButtonHandler = actionButtonHandler`
	`54`	`+ photoViewController.actionButton = UIBarButtonItem(barButtonSystemItem: .Action, target: nil, action: nil)`
`54`	`55`	`photoViewController.traitCollectionChangeHandler = traitCollectionChangeHandler`
`55`	`56`	`photoViewController.countUpdateHandler = updateCount`
`56`	`57`	`let navigationController = navBarWrappedViewController(photoViewController)`
`@@ -65,7 +66,7 @@ private extension ViewController {`
`65`	`66`	`dismissViewControllerAnimated(true, completion: nil)`
`66`	`67`	`}`
`67`	`68`
`68`		`- func actionButtonHandler(galleryItem: RIGImageGalleryItem) {`
	`69`	`+ func actionButtonHandler(_: RIGImageGalleryViewController,galleryItem: RIGImageGalleryItem) {`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`func updateCount(gallery: RIGImageGalleryViewController, position: Int, total: Int) {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class ImageGalleryViewControllerTests: XCTestCase {`
`66`	`66`	`waitForExpectationsWithTimeout(1.0, handler: nil)`
`67`	`67`	`imageGallery.doneButton = UIBarButtonItem()`
`68`	`68`	`let dismissFired = expectationWithDescription("dismiss handler will fire on completion")`
`69`		`- imageGallery.dismissHandler = {`
	`69`	`+ imageGallery.dismissHandler = { _ in`
`70`	`70`	`dismissFired.fulfill()`
`71`	`71`	`}`
`72`	`72`	`imageGallery.performSelector((imageGallery.navigationItem.leftBarButtonItem?.action)!, withObject: imageGallery)`