ios/chrome/browser/ui/collection_view/cells/collection_view_text_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/collection_view/cells/collection_view_text_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/collection_view/cells/collection_view_switch_item.mm ('k') | ios/chrome/browser/ui/contextual_search/contextual_search_promo_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.mm

diff --git a/ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.mm b/ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.mm

index f6d4a0057b1cf8e52583e164cfc14aa7e608dabc..ac6905b3ca6a9416d7a7daff74eff59a21bfeee1 100644

--- a/ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.mm

+++ b/ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.mm

@@ -6,7 +6,7 @@

#import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_cell.h"

#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.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"

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

#error "This file requires ARC support."

@@ -36,7 +36,7 @@

- (UIFont*)textFont {

if (!_textFont) {

- _textFont = [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14];

+ _textFont = [[MDCTypography fontLoader] mediumFontOfSize:14];

}

return _textFont;

}

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

- (UIFont*)detailTextFont {

if (!_detailTextFont) {

- _detailTextFont =

- [[MDFRobotoFontLoader sharedInstance] regularFontOfSize:14];

+ _detailTextFont = [[MDCTypography fontLoader] regularFontOfSize:14];

}

return _detailTextFont;

}