From 5802e92929ca0996188d06a6d0f377c2e5243297 Mon Sep 17 00:00:00 2001 From: Claas Lange Date: Sun, 8 Mar 2015 12:43:56 +0100 Subject: [PATCH] Add support for alpha value in colorWithHexString --- Source/VSTheme.m | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/VSTheme.m b/Source/VSTheme.m index ca8056e..cc4021a 100644 --- a/Source/VSTheme.m +++ b/Source/VSTheme.m @@ -271,16 +271,25 @@ static BOOL stringIsEmpty(NSString *s) { NSMutableString *s = [hexString mutableCopy]; [s replaceOccurrencesOfString:@"#" withString:@"" options:0 range:NSMakeRange(0, [hexString length])]; + + if ([s length] == 6) + { + s = [[s stringByAppendingString:@"ff"] mutableCopy]; + } + CFStringTrimWhitespace((__bridge CFMutableStringRef)s); NSString *redString = [s substringToIndex:2]; NSString *greenString = [s substringWithRange:NSMakeRange(2, 2)]; NSString *blueString = [s substringWithRange:NSMakeRange(4, 2)]; + NSString *alphaString = [s substringWithRange:NSMakeRange(6,2)]; - unsigned int red = 0, green = 0, blue = 0; + unsigned int red = 0, green = 0, blue = 0, alpha = 0; [[NSScanner scannerWithString:redString] scanHexInt:&red]; [[NSScanner scannerWithString:greenString] scanHexInt:&green]; [[NSScanner scannerWithString:blueString] scanHexInt:&blue]; + [[NSScanner scannerWithString:alphaString] scanHexInt:&alpha]; - return [UIColor colorWithRed:(CGFloat)red/255.0f green:(CGFloat)green/255.0f blue:(CGFloat)blue/255.0f alpha:1.0f]; + return [UIColor colorWithRed:(CGFloat)red/255.0f green:(CGFloat)green/255.0f blue:(CGFloat)blue/255.0f alpha:(CGFloat)alpha/255.0f]; } +