Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Unified Diff: ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm

Issue 2912863005: Use MDCTypography instead of MDFRobotoFontLoader directly. (Closed)
Patch Set: Update target value in unit test 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
Index: ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm
diff --git a/ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm b/ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm
index b010c60b5a178015fa58ab8665ed856daccaa6f6..1fd0fc29d7450ec60a68ad223bfbf1f8125790c4 100644
--- a/ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm
+++ b/ios/chrome/browser/ui/first_run/welcome_to_chrome_view.mm
@@ -18,7 +18,7 @@
#include "ios/chrome/common/string_util.h"
#include "ios/chrome/grit/ios_chromium_strings.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.h"
#include "url/gurl.h"
@@ -485,7 +485,7 @@ NSString* const kCheckBoxCheckedImageName = @"checkbox_checked";
}
- (void)configureTitleLabel {
- self.titleLabel.font = [[MDFRobotoFontLoader sharedInstance]
+ self.titleLabel.font = [[MDCTypography fontLoader]
regularFontOfSize:kTitleLabelFontSize[self.cr_widthSizeClass]];
}
@@ -502,13 +502,13 @@ NSString* const kCheckBoxCheckedImageName = @"checkbox_checked";
}
- (void)configureTOSLabel {
- self.TOSLabel.font = [[MDFRobotoFontLoader sharedInstance]
+ self.TOSLabel.font = [[MDCTypography fontLoader]
regularFontOfSize:kTOSLabelFontSize[self.cr_widthSizeClass]];
self.TOSLabel.cr_lineHeight = kTOSLabelLineHeight[self.cr_widthSizeClass];
}
- (void)configureOptInLabel {
- self.optInLabel.font = [[MDFRobotoFontLoader sharedInstance]
+ self.optInLabel.font = [[MDCTypography fontLoader]
regularFontOfSize:kOptInLabelFontSize[self.cr_widthSizeClass]];
self.optInLabel.cr_lineHeight = kOptInLabelLineHeight[self.cr_widthSizeClass];
}
@@ -523,7 +523,7 @@ NSString* const kCheckBoxCheckedImageName = @"checkbox_checked";
}
- (void)configureOKButton {
- self.OKButton.titleLabel.font = [[MDFRobotoFontLoader sharedInstance]
+ self.OKButton.titleLabel.font = [[MDCTypography fontLoader]
mediumFontOfSize:kOKButtonTitleLabelFontSize[self.cr_widthSizeClass]];
CGSize size = [self.OKButton
sizeThatFits:CGSizeMake(CGFLOAT_MAX,

Powered by Google App Engine
This is Rietveld 408576698