Index: ios/chrome/browser/ui/settings/settings_collection_view_controller.mm |
diff --git a/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm |
index 73c8da6fa4ed901bcbd9813406885fb188b0a21d..ed4ff58090126702e75bf6cc20de3eadfe8f7004 100644 |
--- a/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm |
+++ b/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm |
@@ -49,6 +49,7 @@ |
#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_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/colors/MDCPalette+CrAdditions.h" |
@@ -75,6 +76,7 @@ |
#import "ios/public/provider/chrome/browser/signin/chrome_identity.h" |
#import "ios/public/provider/chrome/browser/signin/signin_resources_provider.h" |
#include "ios/public/provider/chrome/browser/voice/voice_search_prefs.h" |
+#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h" |
#include "ui/base/l10n/l10n_util_mac.h" |
NSString* const kSettingsCollectionViewId = @"kSettingsCollectionViewId"; |
@@ -349,7 +351,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id, |
CollectionViewTextItem* basicsHeader = [ |
[[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease]; |
basicsHeader.text = l10n_util::GetNSString(IDS_IOS_OPTIONS_GENERAL_TAB_LABEL); |
- basicsHeader.textColor = [[MDCPalette greyPalette] tint500]; |
[model setHeader:basicsHeader |
forSectionWithIdentifier:SectionIdentifierBasics]; |
[model addItem:[self searchEngineDetailItem] |
@@ -367,7 +368,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id, |
[[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease]; |
advancedHeader.text = |
l10n_util::GetNSString(IDS_IOS_OPTIONS_ADVANCED_TAB_LABEL); |
- advancedHeader.textColor = [[MDCPalette greyPalette] tint500]; |
[model setHeader:advancedHeader |
forSectionWithIdentifier:SectionIdentifierAdvanced]; |
[model addItem:[self voiceSearchDetailItem] |
@@ -390,7 +390,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id, |
CollectionViewTextItem* debugHeader = [[[CollectionViewTextItem alloc] |
initWithType:ItemTypeHeader] autorelease]; |
debugHeader.text = @"Debug"; |
- debugHeader.textColor = [[MDCPalette greyPalette] tint500]; |
[model setHeader:debugHeader |
forSectionWithIdentifier:SectionIdentifierDebug]; |
} |
@@ -657,6 +656,12 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id, |
} |
switch (itemType) { |
+ case ItemTypeHeader: { |
+ CollectionViewTextCell* textCell = |
+ base::mac::ObjCCastStrict<CollectionViewTextCell>(cell); |
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500]; |
+ break; |
+ } |
case ItemTypeMemoryDebugging: { |
CollectionViewSwitchCell* switchCell = |
base::mac::ObjCCastStrict<CollectionViewSwitchCell>(cell); |