CollectionViewTextItem no longer styles CollectionViewTextCell

ios/chrome/browser/payments/payment_request_view_controller.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/payments/payment_request_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 11 matching lines @@
 #import "ios/chrome/browser/payments/cells/payment_method_item.h"
 #import "ios/chrome/browser/payments/cells/price_item.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
 #import "ios/chrome/browser/payments/payment_request_view_controller_actions.h"
 #import "ios/chrome/browser/ui/autofill/cells/status_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_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/colors/MDCPalette+CrAdditions.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
@@ skipping 229 matching lines @@
         uppercaseStringWithLocale:[NSLocale currentLocale]];
     addAddressItem.accessibilityTraits |= UIAccessibilityTraitButton;
   }
   [model addItem:shippingAddressItem
       toSectionWithIdentifier:SectionIdentifierShipping];
 
   CollectionViewItem* shippingOptionItem = nil;
   if (_paymentRequest->selected_shipping_option()) {
     CollectionViewTextItem* selectedShippingOptionItem =
         [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingOption];
-    selectedShippingOptionItem.textFont = [MDCTypography body2Font];
-    selectedShippingOptionItem.textColor = [[MDCPalette greyPalette] tint900];
-    selectedShippingOptionItem.detailTextFont = [MDCTypography body1Font];
-    selectedShippingOptionItem.detailTextColor =
-        [[MDCPalette greyPalette] tint900];
     shippingOptionItem = selectedShippingOptionItem;
 
     _selectedShippingOptionItem = selectedShippingOptionItem;
     [self fillShippingOptionItem:selectedShippingOptionItem
                       withOption:_paymentRequest->selected_shipping_option()];
     selectedShippingOptionItem.accessoryType =
         MDCCollectionViewCellAccessoryDisclosureIndicator;
     selectedShippingOptionItem.accessibilityTraits |=
         UIAccessibilityTraitButton;
   } else {
@@ skipping 213 matching lines @@
 #pragma mark UICollectionViewDataSource
 
 - (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
                  cellForItemAtIndexPath:(nonnull NSIndexPath*)indexPath {
   UICollectionViewCell* cell =
       [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
 
   NSInteger itemType =
       [self.collectionViewModel itemTypeForIndexPath:indexPath];
   switch (itemType) {
+    case ItemTypePaymentTitle:
+    case ItemTypeShippingTitle:
+    case ItemTypeShippingOption:
+    case ItemTypeContactInfoTitle: {
+      CollectionViewTextCell* textCell =
+          base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+      textCell.textLabel.font = [MDCTypography body2Font];
+      textCell.textLabel.textColor = [[MDCPalette greyPalette] tint900];
+      textCell.detailTextLabel.font = [MDCTypography body1Font];
+      textCell.detailTextLabel.textColor = [[MDCPalette greyPalette] tint900];
+      break;
+    }
     case ItemTypeAddShippingAddress: {
       CollectionViewDetailCell* detailCell =
           base::mac::ObjCCastStrict<CollectionViewDetailCell>(cell);
       detailCell.detailTextLabel.font = [MDCTypography body2Font];
       detailCell.detailTextLabel.textColor =
           [[MDCPalette cr_bluePalette] tint700];
       break;
     }
     case ItemTypeFooterText: {
       CollectionViewFooterCell* footerCell =
@@ skipping 100 matching lines @@
 
 - (BOOL)collectionView:(UICollectionView*)collectionView
     shouldHideItemBackgroundAtIndexPath:(NSIndexPath*)indexPath {
   // No background on the footer text item.
   NSInteger sectionIdentifier =
       [self.collectionViewModel sectionIdentifierForSection:indexPath.section];
   return sectionIdentifier == SectionIdentifierFooter ? YES : NO;
 }
 
 @end