[iOS] Fix multiline labels when selected

This CL fixes the way the multilines labels are handling the accessory
view. Instead of getting resized when the accessory is added to the
view, they have a width taking into account the accessory view.

Bug: 911088
Change-Id: I153a0939600ca89d7f27c80ab411c287c6408398
Reviewed-on: https://chromium-review.googlesource.com/c/1363192
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614667}

ios/chrome/browser/ui/settings/cells/import_data_multiline_detail_item.h

@@ -26,9 +26,8 @@
 
 // ImportDataMultilineDetailCell implements an UITableViewCell
 // subclass containing two text labels: a "main" label and a "detail" label.
-// The two labels are laid out on top of each other. The detail text can span
-// multiple lines.
-// This is to be used with a ImportDataMultilineDetailItem.
+// The two labels are laid out on top of each other and can span on multiple
+// lines. This is to be used with a ImportDataMultilineDetailItem.
 @interface ImportDataMultilineDetailCell : UITableViewCell
 
 // UILabels corresponding to |text| and |detailText| from the item.

ios/chrome/browser/ui/settings/cells/import_data_multiline_detail_item.mm

@@ -13,6 +13,10 @@
 #error "This file requires ARC support."
 #endif
 
+namespace {
+const CGFloat kAccessoryWidth = 40;
+}  // namespace
+
 @implementation ImportDataMultilineDetailItem
 
 @synthesize accessoryType = _accessoryType;
@@ -53,6 +57,7 @@
 
     _textLabel = [[UILabel alloc] init];
     _textLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    _textLabel.numberOfLines = 0;
     _textLabel.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
     _textLabel.adjustsFontForContentSizeCategory = YES;
     _textLabel.textColor = UIColor.blackColor;
@@ -69,25 +74,42 @@
 
     // Set up the constraints.
     [NSLayoutConstraint activateConstraints:@[
+      [_textLabel.topAnchor
+          constraintEqualToAnchor:contentView.topAnchor
+                         constant:kTableViewLargeVerticalSpacing],
       [_textLabel.leadingAnchor
           constraintEqualToAnchor:contentView.leadingAnchor
                          constant:kTableViewHorizontalSpacing],
       [_textLabel.trailingAnchor
-          constraintEqualToAnchor:contentView.trailingAnchor
-                         constant:-kTableViewHorizontalSpacing],
+          constraintLessThanOrEqualToAnchor:contentView.trailingAnchor
+                                   constant:-kTableViewHorizontalSpacing],
+      [_textLabel.bottomAnchor
+          constraintEqualToAnchor:_detailTextLabel.topAnchor],
       [_detailTextLabel.leadingAnchor
           constraintEqualToAnchor:_textLabel.leadingAnchor],
       [_detailTextLabel.trailingAnchor
-          constraintEqualToAnchor:_textLabel.trailingAnchor],
-      [_textLabel.bottomAnchor
-          constraintEqualToAnchor:_detailTextLabel.topAnchor],
+          constraintLessThanOrEqualToAnchor:contentView.trailingAnchor
+                                   constant:-kTableViewHorizontalSpacing],
+      [_detailTextLabel.bottomAnchor
+          constraintEqualToAnchor:contentView.bottomAnchor
+                         constant:-kTableViewLargeVerticalSpacing],
     ]];
-    AddOptionalVerticalPadding(contentView, _textLabel, _detailTextLabel,
-                               kTableViewLargeVerticalSpacing);
   }
   return self;
 }
 
+- (void)layoutSubviews {
+  // Make sure that the multiline labels' width isn't changed when the accessory
+  // is set.
+  self.detailTextLabel.preferredMaxLayoutWidth =
+      self.bounds.size.width -
+      (kAccessoryWidth + 2 * kTableViewHorizontalSpacing);
+  self.textLabel.preferredMaxLayoutWidth =
+      self.bounds.size.width -
+      (kAccessoryWidth + 2 * kTableViewHorizontalSpacing);
+  [super layoutSubviews];
+}
+
 #pragma mark Accessibility
 
 - (NSString*)accessibilityLabel {

ios/chrome/browser/ui/settings/cells/import_data_multiline_detail_item_unittest.mm

@@ -49,7 +49,7 @@ TEST_F(ImportDataMultilineDetailItemTest, ConfigureCell) {
 TEST_F(ImportDataMultilineDetailItemTest, MultipleLines) {
   ImportDataMultilineDetailCell* cell =
       [[ImportDataMultilineDetailCell alloc] init];
-  EXPECT_EQ(1, cell.textLabel.numberOfLines);
+  EXPECT_EQ(0, cell.textLabel.numberOfLines);
   EXPECT_EQ(0, cell.detailTextLabel.numberOfLines);
 }