update and refine spec and resource loading.

shaolinjr · Mar 17, 2015 · fc581c8 · fc581c8
1 parent 007a945
commit fc581c8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/JSQMessagesViewController.podspec b/JSQMessagesViewController.podspec
@@ -1,21 +1,26 @@
 Pod::Spec.new do |s|
-	s.name					= 'JSQMessagesViewController'
-	s.version				= '7.0.0'
-	s.summary				= 'An elegant messages UI library for iOS.'
-	s.homepage				= 'http://jessesquires.github.io/JSQMessagesViewController'
-	s.license				= 'MIT'
-	s.screenshots			= ['https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot0.png',
-								'https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot1.png',
-								'https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot2.png',
-								'https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot3.png']
-	s.author				= { 'Jesse Squires' => '[email protected]' }
-	s.social_media_url		= 'https://twitter.com/jesse_squires'
-	s.source				= { :git => 'https://github.com/jessesquires/JSQMessagesViewController.git', :tag => s.version }
-	s.platform				= :ios, '7.0'	
-	s.source_files			= 'JSQMessagesViewController/**/*.{h,m}'
-	s.resources				= 'JSQMessagesViewController/Assets/JSQMessagesAssets.bundle', 'JSQMessagesViewController/**/*.{xib}'
-	s.frameworks			= 'QuartzCore', 'CoreGraphics', 'CoreLocation', 'MapKit', 'UIKit', 'Foundation'
-	s.requires_arc			= true
+	s.name = 'JSQMessagesViewController'
+	s.version = '7.0.0'
+	s.summary = 'An elegant messages UI library for iOS.'
+	s.homepage = 'http://jessesquires.github.io/JSQMessagesViewController'
+	s.license = 'MIT'
+	s.platform = :ios, '7.0'
+
+	s.author = { 'Jesse Squires' => '[email protected]' }
+	s.social_media_url = 'https://twitter.com/jesse_squires'
+
+	s.screenshots = ['https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot0.png',
+                    'https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot1.png',
+                    'https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot2.png',
+                    'https://raw.githubusercontent.com/jessesquires/JSQMessagesViewController/develop/Screenshots/screenshot3.png']
+
+	s.source = { :git => 'https://github.com/jessesquires/JSQMessagesViewController.git', :tag => s.version }
+	s.source_files = 'JSQMessagesViewController/**/*.{h,m}'
+
+	s.resources = ['JSQMessagesViewController/Assets/JSQMessagesAssets.bundle', 'JSQMessagesViewController/**/*.{xib}']
+
+	s.frameworks = 'QuartzCore', 'CoreGraphics', 'CoreLocation', 'MapKit', 'UIKit', 'Foundation'
+	s.requires_arc = true
 
 	s.dependency 'JSQSystemSoundPlayer', '~> 2.0.1'
 end
diff --git a/JSQMessagesViewController/Categories/JSQSystemSoundPlayer+JSQMessages.m b/JSQMessagesViewController/Categories/JSQSystemSoundPlayer+JSQMessages.m
@@ -18,7 +18,7 @@
 
 #import "JSQSystemSoundPlayer+JSQMessages.h"
 
-#import "JSQMessagesViewController.h"
+#import "NSBundle+JSQMessages.h"
 
 
 static NSString * const kJSQMessageReceivedSoundName = @"message_received";
@@ -57,7 +57,7 @@ + (void)jsq_playSoundFromJSQMessagesBundleWithName:(NSString *)soundName asAlert
     NSString *originalPlayerBundleIdentifier = [JSQSystemSoundPlayer sharedPlayer].bundle.bundleIdentifier;
 
     //  search for sounds in this library's bundle
-    [JSQSystemSoundPlayer sharedPlayer].bundle = [NSBundle bundleForClass:[JSQMessagesViewController class]];
+    [JSQSystemSoundPlayer sharedPlayer].bundle = [NSBundle jsq_messagesBundle];
 
     NSString *fileName = [NSString stringWithFormat:@"JSQMessagesAssets.bundle/Sounds/%@", soundName];
 

diff --git a/JSQMessagesViewController/Categories/UIImage+JSQMessages.m b/JSQMessagesViewController/Categories/UIImage+JSQMessages.m
@@ -18,7 +18,7 @@
 
 #import "UIImage+JSQMessages.h"
 
-#import "JSQMessagesViewController.h"
+#import "NSBundle+JSQMessages.h"
 
 
 @implementation UIImage (JSQMessages)
@@ -50,11 +50,9 @@ - (UIImage *)jsq_imageMaskedWithColor:(UIColor *)maskColor
 
 + (UIImage *)jsq_bubbleImageFromBundleWithName:(NSString *)name
 {
-    NSString *imagePath = [[NSBundle bundleForClass:[JSQMessagesViewController class]]
-                           pathForResource:[NSString stringWithFormat:@"JSQMessagesAssets.bundle/Images/%@", name]
-                           ofType:@"png"];
-
-    return [UIImage imageWithContentsOfFile:imagePath];
+    NSBundle *bundle = [NSBundle jsq_messagesAssetBundle];
+    NSString *path = [bundle pathForResource:name ofType:@"png" inDirectory:@"Images"];
+    return [UIImage imageWithContentsOfFile:path];
 }
 
 + (UIImage *)jsq_bubbleRegularImage