ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.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/reading_list/reading_list_empty_collection_background.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/reading_list/reading_list_collection_view_item.mm ('k') | ios/chrome/browser/ui/sad_tab/sad_tab_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.mm

diff --git a/ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.mm b/ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.mm

index 7b7e1414f233f9f1c015411bd5f23192e2f9e0f9..c22e4f3aa8559752473767720bb9d90bdb71a047 100644

--- a/ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.mm

+++ b/ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.mm

@@ -9,7 +9,7 @@

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

#include "ios/chrome/grit/ios_strings.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"

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

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

@@ -76,7 +76,7 @@ const CGFloat kPercentageFromTopForPosition = 0.4;

stringByAppendingString:l10n_util::GetNSString(

IDS_IOS_SHARE_MENU_READING_LIST_ACTION)];

- MDFRobotoFontLoader* fontLoader = [MDFRobotoFontLoader sharedInstance];

+ id<MDCTypographyFontLoading> fontLoader = [MDCTypography fontLoader];

UIColor* textColor = [[MDCPalette greyPalette] tint700];

UIFont* textFont = [fontLoader regularFontOfSize:kFontSize];