Merge branch 'release-candidate' into stable

CHANGELOG.md

@@ -1,3 +1,36 @@
+# 101.1.0
+
+This minor release improves tvOS support for Buttons and Snackbar, annotates some AppBar APIs as to-be-deprecated, and fixes a bug in the NavigationDrawer.
+
+## New features
+
+tvOS support is being added to some of our components.
+
+## Component changes
+
+### AppBar
+
+* [Annotate MDCAppBarContainerViewController's appBar and topLayoutGuideAdjustmentEnabled as to be deprecated. (#9394)](https://github.com/material-components/material-components-ios/commit/d7c2865c3d754edf39e28db62ec7039b9ed469c2) (featherless)
+
+### Buttons
+
+* [Add tvOS support to MDCButton. (#9427)](https://github.com/material-components/material-components-ios/commit/71b5766eaa49a4245d8b0c8527773597ce5407d6) (Yarden Eitan)
+
+### Chips
+
+* [Add snapshot tests for selectedImage layout. (#9425)](https://github.com/material-components/material-components-ios/commit/aadb9a6bd099311ea97c189cb7ca2f60701dc201) (Robert Moore)
+* [Tests to evaluate `padding` APIs. (#9423)](https://github.com/material-components/material-components-ios/commit/9694cb2fb68b2717ff16412b3e1ea7c7085bb3b2) (Robert Moore)
+
+### NavigationDrawer
+
+* [Fix #9410 (#9411)](https://github.com/material-components/material-components-ios/commit/bcaf187e373cd3d20fb06b9ea0b5f4ae5546214f) (Jake Rockland)
+
+### Snackbar
+
+* [Add tvOS support to MDCSnackbar. (#9428)](https://github.com/material-components/material-components-ios/commit/7f5d3c76e1e00e461d799019a4fdb52d3c40f9d8) (Yarden Eitan)
+
+---
+
 # 101.0.1
 
 In this patch release we reverted Snackar's display accessibility level from `UIAccessibilityScreenChangedNotification` to `UIAccessibilityLayoutChangedNotification`, as it caused in some cases an unwanted immediate focus shift for VoiceOver users.

MaterialComponents.podspec

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

MaterialComponentsBeta.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponentsBeta"
-  mdc.version      = "101.0.1"
+  mdc.version      = "101.1.0"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone alpha UI libraries that are not yet guaranteed to be ready for general production use. Use with caution."
   mdc.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      = "101.0.1"
+  s.version      = "101.1.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components EarlGrey tests."
   s.description  = "This spec is made for use in the MDC Catalog."

MaterialComponentsExamples.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsExamples"
-  s.version      = "101.0.1"
+  s.version      = "101.1.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components examples."
   s.description  = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

MaterialComponentsSnapshotTests.podspec

@@ -53,7 +53,7 @@ end
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsSnapshotTests"
-  s.version      = "101.0.1"
+  s.version      = "101.1.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components snapshot tests."
   s.homepage     = "https://github.com/material-components/material-components-ios"

VERSION

@@ -1 +1 @@
-101.0.1
+101.1.0

catalog/MDCCatalog/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>101.0.1</string>
+	<string>101.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>101.0.1</string>
+	<string>101.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

catalog/MDCDragons/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>101.0.1</string>
+	<string>101.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>101.0.1</string>
+	<string>101.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

catalog/MaterialCatalog/MaterialCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "101.0.1"
+  s.version      = "101.1.0"
   s.summary      = "Helper Objective-C classes for the MDC catalog."
   s.description  = "This spec is made for use in the MDC Catalog."
   s.homepage     = "https://github.com/material-components/material-components-ios"

components/AppBar/src/MDCAppBarContainerViewController.h

@@ -60,7 +60,11 @@
 /** The content view controller to be displayed behind the header. */
 @property(nonatomic, strong, nonnull, readonly) UIViewController *contentViewController;
 
-#pragma mark - Enabling top layout guide adjustment behavior
+@end
+
+@interface MDCAppBarContainerViewController (ToBeDeprecated)
+
+#pragma mark - To be deprecated
 
 /**
  If enabled, the content view controller's top layout guide will be adjusted as the flexible
@@ -86,8 +90,6 @@
  */
 @property(nonatomic, getter=isTopLayoutGuideAdjustmentEnabled) BOOL topLayoutGuideAdjustmentEnabled;
 
-#pragma mark - To be deprecated
-
 /**
  The App Bar views that will be presented in front of the contentViewController's view.
 

components/AppBar/src/MDCAppBarContainerViewController.m

@@ -17,9 +17,15 @@
 #import "MDCAppBarViewController.h"
 #import "MaterialFlexibleHeader.h"
 
-@implementation MDCAppBarContainerViewController {
-  MDCAppBar *_appBar;
-}
+@interface MDCAppBarContainerViewController ()
+
+// To be deprecated APIs; re-declared here in order to be auto-synthesized.
+@property(nonatomic, getter=isTopLayoutGuideAdjustmentEnabled) BOOL topLayoutGuideAdjustmentEnabled;
+@property(nonatomic, strong, nonnull, readonly) MDCAppBar *appBar;
+
+@end
+
+@implementation MDCAppBarContainerViewController
 
 - (instancetype)initWithContentViewController:(UIViewController *)contentViewController {
   self = [super initWithNibName:nil bundle:nil];

components/Buttons/src/MDCButton.m

@@ -169,7 +169,10 @@ - (void)commonMDCButtonInit {
 
   // Disable default highlight state.
   self.adjustsImageWhenHighlighted = NO;
+
+#ifndef TARGET_OS_TV
   self.showsTouchWhenHighlighted = NO;
+#endif
 
   self.layer.cornerRadius = MDCButtonDefaultCornerRadius;
   if (!self.layer.shapeGenerator) {
@@ -195,8 +198,10 @@ - (void)commonMDCButtonInit {
                 action:@selector(touchDragExit:forEvent:)
       forControlEvents:UIControlEventTouchDragExit];
 
+#ifndef TARGET_OS_TV
   // Block users from activating multiple buttons simultaneously by default.
   self.exclusiveTouch = YES;
+#endif
 
   _inkView.inkColor = [UIColor colorWithWhite:1 alpha:(CGFloat)0.2];