Adding accessibility to the close button in sign-in promo

ios/chrome/browser/ui/authentication/signin_promo_view.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.
 
 #import "ios/chrome/browser/ui/authentication/signin_promo_view.h"
 
 #include "base/logging.h"
 #import "ios/chrome/browser/ui/authentication/signin_promo_view_delegate.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
 #import "ios/chrome/browser/ui/uikit_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)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 // Horizontal padding for label and buttons.
@@ skipping 13 matching lines @@
   NSArray<NSLayoutConstraint*>* _warmStateConstraints;
   signin_metrics::AccessPoint _accessPoint;
 }
 
 @synthesize delegate = _delegate;
 @synthesize mode = _mode;
 @synthesize imageView = _imageView;
 @synthesize textLabel = _textLabel;
 @synthesize primaryButton = _primaryButton;
 @synthesize secondaryButton = _secondaryButton;
+@synthesize closeButton = _closeButton;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
     self.isAccessibilityElement = YES;
 
     // Adding subviews.
     self.clipsToBounds = YES;
     _imageView = [[UIImageView alloc] init];
     _imageView.translatesAutoresizingMaskIntoConstraints = NO;
@@ skipping 13 matching lines @@
     [self addSubview:_primaryButton];
 
     _secondaryButton = [[MDCFlatButton alloc] init];
     _secondaryButton.translatesAutoresizingMaskIntoConstraints = NO;
     _secondaryButton.accessibilityIdentifier = @"signin_promo_secondary_button";
     [_secondaryButton addTarget:self
                          action:@selector(onSecondaryButtonAction:)
                forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:_secondaryButton];
 
+    _closeButton = [[UIButton alloc] init];
+    _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
+    _closeButton.accessibilityIdentifier = @"signin_promo_close_button";
+    [self addSubview:_closeButton];
+
     // Adding style.
     _imageView.contentMode = UIViewContentModeCenter;
     _imageView.layer.masksToBounds = YES;
     _imageView.contentMode = UIViewContentModeScaleAspectFit;
 
     _textLabel.font = [MDCTypography buttonFont];
     _textLabel.textColor = [[MDCPalette greyPalette] tint900];
     _textLabel.numberOfLines = 0;
     _textLabel.textAlignment = NSTextAlignmentCenter;
 
     [_primaryButton setBackgroundColor:[[MDCPalette cr_bluePalette] tint500]
                               forState:UIControlStateNormal];
     _primaryButton.customTitleColor = [UIColor whiteColor];
     _primaryButton.inkColor = [UIColor colorWithWhite:1 alpha:0.2];
 
     _secondaryButton.customTitleColor = [[MDCPalette cr_bluePalette] tint500];
     _secondaryButton.uppercaseTitle = NO;
 
+    [_closeButton setImage:[UIImage imageNamed:@"signin_promo_close_gray"]
+                  forState:UIControlStateNormal];
+    //    _closeButton.hidden = YES;

[lpromero, 2017/05/23 12:06:16]

Still needed? Otherwise remove.

[jlebel, 2017/05/23 12:43:26]

Done.

+
     // Adding constraints.
     NSDictionary* metrics = @{
       @"kButtonHeight" : @(kButtonHeight),
       @"kButtonVerticalPadding" : @(kButtonVerticalPadding),
       @"kButtonVerticalPaddingx2" : @(kButtonVerticalPadding * 2),
       @"kHorizontalPadding" : @(kHorizontalPadding),
       @"kVerticalPadding" : @(kVerticalPadding),
       @"kVerticalPaddingx2" : @(kVerticalPadding * 2),
       @"kVerticalPaddingkButtonVerticalPadding" :
           @(kVerticalPadding + kButtonVerticalPadding),
     };
     NSDictionary* views = @{
       @"imageView" : _imageView,
       @"primaryButton" : _primaryButton,
       @"secondaryButton" : _secondaryButton,
       @"textLabel" : _textLabel,
     };
 
     // Constraints shared between modes.
     NSString* sharedVerticalConstraints =
         @"V:|-kVerticalPaddingx2-[imageView]-kVerticalPadding-[textLabel]-"
         @"kVerticalPaddingkButtonVerticalPadding-[primaryButton(kButtonHeight)"
         @"]";
     NSArray* visualConstraints = @[
       sharedVerticalConstraints,
       @"H:|-kHorizontalPadding-[primaryButton]-kHorizontalPadding-|"
     ];
     ApplyVisualConstraintsWithMetricsAndOptions(
         visualConstraints, views, metrics, NSLayoutFormatAlignAllCenterX);
