[Payment Request] Generic edit form

ios/chrome/browser/payments/payment_request_edit_view_controller.mm

Index: ios/chrome/browser/payments/payment_request_edit_view_controller.mm
diff --git a/ios/chrome/browser/payments/payment_request_edit_view_controller.mm b/ios/chrome/browser/payments/payment_request_edit_view_controller.mm
new file mode 100644
index 0000000000000000000000000000000000000000..ab8ebcf22c6ff90853947e6e280b0c2bbf20bca2
--- /dev/null
+++ b/ios/chrome/browser/payments/payment_request_edit_view_controller.mm
@@ -0,0 +1,502 @@
+// 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/payments/payment_request_edit_view_controller.h"
+
+#include "base/logging.h"
+#import "base/mac/foundation_util.h"
+#include "base/strings/sys_string_conversions.h"
+#include "components/autofill/core/browser/field_types.h"
+#include "components/strings/grit/components_strings.h"
+#import "ios/chrome/browser/payments/cells/payments_text_item.h"
+#import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
+#import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h"
+#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
+#import "ios/chrome/browser/ui/settings/autofill_edit_accessory_view.h"
+#import "ios/chrome/browser/ui/uikit_ui_util.h"
+#include "ios/chrome/grit/ios_theme_resources.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 {
+
+NSString* const kPaymentRequestEditCollectionViewID =
+    @"kPaymentRequestEditCollectionViewID";
+
+const CGFloat kSeparatorEdgeInset = 14;
+
+const CGFloat kFooterCellHorizontalPadding = 16;
+
+AutofillEditCell* AutofillEditCellForTextField(UITextField* textField) {
+  for (UIView* view = textField; view; view = [view superview]) {
+    AutofillEditCell* cell = base::mac::ObjCCast<AutofillEditCell>(view);
+    if (cell)
+      return cell;
+  }
+
+  // There has to be a cell associated with this text field.
+  NOTREACHED();
+  return nil;
+}
+
+typedef NS_ENUM(NSInteger, SectionIdentifier) {
+  SectionIdentifierFooter = kSectionIdentifierEnumZero,
+  SectionIdentifierFirstTextField,
+};
+
+typedef NS_ENUM(NSInteger, ItemType) {
+  ItemTypeFooter = kItemTypeEnumZero,
+  ItemTypeTextField,     // This is a repeated item type.
+  ItemTypeErrorMessage,  // This is a repeated item type.
+};
+
+}  // namespace
+
+@implementation EditorField
+
+@synthesize autofillType = _autofillType;
+@synthesize label = _label;
+@synthesize value = _value;
+@synthesize required = _required;
+@synthesize item = _item;
+@synthesize sectionIdentifier = _sectionIdentifier;
+
+- (instancetype)initWithAutofillType:(NSInteger)autofillType
+                               label:(NSString*)label
+                               value:(NSString*)value
+                            required:(BOOL)required {
+  self = [super init];
+  if (self) {
+    _autofillType = autofillType;
+    _label = label;
+    _value = value;
+    _required = required;
+  }
+  return self;
+}
+
+@end
+
+@interface PaymentRequestEditViewController ()<AutofillEditAccessoryDelegate> {
+  UIBarButtonItem* _cancelButton;

[lpromero, 2017/03/22 10:51:33]

I don't think you need ivars.

[Moe, 2017/03/22 17:54:32]

Done.

+  UIBarButtonItem* _doneButton;
+
+  NSArray<EditorField*>* _fields;
+
+  // The currently focused cell. May be nil.
+  __weak AutofillEditCell* _currentEditingCell;
+
+  AutofillEditAccessoryView* _accessoryView;
+}
+
+// Returns the indexPath for the same row as that of |indexPath| in a section
+// with the given offset relative to that of |indexPath|. May return nil.
+- (NSIndexPath*)indexPathWithSectionOffset:(NSInteger)offset
+                                  fromPath:(NSIndexPath*)indexPath;
+
+// Returns the text field with the given offset relative to the currently
+// focused text field. May return nil.
+- (AutofillEditCell*)nextTextFieldWithOffset:(NSInteger)offset;
+
+// Enables or disables the accessory view's previous and next buttons depending
+// on whether there is a text field before and after the currently focused text
+// field.
+- (void)updateAccessoryViewButtonsStates;
+
+@end
+
+@implementation PaymentRequestEditViewController
+
+@synthesize editorDelegate = _editorDelegate;
+@synthesize validatorDelegate = _validatorDelegate;
+
+- (instancetype)initWithEditorFields:(NSArray<EditorField*>*)fields {
+  self = [super initWithStyle:CollectionViewControllerStyleAppBar];
+  if (self) {
+    _fields = fields;
+
+    // Set self as the validator delegate.
+    _validatorDelegate = self;
+
+    // Set up leading (cancel) button.
+    _cancelButton = [[UIBarButtonItem alloc]
+        initWithTitle:l10n_util::GetNSString(IDS_CANCEL)
+                style:UIBarButtonItemStylePlain
+               target:nil
+               action:@selector(onReturn)];
+    [_cancelButton setTitleTextAttributes:@{
+      NSForegroundColorAttributeName : [UIColor lightGrayColor]
+    }
+                                 forState:UIControlStateDisabled];
+    [_cancelButton
+        setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_CANCEL)];
+    [self navigationItem].leftBarButtonItem = _cancelButton;
+
+    // Set up trailing (done) button.
+    _doneButton =
+        [[UIBarButtonItem alloc] initWithTitle:l10n_util::GetNSString(IDS_DONE)
+                                         style:UIBarButtonItemStylePlain
+                                        target:nil
+                                        action:@selector(onDone)];
+    [_doneButton setTitleTextAttributes:@{
+      NSForegroundColorAttributeName : [UIColor lightGrayColor]
+    }
+                               forState:UIControlStateDisabled];
+    [_doneButton
+        setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_DONE)];
+    [self navigationItem].rightBarButtonItem = _doneButton;
+
+    _accessoryView = [[AutofillEditAccessoryView alloc] initWithDelegate:self];

