Allow fontSize to be specified rather than fontSizeKey as this allows…

… more strict theming of fonts

Source/RNThemeLabel.h

@@ -13,7 +13,7 @@
 <RNThemeUpdateProtocol>
 
 @property (nonatomic, strong) NSString *fontKey;
-@property (nonatomic, strong) NSString *fontSizeKey;
+@property (nonatomic, strong) NSNumber *fontSize;
 @property (nonatomic, strong) NSString *textColorKey;
 @property (nonatomic, strong) NSString *highlightedTextColorKey;
 @property (nonatomic, strong) NSString *backgroundColorKey;

Source/RNThemeLabel.m

@@ -55,11 +55,12 @@ - (void)applyTheme {
     UIFont *font = nil;
 
     if (self.fontKey) {
-        // has the fontSizeKey override be provided?
-        if (self.fontSizeKey) {
-            font = [[RNThemeManager sharedManager] fontForKey:self.fontKey sizeKey:fontSizeKey];
-        } else {
-            font = [[RNThemeManager sharedManager] fontForKey:self.fontKey]
+        // has the fontSize override been provided?
+        if (self.fontSize) {
+            font = [[RNThemeManager sharedManager] fontForKey:self.fontKey size:[self.fontSize floatValue]];
+        }
+        else {
+            font = [[RNThemeManager sharedManager] fontForKey:self.fontKey];
         }
 
         if (font) {

Source/RNThemeManager.h

@@ -26,8 +26,8 @@ extern NSString * const RNThemeManagerDidChangeThemes;
 // If the size key is not specified, the system default will be assumed
 - (UIFont *)fontForKey:(NSString*)key;
 
-// Allows the font size key to be provided separately to the font key
-- (UIFont *)fontForKey:(NSString *)key sizeKey:(NSString *)sizeKey;
+// Allows the font size to be provided separately rather than using the themed style
+- (UIFont *)fontForKey:(NSString *)key size:(CGFloat)size;
 
 // Return a UIColor from a hex color stored in theme file
 - (UIColor *)colorForKey:(NSString *)key;

Source/RNThemeManager.m

@@ -100,11 +100,6 @@ - (NSDictionary *)inheritedThemeWithParentTheme:(NSString *)parentThemeName chil
 
 - (UIFont *)fontForKey:(NSString*)key {
     NSString *sizeKey = [key stringByAppendingString:@"Size"];
-    return [self fontForKey:key sizeKey:sizeKey];
-}
-
-- (UIFont *)fontForKey:(NSString *)key sizeKey:(NSString *)sizeKey
-{
     NSString *fontName = self.styles[key];
 
     // get the font size, using default if not supplied
@@ -120,6 +115,20 @@ - (UIFont *)fontForKey:(NSString *)key sizeKey:(NSString *)sizeKey
     return nil;
 }
 
+- (UIFont *)fontForKey:(NSString *)key size:(CGFloat)size
+{
+    NSString *fontName = self.styles[key];
+
+    while (self.styles[fontName]) {
+        fontName = self.styles[fontName];
+    }
+
+    if (fontName) {
+        return [UIFont fontWithName:fontName size:size];
+    }
+    return nil;
+}
+
 #pragma mark - Colors
 
 - (UIColor *)colorForKey:(NSString *)key {