Merge pull request #30 from Dschee/feature/different-bundle

Added support for loading files from different bundles (than mainBundle)
jmenter · Nov 23, 2015 · 31617be · 31617be
2 parents d6e0632 + d18be25
commit 31617be
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/Classes/JAMSVGImage/SVG Image/JAMSVGImage.h b/Classes/JAMSVGImage/SVG Image/JAMSVGImage.h
@@ -27,6 +27,7 @@
 
 /** Initializes a new SVG image from a file or data source. */
 + (JAMSVGImage *)imageNamed:(NSString *)name;
++ (JAMSVGImage *)imageNamed:(NSString *)name inBundle:(NSBundle *)bundle;
 + (JAMSVGImage *)imageWithContentsOfFile:(NSString *)path;
 + (JAMSVGImage *)imageWithSVGData:(NSData *)svgData;
 

diff --git a/Classes/JAMSVGImage/SVG Image/JAMSVGImage.m b/Classes/JAMSVGImage/SVG Image/JAMSVGImage.m
@@ -50,17 +50,22 @@ - (void)encodeWithCoder:(NSCoder *)aCoder;
 
 + (JAMSVGImage *)imageNamed:(NSString *)name;
 {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        imageCache = [[NSCache alloc] init];
-    });
-
     NSBundle *bundle;
 #if !TARGET_INTERFACE_BUILDER
     bundle = NSBundle.mainBundle;
 #else
     bundle = [NSBundle bundleForClass:self.class];
 #endif
+    return [self imageNamed:name inBundle:bundle];
+}
+
++ (JAMSVGImage *)imageNamed:(NSString *)name inBundle:(NSBundle *)bundle
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        imageCache = [[NSCache alloc] init];
+    });
+
     NSString *fileName = [bundle pathForResource:name ofType:@"svg"];
     if (!fileName) {
         fileName = [bundle pathForResource:name ofType:@"svgz"];
@@ -71,7 +76,7 @@ + (JAMSVGImage *)imageNamed:(NSString *)name;
         image = [JAMSVGImage imageWithContentsOfFile:fileName];
         [imageCache setObject:image forKey:fileName];
     }
-
+    
     return image;
 }
 

diff --git a/Classes/JAMSVGImage/SVG Image/UIImage+SVG.h b/Classes/JAMSVGImage/SVG Image/UIImage+SVG.h
@@ -17,6 +17,7 @@
 @interface UIImage (SVG)
 
 + (UIImage *)imageFromSVGNamed:(NSString *)svgName;
++ (UIImage *)imageFromSVGNamed:(NSString *)svgName inBundle:(NSBundle *)bundle;
 + (UIImage *)imageFromSVGNamed:(NSString *)svgName atSize:(CGSize)size;
 + (UIImage *)imageFromSVGNamed:(NSString *)svgName atScale:(CGFloat)scale;
 

diff --git a/Classes/JAMSVGImage/SVG Image/UIImage+SVG.m b/Classes/JAMSVGImage/SVG Image/UIImage+SVG.m
@@ -20,6 +20,11 @@ + (UIImage *)imageFromSVGNamed:(NSString *)svgName;
     return [JAMSVGImage imageNamed:svgName].image;
 }
 
++ (UIImage *)imageFromSVGNamed:(NSString *)svgName inBundle:(NSBundle *)bundle
+{
+    return [JAMSVGImage imageNamed:svgName inBundle:bundle].image;
+}
+
 + (UIImage *)imageFromSVGNamed:(NSString *)svgName atSize:(CGSize)size;
 {
     return [[JAMSVGImage imageNamed:svgName] imageAtSize:size];