| Index: ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm
|
| diff --git a/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm b/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm
|
| index c562d60245b3aa6b57908ce39c22414674f4175f..7d403b466aaf620cc8f1048fc55896c828359fa6 100644
|
| --- a/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm
|
| +++ b/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm
|
| @@ -13,12 +13,14 @@
|
| #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
|
| #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.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/settings_navigation_controller.h"
|
| #import "ios/chrome/browser/ui/settings/utils/content_setting_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.h"
|
| #include "ui/base/l10n/l10n_util_mac.h"
|
|
|
| @@ -135,13 +137,21 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
| UICollectionViewCell* cell =
|
| [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
|
|
|
| - if ([self.collectionViewModel itemTypeForIndexPath:indexPath] ==
|
| - ItemTypeMainSwitch) {
|
| + NSInteger itemType =
|
| + [self.collectionViewModel itemTypeForIndexPath:indexPath];
|
| + if (itemType == ItemTypeMainSwitch) {
|
| CollectionViewSwitchCell* switchCell =
|
| base::mac::ObjCCastStrict<CollectionViewSwitchCell>(cell);
|
| [switchCell.switchView addTarget:self
|
| action:@selector(blockPopupsSwitchChanged:)
|
| forControlEvents:UIControlEventValueChanged];
|
| + } else if (itemType == ItemTypeHeader || itemType == ItemTypeException) {
|
| + CollectionViewTextCell* textCell =
|
| + base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
|
| + textCell.textLabel.font = [MDCTypography body2Font];
|
| + textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
|
| + textCell.detailTextLabel.font = [MDCTypography body1Font];
|
| + textCell.detailTextLabel.textColor = [[MDCPalette greyPalette] tint500];
|
| }
|
| return cell;
|
| }
|
| @@ -296,7 +306,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
| CollectionViewTextItem* header =
|
| [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader];
|
| header.text = l10n_util::GetNSString(IDS_IOS_POPUPS_ALLOWED);
|
| - header.textColor = [[MDCPalette greyPalette] tint500];
|
| [model setHeader:header forSectionWithIdentifier:SectionIdentifierExceptions];
|
|
|
| for (size_t i = 0; i < _exceptions.GetSize(); ++i) {
|
|
|