[lpromero, 2017/03/22 10:51:33]

You could also load the model, since it only needs the _fields.

[Moe, 2017/03/22 17:54:32]

Good point. For consistency with the other view controllers, I suggest we have
the coordinator call that. Moreover, subclasses will need more things so we
won't end up calling loadModel twice that way.

+  }
+  return self;
+}
+
+#pragma mark - PaymentRequestEditViewControllerActions methods
+
+- (void)onReturn {
+  [_editorDelegate paymentRequestEditViewControllerDidReturn:self];
+}
+
+- (void)onDone {
+  if ([self validateForm]) {
+    [_editorDelegate paymentRequestEditViewController:self
+                               didFinishEditingFields:_fields];
+  }
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+  [super viewDidAppear:animated];
+  [[NSNotificationCenter defaultCenter]
+      addObserver:self
+         selector:@selector(keyboardDidShow)
+             name:UIKeyboardDidShowNotification
+           object:nil];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+  [super viewWillDisappear:animated];
+  [[NSNotificationCenter defaultCenter]
+      removeObserver:self
+                name:UIKeyboardDidShowNotification
+              object:nil];
+}
+
+#pragma mark - CollectionViewController methods
+
+- (void)loadModel {
+  [super loadModel];
+  CollectionViewModel* model = self.collectionViewModel;
+
+  // Iterate over the fields and add the respective sections and items.
+  int sectionIdentifier = static_cast<int>(SectionIdentifierFirstTextField);
+  for (EditorField* field in _fields) {
+    [model addSectionWithIdentifier:sectionIdentifier];
+    AutofillEditItem* item =
+        [[AutofillEditItem alloc] initWithType:ItemTypeTextField];
+    item.textFieldName = field.label;
+    item.textFieldEnabled = YES;
+    item.textFieldValue = field.value;
+    item.required = field.isRequired;
+    item.autofillType =
+        static_cast<autofill::ServerFieldType>(field.autofillType);
+    [model addItem:item
+        toSectionWithIdentifier:static_cast<NSInteger>(sectionIdentifier)];
+    field.item = item;
+    field.sectionIdentifier = static_cast<NSInteger>(sectionIdentifier++);

[lpromero, 2017/03/22 10:51:33]

Move the sectionIdentifier incrementation to its own line.

[Moe, 2017/03/22 17:54:32]

Done.

+  }
+
+  [self loadFooterItems];
+}
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+
+  self.collectionView.accessibilityIdentifier =
+      kPaymentRequestEditCollectionViewID;
+
+  // Customize collection view settings.
+  self.styler.cellStyle = MDCCollectionViewCellStyleCard;
+  self.styler.separatorInset =
+      UIEdgeInsetsMake(0, kSeparatorEdgeInset, 0, kSeparatorEdgeInset);
+}
+
+#pragma mark - UITextFieldDelegate
+
+- (void)textFieldDidBeginEditing:(UITextField*)textField {
+  _currentEditingCell = AutofillEditCellForTextField(textField);
+  [textField setInputAccessoryView:_accessoryView];
+  [self updateAccessoryViewButtonsStates];
+}
+
+- (void)textFieldDidEndEditing:(UITextField*)textField {
+  DCHECK(_currentEditingCell == AutofillEditCellForTextField(textField));
+
+  // Validate the text field.
+  CollectionViewModel* model = self.collectionViewModel;
+
+  NSIndexPath* indexPath = [self indexPathForCurrentTextField];
+  AutofillEditItem* item = base::mac::ObjCCastStrict<AutofillEditItem>(
+      [model itemAtIndexPath:indexPath]);
+
+  NSString* errorMessage =
+      [_validatorDelegate paymentRequestEditViewController:self
+                                             validateValue:textField.text
+                                              autofillType:item.autofillType
+                                                  required:item.required];
+  NSInteger sectionIdentifier =
+      [model sectionIdentifierForSection:[indexPath section]];
+  [self addOrRemoveErrorMessage:errorMessage
+        inSectionWithIdentifier:sectionIdentifier];
+
+  [textField setInputAccessoryView:nil];
+  _currentEditingCell = nil;
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField {
+  DCHECK([_currentEditingCell textField] == textField);
+  [self nextPressed];
+  return NO;

[lpromero, 2017/03/22 10:51:33]

Seems like this means that when returning from the last text field, the keyboard
is not dismissed, right. Is that a UX issue?

[Moe, 2017/03/22 17:54:32]

Oh it probably is. Changed it to dismiss the keyboard when it's the last text
field. There are other UX issues that have to be addressed in the future. like
the keyboard type or the return key type...

+}
+
+#pragma mark - AutofillEditAccessoryDelegate
+
+- (void)nextPressed {
+  AutofillEditCell* nextCell = [self nextTextFieldWithOffset:1];
+  if (nextCell)
+    [nextCell.textField becomeFirstResponder];
+}
+
+- (void)previousPressed {
+  AutofillEditCell* previousCell = [self nextTextFieldWithOffset:-1];
+  if (previousCell)
+    [previousCell.textField becomeFirstResponder];
+}
+
+- (void)closePressed {
+  [[_currentEditingCell textField] resignFirstResponder];
+}
+
+#pragma mark - UICollectionViewDataSource
+
+- (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
+                 cellForItemAtIndexPath:(NSIndexPath*)indexPath {
+  UICollectionViewCell* cell =
+      [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
+
+  if ([cell isKindOfClass:[AutofillEditCell class]]) {

[lpromero, 2017/03/22 10:51:33]

Instead of checking the cell class, why don't you do like below, checking the
item type? That way it will be on par.

Edit: oh, might be related to subclasses of this view controller?

[Moe, 2017/03/22 17:54:32]

Actually I forgot to update this after making the latest changes. This can be
done in a switch statement since it's the base class that decides the type of
the text field item. 

+    AutofillEditCell* autofillEditCell =
+        base::mac::ObjCCast<AutofillEditCell>(cell);

[lpromero, 2017/03/22 10:51:33]

Use ObjCCastStrict, since you checked the class.

[Moe, 2017/03/22 17:54:32]

Acknowledged.

+    autofillEditCell.textField.delegate = self;
+    autofillEditCell.textField.clearButtonMode = UITextFieldViewModeNever;
+    autofillEditCell.textLabel.font = [MDCTypography body2Font];
+    autofillEditCell.textLabel.textColor = [[MDCPalette greyPalette] tint900];
+    autofillEditCell.textField.font = [MDCTypography body1Font];
+    autofillEditCell.textField.textColor =
+        [[MDCPalette cr_bluePalette] tint600];
+  }
+
+  CollectionViewItem* item =
+      [self.collectionViewModel itemAtIndexPath:indexPath];
+  switch (item.type) {
+    case ItemTypeErrorMessage: {
+      PaymentsTextCell* errorMessageCell =
+          base::mac::ObjCCastStrict<PaymentsTextCell>(cell);
+      errorMessageCell.textLabel.font = [MDCTypography body1Font];
+      errorMessageCell.textLabel.textColor =
+          [[MDCPalette cr_redPalette] tint600];
+      break;
+    }
+    case ItemTypeFooter: {
+      CollectionViewFooterCell* footerCell =
+          base::mac::ObjCCastStrict<CollectionViewFooterCell>(cell);
+      footerCell.textLabel.font = [MDCTypography body2Font];
+      footerCell.textLabel.textColor = [[MDCPalette greyPalette] tint600];
+      footerCell.textLabel.shadowColor = nil;  // No shadow.
+      footerCell.horizontalPadding = kFooterCellHorizontalPadding;
+      break;
+    }
+    default:
+      break;
+  }
+
+  return cell;
+}
+
+#pragma mark MDCCollectionViewStylingDelegate
+
+- (CGFloat)collectionView:(UICollectionView*)collectionView
+    cellHeightAtIndexPath:(NSIndexPath*)indexPath {
+  CollectionViewItem* item =
+      [self.collectionViewModel itemAtIndexPath:indexPath];
+
+  if ([item isKindOfClass:[AutofillEditItem class]] ||
+      item.type == ItemTypeErrorMessage || item.type == ItemTypeFooter) {
+    return [MDCCollectionViewCell

[lpromero, 2017/03/22 10:51:33]

Seems safe to always return cr_preferred. I am thinking of having this be the
default implementation of the CollectionViewController class.

[Moe, 2017/03/22 17:54:32]

Yep. return MDCCellDefaultOneLineHeight; shouldn't be reached. However, in my
opinion it helps to keep NOTREACHED() there to avoid surprises when adding new
item types. once the transition is complete I can go back and get rid of these
type checks.

+        cr_preferredHeightForWidth:CGRectGetWidth(collectionView.bounds)
+                           forItem:item];
+  }
+
+  NOTREACHED();
+  return MDCCellDefaultOneLineHeight;
+}
+
+- (BOOL)collectionView:(UICollectionView*)collectionView
+    hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
+  NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
+  switch (type) {
+    case ItemTypeErrorMessage:
+    case ItemTypeFooter:
+      return YES;
+    default:
+      return NO;
+  }
+}
+
+- (BOOL)collectionView:(UICollectionView*)collectionView
+    shouldHideItemBackgroundAtIndexPath:(NSIndexPath*)indexPath {
+  NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
+  switch (type) {
+    case ItemTypeFooter:
+      return YES;
+    default:
+      return NO;
+  }
+}
+
+#pragma mark - Protected methods
+
+- (BOOL)validateForm {
+  for (EditorField* field in _fields) {
+    AutofillEditItem* item = field.item;
+
+    NSString* errorMessage =
+        [_validatorDelegate paymentRequestEditViewController:self
+                                               validateValue:item.textFieldValue
+                                                autofillType:field.autofillType
+                                                    required:field.isRequired];
+    [self addOrRemoveErrorMessage:errorMessage
+          inSectionWithIdentifier:field.sectionIdentifier];
+    if (errorMessage.length != 0) {
+      return NO;
+    }
+
+    field.value = item.textFieldValue;
+  }
+  return YES;
+}
+
+- (void)loadFooterItems {
+  CollectionViewModel* model = self.collectionViewModel;
+
+  [model addSectionWithIdentifier:SectionIdentifierFooter];
+  CollectionViewFooterItem* footerItem =
+      [[CollectionViewFooterItem alloc] initWithType:ItemTypeFooter];
+  footerItem.text = l10n_util::GetNSString(IDS_PAYMENTS_REQUIRED_FIELD_MESSAGE);
+  [model addItem:footerItem toSectionWithIdentifier:SectionIdentifierFooter];
+}
+
+- (NSIndexPath*)indexPathForCurrentTextField {
+  DCHECK(_currentEditingCell);
+  NSIndexPath* indexPath =
+      [[self collectionView] indexPathForCell:_currentEditingCell];
+  DCHECK(indexPath);
+  return indexPath;
+}
+
+- (void)addOrRemoveErrorMessage:(NSString*)errorMessage
+        inSectionWithIdentifier:(NSInteger)sectionIdentifier {
+  CollectionViewModel* model = self.collectionViewModel;
+  if ([model hasItemForItemType:ItemTypeErrorMessage
+              sectionIdentifier:sectionIdentifier]) {
+    NSIndexPath* indexPath = [model indexPathForItemType:ItemTypeErrorMessage
+                                       sectionIdentifier:sectionIdentifier];
+    if (errorMessage.length == 0) {
+      // Remove the item at the index path.
+      [model removeItemWithType:ItemTypeErrorMessage
+          fromSectionWithIdentifier:sectionIdentifier];
+      [self.collectionView deleteItemsAtIndexPaths:@[ indexPath ]];
+    } else {
+      // Reload the item at the index path.
+      PaymentsTextItem* item = base::mac::ObjCCastStrict<PaymentsTextItem>(
+          [model itemAtIndexPath:indexPath]);
+      item.text = errorMessage;
+      [self.collectionView reloadItemsAtIndexPaths:@[ indexPath ]];
+    }
+  } else if (errorMessage.length != 0) {
+    // Insert an item at the index path.
+    PaymentsTextItem* errorMessageItem =
+        [[PaymentsTextItem alloc] initWithType:ItemTypeErrorMessage];
+    errorMessageItem.text = errorMessage;
+    errorMessageItem.image = NativeImage(IDR_IOS_PAYMENTS_WARNING);
+    [model addItem:errorMessageItem toSectionWithIdentifier:sectionIdentifier];
+    NSIndexPath* indexPath = [model indexPathForItemType:ItemTypeErrorMessage
+                                       sectionIdentifier:sectionIdentifier];
+    [self.collectionView insertItemsAtIndexPaths:@[ indexPath ]];
+  }
+}
+
+#pragma mark - PaymentRequestEditViewControllerValidator
+
+- (NSString*)paymentRequestEditViewController:
+                 (PaymentRequestEditViewController*)controller
+                                validateValue:(NSString*)value
+                                 autofillType:(NSInteger)autofillType
+                                     required:(BOOL)required {
+  if (required && value.length == 0) {
+    return l10n_util::GetNSString(
+        IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
+  }
+  return @"";
+}
+
+#pragma mark - Helper methods
+
+- (NSIndexPath*)indexPathWithSectionOffset:(NSInteger)offset
+                                  fromPath:(NSIndexPath*)indexPath {
+  DCHECK(indexPath);
+  DCHECK(offset);
+  NSInteger nextSection = [indexPath section] + offset;
+  if (nextSection >= 0 &&
+      nextSection < [[self collectionView] numberOfSections]) {
+    return [NSIndexPath indexPathForRow:[indexPath row] inSection:nextSection];
+  }
+  return nil;
+}
+
+- (AutofillEditCell*)nextTextFieldWithOffset:(NSInteger)offset {
+  UICollectionView* collectionView = [self collectionView];
+  NSIndexPath* currentCellPath = [self indexPathForCurrentTextField];
+  DCHECK(currentCellPath);
+  NSIndexPath* nextCellPath =
+      [self indexPathWithSectionOffset:offset fromPath:currentCellPath];
+  if (nextCellPath) {
+    id nextCell = [collectionView cellForItemAtIndexPath:nextCellPath];
+    if ([nextCell isKindOfClass:[AutofillEditCell class]]) {
+      return base::mac::ObjCCastStrict<AutofillEditCell>(
+          [collectionView cellForItemAtIndexPath:nextCellPath]);
+    }
+  }
+  return nil;
+}
+
+- (void)updateAccessoryViewButtonsStates {
+  AutofillEditCell* previousCell = [self nextTextFieldWithOffset:-1];
+  [[_accessoryView previousButton] setEnabled:previousCell != nil];
+
+  AutofillEditCell* nextCell = [self nextTextFieldWithOffset:1];
+  [[_accessoryView nextButton] setEnabled:nextCell != nil];
+}
+
+#pragma mark - Keyboard handling
+
+- (void)keyboardDidShow {
+  [self.collectionView scrollRectToVisible:[_currentEditingCell frame]
+                                  animated:YES];
+}
+
+@end