[Payment Request] Adds a secondary text label to PaymentsTextCell

ios/chrome/browser/payments/shipping_option_selection_view_controller.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/payments/shipping_option_selection_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/payments/core/currency_formatter.h"
 #include "components/payments/core/strings_util.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/payments/cells/payments_text_item.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #import "ios/chrome/browser/payments/shipping_option_selection_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_item.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"
 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #include "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "ios/web/public/payments/payment_request.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 22 matching lines @@
 }  // namespace
 
 @interface ShippingOptionSelectionViewController ()<
     ShippingOptionSelectionViewControllerActions> {
   // The PaymentRequest object having a copy of web::PaymentRequest as provided
   // by the page invoking the Payment Request API. This is a weak pointer and
   // should outlive this class.
   PaymentRequest* _paymentRequest;
 
   // The currently selected item. May be nil.
-  CollectionViewTextItem* _selectedItem;
+  PaymentsTextItem* _selectedItem;
 }
 
 @end
 
 @implementation ShippingOptionSelectionViewController
 
 @synthesize pending = _pending;
 @synthesize errorMessage = _errorMessage;
 @synthesize delegate = _delegate;
 
@@ skipping 40 matching lines @@
   if (_errorMessage) {
     PaymentsTextItem* messageItem =
         [[PaymentsTextItem alloc] initWithType:ItemTypeMessage];
     messageItem.text = _errorMessage;
     messageItem.image = NativeImage(IDR_IOS_PAYMENTS_WARNING);
     [model addItem:messageItem
         toSectionWithIdentifier:SectionIdentifierShippingOption];
   }
 
   for (const auto* shippingOption : _paymentRequest->shipping_options()) {
-    CollectionViewTextItem* item =
-        [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingOption];
+    PaymentsTextItem* item =
+        [[PaymentsTextItem alloc] initWithType:ItemTypeShippingOption];
     item.text = base::SysUTF16ToNSString(shippingOption->label);
     payments::CurrencyFormatter* currencyFormatter =
         _paymentRequest->GetOrCreateCurrencyFormatter();
     item.detailText = SysUTF16ToNSString(currencyFormatter->Format(
         base::UTF16ToASCII(shippingOption->amount.value)));
 
-    // Styling.
-    item.textFont = [MDCTypography body2Font];
-    item.textColor = [[MDCPalette greyPalette] tint900];
-    item.detailTextFont = [MDCTypography body1Font];
-    item.detailTextColor = [[MDCPalette greyPalette] tint900];
-
     if (_paymentRequest->selected_shipping_option() == shippingOption) {
       item.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
       _selectedItem = item;
     }
 
     [model addItem:item
         toSectionWithIdentifier:SectionIdentifierShippingOption];
   }
 }
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.collectionView.accessibilityIdentifier =
       kShippingOptionSelectionCollectionViewID;
 
   // Customize collection view settings.
   self.styler.cellStyle = MDCCollectionViewCellStyleCard;
   self.styler.separatorInset =
       UIEdgeInsetsMake(0, kSeparatorEdgeInset, 0, kSeparatorEdgeInset);
 }
 
-#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 ItemTypeMessage: {
-      PaymentsTextCell* messageCell =
-          base::mac::ObjCCastStrict<PaymentsTextCell>(cell);
-      messageCell.textLabel.textColor = [[MDCPalette cr_redPalette] tint600];
-      break;
-    }
-    default:
-      break;
-  }
-  return cell;
-}
-
 #pragma mark UICollectionViewDelegate
 
 - (void)collectionView:(UICollectionView*)collectionView
     didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
   [super collectionView:collectionView didSelectItemAtIndexPath:indexPath];
 
   CollectionViewModel* model = self.collectionViewModel;
 
   CollectionViewItem* item = [model itemAtIndexPath:indexPath];
   if (item.type == ItemTypeShippingOption) {
     // Update the currently selected cell, if any.
     if (_selectedItem) {
       _selectedItem.accessoryType = MDCCollectionViewCellAccessoryNone;
       [self reconfigureCellsForItems:@[ _selectedItem ]
              inSectionWithIdentifier:SectionIdentifierShippingOption];
     }
 
     // Update the newly selected cell.
-    CollectionViewTextItem* newlySelectedItem =
-        base::mac::ObjCCastStrict<CollectionViewTextItem>(item);
+    PaymentsTextItem* newlySelectedItem =
+        base::mac::ObjCCastStrict<PaymentsTextItem>(item);
     newlySelectedItem.accessoryType = MDCCollectionViewCellAccessoryCheckmark;
     [self reconfigureCellsForItems:@[ newlySelectedItem ]
            inSectionWithIdentifier:SectionIdentifierShippingOption];
 
     // Update the reference to the selected item.
     _selectedItem = newlySelectedItem;
 
     // Notify the delegate of the selection.
     NSInteger index = [model indexInItemTypeForIndexPath:indexPath];
     DCHECK(index < (NSInteger)_paymentRequest->shipping_options().size());
@@ skipping 28 matching lines @@
     hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeMessage) {
     return YES;
   } else {
     return NO;
   }
 }
 
 @end