Update the LocationBar container during fullscreen

This CL updates the location bar container, updating its background
color and its height to follow the fullscreen progress.
It also updates BVC so the location bar is always displayed.

Bug: 804731
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I6f5b2a750cf1593c8d4c7f12163a9db90dc34090
Reviewed-on: https://chromium-review.googlesource.com/883283Reviewed-by: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Louis Romero <lpromero@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533247}

ios/chrome/browser/ui/browser_view_controller.mm

@@ -4023,7 +4023,12 @@ bubblePresenterForFeature:(const base::Feature&)feature
 // progress of 1.0 fully shows the headers and a progress of 0.0 fully hides
 // them.
 - (void)updateHeadersForFullscreenProgress:(CGFloat)progress {
-  CGFloat offset = AlignValueToPixel((1.0 - progress) * [self toolbarHeight]);
+  CGFloat toolbarHeightFullscreen = 0;
+  if (IsUIRefreshPhase1Enabled()) {
+    toolbarHeightFullscreen = kToolbarHeightFullscreen;
+  }
+  CGFloat offset = AlignValueToPixel(
+      (1.0 - progress) * ([self toolbarHeight] - toolbarHeightFullscreen));
   [self setFramesForHeaders:[self headerViews] atOffset:offset];
 }
 

ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.h

@@ -24,15 +24,13 @@
 - (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
 - (instancetype)init NS_UNAVAILABLE;
 
-// Top anchor at the bottom of the safeAreaLayoutGuide. Used so views don't
-// overlap with the Status Bar.
-@property(nonatomic, strong) NSLayoutYAxisAnchor* topSafeAnchor;
-
 // The location bar view, containing the omnibox.
 @property(nonatomic, strong) UIView* locationBarView;
 
 // Container for the location bar.
 @property(nonatomic, strong, readonly) UIView* locationBarContainer;
+// The height of the container for the location bar.
+@property(nonatomic, strong, readonly) NSLayoutConstraint* locationBarHeight;
 
 // StackView containing the leading buttons (relative to the location bar).
 // It should only contain ToolbarButtons.

ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.mm

@@ -24,6 +24,8 @@
 
 // Container for the location bar, redefined as readwrite.
 @property(nonatomic, strong, readwrite) UIView* locationBarContainer;
+// The height of the container for the location bar, redefined as readwrite.
+@property(nonatomic, strong, readwrite) NSLayoutConstraint* locationBarHeight;
 
 // StackView containing the leading buttons (relative to the location bar). It
 // should only contain ToolbarButtons. Redefined as readwrite.
@@ -66,7 +68,7 @@
 @implementation PrimaryToolbarView
 
 @synthesize locationBarView = _locationBarView;
-@synthesize topSafeAnchor = _topSafeAnchor;
+@synthesize locationBarHeight = _locationBarHeight;
 @synthesize buttonFactory = _buttonFactory;
 @synthesize allButtons = _allButtons;
 @synthesize progressBar = _progressBar;
@@ -101,7 +103,6 @@
     return;
   }
   DCHECK(self.buttonFactory);
-  DCHECK(self.topSafeAnchor);
 
   self.backgroundColor =
       self.buttonFactory.toolbarConfiguration.backgroundColor;
@@ -115,6 +116,12 @@
   [self setUpConstraints];
 }
 
+#pragma mark - UIView
+
+- (CGSize)intrinsicContentSize {
+  return CGSizeMake(UIViewNoIntrinsicMetric, kToolbarHeight);
+}
+
 #pragma mark - Setup
 
 // Sets the location bar container and its view if present.
@@ -189,11 +196,14 @@
         constraintEqualToAnchor:safeArea.leadingAnchor],
     [self.leadingStackView.bottomAnchor
         constraintEqualToAnchor:safeArea.bottomAnchor],
-    [self.leadingStackView.topAnchor
-        constraintEqualToAnchor:self.topSafeAnchor],
+    [self.leadingStackView.heightAnchor
+        constraintEqualToConstant:kToolbarHeight],
   ]];
 
   // LocationBar constraints.
