Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm

Issue 2817953002: CollectionViewTextItem no longer styles CollectionViewTextCell (Closed)
Patch Set: rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
index 0632a09b8558ae51d52bbdb29207a196537b345e..daa31a0c311af64e5d1a7d78ab3a96a4cc216e09 100644
--- a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm
@@ -32,6 +32,7 @@
#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"
@@ -49,6 +50,8 @@
#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"
@@ -270,7 +273,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
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 =
@@ -297,7 +299,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
[[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();
@@ -461,6 +462,12 @@ typedef NS_ENUM(NSInteger, ItemType) {
switchCell.switchView.tag = [self tagForIndexPath:indexPath];
break;
}
+ case ItemTypeHeader: {
+ CollectionViewTextCell* textCell =
+ base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
+ break;
+ }
default:
break;
}

Powered by Google App Engine
This is Rietveld 408576698