[iOS] Removing calls to IsUIRefreshPhase1Enabled() for Sign in promo

Removing calls to IsUIRefreshPhase1Enabled() for Sign in promo.

Bug: 884724
Change-Id: I8417859a633484a1ff46ac440eacb02558ea661f
Reviewed-on: https://chromium-review.googlesource.com/c/1317859
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605396}

ios/chrome/browser/ui/authentication/BUILD.gn

@@ -59,13 +59,11 @@ source_set("authentication") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/signin_interaction/public",
-    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/unified_consent",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/third_party/material_components_ios",
     "//services/identity/public/cpp:cpp",
     "//ui/base",
     "//ui/gfx",
@@ -170,7 +168,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/unified_consent",
     "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser/signin:test_support",
-    "//ios/third_party/material_components_ios",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",

ios/chrome/browser/ui/authentication/signin_promo_item.mm

@@ -61,9 +61,7 @@ const CGFloat kSignInPromoViewPadding = 10;
   self = [super initWithFrame:frame];
   if (self) {
     UIView* contentView = self.contentView;
-    _signinPromoView =
-        [[SigninPromoView alloc] initWithFrame:self.bounds
-                                         style:SigninPromoViewUIRefresh];
+    _signinPromoView = [[SigninPromoView alloc] initWithFrame:self.bounds];
     _signinPromoView.translatesAutoresizingMaskIntoConstraints = NO;
     [contentView addSubview:_signinPromoView];
 

ios/chrome/browser/ui/authentication/signin_promo_view.h

@@ -9,18 +9,8 @@
 
 #include "components/signin/core/browser/signin_metrics.h"
 
-@class MDCFlatButton;
 @protocol SigninPromoViewDelegate;
 
-typedef NS_ENUM(NSInteger, SigninPromoViewUI) {
-  // The legacy SigninPromoViewUI style.
-  SigninPromoViewUILegacy,
-  // The SigninPromoViewRefreshUI style. In order for this value to take effect
-  // the UIRefreshPhase1 flag also needs to be enabled. Otherwise
-  // SigninPromoViewUILegacy style will still be used.
-  SigninPromoViewUIRefresh,
-};
-
 typedef NS_ENUM(NSInteger, SigninPromoViewMode) {
   // No identity available on the device.
   SigninPromoViewModeColdState,
@@ -62,12 +52,8 @@ extern NSString* const kSigninPromoCloseButtonId;
 // |textLabel|.
 @property(nonatomic, readonly) CGFloat horizontalPadding;
 
-// Designated initializer. |signinPromoViewUI| sets the style for the
-// SigninPromoView to legacy or refreshed. This same view is used on Collections
-// and Settings, while the Collections UI will be refreshed soon, we still need
-// to support the legacy UI for settings.
+// Designated initializer.
 - (instancetype)initWithFrame:(CGRect)frame
-                        style:(SigninPromoViewUI)signinPromoViewUI
     NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
 - (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;

ios/chrome/browser/ui/authentication/signin_promo_view.mm

@@ -8,13 +8,10 @@
 #include "base/mac/foundation_util.h"
 #import "ios/chrome/browser/ui/authentication/signin_promo_view_delegate.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
-#include "ios/chrome/browser/ui/util/ui_util.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #import "ios/chrome/common/ui_util/constraints_ui_util.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
-#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
-#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -24,20 +21,8 @@
 namespace {
 // Horizontal padding for label and buttons.
 const CGFloat kHorizontalPadding = 40;
-// Spacing within stackView.
-const CGFloat kLegacySubViewVerticalSpacing = 14;
-// StackView vertical padding.
-const CGFloat kLegacyStackViewVerticalPadding = 20.0;
-// StackView horizontal padding.
-const CGFloat kLegacyStackViewHorizontalPadding = 15.0;
-// Vertical padding for buttons.
-const CGFloat kButtonVerticalPadding = 10;
 // Image size for warm state.
 const CGFloat kProfileImageFixedSize = 48;
-// Size for the close button width and height.
-const CGFloat kCloseButtonSize = 24;
-// Padding for the close button.
-const CGFloat kCloseButtonPadding = 8;
 
 // UI Refresh Constants:
 // Text label gray color.
@@ -77,7 +62,6 @@ NSString* const kSigninPromoCloseButtonId = @"kSigninPromoCloseButtonId";
 @property(nonatomic, readwrite) UIButton* primaryButton;
 @property(nonatomic, readwrite) UIButton* secondaryButton;
 @property(nonatomic, readwrite) UIButton* closeButton;
-@property(nonatomic, assign) BOOL loadRefreshUI;
 @end
 
 @implementation SigninPromoView {
@@ -91,15 +75,10 @@ NSString* const kSigninPromoCloseButtonId = @"kSigninPromoCloseButtonId";
 @synthesize primaryButton = _primaryButton;
 @synthesize secondaryButton = _secondaryButton;
 @synthesize closeButton = _closeButton;
-@synthesize loadRefreshUI = _loadRefreshUI;
 
-- (instancetype)initWithFrame:(CGRect)frame
-                        style:(SigninPromoViewUI)signinPromoViewUI {
+- (instancetype)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
-    _loadRefreshUI = (IsUIRefreshPhase1Enabled() &&
-                      signinPromoViewUI == SigninPromoViewUIRefresh);
-
     // Set the whole element as accessible to take advantage of the
     // accessibilityCustomActions.
     self.isAccessibilityElement = YES;
@@ -117,40 +96,23 @@ NSString* const kSigninPromoCloseButtonId = @"kSigninPromoCloseButtonId";
     _textLabel.translatesAutoresizingMaskIntoConstraints = NO;
     _textLabel.numberOfLines = 0;
     _textLabel.textAlignment = NSTextAlignmentCenter;
-    if (_loadRefreshUI) {
-      _textLabel.lineBreakMode = NSLineBreakByWordWrapping;
-      _textLabel.font =
-          [UIFont preferredFontForTextStyle:UIFontTextStyleFootnote];
-      _textLabel.textColor = UIColorFromRGB(kGrayHexColor);
-    } else {
-      _textLabel.font = [MDCTypography buttonFont];
-      _textLabel.textColor = [[MDCPalette greyPalette] tint900];
-    }
+    _textLabel.lineBreakMode = NSLineBreakByWordWrapping;
+    _textLabel.font =
+        [UIFont preferredFontForTextStyle:UIFontTextStyleFootnote];
+    _textLabel.textColor = UIColorFromRGB(kGrayHexColor);
 
     // Create and setup primary button.
     UIButton* primaryButton;
     UIEdgeInsets primaryButtonInsets;
-    if (_loadRefreshUI) {
-      primaryButton = [[UIButton alloc] init];
-      primaryButton.backgroundColor = UIColorFromRGB(kBlueHexColor);
-      [primaryButton.titleLabel
-          setFont:[UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]];
-      primaryButton.layer.cornerRadius = kButtonCornerRadius;
-      primaryButton.clipsToBounds = YES;
-      primaryButtonInsets = UIEdgeInsetsMake(
-          kButtonTitleVerticalContentInset, kButtonTitleHorizontalContentInset,
-          kButtonTitleVerticalContentInset, kButtonTitleHorizontalContentInset);
-    } else {
-      primaryButton = [[MDCFlatButton alloc] init];
-      MDCFlatButton* materialButton =
-          base::mac::ObjCCastStrict<MDCFlatButton>(primaryButton);
-      [materialButton setBackgroundColor:[[MDCPalette cr_bluePalette] tint500]
-                                forState:UIControlStateNormal];
-      materialButton.inkColor = [UIColor colorWithWhite:1 alpha:0.2];
-      primaryButtonInsets =
-          UIEdgeInsetsMake(kButtonVerticalPadding, kHorizontalPadding,
-                           kButtonVerticalPadding, kHorizontalPadding);
-    }
+    primaryButton = [[UIButton alloc] init];
+    primaryButton.backgroundColor = UIColorFromRGB(kBlueHexColor);
+    [primaryButton.titleLabel
+        setFont:[UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]];
+    primaryButton.layer.cornerRadius = kButtonCornerRadius;
+    primaryButton.clipsToBounds = YES;
+    primaryButtonInsets = UIEdgeInsetsMake(
+        kButtonTitleVerticalContentInset, kButtonTitleHorizontalContentInset,
+        kButtonTitleVerticalContentInset, kButtonTitleHorizontalContentInset);
     _primaryButton = primaryButton;
     DCHECK(_primaryButton);
     _primaryButton.accessibilityIdentifier = kSigninPromoPrimaryButtonId;
@@ -165,21 +127,11 @@ NSString* const kSigninPromoCloseButtonId = @"kSigninPromoCloseButtonId";
 
     // Create and setup seconday button.
     UIButton* secondaryButton;
-    if (_loadRefreshUI) {
-      secondaryButton = [[UIButton alloc] init];
-      [secondaryButton.titleLabel
-          setFont:[UIFont
-                      preferredFontForTextStyle:UIFontTextStyleSubheadline]];
-      [secondaryButton setTitleColor:UIColorFromRGB(kBlueHexColor)
-                            forState:UIControlStateNormal];
-    } else {
-      secondaryButton = [[MDCFlatButton alloc] init];
-      MDCFlatButton* materialButton =
-          base::mac::ObjCCastStrict<MDCFlatButton>(secondaryButton);
-      materialButton.uppercaseTitle = NO;
-      [materialButton setTitleColor:[[MDCPalette cr_bluePalette] tint500]
-                           forState:UIControlStateNormal];
-    }
+    secondaryButton = [[UIButton alloc] init];
+    [secondaryButton.titleLabel
+        setFont:[UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline]];
+    [secondaryButton setTitleColor:UIColorFromRGB(kBlueHexColor)
+                          forState:UIControlStateNormal];
     _secondaryButton = secondaryButton;
     DCHECK(_secondaryButton);
     _secondaryButton.translatesAutoresizingMaskIntoConstraints = NO;
@@ -196,8 +148,7 @@ NSString* const kSigninPromoCloseButtonId = @"kSigninPromoCloseButtonId";
     verticalStackView.alignment = UIStackViewAlignmentCenter;
     verticalStackView.axis = UILayoutConstraintAxisVertical;
     verticalStackView.translatesAutoresizingMaskIntoConstraints = NO;
-    verticalStackView.spacing = _loadRefreshUI ? kStackViewSubViewSpacing
-                                               : kLegacySubViewVerticalSpacing;
+    verticalStackView.spacing = kStackViewSubViewSpacing;
     [self addSubview:verticalStackView];
 
     // Create close button and adds it directly to self.
@@ -212,65 +163,31 @@ NSString* const kSigninPromoCloseButtonId = @"kSigninPromoCloseButtonId";
     _closeButton.hidden = YES;
     [self addSubview:_closeButton];
 
-    // Add legacys or UIRefresh constraints for the stackView.
-    if (_loadRefreshUI) {
-      [NSLayoutConstraint activateConstraints:@[
-        [verticalStackView.leadingAnchor
-            constraintEqualToAnchor:self.leadingAnchor
-                           constant:kStackViewHorizontalPadding],
-        [verticalStackView.trailingAnchor
-            constraintEqualToAnchor:self.trailingAnchor
-                           constant:-kStackViewHorizontalPadding],
-        [verticalStackView.topAnchor
-            constraintEqualToAnchor:self.topAnchor
-                           constant:kStackViewVerticalPadding],
-        [verticalStackView.bottomAnchor
-            constraintEqualToAnchor:self.bottomAnchor
-                           constant:-kStackViewVerticalPadding],
-        [_imageView.heightAnchor
-            constraintEqualToConstant:kImageViewWidthHeight],
-        [_imageView.widthAnchor
-            constraintEqualToConstant:kImageViewWidthHeight],
-        // Close button constraints.
-        [_closeButton.topAnchor constraintEqualToAnchor:self.topAnchor],
-        [_closeButton.trailingAnchor
-            constraintEqualToAnchor:self.trailingAnchor
-                           constant:kCloseButtonTrailingMargin],
-        [_closeButton.heightAnchor
-            constraintEqualToConstant:kCloseButtonWidthHeight],
-        [_closeButton.widthAnchor
-            constraintEqualToConstant:kCloseButtonWidthHeight],
-      ]];
-    } else {
-      [NSLayoutConstraint activateConstraints:@[
-        [verticalStackView.leadingAnchor
-            constraintEqualToAnchor:self.leadingAnchor
-                           constant:kLegacyStackViewHorizontalPadding],
-        [verticalStackView.trailingAnchor
-            constraintEqualToAnchor:self.trailingAnchor
-                           constant:-kLegacyStackViewHorizontalPadding],
-        [verticalStackView.topAnchor
-            constraintEqualToAnchor:self.topAnchor
-                           constant:kLegacyStackViewVerticalPadding],
-        [verticalStackView.bottomAnchor
-            constraintEqualToAnchor:self.bottomAnchor
-                           constant:-kLegacyStackViewVerticalPadding],
-        // Close button constraints.
-        [_closeButton.topAnchor constraintEqualToAnchor:self.topAnchor
-                                               constant:kCloseButtonPadding],
-        [_closeButton.trailingAnchor
-            constraintEqualToAnchor:self.trailingAnchor
-                           constant:-kCloseButtonPadding],
-        [_closeButton.heightAnchor constraintEqualToConstant:kCloseButtonSize],
-        [_closeButton.widthAnchor constraintEqualToConstant:kCloseButtonSize],
-        [_primaryButton.leadingAnchor
-            constraintEqualToAnchor:verticalStackView.leadingAnchor
-                           constant:kStackViewHorizontalPadding],
-        [_primaryButton.trailingAnchor
-            constraintEqualToAnchor:verticalStackView.trailingAnchor
-                           constant:-kStackViewHorizontalPadding],
-      ]];
-    }
+    [NSLayoutConstraint activateConstraints:@[
+      [verticalStackView.leadingAnchor
+          constraintEqualToAnchor:self.leadingAnchor
+                         constant:kStackViewHorizontalPadding],
+      [verticalStackView.trailingAnchor
+          constraintEqualToAnchor:self.trailingAnchor
+                         constant:-kStackViewHorizontalPadding],
+      [verticalStackView.topAnchor
+          constraintEqualToAnchor:self.topAnchor
+                         constant:kStackViewVerticalPadding],
+      [verticalStackView.bottomAnchor
+          constraintEqualToAnchor:self.bottomAnchor
+                         constant:-kStackViewVerticalPadding],
+      [_imageView.heightAnchor constraintEqualToConstant:kImageViewWidthHeight],
+      [_imageView.widthAnchor constraintEqualToConstant:kImageViewWidthHeight],
+      // Close button constraints.
+      [_closeButton.topAnchor constraintEqualToAnchor:self.topAnchor],
+      [_closeButton.trailingAnchor
+          constraintEqualToAnchor:self.trailingAnchor
+                         constant:kCloseButtonTrailingMargin],
+      [_closeButton.heightAnchor
+          constraintEqualToConstant:kCloseButtonWidthHeight],
+      [_closeButton.widthAnchor
+          constraintEqualToConstant:kCloseButtonWidthHeight],
+    ]];
     // Default mode.
     _mode = SigninPromoViewModeColdState;
     [self activateColdMode];

ios/chrome/browser/ui/authentication/signin_promo_view_unittest.mm

@@ -17,8 +17,7 @@ using SigninPromoViewTest = PlatformTest;
 TEST_F(SigninPromoViewTest, ChromiumLogoImage) {
   UIWindow* currentWindow = [[UIApplication sharedApplication] keyWindow];
   SigninPromoView* view =
-      [[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)
-                                       style:SigninPromoViewUIRefresh];
+      [[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.mode = SigninPromoViewModeColdState;
   [currentWindow.rootViewController.view addSubview:view];
   UIImage* chromiumLogo = view.imageView.image;
@@ -37,8 +36,7 @@ TEST_F(SigninPromoViewTest, ChromiumLogoImage) {
 TEST_F(SigninPromoViewTest, SecondaryButtonVisibility) {
   UIWindow* currentWindow = [[UIApplication sharedApplication] keyWindow];
   SigninPromoView* view =
-      [[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)
-                                       style:SigninPromoViewUIRefresh];
+      [[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.mode = SigninPromoViewModeColdState;
   [currentWindow.rootViewController.view addSubview:view];
   EXPECT_TRUE(view.secondaryButton.hidden);

ios/chrome/browser/ui/bookmarks/cells/bookmark_table_signin_promo_cell.mm

@@ -35,9 +35,7 @@ const NSInteger kSigninPromoMargin = 8;
   self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
   if (self) {
     UIView* contentView = self.contentView;
-    _signinPromoView =
-        [[SigninPromoView alloc] initWithFrame:self.bounds
-                                         style:SigninPromoViewUIRefresh];
+    _signinPromoView = [[SigninPromoView alloc] initWithFrame:self.bounds];
     _signinPromoView.translatesAutoresizingMaskIntoConstraints = NO;
     [contentView addSubview:_signinPromoView];
     NSArray* visualConstraints = @[

ios/chrome/browser/ui/table_view/cells/table_view_signin_promo_item.mm

@@ -58,8 +58,7 @@ const CGFloat kMargin = 16;
   self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
   if (self) {
     SigninPromoView* signinPromoView =
-        [[SigninPromoView alloc] initWithFrame:CGRectZero
-                                         style:SigninPromoViewUIRefresh];
+        [[SigninPromoView alloc] initWithFrame:CGRectZero];
     self.signinPromoView = signinPromoView;
     self.signinPromoView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.contentView addSubview:self.signinPromoView];