Commit 8c4bab31 authored by sczs@chromium.org's avatar sczs@chromium.org Committed by Commit Bot

[ios] Bookmarks UI Refresh polishing.

- Hides the toolbar border for Edit Folder and Edit Bookmark.
- Removes the Done Button on the Folder Picker.
- Adds separators to BookmarksHomeTableView.
- Removes white background from FolderPicker.

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I26e58dcdb1c65761cf10c7a6956778b02df0b16a
Reviewed-on: https://chromium-review.googlesource.com/1098516
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Reviewed-by: default avataredchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567132}
parent 74356a2c
...@@ -258,6 +258,10 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -258,6 +258,10 @@ typedef NS_ENUM(NSInteger, ItemType) {
if (experimental_flags::IsBookmarksUIRebootEnabled()) { if (experimental_flags::IsBookmarksUIRebootEnabled()) {
deleteButton.tintColor = [UIColor redColor]; deleteButton.tintColor = [UIColor redColor];
// Setting the image to nil will cause the default shadowImage to be used,
// we need to create a new one.
[self.navigationController.toolbar setShadowImage:[UIImage new]
forToolbarPosition:UIBarPositionAny];
[self setToolbarItems:@[ spaceButton, deleteButton, spaceButton ] [self setToolbarItems:@[ spaceButton, deleteButton, spaceButton ]
animated:NO]; animated:NO];
} else { } else {
......
...@@ -488,6 +488,8 @@ folderEditorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel ...@@ -488,6 +488,8 @@ folderEditorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel
if (experimental_flags::IsBookmarksUIRebootEnabled()) { if (experimental_flags::IsBookmarksUIRebootEnabled()) {
deleteButton.tintColor = [UIColor redColor]; deleteButton.tintColor = [UIColor redColor];
[self.navigationController.toolbar setShadowImage:[UIImage new]
forToolbarPosition:UIBarPositionAny];
[self setToolbarItems:@[ spaceButton, deleteButton, spaceButton ] [self setToolbarItems:@[ spaceButton, deleteButton, spaceButton ]
animated:NO]; animated:NO];
} else { } else {
......
...@@ -158,21 +158,22 @@ using bookmarks::BookmarkNode; ...@@ -158,21 +158,22 @@ using bookmarks::BookmarkNode;
if ([self respondsToSelector:@selector(setEdgesForExtendedLayout:)]) { if ([self respondsToSelector:@selector(setEdgesForExtendedLayout:)]) {
[self setEdgesForExtendedLayout:UIRectEdgeNone]; [self setEdgesForExtendedLayout:UIRectEdgeNone];
} }
self.view.backgroundColor = [UIColor whiteColor];
self.view.accessibilityIdentifier = self.view.accessibilityIdentifier =
kBookmarkFolderPickerViewContainerIdentifier; kBookmarkFolderPickerViewContainerIdentifier;
self.title = l10n_util::GetNSString(IDS_IOS_BOOKMARK_CHOOSE_GROUP_BUTTON); self.title = l10n_util::GetNSString(IDS_IOS_BOOKMARK_CHOOSE_GROUP_BUTTON);
UIBarButtonItem* doneItem = [[UIBarButtonItem alloc] if (!experimental_flags::IsBookmarksUIRebootEnabled()) {
initWithTitle:l10n_util::GetNSString( self.view.backgroundColor = [UIColor whiteColor];
IDS_IOS_BOOKMARK_EDIT_MODE_EXIT_MOBILE) UIBarButtonItem* doneItem = [[UIBarButtonItem alloc]
style:UIBarButtonItemStylePlain initWithTitle:l10n_util::GetNSString(
target:self IDS_IOS_BOOKMARK_EDIT_MODE_EXIT_MOBILE)
action:@selector(done:)]; style:UIBarButtonItemStylePlain
doneItem.accessibilityIdentifier = target:self
kBookmarkFolderEditNavigationBarDoneButtonIdentifier; action:@selector(done:)];
self.navigationItem.rightBarButtonItem = doneItem; doneItem.accessibilityIdentifier =
kBookmarkFolderEditNavigationBarDoneButtonIdentifier;
self.navigationItem.rightBarButtonItem = doneItem;
}
if (self.allowsCancel) { if (self.allowsCancel) {
UIBarButtonItem* cancelItem = UIBarButtonItem* cancelItem =
......
...@@ -358,24 +358,26 @@ const CGFloat kShadowRadius = 12.0f; ...@@ -358,24 +358,26 @@ const CGFloat kShadowRadius = 12.0f;
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Set Navigation Bar and Toolbar appearance. // Set Navigation Bar, Toolbar and TableView appearance.
if (experimental_flags::IsBookmarksUIRebootEnabled()) { if (experimental_flags::IsBookmarksUIRebootEnabled()) {
self.navigationController.navigationBarHidden = NO; self.navigationController.navigationBarHidden = NO;
self.navigationController.toolbar.translucent = YES; self.navigationController.toolbar.translucent = YES;
// Add a tableFooterView in order to disable separators at the bottom of the
// tableView.
self.tableView.tableFooterView = [[UIView alloc] init];
} else { } else {
self.navigationController.navigationBarHidden = YES; self.navigationController.navigationBarHidden = YES;
self.navigationController.toolbar.translucent = NO; self.navigationController.toolbar.translucent = NO;
self.navigationController.toolbar.barTintColor = [UIColor whiteColor]; self.navigationController.toolbar.barTintColor = [UIColor whiteColor];
self.navigationController.toolbar.layer.shadowRadius = kShadowRadius; self.navigationController.toolbar.layer.shadowRadius = kShadowRadius;
self.navigationController.toolbar.layer.shadowOpacity = kShadowOpacity; self.navigationController.toolbar.layer.shadowOpacity = kShadowOpacity;
// Disable separators while the loading spinner is showing.
// |loadBookmarkView| will bring them back if needed.
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
} }
self.navigationController.toolbar.accessibilityIdentifier = self.navigationController.toolbar.accessibilityIdentifier =
kBookmarkHomeUIToolbarIdentifier; kBookmarkHomeUIToolbarIdentifier;
// Disable separators while the loading spinner is showing. |loadBookmarkView|
// will bring them back if needed.
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
if (self.bookmarks->loaded()) { if (self.bookmarks->loaded()) {
[self loadBookmarkViews]; [self loadBookmarkViews];
} else { } else {
...@@ -451,8 +453,11 @@ const CGFloat kShadowRadius = 12.0f; ...@@ -451,8 +453,11 @@ const CGFloat kShadowRadius = 12.0f;
[BookmarkHomeSharedState cellHeightPt]; [BookmarkHomeSharedState cellHeightPt];
self.tableView.sectionHeaderHeight = 0; self.tableView.sectionHeaderHeight = 0;
self.tableView.sectionFooterHeight = 0; self.tableView.sectionFooterHeight = 0;
self.sharedState.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
self.sharedState.tableView.allowsMultipleSelectionDuringEditing = YES; self.sharedState.tableView.allowsMultipleSelectionDuringEditing = YES;
if (!experimental_flags::IsBookmarksUIRebootEnabled()) {
self.sharedState.tableView.separatorStyle =
UITableViewCellSeparatorStyleNone;
}
UILongPressGestureRecognizer* longPressRecognizer = UILongPressGestureRecognizer* longPressRecognizer =
[[UILongPressGestureRecognizer alloc] [[UILongPressGestureRecognizer alloc]
......
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