Merge remote-tracking branch 'appwilldev/master'

Author: jrapoport

AWLThemeManager.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "AWLThemeManager"
-  s.version      = "1.0.3"
+  s.version      = "1.0.4"
   s.summary      = "AWLThemeManager is a lightweight theme manager for iOS."
   s.homepage     = "https://github.com/appwilldev/AWLThemeManager"
   # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"

AWLThemeManager/AWLThemeManager.h

@@ -25,9 +25,9 @@
 - (UIFont*)fontForKey:(NSString*)key;
 - (UIFont *)fontForKey:(NSString *)key forTheme:(NSString*)themeName;
 
-//Get img from theme bundle
-- (UIImage*)imageNamed:(NSString*)imgName;
-- (UIImage *)imageNamed:(NSString *)imgName forTheme:(NSString*)themeName;
+//Get img name from defaults.plist, and then img from theme bundle. Use key as image name if img name is missed.
+- (UIImage*)imageNamed:(NSString*)key;
+- (UIImage *)imageNamed:(NSString *)key forTheme:(NSString*)themeName;
 
 //key in defaults.plist of the current theme
 - (id)objectForKey:(NSString*)key;

AWLThemeManager/AWLThemeManager.m

@@ -88,11 +88,11 @@ - (UIColor *)colorForKey:(NSString *)key forTheme:(NSString *)themeName
     NSString *colorValue = [self objectForKey:key forTheme:themeName];
     UIColor *color = [self colorFromString:colorValue];
     if (color == nil && [self isValidString:colorValue]) {
-        NSArray* referenceColor = [colorValue componentsSeparatedByString: @":"];
+        NSArray* referenceColor = [colorValue componentsSeparatedByString:@":"];
         colorValue = referenceColor.firstObject;
         color = [self colorForKey:colorValue forTheme:themeName];
         if (referenceColor.count > 1) {
-            color = [color colorWithAlphaComponent: [referenceColor[1] doubleValue]];
+            color = [color colorWithAlphaComponent:[referenceColor[1] doubleValue]];
         }
     }
 
@@ -118,21 +118,48 @@ - (UIColor*)colorFromString:(NSString*)colorValue
     return nil;
 }
 
-- (UIImage *)imageNamed:(NSString *)imgName
+- (UIImage *)imageNamed:(NSString *)key
 {
-    return [self imageNamed:imgName forTheme:self.currentTheme];;
+    return [self imageNamed:key forTheme:self.currentTheme];;
 }
 
-- (UIImage *)imageNamed:(NSString *)imgName forTheme:(NSString*)themeName
+- (UIImage *)imageNamed:(NSString *)key forTheme:(NSString*)themeName
 {
-    if ([self isValidString:themeName] == NO || [self isValidString:imgName] == NO) {
+    if ([self isValidString:themeName] == NO || [self isValidString:key] == NO) {
         return nil;
     }
 
-    NSString *path = self.themeList[themeName];
-    path = [self relativePathToMainBundle:path];
-    NSString *filePath = [path stringByAppendingPathComponent:imgName];
-    UIImage *img = [UIImage imageNamed:filePath];
+    NSString *imgName = [self objectForKey:key forTheme:themeName];
+    
+    if (imgName == nil) {
+        imgName = key;
+    }
+    
+    UIImage*  img    = nil;
+    NSBundle* bundle = [NSBundle bundleWithPath:self.themeList[themeName]];
+    
+    if (NSFoundationVersionNumber >= NSFoundationVersionNumber_iOS_8_0) {
+        img = [UIImage imageNamed:key inBundle:bundle compatibleWithTraitCollection:nil];
+    }
+    else {
+#ifdef AWLThemeManager_XCASSETS_iOS7
+        //This is included for reference/completeness. It fetches the device specific
+        //image from the compiled Assets.car embedded in the theme bundle for iOS7 devices.
+        //However, it is a *PRIVATE API*
+        //As such, all relevant warnings and caveats apply to it's usage
+        //IF you want to enable with cocoapods you'll need this:
+        //https://guides.cocoapods.org/syntax/podfile.html#post_install
+        static NSString* iOS7PrivateCompatSelector = @"_" @"device" @"Specific" @"ImageNamed:" @"inBundle:";
+        img = [UIImage performSelector:NSSelectorFromString(iOS7PrivateCompatSelector) withObject:imgName withObject:bundle];
+#endif
+    }
+    
+    if (img == nil) {
+        NSString *path = self.themeList[themeName];
+        path = [self relativePathToMainBundle:path];
+        NSString *filePath = [path stringByAppendingPathComponent:imgName];
+        img = [UIImage imageNamed:filePath];
+    }
 
     if (img == nil) {
         NSString *baseTheme = self.themeRelationship[themeName];

README.md

@@ -94,10 +94,21 @@ If you want to use system font, you should ignore the first value, like this:
     bold,14   //boldSystemFontOfSize
     italic,14 //italicSystemFontOfSize
 
-**Support reference** Same with the color.
+**Support reference**. Same with the color.
 
+### Define image
+There are two way for adding img to theme bundle:
+
+1. Put the image file in the bundle;
+2. Add a xcassets file , then put image files in the xcassets. 
+
+**Support reference**. Same with the color. If image name isn't found in defaults.plist, we use key as image name.
+
+#### Other
 You can add whatever you want to the defaults.plist. Just use  `objectForKey:` to get the value.
 
+
+
 ### How to use in your project
 
 Add the absolute path of bundle to AWLThemeManager object, then set the current theme that you want.

ThemeManagerDemo/Assets/Info.plist

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016年 AppWill. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>