Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #if !defined(__has_feature) || !__has_feature(objc_arc) | 5 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 6 #error "This file requires ARC support." | 6 #error "This file requires ARC support." |
| 7 #endif | 7 #endif |
| 8 | 8 |
| 9 #import "remoting/ios/app/remoting_theme.h" | 9 #import "remoting/ios/app/remoting_theme.h" |
| 10 | 10 |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 blue:249.f / 255.f | 39 blue:249.f / 255.f |
| 40 alpha:1.f]; | 40 alpha:1.f]; |
| 41 }); | 41 }); |
| 42 return color; | 42 return color; |
| 43 } | 43 } |
| 44 | 44 |
| 45 + (UIColor*)offlineHostColor { | 45 + (UIColor*)offlineHostColor { |
| 46 static UIColor* color; | 46 static UIColor* color; |
| 47 static dispatch_once_t onceToken; | 47 static dispatch_once_t onceToken; |
| 48 dispatch_once(&onceToken, ^{ | 48 dispatch_once(&onceToken, ^{ |
| 49 color = [UIColor colorWithRed:0.75f green:0.75f blue:0.75f alpha:1.f]; | 49 color = [UIColor colorWithWhite:0.87f alpha:1.f]; |
| 50 }); | 50 }); |
| 51 return color; | 51 return color; |
| 52 } | 52 } |
| 53 | 53 |
| 54 + (UIColor*)onlineHostColor { | 54 + (UIColor*)onlineHostColor { |
| 55 static UIColor* color; | 55 static UIColor* color; |
| 56 static dispatch_once_t onceToken; | 56 static dispatch_once_t onceToken; |
| 57 dispatch_once(&onceToken, ^{ | 57 dispatch_once(&onceToken, ^{ |
| 58 color = [UIColor colorWithRed:0.20f green:0.70f blue:0.20f alpha:1.f]; | 58 color = [UIColor colorWithRed:0.40f green:0.75f blue:0.40f alpha:1.f]; |
|
nicholss
2017/06/27 16:36:02
Oh good, you got rid of that horrible green color
Yuwei
2017/06/27 20:46:45
This is basically to get rid of the opacity settin
| |
| 59 }); | 59 }); |
| 60 return color; | 60 return color; |
| 61 } | 61 } |
| 62 | |
| 63 + (UIColor*)setupListBackgroundColor { | |
| 64 static UIColor* color; | |
| 65 static dispatch_once_t onceToken; | |
| 66 dispatch_once(&onceToken, ^{ | |
| 67 color = [UIColor colorWithWhite:1.f alpha:0.9f]; | |
| 68 }); | |
| 69 return color; | |
| 70 } | |
| 62 | 71 |
| 63 #pragma mark - Icons | 72 #pragma mark - Icons |
| 64 | 73 |
| 65 + (UIImage*)arrowIcon { | 74 + (UIImage*)arrowIcon { |
| 66 static UIImage* icon; | 75 static UIImage* icon; |
| 67 static dispatch_once_t onceToken; | 76 static dispatch_once_t onceToken; |
| 68 dispatch_once(&onceToken, ^{ | 77 dispatch_once(&onceToken, ^{ |
| 69 icon = [UIImage imageNamed:@"ic_arrow_forward_white"]; | 78 icon = [UIImage imageNamed:@"ic_arrow_forward_white"]; |
| 70 }); | 79 }); |
| 71 return icon; | 80 return icon; |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 155 + (UIImage*)settingsIcon { | 164 + (UIImage*)settingsIcon { |
| 156 static UIImage* icon; | 165 static UIImage* icon; |
| 157 static dispatch_once_t onceToken; | 166 static dispatch_once_t onceToken; |
| 158 dispatch_once(&onceToken, ^{ | 167 dispatch_once(&onceToken, ^{ |
| 159 icon = [UIImage imageNamed:@"Settings"]; | 168 icon = [UIImage imageNamed:@"Settings"]; |
| 160 }); | 169 }); |
| 161 return icon; | 170 return icon; |
| 162 } | 171 } |
| 163 | 172 |
| 164 @end | 173 @end |
| OLD | NEW |