Commit d966c4d1 authored by gambard's avatar gambard Committed by Commit Bot

[iOS] Fix TableView Catalog

This CL fixes some crashes in the Collection Cell Catalog.

Bug: 894791
Change-Id: I2ae86bfbbd46cde6dbee1a28808c7d611b802961
Reviewed-on: https://chromium-review.googlesource.com/c/1392095Reviewed-by: default avatarJérôme Lebel <jlebel@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619307}
parent a829e19b
...@@ -21,9 +21,6 @@ const CGFloat kMargin = 16; ...@@ -21,9 +21,6 @@ const CGFloat kMargin = 16;
#pragma mark - TableViewSigninPromoItem #pragma mark - TableViewSigninPromoItem
@implementation TableViewSigninPromoItem @implementation TableViewSigninPromoItem
@synthesize configurator = _configurator;
@synthesize delegate = _delegate;
@synthesize text = _text;
- (instancetype)initWithType:(NSInteger)type { - (instancetype)initWithType:(NSInteger)type {
self = [super initWithType:type]; self = [super initWithType:type];
......
...@@ -72,7 +72,6 @@ typedef NS_ENUM(NSInteger, SectionIdentifier) { ...@@ -72,7 +72,6 @@ typedef NS_ENUM(NSInteger, SectionIdentifier) {
SectionIdentifierAccountCell, SectionIdentifierAccountCell,
SectionIdentifierAccountControlCell, SectionIdentifierAccountControlCell,
SectionIdentifierFooters, SectionIdentifierFooters,
SectionIdentifierSync,
SectionIdentifierContentSuggestionsCell, SectionIdentifierContentSuggestionsCell,
}; };
...@@ -235,14 +234,6 @@ const CGFloat kCardIssuerNetworkIconDimension = 25.0; ...@@ -235,14 +234,6 @@ const CGFloat kCardIssuerNetworkIconDimension = 25.0;
// Multiline cells. // Multiline cells.
[model addSectionWithIdentifier:SectionIdentifierMultilineCell]; [model addSectionWithIdentifier:SectionIdentifierMultilineCell];
CardMultilineItem* multilineItem =
[[CardMultilineItem alloc] initWithType:ItemTypeMultilineBasic];
multilineItem.text =
@"Lorem ipsum dolor sit amet, consectetur "
@"adipiscing elit, sed do eiusmod tempor "
@"incididunt ut labore et dolore magna aliqua.";
[model addItem:multilineItem
toSectionWithIdentifier:SectionIdentifierMultilineCell];
[model addItem:[self settingsImageDetailTextItem] [model addItem:[self settingsImageDetailTextItem]
toSectionWithIdentifier:SectionIdentifierMultilineCell]; toSectionWithIdentifier:SectionIdentifierMultilineCell];
LegacySettingsImageDetailTextItem* settingsImageDetailTextItem = LegacySettingsImageDetailTextItem* settingsImageDetailTextItem =
...@@ -384,11 +375,6 @@ const CGFloat kCardIssuerNetworkIconDimension = 25.0; ...@@ -384,11 +375,6 @@ const CGFloat kCardIssuerNetworkIconDimension = 25.0;
[model addItem:[self warmStateSigninPromoItem] [model addItem:[self warmStateSigninPromoItem]
toSectionWithIdentifier:SectionIdentifierAccountCell]; toSectionWithIdentifier:SectionIdentifierAccountCell];
// Sync cells.
[model addSectionWithIdentifier:SectionIdentifierSync];
[model addItem:[self syncPassphraseErrorItem]
toSectionWithIdentifier:SectionIdentifierSync];
// Account control cells. // Account control cells.
[model addSectionWithIdentifier:SectionIdentifierAccountControlCell]; [model addSectionWithIdentifier:SectionIdentifierAccountControlCell];
[model addItem:[self accountControlItem] [model addItem:[self accountControlItem]
...@@ -819,13 +805,6 @@ const CGFloat kCardIssuerNetworkIconDimension = 25.0; ...@@ -819,13 +805,6 @@ const CGFloat kCardIssuerNetworkIconDimension = 25.0;
return footerItem; return footerItem;
} }
- (PassphraseErrorItem*)syncPassphraseErrorItem {
PassphraseErrorItem* item =
[[PassphraseErrorItem alloc] initWithType:ItemTypeSyncPassphraseError];
item.text = @"Incorrect passphrase";
return item;
}
- (PasswordDetailsItem*)passwordDetailsShortHiddenItem { - (PasswordDetailsItem*)passwordDetailsShortHiddenItem {
PasswordDetailsItem* item = [[PasswordDetailsItem alloc] PasswordDetailsItem* item = [[PasswordDetailsItem alloc]
initWithType:ItemTypePasswordDetailsShortHidden]; initWithType:ItemTypePasswordDetailsShortHidden];
......
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
#import "ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.h" #import "ios/chrome/browser/ui/settings/table_cell_catalog_view_controller.h"
#import "ios/chrome/browser/ui/authentication/cells/account_control_item.h" #import "ios/chrome/browser/ui/authentication/cells/account_control_item.h"
#import "ios/chrome/browser/ui/authentication/cells/signin_promo_view_configurator.h"
#import "ios/chrome/browser/ui/authentication/cells/table_view_account_item.h" #import "ios/chrome/browser/ui/authentication/cells/table_view_account_item.h"
#import "ios/chrome/browser/ui/authentication/cells/table_view_signin_promo_item.h"
#import "ios/chrome/browser/ui/autofill/cells/autofill_edit_item.h" #import "ios/chrome/browser/ui/autofill/cells/autofill_edit_item.h"
#import "ios/chrome/browser/ui/icons/chrome_icon.h" #import "ios/chrome/browser/ui/icons/chrome_icon.h"
#import "ios/chrome/browser/ui/settings/cells/autofill_data_item.h" #import "ios/chrome/browser/ui/settings/cells/autofill_data_item.h"
...@@ -281,6 +283,16 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -281,6 +283,16 @@ typedef NS_ENUM(NSInteger, ItemType) {
toSectionWithIdentifier:SectionIdentifierAutofill]; toSectionWithIdentifier:SectionIdentifierAutofill];
// SectionIdentifierAccount. // SectionIdentifierAccount.
TableViewSigninPromoItem* signinPromo =
[[TableViewSigninPromoItem alloc] initWithType:ItemTypeAccount];
signinPromo.configurator = [[SigninPromoViewConfigurator alloc]
initWithUserEmail:@"jonhdoe@example.com"
userFullName:@"John Doe"
userImage:nil
hasCloseButton:NO];
signinPromo.text = @"Signin promo text example";
[model addItem:signinPromo toSectionWithIdentifier:SectionIdentifierAccount];
TableViewAccountItem* accountItemDetailWithError = TableViewAccountItem* accountItemDetailWithError =
[[TableViewAccountItem alloc] initWithType:ItemTypeAccount]; [[TableViewAccountItem alloc] initWithType:ItemTypeAccount];
// TODO(crbug.com/754032): ios_default_avatar image is from a downstream iOS // TODO(crbug.com/754032): ios_default_avatar image is from a downstream iOS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment