[iOS] Convert AutofillProfileEditCollectionVC to UITableView

This CL converts the ViewController, keeping the same features.

Bug: 894791
Change-Id: I8cd336a878d42d6a69bed10e3b22c56d842e5c0d
Reviewed-on: https://chromium-review.googlesource.com/c/1345974
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Chris Lu <thegreenfrog@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611661}

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

@@ -20,8 +20,8 @@ source_set("settings") {
     "autofill_edit_table_view_controller.mm",
     "autofill_profile_collection_view_controller.h",
     "autofill_profile_collection_view_controller.mm",
-    "autofill_profile_edit_collection_view_controller.h",
-    "autofill_profile_edit_collection_view_controller.mm",
+    "autofill_profile_edit_table_view_controller.h",
+    "autofill_profile_edit_table_view_controller.mm",
     "bandwidth_management_table_view_controller.h",
     "bandwidth_management_table_view_controller.mm",
     "bar_button_activity_indicator.h",
@@ -273,7 +273,7 @@ source_set("unit_tests") {
     "about_chrome_table_view_controller_unittest.mm",
     "autofill_credit_card_collection_view_controller_unittest.mm",
     "autofill_profile_collection_view_controller_unittest.mm",
-    "autofill_profile_edit_collection_view_controller_unittest.mm",
+    "autofill_profile_edit_table_view_controller_unittest.mm",
     "bandwidth_management_table_view_controller_unittest.mm",
     "block_popups_table_view_controller_unittest.mm",
     "clear_browsing_data_collection_view_controller_unittest.mm",

ios/chrome/browser/ui/settings/autofill_edit_table_view_controller.mm

@@ -31,9 +31,13 @@
   }
 
   _accessoryView = [[AutofillEditAccessoryView alloc] initWithDelegate:self];
+  return self;
+}
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
   [self setShouldHideDoneButton:YES];
   [self updateEditButton];
-  return self;
 }
 
 - (void)viewDidAppear:(BOOL)animated {

ios/chrome/browser/ui/settings/autofill_profile_collection_view_controller.mm

@@ -19,7 +19,7 @@
 #include "ios/chrome/browser/ui/collection_view/cells/collection_view_cell_constants.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
-#import "ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_edit_table_view_controller.h"
 #import "ios/chrome/browser/ui/settings/cells/autofill_data_item.h"
 #import "ios/chrome/browser/ui/settings/cells/legacy/legacy_settings_switch_item.h"
 #import "ios/chrome/browser/ui/settings/cells/settings_text_item.h"
@@ -319,8 +319,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
   const std::vector<autofill::AutofillProfile*> autofillProfiles =
       _personalDataManager->GetProfiles();
-  AutofillProfileEditCollectionViewController* controller =
-      [AutofillProfileEditCollectionViewController
+  AutofillProfileEditTableViewController* controller =
+      [AutofillProfileEditTableViewController
           controllerWithProfile:*autofillProfiles[indexPath.item]
             personalDataManager:_personalDataManager];
   controller.dispatcher = self.dispatcher;

ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.h → ios/chrome/browser/ui/settings/autofill_profile_edit_table_view_controller.h

@@ -2,31 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_EDIT_COLLECTION_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_EDIT_COLLECTION_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_EDIT_TABLE_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_EDIT_TABLE_VIEW_CONTROLLER_H_
 
-#import "ios/chrome/browser/ui/settings/legacy_autofill_edit_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_edit_table_view_controller.h"
 
 namespace autofill {
 class AutofillProfile;
 class PersonalDataManager;
 }  // namespace autofill
 
-extern NSString* const kAutofillProfileEditCollectionViewId;
+extern NSString* const kAutofillProfileEditTableViewId;
 
-// The collection view for the Autofill settings.
-@interface AutofillProfileEditCollectionViewController
-    : LegacyAutofillEditCollectionViewController
+// The table view for the Autofill profile edit settings.
+@interface AutofillProfileEditTableViewController
+    : AutofillEditTableViewController
 
 // Creates a controller for |profile| and |dataManager| that cannot be null.
 + (instancetype)controllerWithProfile:(const autofill::AutofillProfile&)profile
                   personalDataManager:
                       (autofill::PersonalDataManager*)dataManager;
 
-- (instancetype)initWithLayout:(UICollectionViewLayout*)layout
-                         style:(CollectionViewControllerStyle)style
+- (instancetype)initWithTableViewStyle:(UITableViewStyle)style
+                           appBarStyle:
+                               (ChromeTableViewControllerStyle)appBarStyle
     NS_UNAVAILABLE;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_EDIT_COLLECTION_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_PROFILE_EDIT_TABLE_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller.mm → ios/chrome/browser/ui/settings/autofill_profile_edit_table_view_controller.mm

@@ -2,7 +2,7 @@
 // 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/settings/autofill_profile_edit_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_edit_table_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/stl_util.h"
@@ -14,10 +14,10 @@
 #include "ios/chrome/browser/application_context.h"
 #import "ios/chrome/browser/ui/autofill/autofill_ui_type.h"
 #import "ios/chrome/browser/ui/autofill/autofill_ui_type_util.h"
-#import "ios/chrome/browser/ui/autofill/cells/legacy_autofill_edit_item.h"
-#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
+#import "ios/chrome/browser/ui/autofill/cells/autofill_edit_item.h"
 #include "ios/chrome/browser/ui/commands/application_commands.h"
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
+#import "ios/chrome/browser/ui/table_view/table_view_model.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
@@ -26,8 +26,8 @@
 #error "This file requires ARC support."
 #endif
 
-NSString* const kAutofillProfileEditCollectionViewId =
-    @"kAutofillProfileEditCollectionViewId";
+NSString* const kAutofillProfileEditTableViewId =
+    @"kAutofillProfileEditTableViewId";
 
 namespace {
 using ::AutofillTypeFromAutofillUIType;
@@ -73,9 +73,9 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
 
 }  // namespace
 
-@interface AutofillProfileEditCollectionViewController ()
+@interface AutofillProfileEditTableViewController ()
 
-// Initializes a AutofillProfileEditCollectionViewController with |profile| and
+// Initializes a AutofillProfileEditTableViewController with |profile| and
 // |dataManager|.
 - (instancetype)initWithProfile:(const autofill::AutofillProfile&)profile
             personalDataManager:(autofill::PersonalDataManager*)dataManager
@@ -83,7 +83,7 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
 
 @end
 
-@implementation AutofillProfileEditCollectionViewController {
+@implementation AutofillProfileEditTableViewController {
   autofill::PersonalDataManager* _personalDataManager;  // weak
   autofill::AutofillProfile _autofillProfile;
 }
@@ -94,19 +94,14 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
             personalDataManager:(autofill::PersonalDataManager*)dataManager {
   DCHECK(dataManager);
 
-  UICollectionViewLayout* layout = [[MDCCollectionViewFlowLayout alloc] init];
   self =
-      [super initWithLayout:layout style:CollectionViewControllerStyleAppBar];
+      [super initWithTableViewStyle:UITableViewStyleGrouped
+                        appBarStyle:ChromeTableViewControllerStyleWithAppBar];
   if (self) {
     _personalDataManager = dataManager;
     _autofillProfile = profile;
 
-    [self setCollectionViewAccessibilityIdentifier:
-              kAutofillProfileEditCollectionViewId];
     [self setTitle:l10n_util::GetNSString(IDS_IOS_AUTOFILL_EDIT_ADDRESS)];
-    // TODO(crbug.com/764578): -loadModel should not be called from
-    // initializer. A possible fix is to move this call to -viewDidLoad.
-    [self loadModel];
   }
 
   return self;
@@ -118,7 +113,15 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
   return [[self alloc] initWithProfile:profile personalDataManager:dataManager];
 }
 
-#pragma mark - SettingsRootCollectionViewController
+- (void)viewDidLoad {
+  [super viewDidLoad];
+
+  self.tableView.allowsSelectionDuringEditing = YES;
+  self.tableView.accessibilityIdentifier = kAutofillProfileEditTableViewId;
+  [self loadModel];
+}
+
+#pragma mark - SettingsRootTableViewController
 
 - (void)editButtonPressed {
   // In the case of server profiles, open the Payments editing page instead.
@@ -136,8 +139,8 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
 
   [super editButtonPressed];
 
-  if (!self.editor.editing) {
-    CollectionViewModel* model = self.collectionViewModel;
+  if (!self.tableView.editing) {
+    TableViewModel* model = self.tableViewModel;
     NSInteger itemCount =
         [model numberOfItemsInSection:
                    [model sectionForSectionIdentifier:SectionIdentifierFields]];
@@ -147,11 +150,10 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
     NSInteger section =
         [model sectionForSectionIdentifier:SectionIdentifierFields];
     for (NSInteger itemIndex = 0; itemIndex < itemCount; ++itemIndex) {
-      NSIndexPath* path =
-          [NSIndexPath indexPathForItem:itemIndex inSection:section];
-      LegacyAutofillEditItem* item =
-          base::mac::ObjCCastStrict<LegacyAutofillEditItem>(
-              [model itemAtIndexPath:path]);
+      NSIndexPath* path = [NSIndexPath indexPathForItem:itemIndex
+                                              inSection:section];
+      AutofillEditItem* item = base::mac::ObjCCastStrict<AutofillEditItem>(
+          [model itemAtIndexPath:path]);
       autofill::ServerFieldType serverFieldType =
           AutofillTypeFromAutofillUIType(item.autofillUIType);
       if (item.autofillUIType == AutofillUITypeProfileHomeAddressCountry) {
@@ -172,26 +174,25 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
   [self loadModel];
   // Update the cells.
   [self reconfigureCellsForItems:
-            [self.collectionViewModel
+            [self.tableViewModel
                 itemsInSectionWithIdentifier:SectionIdentifierFields]];
 }
 
 - (void)loadModel {
   [super loadModel];
-  CollectionViewModel* model = self.collectionViewModel;
+  TableViewModel* model = self.tableViewModel;
 
   std::string locale = GetApplicationContext()->GetApplicationLocale();
   [model addSectionWithIdentifier:SectionIdentifierFields];
   for (size_t i = 0; i < base::size(kFieldsToDisplay); ++i) {
     const AutofillFieldDisplayInfo& field = kFieldsToDisplay[i];
-    LegacyAutofillEditItem* item =
-        [[LegacyAutofillEditItem alloc] initWithType:ItemTypeField];
-    item.cellStyle = CollectionViewCellStyle::kUIKit;
+    AutofillEditItem* item =
+        [[AutofillEditItem alloc] initWithType:ItemTypeField];
     item.textFieldName = l10n_util::GetNSString(field.displayStringID);
     item.textFieldValue = base::SysUTF16ToNSString(_autofillProfile.GetInfo(
         autofill::AutofillType(field.autofillType), locale));
     item.autofillUIType = AutofillUITypeFromAutofillType(field.autofillType);
-    item.textFieldEnabled = self.editor.editing;
+    item.textFieldEnabled = self.tableView.editing;
     item.autoCapitalizationType = field.autoCapitalizationType;
     item.returnKeyType = field.returnKeyType;
     item.keyboardType = field.keyboardType;
@@ -199,48 +200,37 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
   }
 }
 
-#pragma mark - MDCCollectionViewEditingDelegate
+#pragma mark - UITableViewDataSource
 
-- (BOOL)collectionViewAllowsEditing:(UICollectionView*)collectionView {
-  // The collection view needs to allow editing in order to respond to the Edit
-  // button.
-  return YES;
-}
+- (UITableViewCell*)tableView:(UITableView*)tableView
+        cellForRowAtIndexPath:(NSIndexPath*)indexPath {
+  UITableViewCell* cell = [super tableView:tableView
+                     cellForRowAtIndexPath:indexPath];
 
-- (BOOL)collectionView:(UICollectionView*)collectionView
-    canEditItemAtIndexPath:(NSIndexPath*)indexPath {
-  // Items in this collection view are not deletable, so should not be seen
-  // as editable by the collection view.
-  return NO;
-}
+  cell.selectionStyle = UITableViewCellSelectionStyleNone;
 
-#pragma mark - UICollectionViewDataSource
-
-- (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
-                 cellForItemAtIndexPath:(NSIndexPath*)indexPath {
-  UICollectionViewCell* cell =
-      [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
-
-  LegacyAutofillEditCell* textFieldCell =
-      base::mac::ObjCCastStrict<LegacyAutofillEditCell>(cell);
+  AutofillEditCell* textFieldCell =
+      base::mac::ObjCCastStrict<AutofillEditCell>(cell);
   textFieldCell.accessibilityIdentifier = textFieldCell.textLabel.text;
   textFieldCell.textField.delegate = self;
   return textFieldCell;
 }
 
-#pragma mark - UICollectionViewDelegate
-
-- (BOOL)collectionView:(UICollectionView*)collectionView
-    shouldSelectItemAtIndexPath:(NSIndexPath*)indexPath {
-  if (self.editor.editing) {
-    UICollectionViewCell* cell =
-        [self.collectionView cellForItemAtIndexPath:indexPath];
-    LegacyAutofillEditCell* textFieldCell =
-        base::mac::ObjCCastStrict<LegacyAutofillEditCell>(cell);
+- (void)tableView:(UITableView*)tableView
+    didSelectRowAtIndexPath:(NSIndexPath*)indexPath {
+  if (self.tableView.editing) {
+    UITableViewCell* cell = [self.tableView cellForRowAtIndexPath:indexPath];
+    AutofillEditCell* textFieldCell =
+        base::mac::ObjCCastStrict<AutofillEditCell>(cell);
     [textFieldCell.textField becomeFirstResponder];
   }
-  return [super collectionView:collectionView
-      shouldSelectItemAtIndexPath:indexPath];
+}
+
+- (BOOL)tableView:(UITableView*)tableView
+    canEditRowAtIndexPath:(NSIndexPath*)indexPath {
+  // Items in this collection view are not deletable, so should not be seen
+  // as editable by the table view.
+  return NO;
 }
 
 @end

ios/chrome/browser/ui/settings/autofill_profile_edit_collection_view_controller_unittest.mm → ios/chrome/browser/ui/settings/autofill_profile_edit_table_view_controller_unittest.mm

@@ -2,7 +2,7 @@
 // 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/settings/autofill_profile_edit_collection_view_controller.h"
+#import "ios/chrome/browser/ui/settings/autofill_profile_edit_table_view_controller.h"
 
 #include <memory>
 
@@ -14,8 +14,8 @@
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #include "ios/chrome/browser/ui/settings/personal_data_manager_data_changed_observer.h"
+#import "ios/chrome/browser/ui/table_view/table_view_model.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/platform_test.h"
 
@@ -46,9 +46,9 @@ static NSArray* FindTextFieldDescendants(UIView* root) {
   return textFields;
 }
 
-class AutofillProfileEditCollectionViewControllerTest : public PlatformTest {
+class AutofillProfileEditTableViewControllerTest : public PlatformTest {
  protected:
-  AutofillProfileEditCollectionViewControllerTest() {
+  AutofillProfileEditTableViewControllerTest() {
     TestChromeBrowserState::Builder test_cbs_builder;
     chrome_browser_state_ = test_cbs_builder.Build();
     chrome_browser_state_->CreateWebDataService();
@@ -70,44 +70,40 @@ class AutofillProfileEditCollectionViewControllerTest : public PlatformTest {
     personal_data_manager_->SaveImportedProfile(autofill_profile);
     observer.Wait();  // Wait for the completion of the asynchronous operation.
 
-    autofill_profile_edit_controller_ =
-        [AutofillProfileEditCollectionViewController
-            controllerWithProfile:autofill_profile
-              personalDataManager:personal_data_manager_];
+    autofill_profile_edit_controller_ = [AutofillProfileEditTableViewController
+        controllerWithProfile:autofill_profile
+          personalDataManager:personal_data_manager_];
+
+    // Load the view to force the loading of the model.
+    [autofill_profile_edit_controller_ loadViewIfNeeded];
   }
 
   web::TestWebThreadBundle thread_bundle_;
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
   autofill::PersonalDataManager* personal_data_manager_;
-  AutofillProfileEditCollectionViewController*
-      autofill_profile_edit_controller_;
+  AutofillProfileEditTableViewController* autofill_profile_edit_controller_;
 };
 
 // Default test case of no addresses or credit cards.
-TEST_F(AutofillProfileEditCollectionViewControllerTest, TestInitialization) {
-  CollectionViewModel* model =
-      [autofill_profile_edit_controller_ collectionViewModel];
+TEST_F(AutofillProfileEditTableViewControllerTest, TestInitialization) {
+  TableViewModel* model = [autofill_profile_edit_controller_ tableViewModel];
 
   EXPECT_EQ(1, [model numberOfSections]);
   EXPECT_EQ(10, [model numberOfItemsInSection:0]);
 }
 
 // Adding a single address results in an address section.
-TEST_F(AutofillProfileEditCollectionViewControllerTest, TestOneProfile) {
-  CollectionViewModel* model =
-      [autofill_profile_edit_controller_ collectionViewModel];
-  UICollectionView* collectionView =
-      [autofill_profile_edit_controller_ collectionView];
+TEST_F(AutofillProfileEditTableViewControllerTest, TestOneProfile) {
+  TableViewModel* model = [autofill_profile_edit_controller_ tableViewModel];
+  UITableView* tableView = [autofill_profile_edit_controller_ tableView];
 
   EXPECT_EQ(1, [model numberOfSections]);
   EXPECT_EQ(10, [model numberOfItemsInSection:0]);
 
   NSIndexPath* path = [NSIndexPath indexPathForRow:0 inSection:0];
 
-  UIView* cell =
-      [autofill_profile_edit_controller_ collectionView:collectionView
-                                 cellForItemAtIndexPath:path];
-  EXPECT_TRUE([cell isKindOfClass:[MDCCollectionViewCell class]]);
+  UIView* cell = [autofill_profile_edit_controller_ tableView:tableView
+                                        cellForRowAtIndexPath:path];
 
   NSArray* textFields = FindTextFieldDescendants(cell);
   EXPECT_TRUE([textFields count] > 0);
@@ -117,9 +113,8 @@ TEST_F(AutofillProfileEditCollectionViewControllerTest, TestOneProfile) {
       [[field text] isEqualToString:base::SysUTF8ToNSString(kTestFullName)]);
 
   path = [NSIndexPath indexPathForRow:2 inSection:0];
-  cell = [autofill_profile_edit_controller_ collectionView:collectionView
-                                    cellForItemAtIndexPath:path];
-  EXPECT_TRUE([cell isKindOfClass:[MDCCollectionViewCell class]]);
+  cell = [autofill_profile_edit_controller_ tableView:tableView
+                                cellForRowAtIndexPath:path];
   textFields = FindTextFieldDescendants(cell);
   EXPECT_TRUE([textFields count] > 0);
   field = [textFields objectAtIndex:0];