Merge branch 'release-candidate' into stable

CHANGELOG.md

@@ -1,3 +1,65 @@
+# 122.0.0
+
+In this major release, we have made some API-breaking changes and landed some bug fixes and test improvements.
+
+## Breaking changes
+
+### FlexibleHeader
+
+- FlexibleHeader's topSafeAreaGuide is now a UIView.
+
+### ProgressView
+
+- We've removed generics annotations from ProgressView's progressTintColors.
+
+## Component changes
+
+### AppBar
+
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/1437067081c38031d16e80f08437d4667543bce0) (Jeff Verkoeyen)
+
+### BottomNavigation
+
+* [Ensure correct Voiceover behavior in iOS 14.](https://github.com/material-components/material-components-ios/commit/4b4b0f3d7d1753a926ef88723361656252219f28) (Alyssa Weiss)
+
+### Buttons
+
+* [Add inferMinimumAndMaximumSizeWhenMultiline](https://github.com/material-components/material-components-ios/commit/8f2917d52553499260f11c8fd388304838ef9361) (Andrew Overton)
+* [Internal change](https://github.com/material-components/material-components-ios/commit/105c4f4ab046ab01bf0677247cfbceee2b51440f) (Andrew Overton)
+
+### Collections
+
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/6171ea2840fb0901a49c0a886c54bf048ff0e8f4) (Jeff Verkoeyen)
+
+### Dialogs
+
+* [Fixed typo in API doc.](https://github.com/material-components/material-components-ios/commit/bcf4760ceba9933de3aa771b1e58cc9e97d7fbed) (Randall Li)
+
+### FlexibleHeader
+
+* [Redefine topSafeAreaGuide as a UIView.](https://github.com/material-components/material-components-ios/commit/22cb5afa87d9fedc134ae64002e48a3c227b2798) (Randall Li)
+
+### ProgressView
+
+* [Add snapshot and unit tests.](https://github.com/material-components/material-components-ios/commit/fdb53be95e6923b7175e5fcd09e850ae0bf69252) (Alyssa Weiss)
+* [Remove generics from ProgressView's progressTintColors](https://github.com/material-components/material-components-ios/commit/c7a70ce81893c97656f8aec6c824fc44066dad88) (Andrew Overton)
+
+### Tabs
+
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/6028ffe8792402eb137f9197e0521439bdf999b9) (Cody Weaver)
+
+## Multi-component changes
+
+* [Clean up markdown formatting.](https://github.com/material-components/material-components-ios/commit/d0ac5f2c8396ba7c5cd278b7892330effe7aa093) (Nobody)
+* [Expose density on text fields and text areas](https://github.com/material-components/material-components-ios/commit/73e404888d1e98e930e62b68f864b60e264c32f3) (Andrew Overton)
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/25c9049d5a4ee13ed9085ca01a92ed3b25867989) (Jeff Verkoeyen)
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/39c20e15f82a89c5ea7311f708c8360671efea5a) (Jeff Verkoeyen)
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/63988b35da1fa5281b4260abd8a075817b19d155) (Jeff Verkoeyen)
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/9f9b452b3aeb357ed46977d3c86d40d29e63200f) (Jeff Verkoeyen)
+* [Optimizing imports](https://github.com/material-components/material-components-ios/commit/b3fa42005b31417c687f8a96aa9c4df568182506) (Jeff Verkoeyen)
+
+---
+
 # 121.0.1
 
 In this patch release we made some internal improvements to our imports and refined our deprecation policy.

MaterialComponents.podspec

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

MaterialComponentsEarlGreyTests.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "121.0.1"
+  s.version      = "122.0.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      = "121.0.1"
+  s.version      = "122.0.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."
@@ -13,5 +13,7 @@ Pod::Spec.new do |s|
 
   s.resources = ['components/*/examples/resources/*', 'components/private/*/examples/resources/*', 'components/schemes/*/examples/resources/*']
   s.dependency 'MaterialComponents'
+	s.dependency 'MDFInternationalization'
+	s.dependency 'MDFTextAccessibility'
   s.public_header_files = ['components/*/examples/*.h', 'components/*/examples/supplemental/*.h', 'components/private/*/examples/*.h', 'components/schemes/*/examples/*.h']
 end

MaterialComponentsSnapshotTests.podspec

@@ -53,7 +53,7 @@ end
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsSnapshotTests"
-  s.version      = "121.0.1"
+  s.version      = "122.0.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 @@
-121.0.1
+122.0.0

catalog/MDCCatalog/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>121.0.1</string>
+	<string>122.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>121.0.1</string>
+	<string>122.0.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>121.0.1</string>
+	<string>122.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>121.0.1</string>
+	<string>122.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

catalog/MaterialCatalog/MDCCatalogTiles.m

@@ -15,7 +15,7 @@
 #import <UIKit/UIKit.h>
 
 #import "MDCCatalogTiles.h"
-#import "MaterialThemes.h"
+#import "MaterialColorScheme.h"
 
 UIImage* _Nullable MDCDrawImage(CGRect frame,
                                 MDCDrawFunc drawFunc,

catalog/MaterialCatalog/MaterialCatalog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "121.0.1"
+  s.version      = "122.0.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/examples/AppBarImageryExample.m

@@ -16,6 +16,9 @@
 
 #import "MaterialAppBar+ColorThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
+#import "MaterialColorScheme.h"
 
 @interface AppBarImageryExample : UITableViewController
 @property(nonatomic, strong) MDCAppBarViewController *appBarViewController;

components/AppBar/examples/AppBarInterfaceBuilderExampleController.m

@@ -16,6 +16,8 @@
 
 #import "MaterialAppBar+ColorThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialColorScheme.h"
 
 @interface AppBarInterfaceBuilderExample : UIViewController <UIScrollViewDelegate>
 

components/AppBar/examples/AppBarModalPresentationExample.m

@@ -16,6 +16,8 @@
 
 #import "MaterialAppBar+ColorThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialColorScheme.h"
 
 @interface AppBarModalPresentationExamplePresented : UITableViewController
 @property(strong, nonatomic) MDCAppBarViewController *appBarViewController;

components/AppBar/examples/AppBarPresentedExample.m

@@ -15,8 +15,6 @@
 #import <UIKit/UIKit.h>
 
 #import "AppBarSampleViewController.h"
-#import "MaterialAppBar.h"
-#import "MaterialAppBar+Theming.h"
 #import "MaterialButtons.h"
 #import "MaterialButtons+Theming.h"
 #import "MaterialContainerScheme.h"

components/AppBar/examples/AppBarPresentedHiddenExample.m

@@ -16,10 +16,10 @@
 
 #import "AppBarSampleViewController.h"
 #import "MaterialAppBar.h"
-#import "MaterialAppBar+Theming.h"
 #import "MaterialAvailability.h"
 #import "MaterialButtons.h"
 #import "MaterialButtons+Theming.h"
+#import "MaterialFlexibleHeader.h"
 #import "MaterialContainerScheme.h"
 
 // This example demonstrates a view controller being presented with the AppBar initially hidden.

components/AppBar/examples/AppBarSectionHeadersExample.m

@@ -16,6 +16,8 @@
 
 #import "MaterialAppBar+ColorThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialColorScheme.h"
 
 @interface AppBarSectionHeadersExample : UITableViewController
 

components/AppBar/examples/AppBarTypicalCollectionViewExample.m

@@ -15,8 +15,11 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface AppBarTypicalCollectionViewExample : UICollectionViewController
 

components/AppBar/examples/AppBarTypicalUseExample.m

@@ -15,8 +15,12 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface AppBarTypicalUseExample : UITableViewController
 

components/AppBar/examples/AppBarWKWebViewLargeContentExample.m

@@ -16,8 +16,12 @@
 #import <WebKit/WebKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 // This demonstrates that a WKWebView with large content as the tracking scroll view is able to
 // scroll as expected, even with the useAdditionalSafeAreaInsetsForWebKitScrollViews flag enabled.

components/AppBar/examples/AppBarWKWebViewLargeContentNoBugExample.m

@@ -16,8 +16,12 @@
 #import <WebKit/WebKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 // This demonstrates that a WKWebView with large content as the tracking scroll view is able to
 // scroll as expected, even without the useAdditionalSafeAreaInsetsForWebKitScrollViews flag

components/AppBar/examples/AppBarWKWebViewSmallContentBugExample.m

@@ -16,8 +16,12 @@
 #import <WebKit/WebKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 // This demonstrates a bug when WKWebView's scroll view is the tracking scroll view and the web
 // view's content is smaller than the screen. Note that the content is scrollable because the

components/AppBar/examples/AppBarWKWebViewSmallContentExample.m

@@ -16,8 +16,12 @@
 #import <WebKit/WebKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 // This demonstrates that a WKWebView with minimal content as the tracking scroll view is not able
 // to scroll as expected. This requires enabling useAdditionalSafeAreaInsetsForWebKitScrollViews

components/AppBar/examples/AppBarWrappedExample.m

@@ -15,8 +15,11 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface WrappedDemoViewController : UIViewController
 @end

components/AppBar/examples/AppBarWrappingUITableViewControllerExample.m

@@ -15,8 +15,11 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialAppBar+TypographyThemer.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface AppBarWrappingUITableViewControllerExample : UIViewController <UITableViewDataSource>
 

components/AppBar/src/MDCAppBarContainerViewController.m

@@ -16,6 +16,7 @@
 
 #import "MDCAppBarViewController.h"
 #import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
 
 @interface MDCAppBarContainerViewController ()
 

components/AppBar/src/MDCAppBarNavigationController.m

@@ -16,6 +16,8 @@
 
 #import "MDCAppBarNavigationControllerToBeDeprecatedDelegate.h"
 #import "MDCAppBarViewController.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialHeaderStackView.h"
 
 #import <objc/runtime.h>
 

components/AppBar/src/MDCAppBarViewController.m

@@ -12,22 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MDCAppBar.h"
+#import "MDCAppBarViewController.h"
 
 #import "MDCAppBarContainerViewController.h"
 
 #import "private/MaterialAppBarStrings.h"
 #import "private/MaterialAppBarStrings_table.h"
 #import "MDCAppBarViewControllerAccessibilityPerformEscapeDelegate.h"
 #import "MaterialFlexibleHeader.h"
+#import "MaterialHeaderStackView.h"
+#import "MaterialNavigationBar.h"
 #import "MaterialShadowElevations.h"
 #import "MaterialShadowLayer.h"
-#import "MaterialTypography.h"
-#import "MaterialApplication.h"
 #import "MaterialIcons+ic_arrow_back.h"
 #import "MaterialUIMetrics.h"
 #import <MDFInternationalization/MDFInternationalization.h>
-#import <MDFTextAccessibility/MDFTextAccessibility.h>
 
 static NSString *const kBarStackKey = @"barStack";
 

components/BottomNavigation/src/private/MDCBottomNavigationItemView.m

@@ -168,6 +168,10 @@ - (void)commonMDCBottomNavigationItemViewInit {
     _button.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
     _button.accessibilityLabel = [self accessibilityLabelWithTitle:_title];
     _button.accessibilityValue = self.accessibilityValue;
+    // This needs to be set specifically for VoiceOver to work on iOS 14, see b/175421576
+    if (@available(iOS 14, *)) {
+      _button.accessibilityTraits |= UIAccessibilityTraitButton;
+    }
     [self addSubview:_button];
   }
 }

components/BottomSheet/README.md

@@ -124,6 +124,7 @@ MDCBottomSheetController *bottomSheet = [[MDCBottomSheetController alloc] initWi
 // Present the bottom sheet
 [self presentViewController:bottomSheet animated:true completion:nil];
 ```
+<!--</div>-->
 
 #### Behavioral customizations
 
@@ -265,4 +266,4 @@ id<MDCShapeScheming> shapeScheme = [[MDCShapeScheme alloc] init];
 [MDCBottomSheetControllerShapeThemer applyShapeScheme:shapeScheme
      toBottomSheetController:component];
 ```
-<!--</div>-->
+<!--</div>-->

components/BottomSheet/examples/BottomSheetAutolayoutExample.m

@@ -14,7 +14,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import "supplemental/BottomSheetDummyStaticViewController.h"
 #import "BottomSheetPresenterViewController.h"
 #import "MaterialBottomSheet.h"