Merge pull request #80 from NYTimes/cdz/64-75-image-loading

Load bar button item images from the correct bundle
nytimes · Oct 30, 2015 · ceec2bd · ceec2bd
2 parents 5751193 + 07eedb4
commit ceec2bd
Show file tree

Hide file tree

Showing 17 changed files with 739 additions and 625 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  NYTPhotoViewer: d74401f7cf0b679a1763414d114eb5c81f5a1db8
+  NYTPhotoViewer: d852216690e0496bf925abab1350be0f547d93bd
   OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
 
 COCOAPODS: 0.38.2
diff --git a/Example/Pods/Headers/Private/NYTPhotoViewer/NSBundle+NYTPhotoViewer.h b/Example/Pods/Headers/Private/NYTPhotoViewer/NSBundle+NYTPhotoViewer.h
diff --git a/Example/Pods/Headers/Private/NYTPhotoViewer/NYTOperatingSystemCompatibilityUtility.h b/Example/Pods/Headers/Private/NYTPhotoViewer/NYTOperatingSystemCompatibilityUtility.h
diff --git a/Example/Pods/Headers/Public/NYTPhotoViewer/NSBundle+NYTPhotoViewer.h b/Example/Pods/Headers/Public/NYTPhotoViewer/NSBundle+NYTPhotoViewer.h
diff --git a/Example/Pods/Headers/Public/NYTPhotoViewer/NYTOperatingSystemCompatibilityUtility.h b/Example/Pods/Headers/Public/NYTPhotoViewer/NYTOperatingSystemCompatibilityUtility.h
diff --git a/Example/Pods/Local Podspecs/NYTPhotoViewer.podspec.json b/Example/Pods/Local Podspecs/NYTPhotoViewer.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/NYTPhotoViewer.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/NYTPhotoViewer.xcscheme
diff --git a/...ods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift-resources.sh b/...ods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift-resources.sh
diff --git a/... Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests-resources.sh b/... Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer-resources.sh b/Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh b/Example/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh
diff --git a/NYTPhotoViewer.podspec b/NYTPhotoViewer.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.source_files = 'Pod/Classes/**/*'
-  s.resources = 'Pod/Assets/**/*'
+  s.ios.resource_bundle = { s.name => ['Pod/Assets/ios/*.png'] }
 
   s.frameworks = 'UIKit', 'Foundation'
 end
diff --git a/Pod/Classes/ios/NYTPhotosViewController.m b/Pod/Classes/ios/NYTPhotosViewController.m
@@ -15,6 +15,7 @@
 #import "NYTPhoto.h"
 #import "NYTPhotosOverlayView.h"
 #import "NYTPhotoCaptionView.h"
+#import "NSBundle+NYTPhotoViewer.h"
 
 NSString * const NYTPhotosViewControllerDidNavigateToPhotoNotification = @"NYTPhotosViewControllerDidNavigateToPhotoNotification";
 NSString * const NYTPhotosViewControllerWillDismissNotification = @"NYTPhotosViewControllerWillDismissNotification";
@@ -172,7 +173,7 @@ - (void)commonInitWithPhotos:(NSArray *)photos initialPhoto:(id <NYTPhoto>)initi
 
     // iOS 7 has an issue with constraints that could evaluate to be negative, so we set the width to the margins' size.
     _overlayView = [[NYTPhotosOverlayView alloc] initWithFrame:CGRectMake(0, 0, NYTPhotoCaptionViewHorizontalMargin * 2.0, 0)];
-    _overlayView.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"NYTPhotoViewerCloseButtonX"] landscapeImagePhone:[UIImage imageNamed:@"NYTPhotoViewerCloseButtonXLandscape"] style:UIBarButtonItemStylePlain target:self action:@selector(doneButtonTapped:)];
+    _overlayView.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"NYTPhotoViewerCloseButtonX" inBundle:[NSBundle nyt_photoViewerResourceBundle] compatibleWithTraitCollection:nil] landscapeImagePhone:[UIImage imageNamed:@"NYTPhotoViewerCloseButtonXLandscape" inBundle:[NSBundle nyt_photoViewerResourceBundle] compatibleWithTraitCollection:nil] style:UIBarButtonItemStylePlain target:self action:@selector(doneButtonTapped:)];
     _overlayView.leftBarButtonItem.imageInsets = NYTPhotosViewControllerCloseButtinImageInsets;
     _overlayView.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonTapped:)];
 

diff --git a/Pod/Classes/ios/Resource Loading/NSBundle+NYTPhotoViewer.h b/Pod/Classes/ios/Resource Loading/NSBundle+NYTPhotoViewer.h
@@ -0,0 +1,15 @@
+//
+//  NSBundle+NYTPhotoViewer.h
+//  NYTPhotoViewer
+//
+//  Created by Chris Dzombak on 10/16/15.
+//
+//
+
+@import Foundation;
+
+@interface NSBundle (NYTPhotoViewer)
+
++ (instancetype)nyt_photoViewerResourceBundle;
+
+@end
diff --git a/Pod/Classes/ios/Resource Loading/NSBundle+NYTPhotoViewer.m b/Pod/Classes/ios/Resource Loading/NSBundle+NYTPhotoViewer.m
@@ -0,0 +1,23 @@
+//
+//  NSBundle+NYTPhotoViewer.m
+//  NYTPhotoViewer
+//
+//  Created by Chris Dzombak on 10/16/15.
+//
+//
+
+#import "NSBundle+NYTPhotoViewer.h"
+
+@implementation NSBundle (NYTPhotoViewer)
+
++ (instancetype)nyt_photoViewerResourceBundle {
+    static NSBundle *resourceBundle = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *resourceBundlePath = [[NSBundle mainBundle] pathForResource:@"NYTPhotoViewer" ofType:@"bundle"];
+        resourceBundle = [self bundleWithPath:resourceBundlePath];
+    });
+    return resourceBundle;
+}
+
+@end