|
@@ -101,7 +101,7 @@
|
101
|
101
|
|
102
|
102
|
id color = dictionary[@"color"];
|
103
|
103
|
if (color) {
|
104
|
|
- [textAttributes setObject:color forKey:NSForegroundColorAttributeName];
|
|
104
|
+ [textAttributes setObject:[RCTConvert UIColor:color] forKey:NSForegroundColorAttributeName];
|
105
|
105
|
}
|
106
|
106
|
|
107
|
107
|
NSNumber* disabledColor = dictionary[@"disabledColor"];
|
|
@@ -113,9 +113,9 @@
|
113
|
113
|
NSNumber* fontSize = dictionary[@"fontSize"] ? dictionary[@"fontSize"] : @(17);
|
114
|
114
|
NSString* fontFamily = dictionary[@"fontFamily"];
|
115
|
115
|
if (fontFamily) {
|
116
|
|
- [textAttributes setObject:[UIFont fontWithName:fontFamily size:[fontSize floatValue]] forKey:NSForegroundColorAttributeName];
|
|
116
|
+ [textAttributes setObject:[UIFont fontWithName:fontFamily size:[fontSize floatValue]] forKey:NSFontAttributeName];
|
117
|
117
|
} else{
|
118
|
|
- [textAttributes setObject:[UIFont systemFontOfSize:[fontSize floatValue]] forKey:NSForegroundColorAttributeName];
|
|
118
|
+ [textAttributes setObject:[UIFont systemFontOfSize:[fontSize floatValue]] forKey:NSFontAttributeName];
|
119
|
119
|
}
|
120
|
120
|
|
121
|
121
|
[barButtonItem setTitleTextAttributes:textAttributes forState:UIControlStateNormal];
|