+  self.locationBarHeight = [self.locationBarContainer.heightAnchor
+      constraintEqualToConstant:kToolbarHeight -
+                                2 * kLocationBarVerticalMargin];
   [NSLayoutConstraint activateConstraints:@[
     [self.locationBarContainer.leadingAnchor
         constraintEqualToAnchor:self.leadingStackView.trailingAnchor],
@@ -202,12 +212,7 @@
     [self.locationBarContainer.bottomAnchor
         constraintEqualToAnchor:self.bottomAnchor
                        constant:-kLocationBarVerticalMargin],
-    [self.locationBarContainer.topAnchor
-        constraintEqualToAnchor:self.topSafeAnchor
-                       constant:kLocationBarVerticalMargin],
-    [self.locationBarContainer.heightAnchor
-        constraintEqualToConstant:kToolbarHeight -
-                                  2 * kLocationBarVerticalMargin],
+    self.locationBarHeight,
   ]];
 
   // Trailing StackView constraints.
@@ -216,8 +221,8 @@
         constraintEqualToAnchor:safeArea.trailingAnchor],
     [self.trailingStackView.bottomAnchor
         constraintEqualToAnchor:safeArea.bottomAnchor],
-    [self.trailingStackView.topAnchor
-        constraintEqualToAnchor:self.topSafeAnchor],
+    [self.trailingStackView.heightAnchor
+        constraintEqualToConstant:kToolbarHeight],
   ]];
 
   // locationBarView constraints, if present.

ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view_controller.mm

@@ -13,6 +13,8 @@
 #import "ios/chrome/browser/ui/toolbar/adaptive/adaptive_toolbar_view_controller+subclassing.h"
 #import "ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.h"
 #import "ios/chrome/browser/ui/toolbar/clean/toolbar_button.h"
+#import "ios/chrome/browser/ui/toolbar/clean/toolbar_button_factory.h"
+#import "ios/chrome/browser/ui/toolbar/clean/toolbar_configuration.h"
 #import "ios/chrome/browser/ui/toolbar/clean/toolbar_constants.h"
 #import "ios/chrome/browser/ui/toolbar/clean/toolbar_tools_menu_button.h"
 #import "ios/chrome/browser/ui/util/named_guide.h"
@@ -66,12 +68,6 @@
   self.view =
       [[PrimaryToolbarView alloc] initWithButtonFactory:self.buttonFactory];
 
-  if (@available(iOS 11, *)) {
-    self.view.topSafeAnchor = self.view.safeAreaLayoutGuide.topAnchor;
-  } else {
-    self.view.topSafeAnchor = self.topLayoutGuide.bottomAnchor;
-  }
-
   // This method cannot be called from the init as the topSafeAnchor can only be
   // set to topLayoutGuide after the view creation on iOS 10.
   [self.view setUp];
@@ -129,9 +125,16 @@
 #pragma mark - FullscreenUIElement
 
 - (void)updateForFullscreenProgress:(CGFloat)progress {
-  self.view.leadingStackView.alpha = progress;
-  self.view.trailingStackView.alpha = progress;
-  // TODO(crbug.com/804731): Update the location bar constraints.
+  CGFloat alphaValue = fmax(progress * 2 - 1, 0);
+  self.view.leadingStackView.alpha = alphaValue;
+  self.view.trailingStackView.alpha = alphaValue;
+  self.view.locationBarHeight.constant =
+      AlignValueToPixel(kToolbarHeightFullscreen +
+                        (kToolbarHeight - kToolbarHeightFullscreen) * progress -
+                        2 * kLocationBarVerticalMargin);
+  self.view.locationBarContainer.backgroundColor =
+      [self.buttonFactory.toolbarConfiguration.omniboxBackgroundColor
+          colorWithAlphaComponent:alphaValue];
 }
 
 - (void)updateForFullscreenEnabled:(BOOL)enabled {

ios/chrome/browser/ui/toolbar/public/toolbar_controller_constants.h

@@ -13,6 +13,8 @@
 
 // Height of the toolbar.
 extern const CGFloat kToolbarHeight;
+// Height of the toolbar when in fullscreen.
+extern const CGFloat kToolbarHeightFullscreen;
 
 // The time delay before non-initial button images are loaded.
 extern const int64_t kNonInitialImageAdditionDelayNanosec;

ios/chrome/browser/ui/toolbar/public/toolbar_controller_constants.mm

@@ -9,6 +9,7 @@
 #endif
 
 const CGFloat kToolbarHeight = 56;
+const CGFloat kToolbarHeightFullscreen = 35;
 
 const int64_t kNonInitialImageAdditionDelayNanosec = 500000LL;