Merge branch 'release-candidate'

material-components · Mar 2, 2017 · 08c0904 · 08c0904
2 parents 6752ec5 + 15b2724
commit 08c0904
Show file tree

Hide file tree

Showing 21 changed files with 478 additions and 224 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,55 @@
+# 22.0.0
+
+## API diffs
+
+### Dialogs
+
+#### Changes
+
+* [Add Dynamic Type support to Alert controller (#1213)](https://github.com/material-components/material-components-ios/commit/9f92b161db6441dfa8b4eacf7dff6d8aced37509) (ianegordon)
+
+### Typography
+
+#### Changes
+
+* [Added bold and italics to the system fontloader and MDCTypographyFontLoader protocol (#1225)](https://github.com/material-components/material-components-ios/commit/975680a9cb34db366f4d95e62a105d7a0300b972) (Randall Li)
+
+## Component changes
+
+### AppBar
+
+#### Changes
+
+* [Fix analyzer warnings (#1229)](https://github.com/material-components/material-components-ios/commit/42084cb3b8fa4c9b7deef0120231ec1063a5397a) (ianegordon)
+
+### Buttons
+
+#### Changes
+
+* [Dynamic Type resizing fix (#1213)](https://github.com/material-components/material-components-ios/commit/9f92b161db6441dfa8b4eacf7dff6d8aced37509) (ianegordon)
+
+### Dialogs
+
+#### Changes
+
+* [Add Dynamic Type support to Alert controller (#1213)](https://github.com/material-components/material-components-ios/commit/9f92b161db6441dfa8b4eacf7dff6d8aced37509) (ianegordon)
+
+### Snackbar
+
+#### Changes
+
+* [fix case of UIKit.h (#1223)](https://github.com/material-components/material-components-ios/commit/3f2968b54c738c747c6b9a02ab614d7853b0c406) (yoshisatoyanagisawa)
+
+### Typography
+
+#### Changes
+
+* [Add warning about custom fonts and Dynamic Type (#1224)](https://github.com/material-components/material-components-ios/commit/9bea2218a6a6fa7d3eabf4788e4a49ff52487259) (ianegordon)
+* [Added bold and italics to the system fontloader and MDCTypographyFontLoader protocol (#1225)](https://github.com/material-components/material-components-ios/commit/975680a9cb34db366f4d95e62a105d7a0300b972) (Randall Li)
+* [Fix analyzer warnings (#1229)](https://github.com/material-components/material-components-ios/commit/42084cb3b8fa4c9b7deef0120231ec1063a5397a) (ianegordon)
+* [switch it to a objc test (#1226)](https://github.com/material-components/material-components-ios/commit/64852237037ccd68af02b84e03f085392829ec5e) (Randall Li)
+
+
 # 21.3.0
 
 ## API diffs

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "21.3.0"
+  s.version      = "22.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "21.3.0"
+  s.version      = "22.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "21.3.0"
+  s.version      = "22.0.0"
   s.authors      = "The Material Motion authors."
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,37 +1,37 @@
 PODS:
   - CatalogByConvention (2.0.0)
   - EarlGrey (1.7.1)
-  - MaterialComponents (21.3.0):
-    - MaterialComponents/ActivityIndicator (= 21.3.0)
-    - MaterialComponents/AnimationTiming (= 21.3.0)
-    - MaterialComponents/AppBar (= 21.3.0)
-    - MaterialComponents/ButtonBar (= 21.3.0)
-    - MaterialComponents/Buttons (= 21.3.0)
-    - MaterialComponents/CollectionCells (= 21.3.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 21.3.0)
-    - MaterialComponents/Collections (= 21.3.0)
-    - MaterialComponents/Dialogs (= 21.3.0)
-    - MaterialComponents/FeatureHighlight (= 21.3.0)
-    - MaterialComponents/FlexibleHeader (= 21.3.0)
-    - MaterialComponents/HeaderStackView (= 21.3.0)
-    - MaterialComponents/Ink (= 21.3.0)
-    - MaterialComponents/NavigationBar (= 21.3.0)
-    - MaterialComponents/OverlayWindow (= 21.3.0)
-    - MaterialComponents/PageControl (= 21.3.0)
-    - MaterialComponents/Palettes (= 21.3.0)
-    - MaterialComponents/private (= 21.3.0)
-    - MaterialComponents/ProgressView (= 21.3.0)
-    - MaterialComponents/ShadowElevations (= 21.3.0)
-    - MaterialComponents/ShadowLayer (= 21.3.0)
-    - MaterialComponents/Slider (= 21.3.0)
-    - MaterialComponents/Snackbar (= 21.3.0)
-    - MaterialComponents/Tabs (= 21.3.0)
-    - MaterialComponents/Typography (= 21.3.0)
-  - MaterialComponents/ActivityIndicator (21.3.0):
+  - MaterialComponents (22.0.0):
+    - MaterialComponents/ActivityIndicator (= 22.0.0)
+    - MaterialComponents/AnimationTiming (= 22.0.0)
+    - MaterialComponents/AppBar (= 22.0.0)
+    - MaterialComponents/ButtonBar (= 22.0.0)
+    - MaterialComponents/Buttons (= 22.0.0)
+    - MaterialComponents/CollectionCells (= 22.0.0)
+    - MaterialComponents/CollectionLayoutAttributes (= 22.0.0)
+    - MaterialComponents/Collections (= 22.0.0)
+    - MaterialComponents/Dialogs (= 22.0.0)
+    - MaterialComponents/FeatureHighlight (= 22.0.0)
+    - MaterialComponents/FlexibleHeader (= 22.0.0)
+    - MaterialComponents/HeaderStackView (= 22.0.0)
+    - MaterialComponents/Ink (= 22.0.0)
+    - MaterialComponents/NavigationBar (= 22.0.0)
+    - MaterialComponents/OverlayWindow (= 22.0.0)
+    - MaterialComponents/PageControl (= 22.0.0)
+    - MaterialComponents/Palettes (= 22.0.0)
+    - MaterialComponents/private (= 22.0.0)
+    - MaterialComponents/ProgressView (= 22.0.0)
+    - MaterialComponents/ShadowElevations (= 22.0.0)
+    - MaterialComponents/ShadowLayer (= 22.0.0)
+    - MaterialComponents/Slider (= 22.0.0)
+    - MaterialComponents/Snackbar (= 22.0.0)
+    - MaterialComponents/Tabs (= 22.0.0)
+    - MaterialComponents/Typography (= 22.0.0)
+  - MaterialComponents/ActivityIndicator (22.0.0):
     - MaterialComponents/private/Application
     - MaterialComponents/private/RTL
-  - MaterialComponents/AnimationTiming (21.3.0)
-  - MaterialComponents/AppBar (21.3.0):
+  - MaterialComponents/AnimationTiming (22.0.0)
+  - MaterialComponents/AppBar (22.0.0):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -40,16 +40,16 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (21.3.0):
+  - MaterialComponents/ButtonBar (22.0.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (21.3.0):
+  - MaterialComponents/Buttons (22.0.0):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/CollectionCells (21.3.0):
+  - MaterialComponents/CollectionCells (22.0.0):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -60,103 +60,103 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (21.3.0)
-  - MaterialComponents/Collections (21.3.0):
+  - MaterialComponents/CollectionLayoutAttributes (22.0.0)
+  - MaterialComponents/Collections (22.0.0):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (21.3.0):
+  - MaterialComponents/Dialogs (22.0.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/RTL
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FeatureHighlight (21.3.0):
+  - MaterialComponents/FeatureHighlight (22.0.0):
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/FlexibleHeader (21.3.0):
+  - MaterialComponents/FlexibleHeader (22.0.0):
     - MaterialComponents/private/Application
     - MDFTextAccessibility
-  - MaterialComponents/HeaderStackView (21.3.0)
-  - MaterialComponents/Ink (21.3.0)
-  - MaterialComponents/NavigationBar (21.3.0):
+  - MaterialComponents/HeaderStackView (22.0.0)
+  - MaterialComponents/Ink (22.0.0)
+  - MaterialComponents/NavigationBar (22.0.0):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/OverlayWindow (21.3.0):
+  - MaterialComponents/OverlayWindow (22.0.0):
     - MaterialComponents/private/Application
-  - MaterialComponents/PageControl (21.3.0)
-  - MaterialComponents/Palettes (21.3.0)
-  - MaterialComponents/private (21.3.0):
-    - MaterialComponents/private/Application (= 21.3.0)
-    - MaterialComponents/private/Icons (= 21.3.0)
-    - MaterialComponents/private/KeyboardWatcher (= 21.3.0)
-    - MaterialComponents/private/Overlay (= 21.3.0)
-    - MaterialComponents/private/RTL (= 21.3.0)
-    - MaterialComponents/private/ThumbTrack (= 21.3.0)
-  - MaterialComponents/private/Application (21.3.0)
-  - MaterialComponents/private/Icons (21.3.0):
-    - MaterialComponents/private/Icons/Base (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_check (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_info (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 21.3.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 21.3.0)
-  - MaterialComponents/private/Icons/Base (21.3.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (21.3.0):
+  - MaterialComponents/PageControl (22.0.0)
+  - MaterialComponents/Palettes (22.0.0)
+  - MaterialComponents/private (22.0.0):
+    - MaterialComponents/private/Application (= 22.0.0)
+    - MaterialComponents/private/Icons (= 22.0.0)
+    - MaterialComponents/private/KeyboardWatcher (= 22.0.0)
+    - MaterialComponents/private/Overlay (= 22.0.0)
+    - MaterialComponents/private/RTL (= 22.0.0)
+    - MaterialComponents/private/ThumbTrack (= 22.0.0)
+  - MaterialComponents/private/Application (22.0.0)
+  - MaterialComponents/private/Icons (22.0.0):
+    - MaterialComponents/private/Icons/Base (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_check (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_check_circle (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_info (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 22.0.0)
+    - MaterialComponents/private/Icons/ic_reorder (= 22.0.0)
+  - MaterialComponents/private/Icons/Base (22.0.0)
+  - MaterialComponents/private/Icons/ic_arrow_back (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (21.3.0):
+  - MaterialComponents/private/Icons/ic_check (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (21.3.0):
+  - MaterialComponents/private/Icons/ic_check_circle (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (21.3.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (21.3.0):
+  - MaterialComponents/private/Icons/ic_info (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (21.3.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (21.3.0):
+  - MaterialComponents/private/Icons/ic_reorder (22.0.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (21.3.0):
+  - MaterialComponents/private/KeyboardWatcher (22.0.0):
     - MaterialComponents/private/Application
-  - MaterialComponents/private/Overlay (21.3.0)
-  - MaterialComponents/private/RTL (21.3.0)
-  - MaterialComponents/private/ThumbTrack (21.3.0):
+  - MaterialComponents/private/Overlay (22.0.0)
+  - MaterialComponents/private/RTL (22.0.0)
+  - MaterialComponents/private/ThumbTrack (22.0.0):
     - MaterialComponents/Ink
     - MaterialComponents/private/RTL
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ProgressView (21.3.0):
+  - MaterialComponents/ProgressView (22.0.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/ShadowElevations (21.3.0)
-  - MaterialComponents/ShadowLayer (21.3.0)
-  - MaterialComponents/Slider (21.3.0):
+  - MaterialComponents/ShadowElevations (22.0.0)
+  - MaterialComponents/ShadowLayer (22.0.0)
+  - MaterialComponents/Slider (22.0.0):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (21.3.0):
+  - MaterialComponents/Snackbar (22.0.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/Application
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
     - MaterialComponents/Typography
-  - MaterialComponents/Tabs (21.3.0):
+  - MaterialComponents/Tabs (22.0.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Ink
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/Typography (21.3.0):
+  - MaterialComponents/Typography (22.0.0):
     - MaterialComponents/private/Application
-  - MaterialComponentsCatalog (21.3.0):
+  - MaterialComponentsCatalog (22.0.0):
     - MaterialComponents
-  - MaterialComponentsUnitTests (21.3.0):
+  - MaterialComponentsUnitTests (22.0.0):
     - MaterialComponents
     - MDFTextAccessibility
   - MDFTextAccessibility (1.1.4)
@@ -179,9 +179,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
   EarlGrey: 4ee729245614b7157aafa7fa4a8c4fd4ba38113a
-  MaterialComponents: 2ac12e2696035b4fd9b39d8bda4221a5bf701b2b
-  MaterialComponentsCatalog: fca2048b526aa3867182dedfcd06f987268177e4
-  MaterialComponentsUnitTests: 8d1b32b05fb9b024fb935831f0637f4845bd839f
+  MaterialComponents: 5b9fb963ed4fa4c5d7a337cc6867c5ba65d8d324
+  MaterialComponentsCatalog: 6466cef1a09b51d3841256b674943efd023337c0
+  MaterialComponentsUnitTests: 9b2c86b559061809f4d0685d5185208816845dfd
   MDFTextAccessibility: aa897b2675bc614c01a331053af680deea692148
 
 PODFILE CHECKSUM: 0a93a34ae9af89654baaaa3a998126cb7d9e1198

diff --git a/components/AppBar/examples/AppBarModalPresentationExample.m b/components/AppBar/examples/AppBarModalPresentationExample.m
@@ -53,6 +53,7 @@ - (instancetype)init {
 }
 
 - (void)viewDidLoad {
+  [super viewDidLoad];
 
   // UITableViewController's tableView.delegate is self by default. We're setting it here for
   // emphasis.

diff --git a/components/Buttons/src/MDCButton.m b/components/Buttons/src/MDCButton.m
@@ -705,6 +705,7 @@ - (void)mdc_setAdjustsFontForContentSizeCategory:(BOOL)adjusts {
 - (void)contentSizeCategoryDidChange:(NSNotification *)notification {
   UIFont *font = [UIFont mdc_preferredFontForMaterialTextStyle:MDCFontTextStyleButton];
   self.titleLabel.font = font;
+  [self sizeToFit];
 }
 
 #pragma mark - Deprecations