CollectionViewTextItem no longer styles CollectionViewTextCell

ios/chrome/browser/ui/settings/save_passwords_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/save_passwords_collection_view_controller.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/ios/ios_util.h"
@@ skipping 19 matching lines @@
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/url_formatter.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.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_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/password_details_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/reauthentication_module.h"
 #import "ios/chrome/browser/ui/settings/settings_utils.h"
 #import "ios/chrome/browser/ui/settings/utils/pref_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_mac.h"
 #include "url/gurl.h"
 
 namespace {
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
   SectionIdentifierMessage = kSectionIdentifierEnumZero,
   SectionIdentifierSavePasswordsSwitch,
   SectionIdentifierSavedPasswords,
   SectionIdentifierBlacklist,
@@ skipping 169 matching lines @@
       toSectionWithIdentifier:SectionIdentifierSavePasswordsSwitch];
 
   // Saved passwords.
   if ([passwordManagerEnabled_ value]) {
     if (!savedForms_.empty()) {
       [model addSectionWithIdentifier:SectionIdentifierSavedPasswords];
       CollectionViewTextItem* headerItem = [[[CollectionViewTextItem alloc]
           initWithType:ItemTypeHeader] autorelease];
       headerItem.text =
           l10n_util::GetNSString(IDS_PASSWORD_MANAGER_SHOW_PASSWORDS_TAB_TITLE);
-      headerItem.textColor = [[MDCPalette greyPalette] tint500];
       [model setHeader:headerItem
           forSectionWithIdentifier:SectionIdentifierSavedPasswords];
       for (const auto& form : savedForms_) {
         [model addItem:[self savedFormItemWithForm:form.get()]
             toSectionWithIdentifier:SectionIdentifierSavedPasswords];
       }
     }
     if (!blacklistedForms_.empty()) {
       [model addSectionWithIdentifier:SectionIdentifierBlacklist];
       CollectionViewTextItem* headerItem = [[[CollectionViewTextItem alloc]
           initWithType:ItemTypeHeader] autorelease];
       headerItem.text =
           l10n_util::GetNSString(IDS_PASSWORD_MANAGER_EXCEPTIONS_TAB_TITLE);
-      headerItem.textColor = [[MDCPalette greyPalette] tint500];
       [model setHeader:headerItem
           forSectionWithIdentifier:SectionIdentifierBlacklist];
       for (const auto& form : blacklistedForms_) {
         [model addItem:[self blacklistedFormItemWithForm:form.get()]
             toSectionWithIdentifier:SectionIdentifierBlacklist];
       }
     }
   }
 }
 
@@ skipping 106 matching lines @@
   }
 }
 
 #pragma mark - UICollectionViewDataSource
 
 - (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
                  cellForItemAtIndexPath:(NSIndexPath*)indexPath {
   UICollectionViewCell* cell =
       [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
 
-  if ([self.collectionViewModel itemTypeForIndexPath:indexPath] ==
-      ItemTypeSavePasswordsSwitch) {
+  NSInteger itemType =
+      [self.collectionViewModel itemTypeForIndexPath:indexPath];
+
+  if (itemType == ItemTypeSavePasswordsSwitch) {
     CollectionViewSwitchCell* switchCell =
         base::mac::ObjCCastStrict<CollectionViewSwitchCell>(cell);
     [switchCell.switchView addTarget:self
                               action:@selector(savePasswordsSwitchChanged:)
                     forControlEvents:UIControlEventValueChanged];
+  } else if (itemType == ItemTypeHeader || itemType == ItemTypeSavedPassword ||
+             itemType == ItemTypeBlacklisted) {
+    CollectionViewTextCell* textCell =
+        base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+    textCell.textLabel.font = [MDCTypography body2Font];
+    if (itemType == ItemTypeHeader)
+      textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
+    else
+      textCell.textLabel.textColor = [[MDCPalette greyPalette] tint900];
+    textCell.detailTextLabel.font = [MDCTypography body1Font];
+    textCell.detailTextLabel.textColor = [[MDCPalette greyPalette] tint500];
   }
   return cell;
 }
 
 #pragma mark - BooleanObserver
 
 - (void)booleanDidChange:(id<ObservableBoolean>)observableBoolean {
   DCHECK_EQ(observableBoolean, passwordManagerEnabled_.get());
 
   // Update the item.
@@ skipping 200 matching lines @@
 
 - (void)updateSuccessfulReauthTime {
   successfulReauthTime_.reset([[NSDate alloc] init]);
 }
 
 - (NSDate*)lastSuccessfulReauthTime {
   return successfulReauthTime_.get();
 }
 
 @end