Use the same design for all suggestions

ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_updater.mm

 // Copyright 2016 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_collection_updater.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/time/time.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
-#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_article_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_footer_item.h"
+#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_item.h"
-#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_reading_list_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_text_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_source.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_image_fetcher.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestion_identifier.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h"
 #import "ios/chrome/browser/ui/favicon/favicon_attributes.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 69 matching lines @@
       return SectionIdentifierMostVisited;
 
     case ContentSuggestionsSectionUnknown:
       return SectionIdentifierDefault;
   }
 }
 
 }  // namespace
 
 @interface ContentSuggestionsCollectionUpdater ()<
-    ContentSuggestionsArticleItemDelegate,
+    ContentSuggestionsItemDelegate,
     ContentSuggestionsDataSink>
 
 @property(nonatomic, weak) id<ContentSuggestionsDataSource> dataSource;
 @property(nonatomic, strong)
     NSMutableDictionary<NSNumber*, ContentSuggestionsSectionInformation*>*
         sectionInfoBySectionIdentifier;
 
 @end
 
 @implementation ContentSuggestionsCollectionUpdater
@@ skipping 145 matching lines @@
                                                      sectionIdentifier]] == 0) {
           CSCollectionViewItem* item =
               [self emptyItemForSectionInfo:sectionInfo];
           NSIndexPath* addedIndexPath =
               [self addItem:item toSectionWithIdentifier:sectionIdentifier];
           [indexPaths addObject:addedIndexPath];
         }
         break;
       }
       case ContentSuggestionTypeArticle: {
-        ContentSuggestionsArticleItem* articleItem =
-            [self articleItemForSuggestion:suggestion];
+        ContentSuggestionsItem* articleItem =
+            [self suggestionItemForSuggestion:suggestion];
+
+        articleItem.hasImage = YES;
+
+        __weak ContentSuggestionsItem* weakItem = articleItem;
+        [self fetchFaviconForItem:articleItem
+                          withURL:articleItem.URL
+                         callback:^void(FaviconAttributes* attributes) {
+                           weakItem.attributes = attributes;
+                         }];
+
+        __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
+        [self.dataSource
+            fetchFaviconImageForSuggestion:articleItem.suggestionIdentifier
+                                completion:^void(UIImage* favicon) {
+                                  if (!weakItem || !weakSelf)
+                                    return;
+
+                                  ContentSuggestionsCollectionUpdater*
+                                      strongSelf = weakSelf;

[jif, 2017/05/10 09:36:11]

strongSelf and strongItem should be the first thing done in the block.

The test would become:
if (!strongItem || !strongSelf)

[gambard, 2017/05/10 12:17:13]

Done.

+                                  ContentSuggestionsItem* strongItem = weakItem;
+                                  strongItem.attributes = [FaviconAttributes
+                                      attributesWithImage:favicon];
+                                  [strongSelf.collectionViewController
+                                      reconfigureCellsForItems:@[ strongItem ]];
+                                }];
 
         NSIndexPath* addedIndexPath = [self addItem:articleItem
                             toSectionWithIdentifier:sectionIdentifier];
         [indexPaths addObject:addedIndexPath];
         break;
       }
       case ContentSuggestionTypeReadingList: {
-        ContentSuggestionsReadingListItem* readingListItem =
-            [self readingListItemForSuggestion:suggestion];
+        ContentSuggestionsItem* readingListItem =
+            [self suggestionItemForSuggestion:suggestion];
+
+        __weak ContentSuggestionsItem* weakItem = readingListItem;
+        [self fetchFaviconForItem:readingListItem
+                          withURL:readingListItem.URL
+                         callback:^void(FaviconAttributes* attributes) {
+                           weakItem.attributes = attributes;
+                         }];
 
         NSIndexPath* addedIndexPath = [self addItem:readingListItem
                             toSectionWithIdentifier:sectionIdentifier];
         [indexPaths addObject:addedIndexPath];
         break;
       }
       case ContentSuggestionTypeMostVisited: {
         ContentSuggestionsMostVisitedItem* mostVisitedItem =
             [[ContentSuggestionsMostVisitedItem alloc]
                 initWithType:ItemTypeMostVisited];
@@ skipping 40 matching lines @@
   CSCollectionViewModel* model =
       self.collectionViewController.collectionViewModel;
   NSInteger sectionIdentifier = [model sectionIdentifierForSection:section];
   ContentSuggestionsSectionInformation* sectionInfo =
       self.sectionInfoBySectionIdentifier[@(sectionIdentifier)];
 
   CSCollectionViewItem* item = [self emptyItemForSectionInfo:sectionInfo];
   return [self addItem:item toSectionWithIdentifier:sectionIdentifier];
 }
 
-#pragma mark - ContentSuggestionsArticleItemDelegate
+#pragma mark - ContentSuggestionsItemDelegate
 
