[ios clean] ToolsMenu UI changes

ios/clean/chrome/browser/ui/tools/menu_view_controller.mm

Index: ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
diff --git a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
index 99d8d9c74af4f6f0a7a2bd28108878b142f525d6..334d29d1c4e43190210142a8a05bcec76b6f3033 100644
--- a/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/tools/menu_view_controller.mm
@@ -8,10 +8,12 @@
 
 #import "ios/clean/chrome/browser/ui/tools/menu_view_controller.h"
 
+#include "base/i18n/rtl.h"
 #import "base/logging.h"
 #import "base/macros.h"
 #import "ios/clean/chrome/browser/ui/actions/settings_actions.h"
 #import "ios/clean/chrome/browser/ui/actions/tools_menu_actions.h"
+#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -19,7 +21,7 @@
 
 namespace {
 const CGFloat kMenuWidth = 250;
-const CGFloat kMenuItemHeight = 44;
+const CGFloat kMenuItemHeight = 48;
 }
 
 // Placeholder model for menu item configuration.
@@ -44,17 +46,33 @@ const CGFloat kMenuItemHeight = 44;
   if ((self = [super init])) {
     _menuItems = @[
       [[MenuItem alloc] init], [[MenuItem alloc] init], [[MenuItem alloc] init],
-      [[MenuItem alloc] init]
+      [[MenuItem alloc] init], [[MenuItem alloc] init], [[MenuItem alloc] init],
+      [[MenuItem alloc] init], [[MenuItem alloc] init], [[MenuItem alloc] init],
+      [[MenuItem alloc] init], [[MenuItem alloc] init]
     ];
 
     _menuItems[0].title = @"New Tab";
 
-    _menuItems[1].title = @"Find in Page…";
+    _menuItems[1].title = @"New Incognito Tab";
+
+    _menuItems[2].title = @"Bookmarks";
+
+    _menuItems[3].title = @"Reading List";
+
+    _menuItems[4].title = @"Recent Tabs";
+
+    _menuItems[5].title = @"History";
+
+    _menuItems[6].title = @"Report an Issue";
+
+    _menuItems[7].title = @"Find in Page…";
+
+    _menuItems[8].title = @"Request Desktop Site";
 
-    _menuItems[2].title = @"Request Desktop Site";
+    _menuItems[9].title = @"Settings";
+    _menuItems[9].action = @selector(showSettings:);
 
-    _menuItems[3].title = @"Settings";
-    _menuItems[3].action = @selector(showSettings:);
+    _menuItems[10].title = @"Help";
   }
   return self;
 }
@@ -66,6 +84,7 @@ const CGFloat kMenuItemHeight = 44;
   self.view = [[UIView alloc] initWithFrame:frame];
   self.view.backgroundColor = [UIColor whiteColor];
   self.view.autoresizingMask = UIViewAutoresizingNone;
+  self.view.layer.borderColor = [UIColor clearColor].CGColor;
 }
 
 - (void)viewDidLoad {
@@ -75,7 +94,13 @@ const CGFloat kMenuItemHeight = 44;
   for (MenuItem* item in _menuItems) {
     UIButton* menuButton = [UIButton buttonWithType:UIButtonTypeSystem];
     menuButton.translatesAutoresizingMaskIntoConstraints = NO;
+    menuButton.tintColor = [UIColor blackColor];
     [menuButton setTitle:item.title forState:UIControlStateNormal];
+    [menuButton.titleLabel
+        setFont:[[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16]];
+    [menuButton.titleLabel
+        setTextAlignment:(!base::i18n::IsRTL() ? NSTextAlignmentRight

[marq (ping after 24h), 2017/02/13 12:51:09]

TL;DR: Just use NSTextAlignmentNatural.

Here are some hints for getting RTL stuff right:

(1) If you are writing conditional logic during view layout, you are probably
doing it wrong. Look at the functions and data structure in
ios/chrome/browser/ui/rtl_geometry.h (and how they are used elsewhere in the
code) for alternatives.

(2) If you absolutely have to check and see if the current layout needs to be
RTL, use UseRTLLayout() from that file. It currently just calls IsRTL(), but it
also provides an injection point for us to handle other cases -- for example,
this is where we handled the RTL pseudolanguage setting before IsRTL() did. All
of the /ios/ RTL APIs use UseRTLLayout(), so until we change them, our code
should, too.

(3) If you are dealing with UIKit layout constants, many of them have RTL-aware
variants. For NSTextAlignment, the value NSTextAlignmentNatural will align
correctly based on the current language's text direction.

[sczs, 2017/02/13 16:40:42]

Thanks for the tips Mark. I actually copied this from the old ToolMenuVC, so
I'll be on the lookout for RTL conditional logic during view layout.

+                                               : NSTextAlignmentLeft)];
     [menuButton addTarget:nil
                    action:@selector(closeToolsMenu:)
          forControlEvents:UIControlEventTouchUpInside];