Add favicon view to ContentSuggestionsArticle

ios/chrome/browser/ui/content_suggestions/cells/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/cells/content_suggestions_article_item.h"
 
 #include "base/time/time.h"
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
+#import "ios/chrome/browser/ui/favicon/favicon_attributes.h"
+#import "ios/chrome/browser/ui/favicon/favicon_view.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/util/i18n_string.h"
 #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 const CGFloat kImageSize = 72;
 // When updating this, make sure to update |layoutSubviews|.

[lpromero, 2017/03/29 14:33:01]

Why? Here and below.

[gambard, 2017/03/29 16:25:14]

Because it is the spacing between the labels and the elements on the side.

[lpromero, 2017/03/29 16:35:47]

I don't get why this comment is here.

[gambard, 2017/03/30 06:52:24]

Well... Yes, the comment does not make sense as is.

 const CGFloat kStandardSpacing = 16;
+// When updating this, make sure to update |layoutSubviews|.

[Olivier, 2017/03/29 14:38:24]

why?

[gambard, 2017/03/29 16:25:14]

Because it is the spacing between the labels and the elements on the side.

+const CGFloat kSmallSpacing = 8;
+// Size of the favicon view.
+const CGFloat kFaviconSize = 16;
 // Size of the icon displayed when there is not image.
 const CGFloat kIconSize = 24;
 // Name of the icon displayed when there is not image.
 NSString* const kNoImageIconName = @"content_suggestions_no_image";
 // No image icon percentage of white.
 const CGFloat kNoImageIconWhite = 0.38;
 // No image background percentage of white.
 const CGFloat kNoImageBackgroundWhite = 0.95;
 // Duration of the animation to display the image for the article.
 const CGFloat kAnimationDuration = 0.3;
@@ skipping 15 matching lines @@
 
 @synthesize title = _title;
 @synthesize subtitle = _subtitle;
 @synthesize image = _image;
 @synthesize articleURL = _articleURL;
 @synthesize publisher = _publisher;
 @synthesize publishDate = _publishDate;
 @synthesize suggestionIdentifier = _suggestionIdentifier;
 @synthesize delegate = _delegate;
 @synthesize imageFetched = _imageFetched;
+@synthesize attributes = _attributes;
 
 - (instancetype)initWithType:(NSInteger)type
                        title:(NSString*)title
                     subtitle:(NSString*)subtitle
                     delegate:(id<ContentSuggestionsArticleItemDelegate>)delegate
                          url:(const GURL&)url {
   self = [super initWithType:type];
   if (self) {
     self.cellClass = [ContentSuggestionsArticleCell class];
     _title = [title copy];
     _subtitle = [subtitle copy];
     _articleURL = url;
     _delegate = delegate;
   }
   return self;
 }
 
 - (void)configureCell:(ContentSuggestionsArticleCell*)cell {
   [super configureCell:cell];
   if (!self.imageFetched) {
     self.imageFetched = YES;
     // Fetch the image. During the fetch the cell's image should still be set.
     [self.delegate loadImageForArticleItem:self];
   }
+  if (self.attributes)

[lpromero, 2017/03/29 14:33:01]

If there are no attributes, the favicon view is not reconfigured, nor
deconfigured. Does it means it can keep the configuration from a previous item
when the cell is reused?

[gambard, 2017/03/29 16:25:13]

In theory yes. But the call to self.attributes = ... is "very quick", so it
never happens (the same pattern is used in Reading List).
I have plan to fix this :)

+    [cell.faviconView configureWithAttributes:self.attributes];
   cell.titleLabel.text = self.title;
   cell.subtitleLabel.text = self.subtitle;
   [cell setContentImage:self.image];
   [cell setPublisherName:self.publisher date:self.publishDate];
 }
 
 @end
 
 #pragma mark - ContentSuggestionsArticleCell
 
@@ skipping 15 matching lines @@
 @end
 
 @implementation ContentSuggestionsArticleCell
 
 @synthesize titleLabel = _titleLabel;
 @synthesize subtitleLabel = _subtitleLabel;
 @synthesize imageContainer = _imageContainer;
 @synthesize noImageIcon = _noImageIcon;
 @synthesize publisherLabel = _publisherLabel;
 @synthesize contentImageView = _contentImageView;
+@synthesize faviconView = _faviconView;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
     _titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
     _subtitleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
     _imageContainer = [[UIView alloc] initWithFrame:CGRectZero];
     _noImageIcon = [[UIImageView alloc] initWithFrame:CGRectZero];
     _publisherLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+    _faviconView = [[FaviconViewNew alloc] init];
 
     _titleLabel.numberOfLines = 2;
     _subtitleLabel.numberOfLines = 2;
     [_subtitleLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh
                                       forAxis:UILayoutConstraintAxisVertical];
     [_titleLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh
                                    forAxis:UILayoutConstraintAxisVertical];
 
     _imageContainer.translatesAutoresizingMaskIntoConstraints = NO;
     _noImageIcon.translatesAutoresizingMaskIntoConstraints = NO;
     _titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
     _subtitleLabel.translatesAutoresizingMaskIntoConstraints = NO;
     _publisherLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    _faviconView.translatesAutoresizingMaskIntoConstraints = NO;
 
     [self.contentView addSubview:_imageContainer];
     [self.contentView addSubview:_titleLabel];
     [self.contentView addSubview:_subtitleLabel];
     [self.contentView addSubview:_publisherLabel];