-- (void)loadImageForArticleItem:(ContentSuggestionsArticleItem*)articleItem {
+- (void)loadImageForSuggestionItem:(ContentSuggestionsItem*)suggestionItem {
   __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
-  __weak ContentSuggestionsArticleItem* weakArticle = articleItem;
+  __weak ContentSuggestionsItem* weakArticle = suggestionItem;
 
   void (^imageFetchedCallback)(UIImage*) = ^(UIImage* image) {
     ContentSuggestionsCollectionUpdater* strongSelf = weakSelf;
-    ContentSuggestionsArticleItem* strongArticle = weakArticle;
+    ContentSuggestionsItem* strongArticle = weakArticle;
     if (!strongSelf || !strongArticle) {
       return;
     }
 
     strongArticle.image = image;
     [strongSelf.collectionViewController
         reconfigureCellsForItems:@[ strongArticle ]];
   };
 
   [self.dataSource.imageFetcher
-      fetchImageForSuggestion:articleItem.suggestionIdentifier
+      fetchImageForSuggestion:suggestionItem.suggestionIdentifier
                      callback:imageFetchedCallback];
 }
 
 #pragma mark - Private methods
 
 // Adds a footer to the section identified by |sectionInfo| if there is none
 // present and the section info contains a title for it.
 - (void)addFooterIfNeeded:(ContentSuggestionsSectionInformation*)sectionInfo {
   NSInteger sectionIdentifier = SectionIdentifierForInfo(sectionInfo);
 
@@ skipping 73 matching lines @@
 - (CSCollectionViewItem*)emptyItemForSectionInfo:
     (ContentSuggestionsSectionInformation*)sectionInfo {
   ContentSuggestionsTextItem* item =
       [[ContentSuggestionsTextItem alloc] initWithType:ItemTypeEmpty];
   item.text = l10n_util::GetNSString(IDS_NTP_TITLE_NO_SUGGESTIONS);
   item.detailText = sectionInfo.emptyText;
 
   return item;
 }
 
-// Returns an article built with the |suggestion|.
-- (ContentSuggestionsArticleItem*)articleItemForSuggestion:
+// Returns a suggestion item built with the |suggestion|.
+- (ContentSuggestionsItem*)suggestionItemForSuggestion:
     (ContentSuggestion*)suggestion {
-  ContentSuggestionsArticleItem* articleItem =
-      [[ContentSuggestionsArticleItem alloc]
-          initWithType:ItemTypeForContentSuggestionType(suggestion.type)
-                 title:suggestion.title
-              subtitle:suggestion.text
-              delegate:self
-                   url:suggestion.url];
+  ContentSuggestionsItem* suggestionItem = [[ContentSuggestionsItem alloc]
+      initWithType:ItemTypeForContentSuggestionType(suggestion.type)
+             title:suggestion.title
+          subtitle:suggestion.text
+          delegate:self
+               url:suggestion.url];
 
-  articleItem.publisher = suggestion.publisher;
-  articleItem.publishDate = suggestion.publishDate;
+  suggestionItem.publisher = suggestion.publisher;
+  suggestionItem.publishDate = suggestion.publishDate;
+  suggestionItem.availableOffline = suggestion.availableOffline;
 
-  articleItem.suggestionIdentifier = suggestion.suggestionIdentifier;
+  suggestionItem.suggestionIdentifier = suggestion.suggestionIdentifier;
 
-  __weak ContentSuggestionsArticleItem* weakItem = articleItem;
-  [self fetchFaviconForItem:articleItem
-                    withURL:articleItem.articleURL
-                   callback:^void(FaviconAttributes* attributes) {
-                     weakItem.attributes = attributes;
-                   }];
-
-  __weak ContentSuggestionsCollectionUpdater* weakSelf = self;
-  [self.dataSource
-      fetchFaviconImageForSuggestion:articleItem.suggestionIdentifier
-                          completion:^void(UIImage* favicon) {
-                            if (!weakItem || !weakSelf)
-                              return;
-
-                            weakItem.attributes =
-                                [FaviconAttributes attributesWithImage:favicon];
-                            [weakSelf.collectionViewController
-                                reconfigureCellsForItems:@[ weakItem ]];
-                          }];
-
-  return articleItem;
-}
-
-// Returns a reading list item built with the |suggestion|.
-- (ContentSuggestionsReadingListItem*)readingListItemForSuggestion:
-    (ContentSuggestion*)suggestion {
-  ContentSuggestionsReadingListItem* readingListItem =
-      [[ContentSuggestionsReadingListItem alloc]
-               initWithType:ItemTypeReadingList
-                        url:suggestion.url
-          distillationState:suggestion.readingListExtra.status];
-
-  readingListItem.title = suggestion.title;
-  readingListItem.subtitle = suggestion.publisher;
-
-  readingListItem.suggestionIdentifier = suggestion.suggestionIdentifier;
-
-  __weak ContentSuggestionsReadingListItem* weakItem = readingListItem;
-  [self fetchFaviconForItem:readingListItem
-                    withURL:readingListItem.url
-                   callback:^void(FaviconAttributes* attributes) {
-                     weakItem.attributes = attributes;
-                   }];
-
-  return readingListItem;
+  return suggestionItem;
 }
 
 // Fetches the favicon associated with the |URL|, call the |callback| with the
 // attributes then reconfigure the |item|.
 - (void)fetchFaviconForItem:(CSCollectionViewItem*)item
                     withURL:(const GURL&)URL
                    callback:(void (^)(FaviconAttributes*))callback {
   if (!callback)
     return;
 
@@ skipping 23 matching lines @@
   CSCollectionViewModel* model =
       self.collectionViewController.collectionViewModel;
   NSInteger section = [model sectionForSectionIdentifier:sectionIdentifier];
   NSInteger itemNumber = [model numberOfItemsInSection:section];
   [model addItem:item toSectionWithIdentifier:sectionIdentifier];
 
   return [NSIndexPath indexPathForItem:itemNumber inSection:section];
 }
 
 @end