commit eed8b574888374203877c0efea951fd6768b069f
author sczs <sczs@chromium.org> Wed Nov 14 02:02:29 2018
committer Commit Bot <commit-bot@chromium.org> Wed Nov 14 02:02:29 2018
tree 5db804429918ffbbd486f6ba478249b91f09a963
parent 070b13aa73c17a7fbe958d30352de51880f9582e

[ios] Displays SaveCardInfobar above of Bottom Toolbar.

- Updates the bottomAnchorConstraint constant on sizeThatFits so its
updated by the Fullscreen changes. This will also push the Infobar above
the bottom toolbar, causing it not to be covered by the toolbar.

- Adds missing super calls to will willMoveToSuperview and
didMoveToSuperview.

Screenshots:
https://drive.google.com/open?id=1F8hUj6Cb5VEcOHuSOa8vv6wc8IXY5CeW
https://drive.google.com/open?id=1dlDS3HktGQE8iAwgsJDxcGlEo-MOBvND

Bug: 894449
Change-Id: I987f5eb3e8a8580323a0367d45c885406edcd7a0
Reviewed-on: https://chromium-review.googlesource.com/c/1334658
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607839}

ios/chrome/browser/ui/autofill/save_card_infobar_view.mm

diff --git a/ios/chrome/browser/ui/autofill/save_card_infobar_view.mm b/ios/chrome/browser/ui/autofill/save_card_infobar_view.mm
index d4810a6..0b958ab 100644
--- a/ios/chrome/browser/ui/autofill/save_card_infobar_view.mm
+++ b/ios/chrome/browser/ui/autofill/save_card_infobar_view.mm
@@ -183,9 +183,11 @@
     // TODO(crbug.com/904521): Investigate why this is needed.
     self.bottomAnchorConstraint.priority = UILayoutPriorityDefaultLow;
   }
+  [super willMoveToSuperview:newSuperview];
 }
 
 - (void)didMoveToSuperview {
+  [super didMoveToSuperview];
   if (!self.superview)
     return;
 
@@ -194,21 +196,28 @@
   self.bottomAnchorConstraint.priority = UILayoutPriorityDefaultHigh;
 }
 
-- (void)layoutSubviews {
-  // Set a bottom margin equal to the height of the secondary toolbar, if any.
-  // Deduct the bottom safe area inset as it is already included in the height
-  // of the secondary toolbar.
-  // TODO(crbug.com/894449): This won't update the infobar's position after the
-  // secondary toolbar reappears. Consider adding a constraint to the
-  // |layoutGuide| in |didMoveToSuperview|.
-  NamedGuide* layoutGuide =
-      [NamedGuide guideWithName:kSecondaryToolbarGuide view:self];
-  self.bottomAnchorConstraint.constant = layoutGuide.layoutFrame.size.height;
-
-  [super layoutSubviews];
-}
-
 - (CGSize)sizeThatFits:(CGSize)size {
+  // Calculate the safe area and current Toolbar height. Set the
+  // bottomAnchorConstraint constant to this height to create the bottom
+  // padding.
+  CGFloat bottomSafeAreaInset = SafeAreaInsetsForView(self).bottom;
+  CGFloat toolbarHeight = 0;
+  UILayoutGuide* guide =
+      [NamedGuide guideWithName:kSecondaryToolbarGuide view:self];
+  UILayoutGuide* guideNoFullscreen =
+      [NamedGuide guideWithName:kSecondaryToolbarNoFullscreenGuide view:self];
+  if (guide && guideNoFullscreen) {
+    CGFloat toolbarHeightCurrent = guide.layoutFrame.size.height;
+    CGFloat toolbarHeightMax = guideNoFullscreen.layoutFrame.size.height;
+    if (toolbarHeightMax > 0) {
+      CGFloat fullscreenProgress = toolbarHeightCurrent / toolbarHeightMax;
+      CGFloat toolbarHeightInSafeArea = toolbarHeightMax - bottomSafeAreaInset;
+      toolbarHeight += fullscreenProgress * toolbarHeightInSafeArea;
+    }
+  }
+  self.bottomAnchorConstraint.constant = toolbarHeight + bottomSafeAreaInset;
+
+  // Now that the constraint constant has been set calculate the fitting size.
   CGSize computedSize = [self systemLayoutSizeFittingSize:size];
   return CGSizeMake(size.width, computedSize.height);
 }