[Typography] font initializer based on style and Dynamic Type (#2666)

material-components · Dec 11, 2017 · 93e21f1 · 93e21f1
1 parent 1663ee2
commit 93e21f1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/components/Typography/src/UIFont+MaterialTypography.h b/components/Typography/src/UIFont+MaterialTypography.h
@@ -35,4 +35,14 @@
  */
 + (nonnull UIFont *)mdc_standardFontForMaterialTextStyle:(MDCFontTextStyle)style;
 
+/**
+ Returns an new instance of the font sized according to the text-style and whether the content
+ size category (Dynamic Type) should be taken into account.
+
+ @param style The Material font text style that will determine the fontSize of the new font
+ @param scaled Should the new font be scaled according to the content size category (Dynamic Type)
+ */
+- (nonnull UIFont *)mdc_fontSizedForMaterialTextStyle:(MDCFontTextStyle)style
+                                 scaledForDynamicType:(BOOL)scaled;
+
 @end
diff --git a/components/Typography/src/UIFont+MaterialTypography.m b/components/Typography/src/UIFont+MaterialTypography.m
@@ -52,4 +52,16 @@ + (nonnull UIFont *)mdc_standardFontForMaterialTextStyle:(MDCFontTextStyle)style
   return font;
 }
 
+- (nonnull UIFont *)mdc_fontSizedForMaterialTextStyle:(MDCFontTextStyle)style
+                                 scaledForDynamicType:(BOOL)scaled {
+  UIFontDescriptor *fontDescriptor;
+  if (scaled) {
+    fontDescriptor = [UIFontDescriptor mdc_preferredFontDescriptorForMaterialTextStyle:style];
+  } else {
+    fontDescriptor = [UIFontDescriptor mdc_standardFontDescriptorForMaterialTextStyle:style];
+  }
+
+  return [self fontWithSize:fontDescriptor.pointSize];
+}
+
 @end