Chromium Code Reviews| Index: remoting/ios/app/client_connection_view_controller.mm |
| diff --git a/remoting/ios/app/client_connection_view_controller.mm b/remoting/ios/app/client_connection_view_controller.mm |
| index 657ccf95a8f49ecc02eb76d887d47f81ed290e3f..d7f1f1c6017d3adfd5e8ae494a9c0a13395f3ec8 100644 |
| --- a/remoting/ios/app/client_connection_view_controller.mm |
| +++ b/remoting/ios/app/client_connection_view_controller.mm |
| @@ -14,6 +14,7 @@ |
| #import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h" |
| #import "remoting/ios/app/host_view_controller.h" |
| #import "remoting/ios/app/pin_entry_view.h" |
| +#import "remoting/ios/app/remoting_styles.h" |
|
nicholss
2017/06/07 21:01:41
Most apps call this theme, ie remoting_theme
Yuwei
2017/06/07 22:25:22
Done.
|
| #import "remoting/ios/domain/client_session_details.h" |
| #import "remoting/ios/domain/host_info.h" |
| #import "remoting/ios/facade/remoting_authentication.h" |
| @@ -86,7 +87,7 @@ static const CGFloat kKeyboardAnimationTime = 0.3; |
| _navBar = [[MDCNavigationBar alloc] initWithFrame:CGRectZero]; |
| [_navBar observeNavigationItem:self.navigationItem]; |
| - [_navBar setBackgroundColor:[UIColor blackColor]]; |
| + [_navBar setBackgroundColor:RemotingStyles.connectionViewBackgroundColor]; |
| MDCNavigationBarTextColorAccessibilityMutator* mutator = |
| [[MDCNavigationBarTextColorAccessibilityMutator alloc] init]; |
| [mutator mutate:_navBar]; |
| @@ -111,7 +112,7 @@ static const CGFloat kKeyboardAnimationTime = 0.3; |
| - (void)loadView { |
| [super loadView]; |
| - self.view.backgroundColor = [UIColor blackColor]; |
| + self.view.backgroundColor = RemotingStyles.connectionViewBackgroundColor; |
| _activityIndicator = [[MDCActivityIndicator alloc] initWithFrame:CGRectZero]; |
| [self.view addSubview:_activityIndicator]; |
| @@ -132,7 +133,7 @@ static const CGFloat kKeyboardAnimationTime = 0.3; |
| _iconView.contentMode = UIViewContentModeCenter; |
| _iconView.alpha = 0.87f; |
| - _iconView.backgroundColor = UIColor.lightGrayColor; |
| + _iconView.backgroundColor = RemotingStyles.onlineHostColor; |
| _iconView.layer.cornerRadius = kIconRadius; |
| _iconView.layer.masksToBounds = YES; |
| _iconView.image = [UIImage imageNamed:@"ic_desktop"]; |
| @@ -140,7 +141,7 @@ static const CGFloat kKeyboardAnimationTime = 0.3; |
| _activityIndicator.radius = kActivityIndicatorRadius; |
| _activityIndicator.trackEnabled = YES; |
| _activityIndicator.strokeWidth = kActivityIndicatorStrokeWidth; |
| - _activityIndicator.cycleColors = @[ [UIColor whiteColor] ]; |
| + _activityIndicator.cycleColors = @[ UIColor.whiteColor ]; |
| _statusLabel.numberOfLines = 1; |
| _statusLabel.lineBreakMode = NSLineBreakByTruncatingTail; |
| @@ -228,6 +229,7 @@ static const CGFloat kKeyboardAnimationTime = 0.3; |
| _pinEntryView.frame.size.height + kPadding); |
| if (overlap < 0) { |
| f.origin.y = overlap; |
| + // TODO(yuweih): This may push the navigation bar off screen. |
| self.view.frame = f; |
| } |
| }]; |