felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-21 15:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

AvatorGenerator: Made it use colors defined by VectorDesignValues

Browse Source
This commit is contained in:
manuroe
2016-02-05 15:40:16 +01:00
parent 485f79b51e
commit 4faa6dc6c3
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Utils/AvatarGenerator.m
+5 -10
View File
@@ -16,19 +16,14 @@
#import "AvatarGenerator.h"
#import "VectorDesignValues.h"
@implementation AvatarGenerator
static NSMutableDictionary *imageByKeyDict = nil;
static NSMutableArray* colorsList = nil;
static UILabel* backgroundLabel = nil;
#define UIColorFromRGB(rgbValue) \
[UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
green:((float)((rgbValue & 0x00FF00) >> 8))/255.0 \
blue:((float)((rgbValue & 0x0000FF) >> 0))/255.0 \
alpha:1.0]
/**
Init the generated avatar colors.
Should be the same as the webclient.
@@ -38,9 +33,9 @@ static UILabel* backgroundLabel = nil;
if (!colorsList)
{
colorsList = [[NSMutableArray alloc] init];
[colorsList addObject:UIColorFromRGB(0x76cfa6)];
[colorsList addObject:UIColorFromRGB(0x50e2c2)];
[colorsList addObject:UIColorFromRGB(0xf4c371)];
[colorsList addObject:kVectorColorGreen];
[colorsList addObject:kVectorColorLightGreen];
[colorsList addObject:kVectorColorOrange];
}
}
Vector/Utils/VectorDesignValues.h
+11
View File
@@ -16,10 +16,21 @@
#import <MatrixKit/MatrixKit.h>
/**
Convert a RGB hexadecimal value into a UIColor.
*/
#define UIColorFromRGB(rgbValue) \
[UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
green:((float)((rgbValue & 0x00FF00) >> 8))/255.0 \
blue:((float)((rgbValue & 0x0000FF) >> 0))/255.0 \
alpha:1.0]
#pragma mark - Vector Colors
extern UIColor *kVectorColorGreen;
extern UIColor *kVectorColorLightGreen;
extern UIColor *kVectorColorLightGrey;
extern UIColor *kVectorColorSiver;
extern UIColor *kVectorColorOrange;
#pragma mark - Vector Text Colors
extern UIColor *kVectorTextColorBlack;
Vector/Utils/VectorDesignValues.m
+13 -5
View File
@@ -17,8 +17,10 @@
#import "VectorDesignValues.h"
UIColor *kVectorColorGreen;
UIColor *kVectorColorLightGreen;
UIColor *kVectorColorLightGrey;
UIColor *kVectorColorSiver;
UIColor *kVectorColorOrange;
UIColor *kVectorTextColorBlack;
UIColor *kVectorTextColorGray;
@@ -30,12 +32,18 @@ UIColor *kVectorTextColorGray;
[super load];
// Load colors at the app load time for the life of the app
kVectorColorGreen = [UIColor colorWithRed:(98.0/256.0) green:(206.0/256.0) blue:(156.0/256.0) alpha:1.0];
kVectorColorLightGrey = [UIColor colorWithRed:(242.0 / 256.0) green:(242.0 / 256.0) blue:(242.0 / 256.0) alpha:1.0];
kVectorColorSiver = [UIColor colorWithRed:(199.0 / 256.0) green:(199.0 / 256.0) blue:(204.0 / 256.0) alpha:1.0];
kVectorTextColorBlack = [UIColor colorWithRed:(60.0 / 256.0) green:(60.0 / 256.0) blue:(60.0 / 256.0) alpha:1.0];
kVectorTextColorGray = [UIColor colorWithRed:(157.0 / 256.0) green:(157.0 / 256.0) blue:(157.0 / 256.0) alpha:1.0];
// Colors as defined by the design
kVectorColorGreen = [UIColor colorWithRed:(98.0/255.0) green:(206.0/255.0) blue:(156.0/255.0) alpha:1.0];
kVectorColorLightGrey = [UIColor colorWithRed:(242.0 / 255.0) green:(242.0 / 255.0) blue:(242.0 / 255.0) alpha:1.0];
kVectorColorSiver = [UIColor colorWithRed:(199.0 / 255.0) green:(199.0 / 255.0) blue:(204.0 / 255.0) alpha:1.0];
kVectorTextColorBlack = [UIColor colorWithRed:(60.0 / 255.0) green:(60.0 / 255.0) blue:(60.0 / 255.0) alpha:1.0];
kVectorTextColorGray = [UIColor colorWithRed:(157.0 / 255.0) green:(157.0 / 255.0) blue:(157.0 / 255.0) alpha:1.0];
// Colors copied from Vector web
kVectorColorLightGreen = UIColorFromRGB(0x50e2c2);
kVectorColorOrange = UIColorFromRGB(0xf4c371);
}
@end