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

Side by Side Diff: ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

Issue 2768933005: Use CollectionViewTextItem instead of a cast (Closed)
Patch Set: Remove MDFRoboto Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/ui/settings/settings_collection_view_controller.h" 5 #import "ios/chrome/browser/ui/settings/settings_collection_view_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #import "base/ios/weak_nsobject.h" 9 #import "base/ios/weak_nsobject.h"
10 #import "base/mac/foundation_util.h" 10 #import "base/mac/foundation_util.h"
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 } else { 325 } else {
326 [model addItem:[self accountCellItem] 326 [model addItem:[self accountCellItem]
327 toSectionWithIdentifier:SectionIdentifierSignIn]; 327 toSectionWithIdentifier:SectionIdentifierSignIn];
328 } 328 }
329 329
330 // Basics section 330 // Basics section
331 [model addSectionWithIdentifier:SectionIdentifierBasics]; 331 [model addSectionWithIdentifier:SectionIdentifierBasics];
332 CollectionViewTextItem* basicsHeader = [ 332 CollectionViewTextItem* basicsHeader = [
333 [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease]; 333 [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease];
334 basicsHeader.text = l10n_util::GetNSString(IDS_IOS_OPTIONS_GENERAL_TAB_LABEL); 334 basicsHeader.text = l10n_util::GetNSString(IDS_IOS_OPTIONS_GENERAL_TAB_LABEL);
335 basicsHeader.textColor = [[MDCPalette greyPalette] tint500];
335 [model setHeader:basicsHeader 336 [model setHeader:basicsHeader
336 forSectionWithIdentifier:SectionIdentifierBasics]; 337 forSectionWithIdentifier:SectionIdentifierBasics];
337 [model addItem:[self searchEngineDetailItem] 338 [model addItem:[self searchEngineDetailItem]
338 toSectionWithIdentifier:SectionIdentifierBasics]; 339 toSectionWithIdentifier:SectionIdentifierBasics];
339 [model addItem:[self savePasswordsDetailItem] 340 [model addItem:[self savePasswordsDetailItem]
340 toSectionWithIdentifier:SectionIdentifierBasics]; 341 toSectionWithIdentifier:SectionIdentifierBasics];
341 [model addItem:[self autoFillDetailItem] 342 [model addItem:[self autoFillDetailItem]
342 toSectionWithIdentifier:SectionIdentifierBasics]; 343 toSectionWithIdentifier:SectionIdentifierBasics];
343 [model addItem:[self nativeAppsDetailItem] 344 [model addItem:[self nativeAppsDetailItem]
344 toSectionWithIdentifier:SectionIdentifierBasics]; 345 toSectionWithIdentifier:SectionIdentifierBasics];
345 346
346 // Advanced Section 347 // Advanced Section
347 [model addSectionWithIdentifier:SectionIdentifierAdvanced]; 348 [model addSectionWithIdentifier:SectionIdentifierAdvanced];
348 CollectionViewTextItem* advancedHeader = [ 349 CollectionViewTextItem* advancedHeader = [
349 [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease]; 350 [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease];
350 advancedHeader.text = 351 advancedHeader.text =
351 l10n_util::GetNSString(IDS_IOS_OPTIONS_ADVANCED_TAB_LABEL); 352 l10n_util::GetNSString(IDS_IOS_OPTIONS_ADVANCED_TAB_LABEL);
353 advancedHeader.textColor = [[MDCPalette greyPalette] tint500];
352 [model setHeader:advancedHeader 354 [model setHeader:advancedHeader
353 forSectionWithIdentifier:SectionIdentifierAdvanced]; 355 forSectionWithIdentifier:SectionIdentifierAdvanced];
354 [model addItem:[self voiceSearchDetailItem] 356 [model addItem:[self voiceSearchDetailItem]
355 toSectionWithIdentifier:SectionIdentifierAdvanced]; 357 toSectionWithIdentifier:SectionIdentifierAdvanced];
356 [model addItem:[self privacyDetailItem] 358 [model addItem:[self privacyDetailItem]
357 toSectionWithIdentifier:SectionIdentifierAdvanced]; 359 toSectionWithIdentifier:SectionIdentifierAdvanced];
358 [model addItem:[self contentSettingsDetailItem] 360 [model addItem:[self contentSettingsDetailItem]
359 toSectionWithIdentifier:SectionIdentifierAdvanced]; 361 toSectionWithIdentifier:SectionIdentifierAdvanced];
360 [model addItem:[self bandwidthManagementDetailItem] 362 [model addItem:[self bandwidthManagementDetailItem]
361 toSectionWithIdentifier:SectionIdentifierAdvanced]; 363 toSectionWithIdentifier:SectionIdentifierAdvanced];
362 364
363 // Info Section 365 // Info Section
364 [model addSectionWithIdentifier:SectionIdentifierInfo]; 366 [model addSectionWithIdentifier:SectionIdentifierInfo];
365 [model addItem:[self aboutChromeDetailItem] 367 [model addItem:[self aboutChromeDetailItem]
366 toSectionWithIdentifier:SectionIdentifierInfo]; 368 toSectionWithIdentifier:SectionIdentifierInfo];
367 369
368 // Debug Section 370 // Debug Section
369 if ([self hasDebugSection]) { 371 if ([self hasDebugSection]) {
370 [model addSectionWithIdentifier:SectionIdentifierDebug]; 372 [model addSectionWithIdentifier:SectionIdentifierDebug];
371 CollectionViewTextItem* debugHeader = [[[CollectionViewTextItem alloc] 373 CollectionViewTextItem* debugHeader = [[[CollectionViewTextItem alloc]
372 initWithType:ItemTypeHeader] autorelease]; 374 initWithType:ItemTypeHeader] autorelease];
373 debugHeader.text = @"Debug"; 375 debugHeader.text = @"Debug";
376 debugHeader.textColor = [[MDCPalette greyPalette] tint500];
374 [model setHeader:debugHeader 377 [model setHeader:debugHeader
375 forSectionWithIdentifier:SectionIdentifierDebug]; 378 forSectionWithIdentifier:SectionIdentifierDebug];
376 } 379 }
377 380
378 if (experimental_flags::IsMemoryDebuggingEnabled()) { 381 if (experimental_flags::IsMemoryDebuggingEnabled()) {
379 _showMemoryDebugToolsItem.reset([[self showMemoryDebugSwitchItem] retain]); 382 _showMemoryDebugToolsItem.reset([[self showMemoryDebugSwitchItem] retain]);
380 [model addItem:_showMemoryDebugToolsItem 383 [model addItem:_showMemoryDebugToolsItem
381 toSectionWithIdentifier:SectionIdentifierDebug]; 384 toSectionWithIdentifier:SectionIdentifierDebug];
382 } 385 }
383 386
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 #endif // CHROMIUM_BUILD && !defined(NDEBUG) 677 #endif // CHROMIUM_BUILD && !defined(NDEBUG)
675 break; 678 break;
676 } 679 }
677 default: 680 default:
678 break; 681 break;
679 } 682 }
680 683
681 return cell; 684 return cell;
682 } 685 }
683 686
684 - (UICollectionReusableView*)collectionView:(UICollectionView*)collectionView
685 viewForSupplementaryElementOfKind:(NSString*)kind
686 atIndexPath:(NSIndexPath*)indexPath {
687 UICollectionReusableView* view = [super collectionView:collectionView
688 viewForSupplementaryElementOfKind:kind
689 atIndexPath:indexPath];
690
691 MDCCollectionViewTextCell* textCell =
692 base::mac::ObjCCast<MDCCollectionViewTextCell>(view);
693 if (textCell) {
694 textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
695 }
696 return view;
697 }
698
699 #pragma mark UICollectionViewDelegate 687 #pragma mark UICollectionViewDelegate
700 688
701 - (void)collectionView:(UICollectionView*)collectionView 689 - (void)collectionView:(UICollectionView*)collectionView
702 didSelectItemAtIndexPath:(NSIndexPath*)indexPath { 690 didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
703 [super collectionView:collectionView didSelectItemAtIndexPath:indexPath]; 691 [super collectionView:collectionView didSelectItemAtIndexPath:indexPath];
704 692
705 id object = [self.collectionViewModel itemAtIndexPath:indexPath]; 693 id object = [self.collectionViewModel itemAtIndexPath:indexPath];
706 if ([object respondsToSelector:@selector(isEnabled)] && 694 if ([object respondsToSelector:@selector(isEnabled)] &&
707 ![object performSelector:@selector(isEnabled)]) { 695 ![object performSelector:@selector(isEnabled)]) {
708 // Don't perform any action if the cell isn't enabled. 696 // Don't perform any action if the cell isn't enabled.
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 NSString* autofillDetail = 1079 NSString* autofillDetail =
1092 autofillEnabled ? l10n_util::GetNSString(IDS_IOS_SETTING_ON) 1080 autofillEnabled ? l10n_util::GetNSString(IDS_IOS_SETTING_ON)
1093 : l10n_util::GetNSString(IDS_IOS_SETTING_OFF); 1081 : l10n_util::GetNSString(IDS_IOS_SETTING_OFF);
1094 _autoFillDetailItem.get().detailText = autofillDetail; 1082 _autoFillDetailItem.get().detailText = autofillDetail;
1095 [self reconfigureCellsForItems:@[ _autoFillDetailItem ] 1083 [self reconfigureCellsForItems:@[ _autoFillDetailItem ]
1096 inSectionWithIdentifier:SectionIdentifierBasics]; 1084 inSectionWithIdentifier:SectionIdentifierBasics];
1097 } 1085 }
1098 } 1086 }
1099 1087
1100 @end 1088 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698