[iOS][Settings] Updates TableViews design

This CL updates the design of TableViews.
The presentation style changes depending on the device.
Background colors have also been changed.

Bug: 922511
Change-Id: Ifc2207146bedbc5f8332b3df7fa112a6525a279a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2567928Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Ewann Pellé <ewannpv@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833332}

ios/chrome/browser/ui/bookmarks/BUILD.gn

@@ -76,6 +76,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view:views",
     "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading",

ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.mm

@@ -62,7 +62,9 @@
 #import "ios/chrome/browser/ui/table_view/table_view_illustrated_empty_view.h"
 #import "ios/chrome/browser/ui/table_view/table_view_model.h"
 #import "ios/chrome/browser/ui/table_view/table_view_navigation_controller_constants.h"
+#import "ios/chrome/browser/ui/table_view/table_view_utils.h"
 #import "ios/chrome/browser/ui/ui_feature_flags.h"
+#include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/menu_util.h"
 #import "ios/chrome/browser/ui/util/multi_window_support.h"
 #import "ios/chrome/browser/ui/util/rtl_geometry.h"
@@ -241,7 +243,11 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
 
 - (instancetype)initWithBrowser:(Browser*)browser {
   DCHECK(browser);
-  self = [super initWithStyle:UITableViewStylePlain];
+
+  UITableViewStyle style = base::FeatureList::IsEnabled(kSettingsRefresh)
+                               ? ChromeTableViewStyle()
+                               : UITableViewStylePlain;
+  self = [super initWithStyle:style];
   if (self) {
     _browser = browser;
     _browserState =

ios/chrome/browser/ui/history/BUILD.gn

@@ -101,6 +101,7 @@ source_set("history_ui") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/history/history_table_view_controller.mm

@@ -39,6 +39,7 @@
 #import "ios/chrome/browser/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/ui/table_view/table_view_favicon_data_source.h"
 #import "ios/chrome/browser/ui/table_view/table_view_navigation_controller_constants.h"
+#import "ios/chrome/browser/ui/table_view/table_view_utils.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/menu_util.h"
 #import "ios/chrome/browser/ui/util/multi_window_support.h"
@@ -139,7 +140,10 @@ const CGFloat kButtonHorizontalPadding = 30.0;
 #pragma mark - ViewController Lifecycle.
 
 - (instancetype)init {
-  return [super initWithStyle:UITableViewStylePlain];
+  UITableViewStyle style = base::FeatureList::IsEnabled(kSettingsRefresh)
+                               ? ChromeTableViewStyle()
+                               : UITableViewStylePlain;
+  return [super initWithStyle:style];
 }
 
 - (void)viewWillAppear:(BOOL)animated {

ios/chrome/browser/ui/reading_list/BUILD.gn

@@ -126,6 +126,7 @@ source_set("reading_list_ui") {
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/reading_list/reading_list_table_view_controller.mm

@@ -31,6 +31,7 @@
 #import "ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_commands.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_toolbar_button_manager.h"
 #import "ios/chrome/browser/ui/table_view/cells/table_view_text_header_footer_item.h"
+#import "ios/chrome/browser/ui/table_view/table_view_utils.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/menu_util.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
@@ -111,7 +112,10 @@ ReadingListSelectionState GetSelectionStateForSelectedCounts(
 @synthesize needsSectionCleanupAfterEditing = _needsSectionCleanupAfterEditing;
 
 - (instancetype)init {
-  self = [super initWithStyle:UITableViewStylePlain];
+  UITableViewStyle style = base::FeatureList::IsEnabled(kSettingsRefresh)
+                               ? ChromeTableViewStyle()
+                               : UITableViewStylePlain;
+  self = [super initWithStyle:style];
   if (self) {
     _toolbarManager = [[ReadingListToolbarButtonManager alloc] init];
     _toolbarManager.commandHandler = self;

ios/chrome/browser/ui/recent_tabs/BUILD.gn

@@ -95,6 +95,7 @@ source_set("recent_tabs_ui") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",

ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm

@@ -52,6 +52,7 @@
 #import "ios/chrome/browser/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/ui/table_view/table_view_favicon_data_source.h"
+#import "ios/chrome/browser/ui/table_view/table_view_utils.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/menu_util.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
@@ -152,7 +153,10 @@ API_AVAILABLE(ios(13.0))
 #pragma mark - Public Interface
 
 - (instancetype)init {
-  self = [super initWithStyle:UITableViewStylePlain];
+  UITableViewStyle style = base::FeatureList::IsEnabled(kSettingsRefresh)
+                               ? ChromeTableViewStyle()
+                               : UITableViewStylePlain;
+  self = [super initWithStyle:style];
   if (self) {
     _sessionState = SessionsSyncUserState::USER_SIGNED_OUT;
     _syncedSessions.reset(new synced_sessions::SyncedSessions());

ios/chrome/browser/ui/settings/settings_navigation_controller.mm

@@ -292,6 +292,11 @@ NSString* const kSettingsDoneButtonId = @"kSettingsDoneButtonId";
   self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
 
   if (base::FeatureList::IsEnabled(kSettingsRefresh)) {
+    self.navigationBar.translucent = NO;
+    self.toolbar.translucent = NO;
+    self.navigationBar.barTintColor =
+        [UIColor colorNamed:kSecondaryBackgroundColor];
+    self.toolbar.barTintColor = [UIColor colorNamed:kSecondaryBackgroundColor];
     self.view.backgroundColor = [UIColor colorNamed:kSecondaryBackgroundColor];
   }
 

ios/chrome/browser/ui/settings/settings_root_table_view_controller.mm

@@ -121,13 +121,7 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
                            action:nil];
   [self setToolbarItems:@[ flexibleSpace, self.deleteButton, flexibleSpace ]
                animated:YES];
-  if (base::FeatureList::IsEnabled(kSettingsRefresh)) {
-    self.styler.tableViewBackgroundColor =
-        [UIColor colorNamed:kSecondaryBackgroundColor];
-  } else {
-    self.styler.tableViewBackgroundColor =
-        UIColor.cr_systemGroupedBackgroundColor;
-  }
+
   [super viewDidLoad];
   self.styler.cellBackgroundColor =
       UIColor.cr_secondarySystemGroupedBackgroundColor;

ios/chrome/browser/ui/table_view/BUILD.gn

@@ -20,6 +20,7 @@ source_set("table_view") {
     ":styler",
     ":views",
     "//base",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/common/ui/colors",
@@ -48,6 +49,7 @@ source_set("styler") {
     "chrome_table_view_styler.mm",
   ]
   public_deps = [
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
   ]

ios/chrome/browser/ui/table_view/chrome_table_view_styler.mm

@@ -4,8 +4,10 @@
 
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
 
+#include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
+#import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -15,7 +17,13 @@
 
 - (instancetype)init {
   if ((self = [super init])) {
-    _tableViewBackgroundColor = UIColor.cr_systemBackgroundColor;
+    if (base::FeatureList::IsEnabled(kSettingsRefresh)) {
+      _tableViewBackgroundColor =
+          [UIColor colorNamed:kSecondaryBackgroundColor];
+      _cellBackgroundColor = UIColor.cr_secondarySystemGroupedBackgroundColor;
+    } else {
+      _tableViewBackgroundColor = UIColor.cr_systemGroupedBackgroundColor;
+    }
   }
   return self;
 }

ios/chrome/browser/ui/table_view/table_view_navigation_controller.mm

@@ -7,7 +7,9 @@
 #include "base/mac/foundation_util.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
+#include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
+#import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -32,12 +34,19 @@
   [super viewDidLoad];
 
   self.navigationBar.translucent = NO;
-  self.navigationBar.barTintColor = UIColor.cr_systemBackgroundColor;
-  self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
   self.navigationBar.prefersLargeTitles = YES;
-
   self.toolbar.translucent = NO;
-  self.toolbar.barTintColor = UIColor.cr_systemBackgroundColor;
+
+  if (base::FeatureList::IsEnabled(kSettingsRefresh)) {
+    self.navigationBar.barTintColor =
+        [UIColor colorNamed:kSecondaryBackgroundColor];
+    self.toolbar.barTintColor = [UIColor colorNamed:kSecondaryBackgroundColor];
+    self.view.backgroundColor = [UIColor colorNamed:kSecondaryBackgroundColor];
+  } else {
+    self.navigationBar.barTintColor = UIColor.cr_systemBackgroundColor;
+    self.toolbar.barTintColor = UIColor.cr_systemBackgroundColor;
+    self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
+  }
 }
 
 @end