[iOS] Replacing Back button with Cancel during editing

This change replace back button with cancel during editing.

Bug: 1146127
Change-Id: I7feed5cdc201d2239d0dd957119a31330f5b23ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526085
Commit-Queue: Viktor Semeniuk <vsemeniuk@google.com>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831082}

ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm

@@ -133,8 +133,10 @@ typedef NS_ENUM(NSInteger, ReauthenticationReason) {
   if (self.tableView.editing) {
     // If password or username value was changed show confirmation dialog before
     // saving password. Editing mode will be exited only if user confirm saving.
-    if (self.password.password != self.passwordTextItem.textFieldValue ||
-        self.password.username != self.usernameTextItem.textFieldValue) {
+    if (![self.password.password
+            isEqualToString:self.passwordTextItem.textFieldValue] ||
+        ![self.password.username
+            isEqualToString:self.usernameTextItem.textFieldValue]) {
       [self.handler showPasswordEditDialogWithOrigin:self.password.origin];
     } else {
       [self passwordEditingConfirmed];
@@ -185,6 +187,10 @@ typedef NS_ENUM(NSInteger, ReauthenticationReason) {
   }
 }
 
+- (BOOL)showCancelDuringEditing {
+  return YES;
+}
+
 #pragma mark - Items
 
 - (TableViewTextEditItem*)websiteItem {

ios/chrome/browser/ui/settings/password/passwords_settings_egtest.mm

@@ -49,6 +49,7 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(PasswordSettingsAppInterface);
 
 using chrome_test_util::ButtonWithAccessibilityLabel;
 using chrome_test_util::ButtonWithAccessibilityLabelId;
+using chrome_test_util::NavigationBarCancelButton;
 using chrome_test_util::NavigationBarDoneButton;
 using chrome_test_util::SettingsDoneButton;
 using chrome_test_util::SettingsMenuBackButton;
@@ -691,20 +692,10 @@ void CopyPasswordDetailWithID(int detail_id) {
 
   [[EarlGrey selectElementWithMatcher:DeleteButton()] performAction:grey_tap()];
 
-  // Tap the alert's Cancel button to cancel.
-  if ([ChromeEarlGrey isIPadIdiom]) {
-    [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
-                                            kPasswordDetailsTableViewId)]
-        performAction:grey_tap()];
-  } else {
-    [[EarlGrey
-        selectElementWithMatcher:grey_allOf(
-                                     ButtonWithAccessibilityLabel(
-                                         l10n_util::GetNSString(
-                                             IDS_IOS_CANCEL_PASSWORD_DELETION)),
-                                     grey_interactable(), nullptr)]
-        performAction:grey_tap()];
-  }
+  // Close the dialog by taping on Password Details screen.
+  [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
+                                          kPasswordDetailsTableViewId)]
+      performAction:grey_tap()];
 
   // Check that the current view is still the detail view.
   [[EarlGrey selectElementWithMatcher:grey_accessibilityID(
@@ -717,6 +708,8 @@ void CopyPasswordDetailWithID(int detail_id) {
 
   // Go back to the list view and verify that the password is still in the
   // list.
+  [[EarlGrey selectElementWithMatcher:NavigationBarCancelButton()]
+      performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
   [GetInteractionForPasswordEntry(@"example.com, concrete username")
@@ -836,6 +829,8 @@ void CopyPasswordDetailWithID(int detail_id) {
   [[EarlGrey selectElementWithMatcher:DeleteButton()]
       assertWithMatcher:grey_notNil()];
 
+  [[EarlGrey selectElementWithMatcher:NavigationBarCancelButton()]
+      performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
@@ -1455,6 +1450,8 @@ void CopyPasswordDetailWithID(int detail_id) {
   [[EarlGrey selectElementWithMatcher:PasswordDetailPassword()]
       assertWithMatcher:grey_textFieldValue(@"new password")];
 
+  [[EarlGrey selectElementWithMatcher:NavigationBarCancelButton()]
+      performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
@@ -1570,9 +1567,49 @@ void CopyPasswordDetailWithID(int detail_id) {
       assertWithMatcher:grey_allOf(grey_sufficientlyVisible(),
                                    grey_not(grey_enabled()), nil)];
 
+  [[EarlGrey selectElementWithMatcher:NavigationBarCancelButton()]
+      performAction:grey_tap()];
+
+  [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
+      performAction:grey_tap()];
+
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:SettingsDoneButton()]
+      performAction:grey_tap()];
+}
+
+// Checks that attempts to edit a username provide appropriate feedback.
+- (void)testCancelDuringEditing {
+  SaveExamplePasswordForm();
+
+  OpenPasswordSettings();
 
+  [GetInteractionForPasswordEntry(@"example.com, concrete username")
+      performAction:grey_tap()];
+
+  // Check the snackbar in case of successful reauthentication.
+  [PasswordSettingsAppInterface setUpMockReauthenticationModule];
+  [PasswordSettingsAppInterface mockReauthenticationModuleExpectedResult:
+                                    ReauthenticationResult::kSuccess];
+
+  TapEdit();
+
+  [[EarlGrey selectElementWithMatcher:PasswordDetailPassword()]
+      performAction:grey_replaceText(@"new password")];
+
+  [[EarlGrey selectElementWithMatcher:NavigationBarCancelButton()]
+      performAction:grey_tap()];
+
+  // Test that password value is unchanged.
+  [GetInteractionForPasswordDetailItem(ShowPasswordButton())
+      performAction:grey_tap()];
+
+  [[EarlGrey selectElementWithMatcher:PasswordDetailPassword()]
+      assertWithMatcher:grey_textFieldValue(@"concrete password")];
+
+  [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
+      performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
       performAction:grey_tap()];
   [[EarlGrey selectElementWithMatcher:SettingsDoneButton()]

ios/chrome/browser/ui/settings/settings_root_table_view_controller.h

@@ -61,6 +61,10 @@
 // editing mode of this controller.
 - (void)editButtonPressed;
 
+// Returns NO. Subclasses should overload this if the cancel button should be
+// shown during editing.
+- (BOOL)showCancelDuringEditing;
+
 // Called when this ViewController toolbar's delete item has been tapped.
 // |indexPaths| is the index paths of the currently selected item to be deleted.
 // Default implementation removes the items.

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

@@ -51,6 +51,10 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
 // store the item while the interaction is prevented.
 @property(nonatomic, strong) UIBarButtonItem* savedBarButtonItem;
 
+// Back button on navigation panel. This is used to store back button while it
+// is replaced with Cancel during editing.
+@property(nonatomic, strong) UIBarButtonItem* backButtonItem;
+
 // Veil preventing interactions with the TableView.
 @property(nonatomic, strong) UIView* veil;
 
@@ -79,6 +83,13 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
   } else {
     self.navigationItem.rightBarButtonItem = [self doneButtonIfNeeded];
   }
+
+  // Update Cancel/Back button.
+  if (self.showCancelDuringEditing) {
+    self.navigationItem.leftBarButtonItem =
+        self.tableView.editing ? [self createEditModeCancelButton]
+                               : self.backButtonItem;
+  }
 }
 
 - (void)reloadData {
@@ -127,6 +138,8 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
 
   self.navigationItem.largeTitleDisplayMode =
       UINavigationItemLargeTitleDisplayModeNever;
+
+  self.backButtonItem = self.navigationItem.leftBarButtonItem;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -253,6 +266,21 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
              action:@selector(editButtonPressed)];
 }
 
+- (UIBarButtonItem*)createEditModeCancelButton {
+  // Create a custom Cancel bar button item.
+  return [[UIBarButtonItem alloc]
+      initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
+                           target:self
+                           action:@selector(cancelEditing)];
+}
+
+// Quits editing mode and reloads data to the state before editing.
+- (void)cancelEditing {
+  [self setEditing:!self.tableView.editing animated:YES];
+  [self updateUIForEditState];
+  [self reloadData];
+}
+
 #pragma mark - Subclassing
 
 - (BOOL)shouldHideToolbar {
@@ -267,6 +295,10 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
   return NO;
 }
 
+- (BOOL)showCancelDuringEditing {
+  return NO;
+}
+
 - (void)editButtonPressed {
   [self setEditing:!self.tableView.editing animated:YES];
   [self updateUIForEditState];