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 9cd65b8796d536527ba2b794a8d9811420085bda..422fa4ef5136cbbe54ad9524c819036cd733dc3d 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 |
@@ -14,6 +14,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" |
@@ -25,6 +26,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" |
namespace { |
@@ -123,7 +125,6 @@ reauthenticationModule:(id<ReauthenticationProtocol>)reauthenticationModule |
[[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease]; |
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] autorelease]; |
passwordHeader.text = |
l10n_util::GetNSString(IDS_IOS_SHOW_PASSWORD_VIEW_PASSWORD); |
- passwordHeader.textColor = [[MDCPalette greyPalette] tint500]; |
[model setHeader:passwordHeader |
forSectionWithIdentifier:SectionIdentifierPassword]; |
_passwordItem.reset( |
@@ -185,7 +185,6 @@ reauthenticationModule:(id<ReauthenticationProtocol>)reauthenticationModule |
CollectionViewTextItem* item = [ |
[[CollectionViewTextItem alloc] initWithType:ItemTypeDelete] autorelease]; |
item.text = l10n_util::GetNSString(IDS_IOS_SETTINGS_PASSWORD_DELETE_BUTTON); |
- item.textColor = [[MDCPalette cr_redPalette] tint500]; |
item.accessibilityTraits |= UIAccessibilityTraitButton; |
return item; |
} |
@@ -303,6 +302,37 @@ 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 ItemTypeCopy: |
+ case ItemTypeDelete: { |
+ CollectionViewTextCell* textCell = |
+ base::mac::ObjCCastStrict<CollectionViewTextCell>(cell); |
+ textCell.textLabel.font = [MDCTypography body2Font]; |
+ if (itemType == ItemTypeHeader || itemType == ItemTypeDelete) |
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500]; |
+ else |
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint900]; |
+ textCell.detailTextLabel.font = [MDCTypography body1Font]; |
+ textCell.detailTextLabel.textColor = [[MDCPalette greyPalette] tint500]; |
+ |
+ break; |
+ } |
+ default: |
+ break; |
+ } |
+ return cell; |
+} |
+ |
#pragma mark - UICollectionViewDelegate |
- (void)collectionView:(UICollectionView*)collectionView |