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

Side by Side Diff: ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.mm

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

Powered by Google App Engine
This is Rietveld 408576698