| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.
h" | 4 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.
h" |
| 5 | 5 |
| 6 #include <memory> | 6 #include <memory> |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| 11 #import "base/ios/weak_nsobject.h" |
| 11 #include "base/logging.h" | 12 #include "base/logging.h" |
| 12 #include "base/mac/foundation_util.h" | 13 #include "base/mac/foundation_util.h" |
| 13 | 14 #include "base/mac/objc_property_releaser.h" |
| 15 #include "base/mac/scoped_nsobject.h" |
| 14 #include "base/strings/sys_string_conversions.h" | 16 #include "base/strings/sys_string_conversions.h" |
| 15 #include "components/bookmarks/browser/bookmark_model.h" | 17 #include "components/bookmarks/browser/bookmark_model.h" |
| 16 #include "components/bookmarks/browser/bookmark_node.h" | 18 #include "components/bookmarks/browser/bookmark_node.h" |
| 17 #import "ios/chrome/browser/ui/bookmarks/bookmark_elevated_toolbar.h" | 19 #import "ios/chrome/browser/ui/bookmarks/bookmark_elevated_toolbar.h" |
| 18 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" | 20 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h" |
| 19 #import "ios/chrome/browser/ui/bookmarks/bookmark_model_bridge_observer.h" | 21 #import "ios/chrome/browser/ui/bookmarks/bookmark_model_bridge_observer.h" |
| 20 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" | 22 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h" |
| 21 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h" | 23 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h" |
| 22 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h" | 24 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h" |
| 23 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h" | 25 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h" |
| 24 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" | 26 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" |
| 25 #import "ios/chrome/browser/ui/icons/chrome_icon.h" | 27 #import "ios/chrome/browser/ui/icons/chrome_icon.h" |
| 26 #import "ios/chrome/browser/ui/material_components/utils.h" | 28 #import "ios/chrome/browser/ui/material_components/utils.h" |
| 27 #include "ios/chrome/browser/ui/rtl_geometry.h" | 29 #include "ios/chrome/browser/ui/rtl_geometry.h" |
| 28 #include "ios/chrome/grit/ios_strings.h" | 30 #include "ios/chrome/grit/ios_strings.h" |
| 29 #import "ios/third_party/material_components_ios/src/components/NavigationBar/sr
c/MaterialNavigationBar.h" | 31 #import "ios/third_party/material_components_ios/src/components/NavigationBar/sr
c/MaterialNavigationBar.h" |
| 30 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat
erialPalettes.h" | 32 #import "ios/third_party/material_components_ios/src/components/Palettes/src/Mat
erialPalettes.h" |
| 31 #import "ios/third_party/material_components_ios/src/components/ShadowElevations
/src/MaterialShadowElevations.h" | 33 #import "ios/third_party/material_components_ios/src/components/ShadowElevations
/src/MaterialShadowElevations.h" |
| 32 #import "ios/third_party/material_components_ios/src/components/ShadowLayer/src/
MaterialShadowLayer.h" | 34 #import "ios/third_party/material_components_ios/src/components/ShadowLayer/src/
MaterialShadowLayer.h" |
| 33 #import "ios/third_party/material_components_ios/src/components/Typography/src/M
aterialTypography.h" | 35 #import "ios/third_party/material_components_ios/src/components/Typography/src/M
aterialTypography.h" |
| 34 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
| 35 | 37 |
| 36 #if !defined(__has_feature) || !__has_feature(objc_arc) | |
| 37 #error "This file requires ARC support." | |
| 38 #endif | |
| 39 | |
| 40 using bookmarks::BookmarkNode; | 38 using bookmarks::BookmarkNode; |
| 41 | 39 |
| 42 namespace { | 40 namespace { |
| 43 | 41 |
| 44 typedef NS_ENUM(NSInteger, SectionIdentifier) { | 42 typedef NS_ENUM(NSInteger, SectionIdentifier) { |
| 45 SectionIdentifierInfo = kSectionIdentifierEnumZero, | 43 SectionIdentifierInfo = kSectionIdentifierEnumZero, |
| 46 }; | 44 }; |
| 47 | 45 |
| 48 typedef NS_ENUM(NSInteger, ItemType) { | 46 typedef NS_ENUM(NSInteger, ItemType) { |
| 49 ItemTypeFolderTitle = kItemTypeEnumZero, | 47 ItemTypeFolderTitle = kItemTypeEnumZero, |
| 50 ItemTypeParentFolder, | 48 ItemTypeParentFolder, |
| 51 }; | 49 }; |
| 52 | 50 |
| 53 } // namespace | 51 } // namespace |
| 54 | 52 |
| 55 @interface BookmarkFolderEditorViewController ()< | 53 @interface BookmarkFolderEditorViewController ()< |
| 56 BookmarkFolderViewControllerDelegate, | 54 BookmarkFolderViewControllerDelegate, |
| 57 BookmarkModelBridgeObserver, | 55 BookmarkModelBridgeObserver, |
| 58 BookmarkTextFieldItemDelegate> { | 56 BookmarkTextFieldItemDelegate> { |
| 59 std::unique_ptr<bookmarks::BookmarkModelBridge> _modelBridge; | 57 std::unique_ptr<bookmarks::BookmarkModelBridge> _modelBridge; |
| 60 | 58 base::mac::ObjCPropertyReleaser |
| 59 _propertyReleaser_BookmarkFolderEditorViewController; |
| 61 // Flag to ignore bookmark model Move notifications when the move is performed | 60 // Flag to ignore bookmark model Move notifications when the move is performed |
| 62 // by this class. | 61 // by this class. |
| 63 BOOL _ignoresOwnMove; | 62 BOOL _ignoresOwnMove; |
| 64 } | 63 } |
| 65 @property(nonatomic, assign) BOOL editingExistingFolder; | 64 @property(nonatomic, assign) BOOL editingExistingFolder; |
| 66 @property(nonatomic, assign) bookmarks::BookmarkModel* bookmarkModel; | 65 @property(nonatomic, assign) bookmarks::BookmarkModel* bookmarkModel; |
| 67 @property(nonatomic, assign) ios::ChromeBrowserState* browserState; | 66 @property(nonatomic, assign) ios::ChromeBrowserState* browserState; |
| 68 @property(nonatomic, assign) const BookmarkNode* folder; | 67 @property(nonatomic, assign) const BookmarkNode* folder; |
| 69 @property(nonatomic, strong) BookmarkFolderViewController* folderViewController; | 68 @property(nonatomic, retain) BookmarkFolderViewController* folderViewController; |
| 70 @property(nonatomic, assign) const BookmarkNode* parentFolder; | 69 @property(nonatomic, assign) const BookmarkNode* parentFolder; |
| 71 @property(nonatomic, weak) UIBarButtonItem* doneItem; | 70 @property(nonatomic, assign) UIBarButtonItem* doneItem; |
| 72 @property(nonatomic, strong) BookmarkTextFieldItem* titleItem; | 71 @property(nonatomic, retain) BookmarkTextFieldItem* titleItem; |
| 73 @property(nonatomic, strong) BookmarkParentFolderItem* parentFolderItem; | 72 @property(nonatomic, retain) BookmarkParentFolderItem* parentFolderItem; |
| 74 // Bottom toolbar with DELETE button that only appears when the edited folder | 73 // Bottom toolbar with DELETE button that only appears when the edited folder |
| 75 // allows deletion. | 74 // allows deletion. |
| 76 @property(nonatomic, weak) BookmarksElevatedToolbar* toolbar; | 75 @property(nonatomic, assign) BookmarksElevatedToolbar* toolbar; |
| 77 | 76 |
| 78 // |bookmarkModel| must not be NULL and must be loaded. | 77 // |bookmarkModel| must not be NULL and must be loaded. |
| 79 - (instancetype)initWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel | 78 - (instancetype)initWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel |
| 80 NS_DESIGNATED_INITIALIZER; | 79 NS_DESIGNATED_INITIALIZER; |
| 81 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style | 80 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style |
| 82 NS_UNAVAILABLE; | 81 NS_UNAVAILABLE; |
| 83 | 82 |
| 84 // Enables or disables the save button depending on the state of the form. | 83 // Enables or disables the save button depending on the state of the form. |
| 85 - (void)updateSaveButtonState; | 84 - (void)updateSaveButtonState; |
| 86 | 85 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 107 @synthesize doneItem = _doneItem; | 106 @synthesize doneItem = _doneItem; |
| 108 @synthesize titleItem = _titleItem; | 107 @synthesize titleItem = _titleItem; |
| 109 @synthesize parentFolderItem = _parentFolderItem; | 108 @synthesize parentFolderItem = _parentFolderItem; |
| 110 @synthesize toolbar = _toolbar; | 109 @synthesize toolbar = _toolbar; |
| 111 | 110 |
| 112 #pragma mark - Class methods | 111 #pragma mark - Class methods |
| 113 | 112 |
| 114 + (instancetype) | 113 + (instancetype) |
| 115 folderCreatorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel | 114 folderCreatorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel |
| 116 parentFolder:(const BookmarkNode*)parentFolder { | 115 parentFolder:(const BookmarkNode*)parentFolder { |
| 117 BookmarkFolderEditorViewController* folderCreator = | 116 base::scoped_nsobject<BookmarkFolderEditorViewController> folderCreator( |
| 118 [[self alloc] initWithBookmarkModel:bookmarkModel]; | 117 [[self alloc] initWithBookmarkModel:bookmarkModel]); |
| 119 folderCreator.parentFolder = parentFolder; | 118 folderCreator.get().parentFolder = parentFolder; |
| 120 folderCreator.folder = NULL; | 119 folderCreator.get().folder = NULL; |
| 121 folderCreator.editingExistingFolder = NO; | 120 folderCreator.get().editingExistingFolder = NO; |
| 122 return folderCreator = nil; | 121 return folderCreator.autorelease(); |
| 123 } | 122 } |
| 124 | 123 |
| 125 + (instancetype) | 124 + (instancetype) |
| 126 folderEditorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel | 125 folderEditorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel |
| 127 folder:(const BookmarkNode*)folder | 126 folder:(const BookmarkNode*)folder |
| 128 browserState:(ios::ChromeBrowserState*)browserState { | 127 browserState:(ios::ChromeBrowserState*)browserState { |
| 129 DCHECK(folder); | 128 DCHECK(folder); |
| 130 DCHECK(!bookmarkModel->is_permanent_node(folder)); | 129 DCHECK(!bookmarkModel->is_permanent_node(folder)); |
| 131 DCHECK(browserState); | 130 DCHECK(browserState); |
| 132 BookmarkFolderEditorViewController* folderEditor = | 131 base::scoped_nsobject<BookmarkFolderEditorViewController> folderEditor( |
| 133 [[self alloc] initWithBookmarkModel:bookmarkModel]; | 132 [[self alloc] initWithBookmarkModel:bookmarkModel]); |
| 134 folderEditor.parentFolder = folder->parent(); | 133 folderEditor.get().parentFolder = folder->parent(); |
| 135 folderEditor.folder = folder; | 134 folderEditor.get().folder = folder; |
| 136 folderEditor.browserState = browserState; | 135 folderEditor.get().browserState = browserState; |
| 137 folderEditor.editingExistingFolder = YES; | 136 folderEditor.get().editingExistingFolder = YES; |
| 138 return folderEditor = nil; | 137 return folderEditor.autorelease(); |
| 139 } | 138 } |
| 140 | 139 |
| 141 #pragma mark - Initialization | 140 #pragma mark - Initialization |
| 142 | 141 |
| 143 - (instancetype)initWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel { | 142 - (instancetype)initWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel { |
| 144 DCHECK(bookmarkModel); | 143 DCHECK(bookmarkModel); |
| 145 DCHECK(bookmarkModel->loaded()); | 144 DCHECK(bookmarkModel->loaded()); |
| 146 self = [super initWithStyle:CollectionViewControllerStyleAppBar]; | 145 self = [super initWithStyle:CollectionViewControllerStyleAppBar]; |
| 147 if (self) { | 146 if (self) { |
| 147 _propertyReleaser_BookmarkFolderEditorViewController.Init( |
| 148 self, [BookmarkFolderEditorViewController class]); |
| 148 _bookmarkModel = bookmarkModel; | 149 _bookmarkModel = bookmarkModel; |
| 149 | 150 |
| 150 // Set up the bookmark model oberver. | 151 // Set up the bookmark model oberver. |
| 151 _modelBridge.reset( | 152 _modelBridge.reset( |
| 152 new bookmarks::BookmarkModelBridge(self, _bookmarkModel)); | 153 new bookmarks::BookmarkModelBridge(self, _bookmarkModel)); |
| 153 } | 154 } |
| 154 return self; | 155 return self; |
| 155 } | 156 } |
| 156 | 157 |
| 157 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style { | 158 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style { |
| 158 NOTREACHED(); | 159 NOTREACHED(); |
| 159 return nil; | 160 return nil; |
| 160 } | 161 } |
| 161 | 162 |
| 162 - (void)dealloc { | 163 - (void)dealloc { |
| 163 _titleItem.delegate = nil; | 164 _titleItem.delegate = nil; |
| 164 _folderViewController.delegate = nil; | 165 _folderViewController.delegate = nil; |
| 166 [super dealloc]; |
| 165 } | 167 } |
| 166 | 168 |
| 167 #pragma mark - UIViewController | 169 #pragma mark - UIViewController |
| 168 | 170 |
| 169 - (void)viewDidLoad { | 171 - (void)viewDidLoad { |
| 170 [super viewDidLoad]; | 172 [super viewDidLoad]; |
| 171 self.collectionView.backgroundColor = [UIColor whiteColor]; | 173 self.collectionView.backgroundColor = [UIColor whiteColor]; |
| 172 | 174 |
| 173 // Add Done button. | 175 // Add Done button. |
| 174 UIBarButtonItem* doneItem = [[UIBarButtonItem alloc] | 176 base::scoped_nsobject<UIBarButtonItem> doneItem([[UIBarButtonItem alloc] |
| 175 initWithTitle:l10n_util::GetNSString( | 177 initWithTitle:l10n_util::GetNSString( |
| 176 IDS_IOS_BOOKMARK_EDIT_MODE_EXIT_MOBILE) | 178 IDS_IOS_BOOKMARK_EDIT_MODE_EXIT_MOBILE) |
| 177 style:UIBarButtonItemStylePlain | 179 style:UIBarButtonItemStylePlain |
| 178 target:self | 180 target:self |
| 179 action:@selector(saveFolder)]; | 181 action:@selector(saveFolder)]); |
| 180 doneItem.accessibilityIdentifier = @"Save"; | 182 doneItem.get().accessibilityIdentifier = @"Save"; |
| 181 self.navigationItem.rightBarButtonItem = doneItem; | 183 self.navigationItem.rightBarButtonItem = doneItem; |
| 182 self.doneItem = doneItem; | 184 self.doneItem = doneItem; |
| 183 | 185 |
| 184 if (self.editingExistingFolder) { | 186 if (self.editingExistingFolder) { |
| 185 // Add Cancel Button. | 187 // Add Cancel Button. |
| 186 UIBarButtonItem* cancelItem = | 188 UIBarButtonItem* cancelItem = |
| 187 [ChromeIcon templateBarButtonItemWithImage:[ChromeIcon closeIcon] | 189 [ChromeIcon templateBarButtonItemWithImage:[ChromeIcon closeIcon] |
| 188 target:self | 190 target:self |
| 189 action:@selector(cancel)]; | 191 action:@selector(cancel)]; |
| 190 cancelItem.accessibilityLabel = | 192 cancelItem.accessibilityLabel = |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 self.folder = self.bookmarkModel->AddFolder( | 266 self.folder = self.bookmarkModel->AddFolder( |
| 265 self.parentFolder, self.parentFolder->child_count(), folderTitle); | 267 self.parentFolder, self.parentFolder->child_count(), folderTitle); |
| 266 } | 268 } |
| 267 [self.delegate bookmarkFolderEditor:self didFinishEditingFolder:self.folder]; | 269 [self.delegate bookmarkFolderEditor:self didFinishEditingFolder:self.folder]; |
| 268 } | 270 } |
| 269 | 271 |
| 270 - (void)changeParentFolder { | 272 - (void)changeParentFolder { |
| 271 std::set<const BookmarkNode*> editedNodes; | 273 std::set<const BookmarkNode*> editedNodes; |
| 272 if (self.folder) | 274 if (self.folder) |
| 273 editedNodes.insert(self.folder); | 275 editedNodes.insert(self.folder); |
| 274 BookmarkFolderViewController* folderViewController = | 276 base::scoped_nsobject<BookmarkFolderViewController> folderViewController( |
| 275 [[BookmarkFolderViewController alloc] | 277 [[BookmarkFolderViewController alloc] |
| 276 initWithBookmarkModel:self.bookmarkModel | 278 initWithBookmarkModel:self.bookmarkModel |
| 277 allowsNewFolders:NO | 279 allowsNewFolders:NO |
| 278 editedNodes:editedNodes | 280 editedNodes:editedNodes |
| 279 allowsCancel:NO | 281 allowsCancel:NO |
| 280 selectedFolder:self.parentFolder]; | 282 selectedFolder:self.parentFolder]); |
| 281 folderViewController.delegate = self; | 283 folderViewController.get().delegate = self; |
| 282 self.folderViewController = folderViewController; | 284 self.folderViewController = folderViewController; |
| 283 | 285 |
| 284 [self.navigationController pushViewController:folderViewController | 286 [self.navigationController pushViewController:folderViewController |
| 285 animated:YES]; | 287 animated:YES]; |
| 286 } | 288 } |
| 287 | 289 |
| 288 #pragma mark - BookmarkFolderViewControllerDelegate | 290 #pragma mark - BookmarkFolderViewControllerDelegate |
| 289 | 291 |
| 290 - (void)folderPicker:(BookmarkFolderViewController*)folderPicker | 292 - (void)folderPicker:(BookmarkFolderViewController*)folderPicker |
| 291 didFinishWithFolder:(const BookmarkNode*)folder { | 293 didFinishWithFolder:(const BookmarkNode*)folder { |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 | 435 |
| 434 if (!self.editingExistingFolder && self.toolbar) | 436 if (!self.editingExistingFolder && self.toolbar) |
| 435 [self removeToolbar]; | 437 [self removeToolbar]; |
| 436 } | 438 } |
| 437 | 439 |
| 438 - (void)setupCollectionViewModel { | 440 - (void)setupCollectionViewModel { |
| 439 [self loadModel]; | 441 [self loadModel]; |
| 440 | 442 |
| 441 [self.collectionViewModel addSectionWithIdentifier:SectionIdentifierInfo]; | 443 [self.collectionViewModel addSectionWithIdentifier:SectionIdentifierInfo]; |
| 442 | 444 |
| 443 BookmarkTextFieldItem* titleItem = | 445 base::scoped_nsobject<BookmarkTextFieldItem> titleItem( |
| 444 [[BookmarkTextFieldItem alloc] initWithType:ItemTypeFolderTitle]; | 446 [[BookmarkTextFieldItem alloc] initWithType:ItemTypeFolderTitle]); |
| 445 titleItem.text = | 447 titleItem.get().text = |
| 446 (self.folder) | 448 (self.folder) |
| 447 ? bookmark_utils_ios::TitleForBookmarkNode(self.folder) | 449 ? bookmark_utils_ios::TitleForBookmarkNode(self.folder) |
| 448 : l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_GROUP_DEFAULT_NAME); | 450 : l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_GROUP_DEFAULT_NAME); |
| 449 titleItem.placeholder = | 451 titleItem.get().placeholder = |
| 450 l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_EDITOR_NAME_LABEL); | 452 l10n_util::GetNSString(IDS_IOS_BOOKMARK_NEW_EDITOR_NAME_LABEL); |
| 451 titleItem.accessibilityIdentifier = @"Title"; | 453 titleItem.get().accessibilityIdentifier = @"Title"; |
| 452 [self.collectionViewModel addItem:titleItem | 454 [self.collectionViewModel addItem:titleItem |
| 453 toSectionWithIdentifier:SectionIdentifierInfo]; | 455 toSectionWithIdentifier:SectionIdentifierInfo]; |
| 454 titleItem.delegate = self; | 456 titleItem.get().delegate = self; |
| 455 self.titleItem = titleItem; | 457 self.titleItem = titleItem; |
| 456 | 458 |
| 457 BookmarkParentFolderItem* parentFolderItem = | 459 base::scoped_nsobject<BookmarkParentFolderItem> parentFolderItem( |
| 458 [[BookmarkParentFolderItem alloc] initWithType:ItemTypeParentFolder]; | 460 [[BookmarkParentFolderItem alloc] initWithType:ItemTypeParentFolder]); |
| 459 parentFolderItem.title = | 461 parentFolderItem.get().title = |
| 460 bookmark_utils_ios::TitleForBookmarkNode(self.parentFolder); | 462 bookmark_utils_ios::TitleForBookmarkNode(self.parentFolder); |
| 461 [self.collectionViewModel addItem:parentFolderItem | 463 [self.collectionViewModel addItem:parentFolderItem |
| 462 toSectionWithIdentifier:SectionIdentifierInfo]; | 464 toSectionWithIdentifier:SectionIdentifierInfo]; |
| 463 self.parentFolderItem = parentFolderItem; | 465 self.parentFolderItem = parentFolderItem; |
| 464 } | 466 } |
| 465 | 467 |
| 466 - (void)addToolbar { | 468 - (void)addToolbar { |
| 467 // Add bottom toolbar with Delete button. | 469 // Add bottom toolbar with Delete button. |
| 468 BookmarksElevatedToolbar* buttonBar = [[BookmarksElevatedToolbar alloc] init]; | 470 base::scoped_nsobject<BookmarksElevatedToolbar> buttonBar( |
| 469 UIBarButtonItem* deleteItem = [[UIBarButtonItem alloc] | 471 [[BookmarksElevatedToolbar alloc] init]); |
| 472 base::scoped_nsobject<UIBarButtonItem> deleteItem([[UIBarButtonItem alloc] |
| 470 initWithTitle:l10n_util::GetNSString(IDS_IOS_BOOKMARK_GROUP_DELETE) | 473 initWithTitle:l10n_util::GetNSString(IDS_IOS_BOOKMARK_GROUP_DELETE) |
| 471 style:UIBarButtonItemStylePlain | 474 style:UIBarButtonItemStylePlain |
| 472 target:self | 475 target:self |
| 473 action:@selector(deleteFolder)]; | 476 action:@selector(deleteFolder)]); |
| 474 deleteItem.accessibilityIdentifier = @"Delete Folder"; | 477 deleteItem.get().accessibilityIdentifier = @"Delete Folder"; |
| 475 [deleteItem setTitleTextAttributes:@{ | 478 [deleteItem setTitleTextAttributes:@{ |
| 476 NSForegroundColorAttributeName : [UIColor blackColor] | 479 NSForegroundColorAttributeName : [UIColor blackColor] |
| 477 } | 480 } |
| 478 forState:UIControlStateNormal]; | 481 forState:UIControlStateNormal]; |
| 479 [buttonBar.layer addSublayer:[[MDCShadowLayer alloc] init]]; | 482 [buttonBar.get().layer |
| 480 buttonBar.shadowElevation = MDCShadowElevationSearchBarResting; | 483 addSublayer:[[[MDCShadowLayer alloc] init] autorelease]]; |
| 481 buttonBar.items = @[ deleteItem ]; | 484 buttonBar.get().shadowElevation = MDCShadowElevationSearchBarResting; |
| 485 buttonBar.get().items = @[ deleteItem ]; |
| 482 [self.view addSubview:buttonBar]; | 486 [self.view addSubview:buttonBar]; |
| 483 | 487 |
| 484 // Constraint |buttonBar| to be in bottom. | 488 // Constraint |buttonBar| to be in bottom. |
| 485 buttonBar.translatesAutoresizingMaskIntoConstraints = NO; | 489 buttonBar.get().translatesAutoresizingMaskIntoConstraints = NO; |
| 486 [self.view addConstraints: | 490 [self.view addConstraints: |
| 487 [NSLayoutConstraint | 491 [NSLayoutConstraint |
| 488 constraintsWithVisualFormat:@"H:|[buttonBar]|" | 492 constraintsWithVisualFormat:@"H:|[buttonBar]|" |
| 489 options:0 | 493 options:0 |
| 490 metrics:nil | 494 metrics:nil |
| 491 views:NSDictionaryOfVariableBindings( | 495 views:NSDictionaryOfVariableBindings( |
| 492 buttonBar)]]; | 496 buttonBar)]]; |
| 493 [self.view addConstraint:[NSLayoutConstraint | 497 [self.view addConstraint:[NSLayoutConstraint |
| 494 constraintWithItem:buttonBar | 498 constraintWithItem:buttonBar |
| 495 attribute:NSLayoutAttributeBottom | 499 attribute:NSLayoutAttributeBottom |
| (...skipping 17 matching lines...) Expand all Loading... |
| 513 - (void)removeToolbar { | 517 - (void)removeToolbar { |
| 514 [self.toolbar removeFromSuperview]; | 518 [self.toolbar removeFromSuperview]; |
| 515 self.toolbar = nil; | 519 self.toolbar = nil; |
| 516 } | 520 } |
| 517 | 521 |
| 518 - (void)updateSaveButtonState { | 522 - (void)updateSaveButtonState { |
| 519 self.doneItem.enabled = (self.titleItem.text.length > 0); | 523 self.doneItem.enabled = (self.titleItem.text.length > 0); |
| 520 } | 524 } |
| 521 | 525 |
| 522 @end | 526 @end |
| OLD | NEW |