Skip to content
This repository was archived by the owner on Apr 17, 2019. It is now read-only.

storing colour as a dictionary #12

Open
jeksys wants to merge 2 commits into
base: master
Choose a base branch
from
Open

storing colour as a dictionary #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7a34e6
adding saving colour as a dictionary with “Name” - font name and “Siz…
jeksys Dec 31, 2013
eaff540
added colour to font settings
jeksys Jan 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 45 additions & 17 deletions Source/VSTheme.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,21 @@ - (UIColor *)colorForKey:(NSString *)key {
if (cachedColor != nil)
return cachedColor;

NSString *colorString = [self stringForKey:key];
UIColor *color = colorWithHexString(colorString);
UIColor *color;
if ([[self objectForKey:key] isKindOfClass:[NSDictionary class]]) {
NSDictionary *fontObject = (NSDictionary*)[self objectForKey:key];
if ([fontObject valueForKey:@"Color"]) {
NSString *colorString;
colorString = [fontObject valueForKey:@"Color"];
color = colorWithHexString(colorString);
}else{
color = [UIColor blackColor];
}
}else{
NSString *colorString = [self stringForKey:key];
color = colorWithHexString(colorString);
}

if (color == nil)
color = [UIColor blackColor];

Expand Down Expand Up @@ -145,23 +158,38 @@ - (UIFont *)fontForKey:(NSString *)key {
if (cachedFont != nil)
return cachedFont;

NSString *fontName = [self stringForKey:key];
CGFloat fontSize = [self floatForKey:[key stringByAppendingString:@"Size"]];

if (fontSize < 1.0f)
fontSize = 15.0f;

UIFont *font = nil;
NSString *fontName;
CGFloat fontSize = 1.0;
UIFont *font = nil;
if ([[self objectForKey:key] isKindOfClass:[NSDictionary class]]) {
NSDictionary *fontObject = (NSDictionary*)[self objectForKey:key];
if ([fontObject valueForKey:@"Size"]) {
fontSize = [[fontObject valueForKey:@"Size"] floatValue];
}
if ([fontObject valueForKey:@"Name"]) {
fontName = [fontObject valueForKey:@"Name"];
}
}else{
fontName = [self stringForKey:key];
fontSize = [self floatForKey:[key stringByAppendingString:@"Size"]];
}

if (fontSize < 1.0f){
fontSize = 15.0f;
}

if (stringIsEmpty(fontName))
font = [UIFont systemFontOfSize:fontSize];
else
font = [UIFont fontWithName:fontName size:fontSize];

if (font == nil)
font = [UIFont systemFontOfSize:fontSize];
if (stringIsEmpty(fontName)){
font = [UIFont systemFontOfSize:fontSize];
}
else{
font = [UIFont fontWithName:fontName size:fontSize];
}

if (font == nil){
font = [UIFont systemFontOfSize:fontSize];
}

[self.fontCache setObject:font forKey:key];
[self.fontCache setObject:font forKey:key];

return font;
}
Expand Down