Merge pull request #49 from grantjbutler/gjb/bar-button-items

Allow setting multiple bar button items for a side
nytimes · May 1, 2015 · 2fd86f5 · 2fd86f5
2 parents 0a3d13e + f34e7bc
commit 2fd86f5
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 1 deletion.
diff --git a/Example/Tests/NYTPhotosViewControllerTests.m b/Example/Tests/NYTPhotosViewControllerTests.m
@@ -87,6 +87,17 @@ - (void)testLeftBarButtonItemIsNilAfterSettingToNil {
     XCTAssertNil(photosViewController.leftBarButtonItem);
 }
 
+- (void)testLeftBarButtonItemsArePopulatedAfterInitialization {
+    NYTPhotosViewController *photosViewController = [[NYTPhotosViewController alloc] initWithPhotos:[self newTestPhotos]];
+    XCTAssertNotNil(photosViewController.leftBarButtonItems);
+}
+
+- (void)testLeftBarButtonItemsAreNilAfterSettingToNil {
+    NYTPhotosViewController *photosViewController = [[NYTPhotosViewController alloc] initWithPhotos:[self newTestPhotos]];
+    photosViewController.leftBarButtonItems = nil;
+    XCTAssertNil(photosViewController.leftBarButtonItems);
+}
+
 - (void)testRightBarButtonItemIsPopulatedAfterInitialization {
     NYTPhotosViewController *photosViewController = [[NYTPhotosViewController alloc] initWithPhotos:[self newTestPhotos]];
     XCTAssertNotNil(photosViewController.rightBarButtonItem);
@@ -98,6 +109,17 @@ - (void)testRightBarButtonItemIsNilAfterSettingToNil {
     XCTAssertNil(photosViewController.rightBarButtonItem);
 }
 
+- (void)testRightBarButtonItemsArePopulatedAfterInitialization {
+    NYTPhotosViewController *photosViewController = [[NYTPhotosViewController alloc] initWithPhotos:[self newTestPhotos]];
+    XCTAssertNotNil(photosViewController.rightBarButtonItems);
+}
+
+- (void)testRightBarButtonItemsAreNilAfterSettingToNil {
+    NYTPhotosViewController *photosViewController = [[NYTPhotosViewController alloc] initWithPhotos:[self newTestPhotos]];
+    photosViewController.rightBarButtonItems = nil;
+    XCTAssertNil(photosViewController.rightBarButtonItems);
+}
+
 - (void)testConvenienceInitializerAcceptsNil {
     XCTAssertNoThrow([[NYTPhotosViewController alloc] initWithPhotos:nil]);
 }

diff --git a/Pod/Classes/ios/NYTPhotosOverlayView.h b/Pod/Classes/ios/NYTPhotosOverlayView.h
@@ -33,11 +33,21 @@
  */
 @property (nonatomic) UIBarButtonItem *leftBarButtonItem;
 
+/**
+ *  The bar button items appearing at the top left of the overlay.
+ */
+@property (nonatomic, copy) NSArray *leftBarButtonItems;
+
 /**
  *  The bar button item appearing at the top right of the overlay.
  */
 @property (nonatomic) UIBarButtonItem *rightBarButtonItem;
 
+/**
+ *  The bar button items appearing at the top right of the overlay.
+ */
+@property (nonatomic, copy) NSArray *rightBarButtonItems;
+
 /**
  *  A view representing the caption for the photo, which will be set to full width and locked to the bottom. Can be any `UIView` object, but is expected to respond to `intrinsicContentSize` appropriately to calculate height.
  */

diff --git a/Pod/Classes/ios/NYTPhotosOverlayView.m b/Pod/Classes/ios/NYTPhotosOverlayView.m
@@ -99,12 +99,28 @@ - (void)setLeftBarButtonItem:(UIBarButtonItem *)leftBarButtonItem {
     [self.navigationItem setLeftBarButtonItem:leftBarButtonItem animated:NO];
 }
 
+- (NSArray *)leftBarButtonItems {
+    return self.navigationItem.leftBarButtonItems;
+}
+
+- (void)setLeftBarButtonItems:(NSArray *)leftBarButtonItems {
+    [self.navigationItem setLeftBarButtonItems:leftBarButtonItems animated:NO];
+}
+
 - (UIBarButtonItem *)rightBarButtonItem {
     return self.navigationItem.rightBarButtonItem;
 }
 
 - (void)setRightBarButtonItem:(UIBarButtonItem *)rightBarButtonItem {
-    [self.navigationItem setRightBarButtonItem:rightBarButtonItem];
+    [self.navigationItem setRightBarButtonItem:rightBarButtonItem animated:NO];
+}
+
+- (NSArray *)rightBarButtonItems {
+    return self.navigationItem.rightBarButtonItems;
+}
+
+- (void)setRightBarButtonItems:(NSArray *)rightBarButtonItems {
+    [self.navigationItem setRightBarButtonItems:rightBarButtonItems animated:NO];
 }
 
 - (NSString *)title {

diff --git a/Pod/Classes/ios/NYTPhotosViewController.h b/Pod/Classes/ios/NYTPhotosViewController.h
@@ -50,11 +50,21 @@ extern NSString * const NYTPhotosViewControllerDidDismissNotification;
  */
 @property (nonatomic) UIBarButtonItem *leftBarButtonItem;
 
+/**
+ *  The left bar button items overlaying the photo.
+ */
+@property (nonatomic, copy) NSArray *leftBarButtonItems;
+
 /**
  *  The right bar button item overlaying the photo.
  */
 @property (nonatomic) UIBarButtonItem *rightBarButtonItem;
 
+/**
+ *  The right bar button items overlaying the photo.
+ */
+@property (nonatomic, copy) NSArray *rightBarButtonItems;
+
 /**
  *  The object that acts as the delegate of the `NYTPhotosViewController`.
  */

diff --git a/Pod/Classes/ios/NYTPhotosViewController.m b/Pod/Classes/ios/NYTPhotosViewController.m
@@ -252,6 +252,14 @@ - (void)setLeftBarButtonItem:(UIBarButtonItem *)leftBarButtonItem {
     self.overlayView.leftBarButtonItem = leftBarButtonItem;
 }
 
+- (NSArray *)leftBarButtonItems {
+    return self.overlayView.leftBarButtonItems;
+}
+
+- (void)setLeftBarButtonItems:(NSArray *)leftBarButtonItems {
+    self.overlayView.leftBarButtonItems = leftBarButtonItems;
+}
+
 - (UIBarButtonItem *)rightBarButtonItem {
     return self.overlayView.rightBarButtonItem;
 }
@@ -260,6 +268,14 @@ - (void)setRightBarButtonItem:(UIBarButtonItem *)rightBarButtonItem {
     self.overlayView.rightBarButtonItem = rightBarButtonItem;
 }
 
+- (NSArray *)rightBarButtonItems {
+    return self.overlayView.rightBarButtonItems;
+}
+
+- (void)setRightBarButtonItems:(NSArray *)rightBarButtonItems {
+    self.overlayView.rightBarButtonItems = rightBarButtonItems;
+}
+
 - (void)displayPhoto:(id <NYTPhoto>)photo animated:(BOOL)animated {
     if (![self.dataSource containsPhoto:photo]) {
         return;