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

Unified Diff: ios/chrome/browser/ui/settings/cells/sync_switch_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
Index: ios/chrome/browser/ui/settings/cells/sync_switch_item.mm
diff --git a/ios/chrome/browser/ui/settings/cells/sync_switch_item.mm b/ios/chrome/browser/ui/settings/cells/sync_switch_item.mm
index d8191ee5d6233d8f744a8c189d4d8594a1a5479c..0c411d7bd441a2b77cd902f89d1c5f11adddb786 100644
--- a/ios/chrome/browser/ui/settings/cells/sync_switch_item.mm
+++ b/ios/chrome/browser/ui/settings/cells/sync_switch_item.mm
@@ -7,7 +7,7 @@
#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.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)
@@ -80,8 +80,7 @@ const CGFloat kHorizontalSwitchPadding = 10;
_textLabel.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentView addSubview:_textLabel];
- _textLabel.font =
- [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14];
+ _textLabel.font = [[MDCTypography fontLoader] mediumFontOfSize:14];
_textLabel.textColor = [[MDCPalette greyPalette] tint900];
_textLabel.numberOfLines = 0;
@@ -89,8 +88,7 @@ const CGFloat kHorizontalSwitchPadding = 10;
_detailTextLabel.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentView addSubview:_detailTextLabel];
- _detailTextLabel.font =
- [[MDFRobotoFontLoader sharedInstance] mediumFontOfSize:14];
+ _detailTextLabel.font = [[MDCTypography fontLoader] mediumFontOfSize:14];
_detailTextLabel.textColor = [[MDCPalette greyPalette] tint500];
_detailTextLabel.numberOfLines = 0;

Powered by Google App Engine
This is Rietveld 408576698