+    NSArray* buttonVisualConstraints =
+        @[ @"H:[closeButton]-|", @"V:|-[closeButton]" ];
+    ApplyVisualConstraints(buttonVisualConstraints,
+                           @{ @"closeButton" : _closeButton });
 
     // Constraints for cold state mode.
     NSArray* coldStateVisualConstraints = @[
       @"V:[primaryButton]-kVerticalPaddingkButtonVerticalPadding-|",
     ];
     _coldStateConstraints = VisualConstraintsWithMetrics(
         coldStateVisualConstraints, views, metrics);
 
     // Constraints for warm state mode.
     NSString* warmStateVerticalConstraints =
@@ skipping 59 matching lines @@
 }
 
 - (void)accessibilityPrimaryAction:(id)unused {
   [_primaryButton sendActionsForControlEvents:UIControlEventTouchUpInside];
 }
 
 - (void)accessibilitySecondaryAction:(id)unused {
   [_secondaryButton sendActionsForControlEvents:UIControlEventTouchUpInside];
 }
 
+- (void)accessibilityCloseAction:(id)unused {
+  [_closeButton sendActionsForControlEvents:UIControlEventTouchUpInside];
+}
+
 - (CGFloat)horizontalPadding {
   return kHorizontalPadding;
 }
 
 - (void)onPrimaryButtonAction:(id)unused {
   switch (_mode) {
     case SigninPromoViewModeColdState:
       [_delegate signinPromoViewDidTapSigninWithNewAccount:self];
       break;
     case SigninPromoViewModeWarmState:
       [_delegate signinPromoViewDidTapSigninWithDefaultAccount:self];
       break;
   }
 }
 
 - (void)onSecondaryButtonAction:(id)unused {
   [_delegate signinPromoViewDidTapSigninWithOtherAccount:self];
 }
 
 #pragma mark - NSObject(Accessibility)
 
 - (NSArray<UIAccessibilityCustomAction*>*)accessibilityCustomActions {
+  NSMutableArray* actions = [NSMutableArray array];
+
   NSString* primaryActionName =
       [_primaryButton titleForState:UIControlStateNormal];
   UIAccessibilityCustomAction* primaryCustomAction =
       [[UIAccessibilityCustomAction alloc]
           initWithName:primaryActionName
                 target:self
               selector:@selector(accessibilityPrimaryAction:)];
-  if (_mode == SigninPromoViewModeColdState) {
-    return @[ primaryCustomAction ];
+  [actions addObject:primaryCustomAction];
+
+  if (_mode == SigninPromoViewModeWarmState) {
+    NSString* secondaryActionName =
+        [_secondaryButton titleForState:UIControlStateNormal];
+    UIAccessibilityCustomAction* secondaryCustomAction =
+        [[UIAccessibilityCustomAction alloc]
+            initWithName:secondaryActionName
+                  target:self
+                selector:@selector(accessibilitySecondaryAction:)];
+    [actions addObject:secondaryCustomAction];
   }
-  NSString* secondaryActionName =
-      [_secondaryButton titleForState:UIControlStateNormal];
-  UIAccessibilityCustomAction* secondaryCustomAction =
+
+  NSString* closeActionName =
+      l10n_util::GetNSString(IDS_IOS_SIGNIN_PROMO_CLOSE_ACCESSIBILITY);
+  UIAccessibilityCustomAction* closeCustomAction =
       [[UIAccessibilityCustomAction alloc]
-          initWithName:secondaryActionName
+          initWithName:closeActionName
                 target:self
-              selector:@selector(accessibilitySecondaryAction:)];
-  return @[ primaryCustomAction, secondaryCustomAction ];
+              selector:@selector(accessibilityCloseAction:)];
+  [actions addObject:closeCustomAction];
+
+  return actions;
 }
 
 - (NSString*)accessibilityLabel {
   return _textLabel.text;
 }
 
 @end