+    [self.contentView addSubview:_faviconView];
 
     [_imageContainer addSubview:_noImageIcon];
 
     _imageContainer.backgroundColor =
         [UIColor colorWithWhite:kNoImageBackgroundWhite alpha:1];
     _noImageIcon.image = [[UIImage imageNamed:kNoImageIconName]
         imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
     [_noImageIcon
         setTintColor:[UIColor colorWithWhite:kNoImageIconWhite alpha:1]];
 
     _titleLabel.font = [MDCTypography subheadFont];
     _subtitleLabel.font = [MDCTypography body1Font];
     _publisherLabel.font = [MDCTypography captionFont];
+    _faviconView.font =
+        [[MDCTypography fontLoader] regularFontOfSize:kFaviconSize / 2];
 
     _subtitleLabel.textColor = [[MDCPalette greyPalette] tint700];
     _publisherLabel.textColor = [[MDCPalette greyPalette] tint700];
 
     [self applyConstraints];
   }
   return self;
 }
 
 - (void)setContentImage:(UIImage*)image {
@@ skipping 52 matching lines @@
 }
 
 #pragma mark - Private
 
 - (void)applyConstraints {
   [NSLayoutConstraint activateConstraints:@[
     [_imageContainer.widthAnchor constraintEqualToConstant:kImageSize],
     [_imageContainer.heightAnchor
         constraintEqualToAnchor:_imageContainer.widthAnchor],
     [_imageContainer.topAnchor constraintEqualToAnchor:_titleLabel.topAnchor],
+
+    // Publisher.
     [_publisherLabel.topAnchor
         constraintGreaterThanOrEqualToAnchor:_imageContainer.bottomAnchor
                                     constant:kStandardSpacing],
     [_publisherLabel.topAnchor
         constraintGreaterThanOrEqualToAnchor:_subtitleLabel.bottomAnchor
                                     constant:kStandardSpacing],
+    [_publisherLabel.bottomAnchor
+        constraintLessThanOrEqualToAnchor:self.contentView.bottomAnchor
+                                 constant:-kStandardSpacing],
+
+    // Favicon.
+    [_faviconView.topAnchor
+        constraintGreaterThanOrEqualToAnchor:_imageContainer.bottomAnchor
+                                    constant:kStandardSpacing],
+    [_faviconView.topAnchor
+        constraintGreaterThanOrEqualToAnchor:_subtitleLabel.bottomAnchor
+                                    constant:kStandardSpacing],
+    [_faviconView.centerYAnchor
+        constraintEqualToAnchor:_publisherLabel.centerYAnchor],
+    [_faviconView.bottomAnchor
+        constraintLessThanOrEqualToAnchor:self.contentView.bottomAnchor
+                                 constant:-kStandardSpacing],
+    [_faviconView.heightAnchor constraintEqualToConstant:kFaviconSize],

[Olivier, 2017/03/29 14:38:24]

If attributes is nil (supported), this view will still take kFaviconSize x
kFaviconSize. Is this expected?

[gambard, 2017/03/29 16:25:14]

Yes. The callback should be quick enough. I plan to fix this.

+    [_faviconView.widthAnchor
+        constraintEqualToAnchor:_faviconView.heightAnchor],
 
     // No image icon.
     [_noImageIcon.centerXAnchor
         constraintEqualToAnchor:_imageContainer.centerXAnchor],
     [_noImageIcon.centerYAnchor
         constraintEqualToAnchor:_imageContainer.centerYAnchor],
     [_noImageIcon.widthAnchor constraintEqualToConstant:kIconSize],
     [_noImageIcon.heightAnchor constraintEqualToAnchor:_noImageIcon.widthAnchor]
   ]];
 
   ApplyVisualConstraintsWithMetrics(
       @[
         @"H:|-(space)-[title]-(space)-[image]-(space)-|",
         @"H:|-(space)-[text]-(space)-[image]",
         @"V:|-(space)-[title]-[text]",
-        @"H:|-(space)-[publish]-(space)-|",
-        @"V:[publish]-|",
+        @"H:|-(space)-[favicon]-(small)-[publish]-(space)-|",
       ],
       @{
         @"image" : _imageContainer,
         @"title" : _titleLabel,
         @"text" : _subtitleLabel,
         @"publish" : _publisherLabel,
+        @"favicon" : _faviconView,
       },
-      @{ @"space" : @(kStandardSpacing) });
+      @{ @"space" : @(kStandardSpacing),
+         @"small" : @(kSmallSpacing) });
 }
 
 @end