CollectionViewTextItem no longer styles CollectionViewTextCell

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

 // Copyright 2015 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/settings/block_popups_collection_view_controller.h"
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.h"
+#import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_cell.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
 #import "ios/chrome/browser/ui/settings/utils/content_setting_backed_boolean.h"
 #include "ios/chrome/grit/ios_strings.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 "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
@@ skipping 96 matching lines @@
   return YES;
 }
 
 #pragma mark - UICollectionViewDataSource
 
 - (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
                  cellForItemAtIndexPath:(NSIndexPath*)indexPath {
   UICollectionViewCell* cell =
       [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
 
-  if ([self.collectionViewModel itemTypeForIndexPath:indexPath] ==
-      ItemTypeMainSwitch) {
+  NSInteger itemType =
+      [self.collectionViewModel itemTypeForIndexPath:indexPath];
+  if (itemType == ItemTypeMainSwitch) {
     CollectionViewSwitchCell* switchCell =
         base::mac::ObjCCastStrict<CollectionViewSwitchCell>(cell);
     [switchCell.switchView addTarget:self
                               action:@selector(blockPopupsSwitchChanged:)
                     forControlEvents:UIControlEventValueChanged];
+  } else if (itemType == ItemTypeHeader || itemType == ItemTypeException) {
+    CollectionViewTextCell* textCell =
+        base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+    textCell.textLabel.font = [MDCTypography body2Font];
+    textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
+    textCell.detailTextLabel.font = [MDCTypography body1Font];
+    textCell.detailTextLabel.textColor = [[MDCPalette greyPalette] tint500];
   }
   return cell;
 }
 
 #pragma mark - MDCCollectionViewEditingDelegate
 
 - (BOOL)collectionView:(UICollectionView*)collectionView
     canEditItemAtIndexPath:(NSIndexPath*)indexPath {
   // Any item in SectionIdentifierExceptions is editable.
   return [self.collectionViewModel
@@ skipping 134 matching lines @@
   }
 }
 
 - (void)populateExceptionsItems {
   CollectionViewModel* model = self.collectionViewModel;
   [model addSectionWithIdentifier:SectionIdentifierExceptions];
 
   CollectionViewTextItem* header =
       [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader];
   header.text = l10n_util::GetNSString(IDS_IOS_POPUPS_ALLOWED);
-  header.textColor = [[MDCPalette greyPalette] tint500];
   [model setHeader:header forSectionWithIdentifier:SectionIdentifierExceptions];
 
   for (size_t i = 0; i < _exceptions.GetSize(); ++i) {
     std::string allowed_url;
     _exceptions.GetString(i, &allowed_url);
     CollectionViewTextItem* item =
         [[CollectionViewTextItem alloc] initWithType:ItemTypeException];
     item.text = base::SysUTF8ToNSString(allowed_url);
     [model addItem:item toSectionWithIdentifier:SectionIdentifierExceptions];
   }
@@ skipping 31 matching lines @@
       [[strongSelf collectionViewModel]
           removeSectionWithIdentifier:SectionIdentifierExceptions];
       [[strongSelf collectionView]
           deleteSections:[NSIndexSet indexSetWithIndex:index]];
     }
                                   completion:nil];
   }
 }
 
 @end