Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: ios/chrome/browser/ui/authentication/signin_promo_view.mm

Issue 2778073002: Adding VisualConstraintsWithMetricsAndOptions() (Closed)
Patch Set: Merge + fix Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/ui/uikit_ui_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/authentication/signin_promo_view.mm
diff --git a/ios/chrome/browser/ui/authentication/signin_promo_view.mm b/ios/chrome/browser/ui/authentication/signin_promo_view.mm
index f84337bc602c4bab37ed276f4500bb11693229d9..ede5c03314df20fe0cf8690089d47ebc21654ae0 100644
--- a/ios/chrome/browser/ui/authentication/signin_promo_view.mm
+++ b/ios/chrome/browser/ui/authentication/signin_promo_view.mm
@@ -117,47 +117,23 @@ const CGFloat kButtonHeight = 36;
visualConstraints, views, metrics, NSLayoutFormatAlignAllCenterX);
// Constraints for cold state mode.
- NSMutableArray* constraints = [NSMutableArray array];
- NSString* primaryButtonVerticalConstraint =
- @"V:[primaryButton]-kVerticalPaddingkButtonVerticalPadding-|";
- [constraints addObjectsFromArray:[NSLayoutConstraint
- constraintsWithVisualFormat:
- primaryButtonVerticalConstraint
- options:0
- metrics:metrics
- views:views]];
- // Remove this rule once chrome image is added.
- NSString* imageViewVerticalSizeConstraint =
- @"V:[imageView(kChromeImageFixedSize)]";
- [constraints addObjectsFromArray:[NSLayoutConstraint
- constraintsWithVisualFormat:
- imageViewVerticalSizeConstraint
- options:0
- metrics:metrics
- views:views]];
- _coldStateConstraints = [constraints copy];
+ NSArray* coldStateVisualConstraints = @[
+ @"V:[primaryButton]-kVerticalPaddingkButtonVerticalPadding-|",
+ @"V:[imageView(kChromeImageFixedSize)]",
+ ];
+ _coldStateConstraints = VisualConstraintsWithMetrics(
+ coldStateVisualConstraints, views, metrics);
// Constraints for warm state mode.
- constraints = [NSMutableArray array];
- NSString* buttonsVerticalConstraint =
- @"V:[primaryButton]-kButtonVerticalPaddingx2-["
- "secondaryButton(kButtonHeight)]-"
- "kVerticalPaddingkButtonVerticalPadding-|";
- [constraints addObjectsFromArray:
- [NSLayoutConstraint
- constraintsWithVisualFormat:buttonsVerticalConstraint
- options:0
- metrics:metrics
- views:views]];
- NSString* secondaryButtonHorizontalConstraint =
- @"H:|-kHorizontalPadding-[secondaryButton]-kHorizontalPadding-|";
- [constraints addObjectsFromArray:[NSLayoutConstraint
- constraintsWithVisualFormat:
- secondaryButtonHorizontalConstraint
- options:0
- metrics:metrics
- views:views]];
- _warmStateConstraints = [constraints copy];
+ formatString = @"V:[primaryButton]-kButtonVerticalPaddingx2-["
+ "secondaryButton(kButtonHeight)]-"
+ "kVerticalPaddingkButtonVerticalPadding-|";
+ NSArray* warmStateVisualConstraints = @[
+ formatString,
+ @"H:|-kHorizontalPadding-[secondaryButton]-kHorizontalPadding-|",
+ ];
+ _warmStateConstraints = VisualConstraintsWithMetrics(
+ warmStateVisualConstraints, views, metrics);
_mode = SigninPromoViewModeColdState;
[self activateColdMode];
« no previous file with comments | « no previous file | ios/chrome/browser/ui/uikit_ui_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698