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

Unified Diff: ios/chrome/browser/ui/settings/save_passwords_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/save_passwords_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
index 200802df22d43a84d64ecfe29a68c315f5f8b09f..be19fa5ec7d570166af872defa70dfade70d5b2a 100644
--- a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm
@@ -37,6 +37,7 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h"
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_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/settings/password_details_collection_view_controller.h"
@@ -45,6 +46,7 @@
#import "ios/chrome/browser/ui/settings/utils/pref_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_mac.h"
#include "url/gurl.h"
@@ -234,7 +236,6 @@ void SavePasswordsConsumer::OnGetPasswordStoreResults(
initWithType:ItemTypeHeader] autorelease];
headerItem.text =
l10n_util::GetNSString(IDS_PASSWORD_MANAGER_SHOW_PASSWORDS_TAB_TITLE);
- headerItem.textColor = [[MDCPalette greyPalette] tint500];
[model setHeader:headerItem
forSectionWithIdentifier:SectionIdentifierSavedPasswords];
for (const auto& form : savedForms_) {
@@ -248,7 +249,6 @@ void SavePasswordsConsumer::OnGetPasswordStoreResults(
initWithType:ItemTypeHeader] autorelease];
headerItem.text =
l10n_util::GetNSString(IDS_PASSWORD_MANAGER_EXCEPTIONS_TAB_TITLE);
- headerItem.textColor = [[MDCPalette greyPalette] tint500];
[model setHeader:headerItem
forSectionWithIdentifier:SectionIdentifierBlacklist];
for (const auto& form : blacklistedForms_) {
@@ -375,13 +375,19 @@ void SavePasswordsConsumer::OnGetPasswordStoreResults(
UICollectionViewCell* cell =
[super collectionView:collectionView cellForItemAtIndexPath:indexPath];
- if ([self.collectionViewModel itemTypeForIndexPath:indexPath] ==
- ItemTypeSavePasswordsSwitch) {
+ NSInteger itemType =
+ [self.collectionViewModel itemTypeForIndexPath:indexPath];
+
+ if (itemType == ItemTypeSavePasswordsSwitch) {
CollectionViewSwitchCell* switchCell =
base::mac::ObjCCastStrict<CollectionViewSwitchCell>(cell);
[switchCell.switchView addTarget:self
action:@selector(savePasswordsSwitchChanged:)
forControlEvents:UIControlEventValueChanged];
+ } else if (itemType == ItemTypeHeader) {
+ CollectionViewTextCell* textCell =
+ base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+ textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
}
return cell;
}

Powered by Google App Engine
This is Rietveld 408576698