Modify article item in ContentSuggestions

ios/chrome/browser/ui/content_suggestions/content_suggestions_article_item.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/content_suggestions/content_suggestions_article_item.h"
 
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 const CGFloat kImageSize = 100;
+const CGFloat kStandardSpacing = 8;
 }
 
 @interface ContentSuggestionsArticleItem ()
 
 @property(nonatomic, copy) NSString* title;
 @property(nonatomic, copy) NSString* subtitle;
-@property(nonatomic, strong) UIImage* image;
 
 @end
 
 @implementation ContentSuggestionsArticleItem
 
 @synthesize title = _title;
 @synthesize subtitle = _subtitle;
 @synthesize image = _image;
+@synthesize articleURL = _articleURL;
 
 - (instancetype)initWithType:(NSInteger)type
                        title:(NSString*)title
                     subtitle:(NSString*)subtitle
-                       image:(UIImage*)image {
+                       image:(UIImage*)image
+                         url:(const GURL&)url {
   self = [super initWithType:type];
   if (self) {
     self.cellClass = [ContentSuggestionsArticleCell class];
     _title = [title copy];
     _subtitle = [subtitle copy];
     _image = image;
+    _articleURL = url;
   }
   return self;
 }
 
 - (void)configureCell:(ContentSuggestionsArticleCell*)cell {
   [super configureCell:cell];
   cell.titleLabel.text = _title;
   cell.subtitleLabel.text = _subtitle;
   cell.imageView.image = _image;
 }
 
 @end
 
 @implementation ContentSuggestionsArticleCell
 
 @synthesize titleLabel = _titleLabel;
 @synthesize subtitleLabel = _subtitleLabel;
 @synthesize imageView = _imageView;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
     _titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
     _subtitleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
     _imageView = [[UIImageView alloc] initWithFrame:CGRectZero];
-    UIView* imageContainer = [[UIView alloc] initWithFrame:CGRectZero];
 
     _subtitleLabel.numberOfLines = 0;
+    _imageView.contentMode = UIViewContentModeScaleAspectFit;
 
-    imageContainer.translatesAutoresizingMaskIntoConstraints = NO;
     _imageView.translatesAutoresizingMaskIntoConstraints = NO;
     _titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
     _subtitleLabel.translatesAutoresizingMaskIntoConstraints = NO;
 
-    [imageContainer addSubview:_imageView];
-    [self.contentView addSubview:imageContainer];
+    [self.contentView addSubview:_imageView];
     [self.contentView addSubview:_titleLabel];
     [self.contentView addSubview:_subtitleLabel];
 
-    ApplyVisualConstraintsWithMetrics(
+    [NSLayoutConstraint activateConstraints:@[
+      [self.contentView.bottomAnchor
+          constraintGreaterThanOrEqualToAnchor:_imageView.bottomAnchor
+                                      constant:kStandardSpacing],
+      [self.contentView.bottomAnchor
+          constraintGreaterThanOrEqualToAnchor:_subtitleLabel.bottomAnchor
+                                      constant:kStandardSpacing],
+      [_imageView.widthAnchor constraintLessThanOrEqualToConstant:kImageSize],
+      [_imageView.heightAnchor constraintLessThanOrEqualToConstant:kImageSize]
+    ]];
+
+    ApplyVisualConstraints(
         @[
-          @"H:|-[title]-[imageContainer(imageSize)]-|",
-          @"H:|[image(imageSize)]", @"H:|-[text]-[imageContainer]",
-          @"V:|[image(imageSize)]", @"V:|-[title]-[text]-|",
-          @"V:|-[imageContainer(>=imageSize)]-|"
+          @"H:|-[title]-[image]-|",
+          @"H:|-[text]-[image]",
+          @"V:|-[title]-[text]-|",
+          @"V:|-[image]",
         ],
         @{
           @"image" : _imageView,
-          @"imageContainer" : imageContainer,
           @"title" : _titleLabel,
           @"text" : _subtitleLabel
-        },
-        @{ @"imageSize" : @(kImageSize) });
+        });
   }
   return self;
 }
 
 #pragma mark - UIView
 
 // Implements -layoutSubviews as per instructions in documentation for
 // +[MDCCollectionViewCell cr_preferredHeightForWidth:forItem:].
 - (void)layoutSubviews {
   [super layoutSubviews];
 
   // Adjust the text label preferredMaxLayoutWidth when the parent's width
   // changes, for instance on screen rotation.
   CGFloat parentWidth = CGRectGetWidth(self.contentView.bounds);
   self.subtitleLabel.preferredMaxLayoutWidth = parentWidth - kImageSize - 3 * 8;
 
   // Re-layout with the new preferred width to allow the label to adjust its
   // height.
   [super layoutSubviews];
 }
 
 @end