Merge pull request #37 from DavidSchechter/master

Loading images from correct bundle for issue #33
eBay · Aug 30, 2016 · 0a3f9f7 · 0a3f9f7
2 parents f25ae31 + 37d6468
commit 0a3f9f7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/NMessenger.podspec b/NMessenger.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "NMessenger"
-  s.version      = "1.0.75"
+  s.version      = "1.0.76"
   s.summary      = "A fast, lightweight messenger component built on AsyncDisplaykit and written in Swift"
 
   # This description is used to generate tags and improve search results.

diff --git a/nMessenger/Source/MessageNodes/BubbleConfiguration/ImageBubbleConfiguration.swift b/nMessenger/Source/MessageNodes/BubbleConfiguration/ImageBubbleConfiguration.swift
@@ -31,7 +31,7 @@ public class ImageBubbleConfiguration: BubbleConfigurationProtocol {
     public func getBubble() -> Bubble
     {
         let newBubble = ImageBubble()
-        newBubble.bubbleImage = UIImage(named: "MessageBubble")
+        newBubble.bubbleImage = UIImage(named: "MessageBubble", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)
         newBubble.cutInsets = UIEdgeInsetsMake(29, 32, 25, 43)
         newBubble.hasLayerMask = isMasked
         return newBubble
@@ -40,7 +40,7 @@ public class ImageBubbleConfiguration: BubbleConfigurationProtocol {
     public func getSecondaryBubble() -> Bubble
     {
         let newBubble = ImageBubble()
-        newBubble.bubbleImage = UIImage(named: "MessageBubble")
+        newBubble.bubbleImage = UIImage(named: "MessageBubble", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)
         newBubble.cutInsets = UIEdgeInsetsMake(29, 32, 25, 43)
         newBubble.hasLayerMask = isMasked
         return newBubble

diff --git a/...nger/Source/MessageNodes/ContentNodes/TypingIndicatorContent/TypingIndicatorContent.swift b/...nger/Source/MessageNodes/ContentNodes/TypingIndicatorContent/TypingIndicatorContent.swift
@@ -30,7 +30,7 @@ public class TypingIndicatorContent: ContentNode {
         var images = [UIImage]()
 
         for imageName in imageNames {
-            if let image = UIImage(named: imageName) {
+            if let image = UIImage(named: imageName, inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil){
                 images.append(image)
             }
         }

diff --git a/nMessenger/Source/Messenger/Components/CameraViewController.swift b/nMessenger/Source/Messenger/Components/CameraViewController.swift
@@ -177,7 +177,7 @@ public class CameraViewController: UIImagePickerController, UIImagePickerControl
         //GALLERY BUTTON
         gallery = UIButton(frame: CGRectMake(self.view.frame.width - sideButtonSize - bottomPadding, self.view.frame.height - sideButtonSize - bottomPadding, sideButtonSize, sideButtonSize))
         gallery.addTarget(self, action: #selector(CameraViewController.changePictureMode), forControlEvents: UIControlEvents.TouchUpInside)
-        gallery.setImage(UIImage(named: "cameraRollIcon")?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
+        gallery.setImage(UIImage(named: "cameraRollIcon", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
         gallery.tintColor = UIColor.whiteColor()
         galleryImage = UIImageView(frame: gallery.frame)
         galleryImage.contentMode = UIViewContentMode.ScaleAspectFill
@@ -208,7 +208,7 @@ public class CameraViewController: UIImagePickerController, UIImagePickerControl
 
         //CAPTURE BUTTON
         capturePictureButton = UIButton(frame: CGRectMake(self.view.frame.width/2 - bottomPadding, self.view.frame.height - captureButtonSize - bottomPadding, captureButtonSize, captureButtonSize))
-        capturePictureButton.setImage(UIImage(named: "shutterBtn")?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
+        capturePictureButton.setImage(UIImage(named: "shutterBtn", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
         capturePictureButton.tintColor = UIColor.whiteColor()
 
         //call the uiimagepickercontroller method takePicture()
@@ -222,7 +222,7 @@ public class CameraViewController: UIImagePickerController, UIImagePickerControl
         //FLIP CAMERA BUTTON
         flipCamera = UIButton(frame: CGRectMake(bottomPadding, self.view.frame.height - sideButtonSize - bottomPadding, sideButtonSize, sideButtonSize))
         flipCamera.addTarget(self, action: #selector(CameraViewController.flipCamera(_:)), forControlEvents: UIControlEvents.TouchUpInside)
-        flipCamera.setImage(UIImage(named: "flipCameraIcon.png")?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
+        flipCamera.setImage(UIImage(named: "flipCameraIcon", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
         flipCamera.tintColor = UIColor.whiteColor()
     }
     /**
@@ -234,7 +234,7 @@ public class CameraViewController: UIImagePickerController, UIImagePickerControl
         cameraToolbar.barStyle = UIBarStyle.BlackTranslucent
         cameraToolbar.translucent = true
         let exitButton = UIButton(frame: CGRectMake(20, 10, 40, 40))
-        exitButton.setImage(UIImage(named: "exitIcon.png")?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
+        exitButton.setImage(UIImage(named: "exitIcon", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
         exitButton.tintColor = UIColor.whiteColor()
         exitButton.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
         exitButton.addTarget(self, action: #selector(CameraViewController.exitButtonPressed), forControlEvents: UIControlEvents.TouchUpInside)
@@ -246,7 +246,7 @@ public class CameraViewController: UIImagePickerController, UIImagePickerControl
     public func addFlashButton() {
         //Flash Button
         flashButton = UIButton(frame: CGRectMake(self.view.frame.width - 60, 10, 40, 40))
-        flashButton.setImage(UIImage(named: "flashIcon")?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
+        flashButton.setImage(UIImage(named: "flashIcon", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate), forState: UIControlState.Normal)
         flashButton.imageEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
         flashButton.tintColor = UIColor.whiteColor()
         flashButton.addTarget(self, action: #selector(CameraViewController.toggleFlash(_:)), forControlEvents: UIControlEvents.TouchUpInside)

diff --git a/nMessengerTests/UI Components/Chat/BubbleTests.swift b/nMessengerTests/UI Components/Chat/BubbleTests.swift
@@ -113,7 +113,7 @@ class BubbleTests: XCTestCase {
 
     func testBubbleImage() {
         let bubble = ImageBubble()
-        bubble.bubbleImage = UIImage(named: "MessageBubble")
+        bubble.bubbleImage = UIImage(named: "MessageBubble", inBundle: NSBundle(forClass: NMessengerViewController.self), compatibleWithTraitCollection: nil)
         XCTAssertNotNil(bubble.layer)
         XCTAssertNotNil(bubble.maskLayer)
         XCTAssertEqual(bubble.hasLayerMask, true)