[Payment Request] Adds a secondary text label to PaymentsTextCell

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"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.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/autofill_profile_item.h"
 #import "ios/chrome/browser/payments/cells/page_info_item.h"
 #import "ios/chrome/browser/payments/cells/payment_method_item.h"
+#import "ios/chrome/browser/payments/cells/payments_text_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_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"
 #include "ios/web/public/payments/payment_request.h"
@@ skipping 63 matching lines @@
   UIBarButtonItem* _cancelButton;
   MDCButton* _payButton;
 
   // 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;
 
   __weak PriceItem* _paymentSummaryItem;
   __weak AutofillProfileItem* _selectedShippingAddressItem;
-  __weak CollectionViewTextItem* _selectedShippingOptionItem;
+  __weak PaymentsTextItem* _selectedShippingOptionItem;
   __weak PaymentMethodItem* _selectedPaymentMethodItem;
   __weak AutofillProfileItem* _selectedContactInfoItem;
 }
 
 @end
 
 @implementation PaymentRequestViewController
 
 @synthesize pageFavicon = _pageFavicon;
 @synthesize pageTitle = _pageTitle;
@@ skipping 108 matching lines @@
     paymentSummaryItem.accessoryType =
         MDCCollectionViewCellAccessoryDisclosureIndicator;
     paymentSummaryItem.accessibilityTraits |= UIAccessibilityTraitButton;
   }
   [model addItem:paymentSummaryItem
       toSectionWithIdentifier:SectionIdentifierSummary];
 
   // Shipping section.
   [model addSectionWithIdentifier:SectionIdentifierShipping];
 
-  CollectionViewTextItem* shippingTitle =
-      [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingTitle];
+  PaymentsTextItem* shippingTitle =
+      [[PaymentsTextItem alloc] initWithType:ItemTypeShippingTitle];
   shippingTitle.text =
       GetShippingSectionTitle(_paymentRequest->shipping_type());
   [model setHeader:shippingTitle
       forSectionWithIdentifier:SectionIdentifierShipping];
 
   CollectionViewItem* shippingAddressItem = nil;
   if (_paymentRequest->selected_shipping_profile()) {
     AutofillProfileItem* selectedShippingAddressItem =
         [[AutofillProfileItem alloc] initWithType:ItemTypeShippingAddress];
     shippingAddressItem = selectedShippingAddressItem;
@@ skipping 12 matching lines @@
         GetShippingAddressSectionString(_paymentRequest->shipping_type()));
     addAddressItem.detailText = [l10n_util::GetNSString(IDS_ADD)
         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];
+    PaymentsTextItem* selectedShippingOptionItem =
+        [[PaymentsTextItem alloc] initWithType:ItemTypeShippingOption];
     shippingOptionItem = selectedShippingOptionItem;
 
     _selectedShippingOptionItem = selectedShippingOptionItem;
     [self fillShippingOptionItem:selectedShippingOptionItem
                       withOption:_paymentRequest->selected_shipping_option()];
     selectedShippingOptionItem.accessoryType =
         MDCCollectionViewCellAccessoryDisclosureIndicator;
     selectedShippingOptionItem.accessibilityTraits |=
         UIAccessibilityTraitButton;
   } else {
     CollectionViewDetailItem* selectShippingOptionItem =
         [[CollectionViewDetailItem alloc]
             initWithType:ItemTypeSelectShippingOption];
     shippingOptionItem = selectShippingOptionItem;
     selectShippingOptionItem.text = base::SysUTF16ToNSString(
         GetShippingOptionSectionString(_paymentRequest->shipping_type()));
     selectShippingOptionItem.accessoryType =
         MDCCollectionViewCellAccessoryDisclosureIndicator;
     selectShippingOptionItem.accessibilityTraits |= UIAccessibilityTraitButton;
   }
   [model addItem:shippingOptionItem
       toSectionWithIdentifier:SectionIdentifierShipping];
 
   // Payment method section.
   [model addSectionWithIdentifier:SectionIdentifierPayment];
 
   CollectionViewItem* paymentMethodItem = nil;
   if (_paymentRequest->selected_credit_card()) {
-    CollectionViewTextItem* paymentTitle =
-        [[CollectionViewTextItem alloc] initWithType:ItemTypePaymentTitle];
+    PaymentsTextItem* paymentTitle =
+        [[PaymentsTextItem alloc] initWithType:ItemTypePaymentTitle];
     paymentTitle.text =
         l10n_util::GetNSString(IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME);
     [model setHeader:paymentTitle
         forSectionWithIdentifier:SectionIdentifierPayment];
 
     PaymentMethodItem* selectedPaymentMethodItem =
         [[PaymentMethodItem alloc] initWithType:ItemTypePaymentMethod];
     paymentMethodItem = selectedPaymentMethodItem;
     _selectedPaymentMethodItem = selectedPaymentMethodItem;
     [self fillPaymentMethodItem:selectedPaymentMethodItem
@@ skipping 12 matching lines @@
     addPaymentMethodItem.accessibilityTraits |= UIAccessibilityTraitButton;
   }
   [model addItem:paymentMethodItem
       toSectionWithIdentifier:SectionIdentifierPayment];
 
   // Contact Info section.
   [model addSectionWithIdentifier:SectionIdentifierContactInfo];
 
   CollectionViewItem* contactInfoItem = nil;
   if (_paymentRequest->selected_contact_profile()) {
-    CollectionViewTextItem* contactInfoTitle =
-        [[CollectionViewTextItem alloc] initWithType:ItemTypeContactInfoTitle];
+    PaymentsTextItem* contactInfoTitle =
+        [[PaymentsTextItem alloc] initWithType:ItemTypeContactInfoTitle];
     contactInfoTitle.text =
         l10n_util::GetNSString(IDS_PAYMENTS_CONTACT_DETAILS_LABEL);
     [model setHeader:contactInfoTitle
         forSectionWithIdentifier:SectionIdentifierContactInfo];
 
     AutofillProfileItem* selectedContactInfoItem =
         [[AutofillProfileItem alloc] initWithType:ItemTypeContactInfo];
     contactInfoItem = selectedContactInfoItem;
     _selectedContactInfoItem = selectedContactInfoItem;
     [self fillContactInfoItem:selectedContactInfoItem
@@ skipping 104 matching lines @@
 }
 
 - (void)fillShippingAddressItem:(AutofillProfileItem*)item
             withAutofillProfile:(autofill::AutofillProfile*)profile {
   DCHECK(profile);
   item.name = GetNameLabelFromAutofillProfile(*profile);
   item.address = GetShippingAddressLabelFromAutofillProfile(*profile);
   item.phoneNumber = GetPhoneNumberLabelFromAutofillProfile(*profile);
 }
 
-- (void)fillShippingOptionItem:(CollectionViewTextItem*)item
+- (void)fillShippingOptionItem:(PaymentsTextItem*)item
                     withOption:(web::PaymentShippingOption*)option {
   item.text = base::SysUTF16ToNSString(option->label);
   payments::CurrencyFormatter* currencyFormatter =
       _paymentRequest->GetOrCreateCurrencyFormatter();
   item.detailText = SysUTF16ToNSString(
       currencyFormatter->Format(base::UTF16ToASCII(option->amount.value)));
 }
 
 - (void)fillPaymentMethodItem:(PaymentMethodItem*)item
                withCreditCard:(autofill::CreditCard*)creditCard {
@@ skipping 144 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