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/privacy_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/privacy_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm b/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm
index 199055f14811795739b951b8b0ba425393f451d0..bfcbea8d3a4d3106f5919385e8de5c81d6beb29d 100644
--- a/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/privacy_collection_view_controller.mm
@@ -28,6 +28,7 @@
#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_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/contextual_search/touch_to_search_permissions_mediator.h"
@@ -45,6 +46,7 @@
#include "ios/chrome/grit/ios_chromium_strings.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 "ios/web/public/web_capabilities.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_mac.h"
@@ -165,7 +167,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
initWithType:ItemTypeOtherDevicesHeader] autorelease];
otherDevicesHeader.text =
l10n_util::GetNSString(IDS_IOS_OPTIONS_CONTINUITY_LABEL);
- otherDevicesHeader.textColor = [[MDCPalette greyPalette] tint500];
[model setHeader:otherDevicesHeader
forSectionWithIdentifier:SectionIdentifierOtherDevices];
[model addItem:[self handoffDetailItem]
@@ -177,7 +178,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
initWithType:ItemTypeWebServicesHeader] autorelease];
webServicesHeader.text =
l10n_util::GetNSString(IDS_IOS_OPTIONS_WEB_SERVICES_LABEL);
- webServicesHeader.textColor = [[MDCPalette greyPalette] tint500];
[model setHeader:webServicesHeader
forSectionWithIdentifier:SectionIdentifierWebServices];
_showSuggestionsItem.reset([[self showSuggestionsSwitchItem] retain]);
@@ -335,6 +335,11 @@ typedef NS_ENUM(NSInteger, ItemType) {
[switchCell.switchView addTarget:self
action:@selector(showSuggestionsToggled:)
forControlEvents:UIControlEventValueChanged];
+ } else if (itemType == ItemTypeOtherDevicesHeader ||
+ itemType == ItemTypeWebServicesHeader) {
+ CollectionViewTextCell* textCell =
+ base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
}
return cell;

Powered by Google App Engine
This is Rietveld 408576698