CollectionViewTextItem no longer styles CollectionViewTextCell

ios/chrome/browser/ui/settings/sync_settings_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/sync_settings_collection_view_controller.h"
 
 #include <memory>
 
 #include "base/auto_reset.h"
 #include "base/mac/foundation_util.h"
@@ skipping 14 matching lines @@
 #import "ios/chrome/browser/signin/chrome_identity_service_observer_bridge.h"
 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
 #include "ios/chrome/browser/sync/sync_setup_service.h"
 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/browser/ui/authentication/authentication_flow.h"
 #import "ios/chrome/browser/ui/authentication/resized_avatar_cache.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_account_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_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"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/commands/open_url_command.h"
 #import "ios/chrome/browser/ui/settings/cells/sync_switch_item.h"
 #import "ios/chrome/browser/ui/settings/cells/text_and_error_item.h"
 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
 #import "ios/chrome/browser/ui/settings/sync_encryption_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.h"
 #import "ios/chrome/browser/ui/sync/sync_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
 #import "ios/public/provider/chrome/browser/signin/chrome_identity_service.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"
 
 // The a11y identifier of the view controller's view.
 NSString* const kSettingsSyncId = @"kSettingsSyncId";
 // Notification when a switch account operation will start.
 NSString* const kSwitchAccountWillStartNotification =
     @"kSwitchAccountWillStartNotification";
 // Notification when a switch account operation did finish.
 NSString* const kSwitchAccountDidFinishNotification =
@@ skipping 201 matching lines @@
 
   // Sync to Section.
   if ([self hasAccountsSection]) {
     NSMutableDictionary<NSString*, CollectionViewItem*>* mutableIdentityMap =
         [[[NSMutableDictionary alloc] init] autorelease];
     // Accounts section. Cells enabled if sync is on.
     [model addSectionWithIdentifier:SectionIdentifierSyncAccounts];
     CollectionViewTextItem* syncToHeader = [[[CollectionViewTextItem alloc]
         initWithType:ItemTypeHeader] autorelease];
     syncToHeader.text = l10n_util::GetNSString(IDS_IOS_SYNC_TO_TITLE);
-    syncToHeader.textColor = [[MDCPalette greyPalette] tint500];
     [model setHeader:syncToHeader
         forSectionWithIdentifier:SectionIdentifierSyncAccounts];
     ProfileOAuth2TokenService* oauth2_service =
         OAuth2TokenServiceFactory::GetForBrowserState(_browserState);
     AccountTrackerService* accountTracker =
         ios::AccountTrackerServiceFactory::GetForBrowserState(_browserState);
 
     for (const std::string& account_id : oauth2_service->GetAccounts()) {
       AccountInfo account = accountTracker->GetAccountInfo(account_id);
       ChromeIdentity* identity = ios::GetChromeBrowserProvider()
                                      ->GetChromeIdentityService()
                                      ->GetIdentityWithGaiaID(account.gaia);
       CollectionViewItem* accountItem = [self accountItem:identity];
       [model addItem:accountItem
           toSectionWithIdentifier:SectionIdentifierSyncAccounts];
       [mutableIdentityMap setObject:accountItem forKey:identity.gaiaID];
     }
     _identityMap.reset([mutableIdentityMap retain]);
   }
 
   // Data Types to sync. Enabled if sync is on.
   [model addSectionWithIdentifier:SectionIdentifierSyncServices];
   CollectionViewTextItem* syncServicesHeader = [
       [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease];
   syncServicesHeader.text =
       l10n_util::GetNSString(IDS_IOS_SYNC_DATA_TYPES_TITLE);
-  syncServicesHeader.textColor = [[MDCPalette greyPalette] tint500];
   [model setHeader:syncServicesHeader
       forSectionWithIdentifier:SectionIdentifierSyncServices];
   BOOL syncEverythingEnabled = _syncSetupService->IsSyncingAllDataTypes();
   [model addItem:[self syncEverythingSwitchItem:syncEverythingEnabled]
       toSectionWithIdentifier:SectionIdentifierSyncServices];
   // Specific Data Types to sync. Enabled if Sync Everything is off.
   for (int i = 0; i < SyncSetupService::kNumberOfSyncableDatatypes; ++i) {
     SyncSetupService::SyncableDatatype dataType =
         static_cast<SyncSetupService::SyncableDatatype>(i);
     [model addItem:[self switchItemForDataType:dataType]
@@ skipping 143 matching lines @@
     }
     case ItemTypeSyncableDataType: {
       SyncSwitchCell* switchCell =
           base::mac::ObjCCastStrict<SyncSwitchCell>(cell);
       [switchCell.switchView addTarget:self
                                 action:@selector(changeDataTypeSyncStatusToOn:)
                       forControlEvents:UIControlEventValueChanged];
       switchCell.switchView.tag = [self tagForIndexPath:indexPath];
       break;
     }
+    case ItemTypeHeader:
+    case ItemTypeManageSyncedData: {
+      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];
+      break;
+    }
     default:
       break;
   }
   return cell;
 }
 
 #pragma mark UICollectionViewDelegate
 
 - (void)collectionView:(UICollectionView*)collectionView
     didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
@@ skipping 493 matching lines @@
   [self updateAccountItem:item withIdentity:identity];
   [self reconfigureCellsForItems:@[ item ]
          inSectionWithIdentifier:SectionIdentifierSyncAccounts];
 }
 
 - (void)onChromeIdentityServiceWillBeDestroyed {
   _identityServiceObserver.reset();
 }
 
 @end