[CRD iOS] Fix color scheme and other UI issues

remoting/ios/app/client_connection_view_controller.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #import "remoting/ios/app/client_connection_view_controller.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MDCActivityIndicator.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #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_theme.h"
 #import "remoting/ios/domain/client_session_details.h"
 #import "remoting/ios/domain/host_info.h"
 #import "remoting/ios/facade/remoting_authentication.h"
 #import "remoting/ios/facade/remoting_service.h"
 #import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/protocol/client_authentication_config.h"
 
 static const CGFloat kIconRadius = 30.f;
@@ skipping 52 matching lines @@
                   forState:UIControlStateNormal];
     [cancelButton addTarget:self
                      action:@selector(didTapCancel:)
            forControlEvents:UIControlEventTouchUpInside];
     self.navigationItem.leftBarButtonItem =
         [[UIBarButtonItem alloc] initWithCustomView:cancelButton];
 
     _navBar = [[MDCNavigationBar alloc] initWithFrame:CGRectZero];
     [_navBar observeNavigationItem:self.navigationItem];
 
-    [_navBar setBackgroundColor:[UIColor blackColor]];
+    [_navBar setBackgroundColor:RemotingTheme.connectionViewBackgroundColor];
     MDCNavigationBarTextColorAccessibilityMutator* mutator =
         [[MDCNavigationBarTextColorAccessibilityMutator alloc] init];
     [mutator mutate:_navBar];
     [self.view addSubview:_navBar];
     _navBar.translatesAutoresizingMaskIntoConstraints = NO;
 
     // Attach navBar to the top of the view.
     [NSLayoutConstraint activateConstraints:@[
       [[_navBar topAnchor] constraintEqualToAnchor:[self.view topAnchor]],
       [[_navBar leadingAnchor]
           constraintEqualToAnchor:[self.view leadingAnchor]],
       [[_navBar trailingAnchor]
           constraintEqualToAnchor:[self.view trailingAnchor]],
       [[_navBar heightAnchor] constraintEqualToConstant:kBarHeight],
     ]];
   }
   return self;
 }
 
 #pragma mark - UIViewController
 
 - (void)loadView {
   [super loadView];
 
-  self.view.backgroundColor = [UIColor blackColor];
+  self.view.backgroundColor = RemotingTheme.connectionViewBackgroundColor;
 
   _activityIndicator = [[MDCActivityIndicator alloc] initWithFrame:CGRectZero];
   [self.view addSubview:_activityIndicator];
 
   _statusLabel = [[UILabel alloc] initWithFrame:CGRectZero];
   [self.view addSubview:_statusLabel];
 
   _iconView = [[UIImageView alloc] initWithFrame:CGRectZero];
   [self.view addSubview:_iconView];
 
   _pinEntryView = [[PinEntryView alloc] init];
   [self.view addSubview:_pinEntryView];
   _pinEntryView.delegate = self;
 }
 
 - (void)viewDidLoad {
   [super viewDidLoad];
 
   _iconView.contentMode = UIViewContentModeCenter;
   _iconView.alpha = 0.87f;
-  _iconView.backgroundColor = UIColor.lightGrayColor;
+  _iconView.backgroundColor = RemotingTheme.onlineHostColor;
   _iconView.layer.cornerRadius = kIconRadius;
   _iconView.layer.masksToBounds = YES;
   _iconView.image = [UIImage imageNamed:@"ic_desktop"];
 
   _activityIndicator.radius = kActivityIndicatorRadius;
   _activityIndicator.trackEnabled = YES;
   _activityIndicator.strokeWidth = kActivityIndicatorStrokeWidth;
-  _activityIndicator.cycleColors = @[ [UIColor whiteColor] ];
+  _activityIndicator.cycleColors = @[ UIColor.whiteColor ];
 
   _statusLabel.numberOfLines = 1;
   _statusLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   _statusLabel.textColor = [UIColor whiteColor];
   _statusLabel.textAlignment = NSTextAlignmentCenter;
 
   _pinEntryView.hidden = YES;
 }
 
 - (void)viewWillLayoutSubviews {
@@ skipping 67 matching lines @@
       animateWithDuration:kKeyboardAnimationTime
                animations:^{
                  CGRect f = self.view.frame;
                  CGFloat newHeight =
                      self.view.frame.size.height - keyboardSize.height;
                  CGFloat overlap =
                      newHeight - (_pinEntryView.frame.origin.y +
                                   _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;
                  }
                }];
 }
 
 - (void)keyboardWillHide:(NSNotification*)notification {
   [UIView animateWithDuration:kKeyboardAnimationTime
                    animations:^{
                      CGRect f = self.view.frame;
                      f.origin.y = 0.f;
@@ skipping 33 matching lines @@
   _activityIndicator.hidden = NO;
   _pinEntryView.hidden = YES;
   [_activityIndicator startAnimating];
 }
 
 - (void)showPinPromptState {
   _statusLabel.text = [NSString stringWithFormat:@"%@", _remoteHostName];
   [_activityIndicator stopAnimating];
   _activityIndicator.hidden = YES;
   _pinEntryView.hidden = NO;
+
+  // TODO(yuweih): This may be called before viewDidAppear and miss the keyboard
+  // callback.
   [_pinEntryView becomeFirstResponder];
 }
 
 - (void)showConnectedState {
   [_pinEntryView endEditing:YES];
   _statusLabel.text =
       [NSString stringWithFormat:@"Connected to %@", _remoteHostName];
   _activityIndicator.progress = 0.0;
   _pinEntryView.hidden = YES;
   _activityIndicator.hidden = NO;
@@ skipping 56 matching lines @@
     default:
       LOG(ERROR) << "Unknown State for Session, " << sessionDetails.state;
       return;
   }
   [[NSOperationQueue mainQueue] addOperationWithBlock:^{
     [self setState:state];
   }];
 }
 
 @end