ios/chrome/browser/ui/authentication/chrome_signin_view_controller.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/authentication/chrome_signin_view_controller.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/alert_coordinator/loading_alert_coordinator.mm ('k') | ios/chrome/browser/ui/autofill/cells/autofill_edit_item.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

diff --git a/ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm b/ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

index e5e7ed5153ed1908a196c0245933fd2d918163d6..f83d98901f83212fb595569635c21631c50ed915 100644

--- a/ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

+++ b/ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

@@ -53,7 +53,7 @@

#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"

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

#import "ui/base/l10n/l10n_util.h"

namespace {

@@ -840,10 +840,10 @@ void HideButton(UIButton* button) {

}

- (void)layoutButtons:(const AuthenticationViewConstants&)constants {

- [_primaryButton titleLabel].font = [[MDFRobotoFontLoader sharedInstance]

- mediumFontOfSize:constants.SecondaryFontSize];

- [_secondaryButton titleLabel].font = [[MDFRobotoFontLoader sharedInstance]

- mediumFontOfSize:constants.SecondaryFontSize];

+ [_primaryButton titleLabel].font =

+ [[MDCTypography fontLoader] mediumFontOfSize:constants.SecondaryFontSize];

+ [_secondaryButton titleLabel].font =

+ [[MDCTypography fontLoader] mediumFontOfSize:constants.SecondaryFontSize];

LayoutRect primaryButtonLayout = LayoutRectZero;

primaryButtonLayout.boundingWidth = CGRectGetWidth(self.view.bounds);