Skip to content

Commit 1f80ade

Browse files
committed
Merge branch 'colors'
2 parents 8dc323b + 284f82b commit 1f80ade

File tree

9 files changed

+15
-8
lines changed

9 files changed

+15
-8
lines changed

Authenticator/Classes/OTPTokenEntryViewController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)ce
199199

200200
cell.textLabel.textColor = [UIColor otpForegroundColor];
201201
if ([cell isKindOfClass:[OTPTextFieldCell class]]) {
202-
((OTPTextFieldCell *)cell).textField.tintColor = [UIColor otpBackgroundColor];
202+
((OTPTextFieldCell *)cell).textField.backgroundColor = [UIColor otpLightColor];
203+
((OTPTextFieldCell *)cell).textField.tintColor = [UIColor otpDarkColor];
203204
}
204205
}
205206

Authenticator/Classes/UIColor+OTP.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727

2828
@interface UIColor (OTP)
2929

30+
+ (instancetype)otpDarkColor;
31+
+ (instancetype)otpLightColor;
32+
3033
+ (instancetype)otpBarBackgroundColor;
3134
+ (instancetype)otpBarForegroundColor;
3235
+ (instancetype)otpBackgroundColor;

Authenticator/Classes/UIColor+OTP.m

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@
2828

2929
@implementation UIColor (OTP)
3030

31-
COLOR(darkBlueColor, [UIColor colorWithIntegerRed:35 green:35 blue:50])
31+
COLOR(otpDarkColor, [UIColor colorWithIntegerRed:35 green:35 blue:50 ])
32+
COLOR(otpLightColor, [UIColor colorWithIntegerRed:250 green:248 blue:240])
3233

33-
COLOR(otpBarBackgroundColor, [UIColor darkBlueColor])
34-
COLOR(otpBarForegroundColor, [UIColor whiteColor])
35-
COLOR(otpBackgroundColor, [UIColor darkBlueColor])
36-
COLOR(otpForegroundColor, [UIColor whiteColor])
34+
COLOR(otpBarBackgroundColor, [UIColor otpDarkColor])
35+
COLOR(otpBarForegroundColor, [UIColor otpLightColor])
36+
COLOR(otpBackgroundColor, [UIColor otpDarkColor])
37+
COLOR(otpForegroundColor, [UIColor otpLightColor])
3738

3839
@end

Authenticator/Resources/Icon.svg

Lines changed: 4 additions & 2 deletions
Loading
Loading
Loading
Loading

Authenticator/Resources/iTunesArtwork

262 Bytes
Binary file not shown.
328 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)