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.2"
+  s.version      = "1.0.3"
   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.m

@@ -88,7 +88,12 @@ - (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: @":"];
+        colorValue = referenceColor.firstObject;
         color = [self colorForKey:colorValue forTheme:themeName];
+        if (referenceColor.count > 1) {
+            color = [color colorWithAlphaComponent: [referenceColor[1] doubleValue]];
+        }
     }
 
     return color;
@@ -98,11 +103,15 @@ - (UIColor*)colorFromString:(NSString*)colorValue
 {
     if ([self isValidString:colorValue]) {
         NSArray* array = [colorValue componentsSeparatedByString:@","];
-        if (array && [array count] == 4) {
-            return [UIColor colorWithRed:[array[0] floatValue]/255
-                                   green:[array[1] floatValue]/255
-                                    blue:[array[2] floatValue]/255
-                                   alpha:[array[3] floatValue]];
+        if (array && [array count] == 2) {
+            return [UIColor colorWithWhite:[array[0] doubleValue]
+                                     alpha:[array[1] doubleValue]];
+        }
+        else if (array && [array count] == 4) {
+            return [UIColor colorWithRed:[array[0] doubleValue]/255.0
+                                   green:[array[1] doubleValue]/255.0
+                                    blue:[array[2] doubleValue]/255.0
+                                   alpha:[array[3] doubleValue]];
         }
     }
 
@@ -173,7 +182,7 @@ - (UIFont*)fontFromString:(NSString*)fontValue
         NSArray *array = [fontValue componentsSeparatedByString:@","];
         if (array && array.count == 2) {
             NSString *fontName = array[0];
-            CGFloat fontSize = [array[1] floatValue];
+            CGFloat fontSize = [array[1] doubleValue];
             if ([self isValidString:fontName]) {
                 if ([fontName isEqualToString:@"bold"]) {
                     font = [UIFont boldSystemFontOfSize:fontSize];

README.md

@@ -63,14 +63,20 @@ The format of color is :
 
 It will return the color use follow method:
 
-    [UIColor colorWithRed:[array[0] floatValue]/255
-                    green:[array[1] floatValue]/255
-                     blue:[array[2] floatValue]/255
-                    alpha:[array[3] floatValue]];
+    [UIColor colorWithRed:[array[0] doubleValue]/255
+                    green:[array[1] doubleValue]/255
+                     blue:[array[2] doubleValue]/255
+                    alpha:[array[3] doubleValue]];
 
 Make sure you set the right value to the color.
 
-**Support reference** If you want to set the same value to different color key, you can set the key of one color to another color, then AWLThemeManager will find the actual value of the color.
+**Support white colorspace format**. Colors can now be specified in white colorspace (e.g. 0.4,1).
+
+**Support reference**. If you want to set the same value to different color key, you can set the key of one color to another color, then AWLThemeManager will find the actual value of the color.
+
+**Modify alpha by reference**. If you reference a color, e.g. “COLOR1” = “255,0,0,1”, “COLOR2” =
+“COLOR1” you can now append “:[alpha]” to the reference to modify it’s
+alpha, e.g. “COLOR2” = “COLOR1:0.2” will equate to “255,0,0,0.2”.
 
 #### Define Font
 The format of font is :
@@ -88,7 +94,7 @@ 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.
 
 You can add whatever you want to the defaults.plist. Just use  `objectForKey:` to get the value.