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

Unified Diff: ios/chrome/browser/ui/sad_tab/sad_tab_view.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
Index: ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
diff --git a/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm b/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
index 2320cfdc50995b3d0881557628d3fcd1e7dc8c93..793be20cc149bf89091a414e3950e62a828ae446 100644
--- a/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
+++ b/ios/chrome/browser/ui/sad_tab/sad_tab_view.mm
@@ -17,7 +17,7 @@
#import "ios/chrome/browser/ui/url_loader.h"
#import "ios/chrome/browser/ui/util/label_link_controller.h"
#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.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 "ios/web/public/navigation_manager.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
@@ -313,7 +313,7 @@ NSString* const kMessageTextViewBulletRTLFormat = @"\u202E%@\u202C";
}];
_footerLabelLinkController.linkFont =
- [MDFRobotoFontLoader.sharedInstance boldFontOfSize:kFooterLabelFontSize];
+ [[MDCTypography fontLoader] boldFontOfSize:kFooterLabelFontSize];
_footerLabelLinkController.linkUnderlineStyle = NSUnderlineStyleSingle;
NSRange linkRange = [label.text rangeOfString:linkText];
DCHECK(linkRange.location != NSNotFound);
@@ -351,7 +351,7 @@ NSString* const kMessageTextViewBulletRTLFormat = @"\u202E%@\u202C";
[_titleLabel
setTextColor:[UIColor colorWithWhite:kTitleLabelTextColorBrightness
alpha:1.0]];
- [_titleLabel setFont:[[MDFRobotoFontLoader sharedInstance]
+ [_titleLabel setFont:[[MDCTypography fontLoader]
regularFontOfSize:kTitleLabelFontSize]];
}
return _titleLabel;
@@ -366,7 +366,7 @@ NSString* const kMessageTextViewBulletRTLFormat = @"\u202E%@\u202C";
[_messageTextView
setTextColor:[UIColor colorWithWhite:kGeneralTextColorBrightness
alpha:1.0]];
- [_messageTextView setFont:[[MDFRobotoFontLoader sharedInstance]
+ [_messageTextView setFont:[[MDCTypography fontLoader]
regularFontOfSize:kMessageTextViewFontSize]];
}
return _messageTextView;
@@ -377,7 +377,7 @@ NSString* const kMessageTextViewBulletRTLFormat = @"\u202E%@\u202C";
_footerLabel = [[UILabel alloc] initWithFrame:CGRectZero];
[_footerLabel setBackgroundColor:self.backgroundColor];
[_footerLabel setNumberOfLines:0];
- [_footerLabel setFont:[[MDFRobotoFontLoader sharedInstance]
+ [_footerLabel setFont:[[MDCTypography fontLoader]
regularFontOfSize:kFooterLabelFontSize]];
[_footerLabel
setTextColor:[UIColor colorWithWhite:kGeneralTextColorBrightness

Powered by Google App Engine
This is Rietveld 408576698