Merge branch 'release-candidate'

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 34.0.01
+
+Hotfix: Fixes Feature Highlight configuration.
+
+## Component changes
+
+### FeatureHighlight
+
+#### Changes
+
+* [Fix broken properties (#1938)](https://github.com/material-components/material-components-ios/commit/669e2f7079239edb29d3bf97c66daecbd49f707d) (Sam Morrison)
+
 # 34.0.0
 
 ## API Diffs

MaterialComponents.podspec

@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "34.0.0"
+  s.version      = "34.0.1"
   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"

MaterialComponentsCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "34.0.0"
+  s.version      = "34.0.1"
   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"

MaterialComponentsEarlGreyTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "34.0.0"
+  s.version      = "34.0.1"
   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"

MaterialComponentsUnitTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "34.0.0"
+  s.version      = "34.0.1"
   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"

components/FeatureHighlight/src/MDCFeatureHighlightViewController.m

@@ -25,7 +25,7 @@
 static const CGFloat kMDCFeatureHighlightPulseAnimationInterval = 1.5f;
 
 @interface MDCFeatureHighlightViewController () <UIViewControllerTransitioningDelegate>
-
+@property(nonatomic, strong) MDCFeatureHighlightView *view;
 @end
 
 @implementation MDCFeatureHighlightViewController {
@@ -37,6 +37,8 @@ @implementation MDCFeatureHighlightViewController {
   UIView *_highlightedView;
 }
 
+@dynamic view;
+
 - (nonnull instancetype)initWithHighlightedView:(nonnull UIView *)highlightedView
                                     andShowView:(nonnull UIView *)displayedView
                                      completion:(nullable MDCFeatureHighlightCompletion)completion {
@@ -185,35 +187,35 @@ - (void)viewWillTransitionToSize:(CGSize)size
 }
 
 - (UIColor *)outerHighlightColor {
-  return _featureHighlightView.outerHighlightColor;
+  return self.view.outerHighlightColor;
 }
 
 - (void)setOuterHighlightColor:(UIColor *)outerHighlightColor {
-  _featureHighlightView.outerHighlightColor = outerHighlightColor;
+  self.view.outerHighlightColor = outerHighlightColor;
 }
 
 - (UIColor *)innerHighlightColor {
-  return _featureHighlightView.innerHighlightColor;
+  return self.view.innerHighlightColor;
 }
 
 - (void)setInnerHighlightColor:(UIColor *)innerHighlightColor {
-  _featureHighlightView.innerHighlightColor = innerHighlightColor;
+  self.view.innerHighlightColor = innerHighlightColor;
 }
 
 - (UIColor *)titleColor {
-  return _featureHighlightView.titleColor;
+  return self.view.titleColor;
 }
 
 - (void)setTitleColor:(UIColor *)titleColor {
-  _featureHighlightView.titleColor = titleColor;
+  self.view.titleColor = titleColor;
 }
 
 - (UIColor *)bodyColor {
-  return _featureHighlightView.bodyColor;
+  return self.view.bodyColor;
 }
 
 - (void)setBodyColor:(UIColor *)bodyColor {
-  _featureHighlightView.bodyColor = bodyColor;
+  self.view.bodyColor = bodyColor;
 }
 
 - (void)acceptFeature {