Index: ios/chrome/browser/ui/settings/password_details_collection_view_controller.mm |
diff --git a/ios/chrome/browser/ui/settings/password_details_collection_view_controller.mm b/ios/chrome/browser/ui/settings/password_details_collection_view_controller.mm |
index 50b7fd7b2c251a339852b41b4a46b5340d8684ed..8de330cb6576484fcb33b1cd2754179fdf6ba729 100644 |
--- a/ios/chrome/browser/ui/settings/password_details_collection_view_controller.mm |
+++ b/ios/chrome/browser/ui/settings/password_details_collection_view_controller.mm |
@@ -12,6 +12,7 @@ |
#include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
#import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h" |
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_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" |
@@ -23,6 +24,7 @@ |
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h" |
#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h" |
#import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h" |
+#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h" |
#include "ui/base/l10n/l10n_util_mac.h" |
#if !defined(__has_feature) || !__has_feature(objc_arc) |
@@ -123,7 +125,6 @@ reauthenticationModule:(id<ReauthenticationProtocol>)reauthenticationModule |
[[CollectionViewTextItem alloc] initWithType:ItemTypeHeader]; |
usernameHeader.text = |
l10n_util::GetNSString(IDS_IOS_SHOW_PASSWORD_VIEW_USERNAME); |
- usernameHeader.textColor = [[MDCPalette greyPalette] tint500]; |
[model setHeader:usernameHeader |
forSectionWithIdentifier:SectionIdentifierUsername]; |
PasswordDetailsItem* usernameItem = |
@@ -138,7 +139,6 @@ reauthenticationModule:(id<ReauthenticationProtocol>)reauthenticationModule |
[[CollectionViewTextItem alloc] initWithType:ItemTypeHeader]; |
passwordHeader.text = |
l10n_util::GetNSString(IDS_IOS_SHOW_PASSWORD_VIEW_PASSWORD); |
- passwordHeader.textColor = [[MDCPalette greyPalette] tint500]; |
[model setHeader:passwordHeader |
forSectionWithIdentifier:SectionIdentifierPassword]; |
_passwordItem = [[PasswordDetailsItem alloc] initWithType:ItemTypePassword]; |
@@ -183,7 +183,6 @@ reauthenticationModule:(id<ReauthenticationProtocol>)reauthenticationModule |
CollectionViewTextItem* item = |
[[CollectionViewTextItem alloc] initWithType:ItemTypeDelete]; |
item.text = l10n_util::GetNSString(IDS_IOS_SETTINGS_PASSWORD_DELETE_BUTTON); |
- item.textColor = [[MDCPalette cr_redPalette] tint500]; |
gambard
2017/04/14 07:04:03
This one is red
|
item.accessibilityTraits |= UIAccessibilityTraitButton; |
return item; |
} |
@@ -299,6 +298,29 @@ reauthenticationModule:(id<ReauthenticationProtocol>)reauthenticationModule |
[_weakDelegate deletePassword:_passwordForm]; |
} |
+#pragma mark - UICollectionViewDataSource |
+ |
+- (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView |
+ cellForItemAtIndexPath:(NSIndexPath*)indexPath { |
+ UICollectionViewCell* cell = |
+ [super collectionView:collectionView cellForItemAtIndexPath:indexPath]; |
+ |
+ NSInteger itemType = |
+ [self.collectionViewModel itemTypeForIndexPath:indexPath]; |
+ switch (itemType) { |
+ case ItemTypeHeader: |
+ case ItemTypeDelete: { |
+ CollectionViewTextCell* textCell = |
+ base::mac::ObjCCastStrict<CollectionViewTextCell>(cell); |
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500]; |
+ break; |
+ } |
+ default: |
+ break; |
+ } |
+ return cell; |
+} |
+ |
#pragma mark - UICollectionViewDelegate |
- (void)collectionView:(UICollectionView*)collectionView |