ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm - Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly. (Closed)

Patch Set: Tentative fix for ManualTextFramerTest Created 3 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ios/chrome/browser/ui/bookmarks/bookmark_promo_cell.mm ('k') | ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

diff --git a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

index a78aa4f9f7f5f34ce744bc6dc7f2ee95e0055f02..1e5b3e34c17d295202914d421679237d9c460e19 100644

--- a/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

+++ b/ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.mm

@@ -8,7 +8,7 @@

#import "ios/chrome/browser/ui/icons/chrome_icon.h"

#import "ios/chrome/browser/ui/uikit_ui_util.h"

#include "ios/chrome/grit/ios_strings.h"

-#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"

+#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"

#include "ui/base/l10n/l10n_util_mac.h"

#if !defined(__has_feature) || !__has_feature(objc_arc)

@@ -62,15 +62,14 @@

_decorationLabel = [[UILabel alloc] init];

_decorationLabel.translatesAutoresizingMaskIntoConstraints = NO;

_decorationLabel.text = l10n_util::GetNSString(IDS_IOS_BOOKMARK_GROUP_BUTTON);

- _decorationLabel.font =

- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:12];

+ _decorationLabel.font = [[MDCTypography fontLoader] regularFontOfSize:12];

_decorationLabel.textColor = bookmark_utils_ios::lightTextColor();

[self.contentView addSubview:_decorationLabel];

_parentFolderNameLabel = [[UILabel alloc] init];

_parentFolderNameLabel.translatesAutoresizingMaskIntoConstraints = NO;

_parentFolderNameLabel.font =

- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:16];

+ [[MDCTypography fontLoader] regularFontOfSize:16];

_parentFolderNameLabel.textColor =

[UIColor colorWithWhite:33.0 / 255.0 alpha:1.0];

_parentFolderNameLabel.textAlignment = NSTextAlignmentNatural;