Merge branch 'release-candidate' into stable

Author: yarneo

CHANGELOG.md

@@ -1,3 +1,87 @@
+# 115.1.0
+
+In this minor release we add 2 APIs to customize BottomNavigation's appearance and behavior, we deprecate the property `rippleAllowsSelection` from `MDCChipView`, we provide a `containerRadius` API to `MDCBaseTextField` and `MDCBaseTextArea`, along with other code cleanups.
+
+## New deprecations
+
+`MDCChipView`'s `rippleAllowSelection` property is now deprecated. Please instead use native UIKit APIs to control whether the chip is selected or not, using either the .selected API, or, with MDCChipCollectionViewCell, by calling the `deselectItemAtIndexPath` API to remove selection. Note, this only applies if you have the `enableRippleBehavior` property set to `YES` on `MDCChipView`.
+
+## New features
+
+### BottomNavigation
+
+You can now customize MDCBottomNavigationBar's height using the `barHeight` property.
+
+```objc
+MDCBottomNavigationBar *bottomNavBar;
+bottomNavBar = [[MDCBottomNavigationBar alloc] initWithFrame:CGRectZero];
+bottomNavBar.barHeight = 44;
+[self.view addSubview:bottomNavBar];
+```
+
+You can now also decide when to hide or show your navigation bar using the new `navigationBarHidden` APIs on MDCBottomNavigationBarController.
+
+```swift
+let bottomNavBarController = MDCBottomNavigationBarController()
+bottomNavBarController.willMove(toParent: self)
+view.addSubview(bottomNavBarController.view)
+addChild(bottomNavBarController)
+bottomNavBarController.didMove(toParent: self)
+let viewController = UIViewController()
+bottomNavBarController.viewControllers = [viewController]
+bottomNavBarController.setNavigationBarHidden(true, animated: true)
+```
+
+### TextControls
+
+Both `MDCBaseTextArea` and `MDCBaseTextField` now have a `containerRadius` API, which determines the corner radius of the container, when applicable.
+Setting this property is a no-op for MDCBaseTextField and any subclasses with invisible containers.
+
+```swift
+let filledTextField = MDCFilledTextField()
+filledTextField.label.text = "label text"
+filledTextField.containerRadius = 8
+```
+
+## Component changes
+
+### Banner
+
+* [Change the trailing padding constraint for textView on MDCBannerView to match the Material Banner specs (https://material.io/components/banners#specs).](https://github.com/material-components/material-components-ios/commit/56226bbef5e50d2604b43699fad75c9d2d0b0873) (Nobody)
+
+### BottomNavigation
+
+* [Add navigationBarHidden property to MDCBottomNavigationBarController.](https://github.com/material-components/material-components-ios/commit/bb71d6bcbbf9205661e8a324db0d9ae260874689) (Bryan Oltman)
+* [Provide an API to set the bar's height.](https://github.com/material-components/material-components-ios/commit/5d3662f0a203cf38e3e379b094b0ffb5f6563b59) (Yarden Eitan)
+* [Remove all checks for iOS 10 availability now that components support iOS 10+](https://github.com/material-components/material-components-ios/commit/ef9fd055935cb3f29644ec1eeec10433355a3b31) (Alyssa Weiss)
+* [Remove no longer used string bundle references](https://github.com/material-components/material-components-ios/commit/6878fc63446902f4d78c73f4a486ad28ef6caf72) (Alyssa Weiss)
+* [Remove supplemental directory from examples.](https://github.com/material-components/material-components-ios/commit/d79d9a86c59ea80f5bbab56d3eaa9badc308d432) (Bryan Oltman)
+* [Update Bottom Navigation Item View accessibility traits so that VoiceOver works correctly on iOS 14.](https://github.com/material-components/material-components-ios/commit/898e373ea257b1122a758cd3855420204c5c018e) (Alyssa Weiss)
+
+### Chips
+
+* [Deprecate rippleAllowsSelection as we move away from MDCStatefulRippleView and to a simpler MDCRippleView when enableRippleBehavior is set to YES.](https://github.com/material-components/material-components-ios/commit/4bcf88708b46a38db2f9d695a8e44e0b744ba7ba) (Yarden Eitan)
+
+### Snackbar
+
+* [Enable shouldDismissOnOverlayTap for VO enabled scenario](https://github.com/material-components/material-components-ios/commit/dcda0408f462d9e15e31ed6d95d9654145dab3f4) (Yun Zhang)
+* [Example: Dismiss snackbars when push or popping the example VC.](https://github.com/material-components/material-components-ios/commit/4c6b2357e9cd89228049ae9cb4ea5b504fddafac) (Randall Li)
+* [Remove non-shared classes from Snackbar supplemental directory.](https://github.com/material-components/material-components-ios/commit/63670a7b2c49c376b13be1dc5bb29356469bc516) (Bryan Oltman)
+* [Remove references to deprecated static MDCSnackbarManager methods.](https://github.com/material-components/material-components-ios/commit/78868b55e6a01ed868f7a0918282d678605ce392) (Bryan Oltman)
+
+### Tabs
+
+* [Remove pre-iOS 10 handling for voiceover now that components support iOS 10+](https://github.com/material-components/material-components-ios/commit/6e127557ebe8d85faab9c4e1420343fad983fca6) (Alyssa Weiss)
+* [Remove unused StringsConstant file from Tabs](https://github.com/material-components/material-components-ios/commit/ef4dc34cad6855f43dc39b8e432761d9259516c7) (Alyssa Weiss)
+
+### TextControls
+
+* [Refactor sizing behavior + expose sizing delegate method](https://github.com/material-components/material-components-ios/commit/58ae5f81390b44bd675a0694caaf4e385a6e39a1) (Andrew Overton)
+* [Add `containerRadius` to MDCBaseTextField](https://github.com/material-components/material-components-ios/commit/d303da4db4c820f39ea5c69a29785aa43bb084a8) (Andrew Overton)
+* [Add containerRadius to filled style object and base text area](https://github.com/material-components/material-components-ios/commit/3aace45a832e030d2e7812e310ffb4488e0bf77b) (Andrew Overton)
+
+---
+
 # 115.0.0
 
 In this major release, we deprecated the Ink component in favor of Ripple and deleted the

MaterialComponents.podspec

@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "115.0.0"
+  mdc.version      = "115.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"
@@ -1437,9 +1437,6 @@ Pod::Spec.new do |mdc|
       "components/#{component.base_name}/src/ExtendedAlignment/*.{h,m}",
       "components/#{component.base_name}/src/SizeClassDelegate/*.{h,m}"
     ]
-    component.resources = [
-      "components/#{component.base_name}/src/Material#{component.base_name}.bundle"
-    ]
 
     component.dependency "MDFInternationalization"
     component.dependency "MaterialComponents/AnimationTiming"

MaterialComponentsEarlGreyTests.podspec

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

catalog/MDCCatalog/Info.plist

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

catalog/MDCDragons/MDCDragonsController.swift

@@ -35,14 +35,18 @@ class MDCDragonsController: UIViewController,
   UIGestureRecognizerDelegate
 {
 
+  let containerScheme: MDCContainerScheming = {
+    let scheme = MDCContainerScheme()
+    scheme.colorScheme = MDCSemanticColorScheme(defaults: .material201907)
+    scheme.typographyScheme = MDCTypographyScheme(defaults: .material201902)
+    scheme.shapeScheme = MDCShapeScheme()
+    return scheme
+  }()
+
   fileprivate struct Constants {
     static let headerScrollThreshold: CGFloat = 50
     static let headerViewMaxHeight: CGFloat = 113
     static let headerViewMinHeight: CGFloat = 53
-    static let bgColor = UIColor(white: 0.97, alpha: 1)
-    static let headerColor = UIColor(red: 0.384, green: 0, blue: 0.933, alpha: 1.0)
-    static let titleColor = UIColor(white: 0, alpha: 0.87)
-    static let subtitleColor = UIColor(white: 0, alpha: 0.60)
   }
   fileprivate var cellsBySection: [[DragonCell]]
   fileprivate var nodes: [CBCNode]
@@ -110,7 +114,7 @@ class MDCDragonsController: UIViewController,
     headerViewController.headerView.maximumHeight = Constants.headerViewMaxHeight
     headerViewController.headerView.minimumHeight = Constants.headerViewMinHeight
 
-    view.backgroundColor = Constants.bgColor
+    view.backgroundColor = containerScheme.colorScheme.backgroundColor
 
     if #available(iOS 14.0, *) {
       #if compiler(>=5.3)
@@ -122,7 +126,7 @@ class MDCDragonsController: UIViewController,
       tableView.register(
         MDCDragonsTableViewCell.self,
         forCellReuseIdentifier: "MDCDragonsTableViewCell")
-      tableView.backgroundColor = Constants.bgColor
+      tableView.backgroundColor = containerScheme.colorScheme.backgroundColor
       tableView.delegate = self
       tableView.dataSource = self
       tableView.rowHeight = UITableView.automaticDimension
@@ -163,7 +167,7 @@ class MDCDragonsController: UIViewController,
 
     headerViewController.headerView.addSubview(headerView)
     headerViewController.headerView.forwardTouchEvents(for: headerView)
-    headerViewController.headerView.backgroundColor = Constants.headerColor
+    headerViewController.headerView.backgroundColor = containerScheme.colorScheme.primaryColor
     if #available(iOS 14.0, *) {
       headerViewController.headerView.trackingScrollView = collectionView
     } else {
@@ -218,29 +222,30 @@ class MDCDragonsController: UIViewController,
     else {
       return UITableViewCell()
     }
-    cell.backgroundColor = .white
     let nodeData =
       isSearchActive ? searched[indexPath.item] : cellsBySection[indexPath.section][indexPath.row]
     let componentName = nodeData.node.title
     cell.textLabel?.text = componentName
+    cell.textLabel?.textColor = containerScheme.colorScheme.onBackgroundColor
+    cell.tintColor = containerScheme.colorScheme.onBackgroundColor
     let node = nodeData.node
     if !node.isExample() && !isSearchActive {
       if nodeData.expanded {
         cell.accessoryView = cell.expandedAccessoryView
-        cell.textLabel?.textColor = Constants.headerColor
+        cell.textLabel?.textColor = containerScheme.colorScheme.primaryColor
       } else {
         cell.accessoryView = cell.collapsedAccessoryView
-        cell.textLabel?.textColor = Constants.titleColor
+        cell.textLabel?.textColor = containerScheme.colorScheme.onBackgroundColor
       }
     } else {
       cell.accessoryView = nil
       if indexPath.section != 0 {
-        cell.textLabel?.textColor = Constants.subtitleColor
+        cell.textLabel?.textColor = containerScheme.colorScheme.onBackgroundColor
         if let text = cell.textLabel?.text {
           cell.textLabel?.text = "  " + text
         }
       } else if isSearchActive {
-        cell.textLabel?.textColor = Constants.titleColor
+        cell.textLabel?.textColor = containerScheme.colorScheme.onBackgroundColor
       }
     }
     return cell
@@ -260,11 +265,12 @@ class MDCDragonsController: UIViewController,
       if nodeData.expanded {
         collapseCells(at: indexPath)
         cell.accessoryView = cell.collapsedAccessoryView
-        cell.textLabel?.textColor = Constants.titleColor
+        cell.textLabel?.textColor = containerScheme.colorScheme.onBackgroundColor
+
       } else {
         expandCells(at: indexPath)
         cell.accessoryView = cell.expandedAccessoryView
-        cell.textLabel?.textColor = Constants.headerColor
+        cell.textLabel?.textColor = containerScheme.colorScheme.primaryColor
       }
       self.tableView.endUpdates()
       nodeData.expanded = !nodeData.expanded
@@ -276,12 +282,6 @@ class MDCDragonsController: UIViewController,
 
     let containerSchemeSel = NSSelectorFromString("setContainerScheme:")
     if vc.responds(to: containerSchemeSel) {
-      let containerScheme = MDCContainerScheme()
-
-      containerScheme.colorScheme = MDCSemanticColorScheme(defaults: .material201907)
-      containerScheme.typographyScheme = MDCTypographyScheme(defaults: .material201902)
-      containerScheme.shapeScheme = MDCShapeScheme()
-
       vc.perform(containerSchemeSel, with: containerScheme)
     }
 
@@ -494,7 +494,7 @@ extension MDCDragonsController {
         frame: view.bounds, collectionViewLayout: generateLayout())
       view.addSubview(collectionView)
       collectionView.autoresizingMask = [.flexibleHeight, .flexibleWidth]
-      collectionView.backgroundColor = .white
+      collectionView.backgroundColor = containerScheme.colorScheme.backgroundColor
       self.collectionView = collectionView
       collectionView.delegate = self
     }
@@ -509,7 +509,7 @@ extension MDCDragonsController {
           // Populate the cell with our item description.
           var contentConfiguration = cell.defaultContentConfiguration()
           contentConfiguration.text = menuItem.title
-          contentConfiguration.textProperties.color = Constants.titleColor
+          contentConfiguration.textProperties.color = containerScheme.colorScheme.onBackgroundColor
           cell.contentConfiguration = contentConfiguration
 
           let disclosureOptions = UICellAccessory.OutlineDisclosureOptions(style: .header)
@@ -525,7 +525,7 @@ extension MDCDragonsController {
           // Populate the cell with our item description.
           var contentConfiguration = cell.defaultContentConfiguration()
           contentConfiguration.text = menuItem.title
-          contentConfiguration.textProperties.color = Constants.subtitleColor
+          contentConfiguration.textProperties.color = containerScheme.colorScheme.onBackgroundColor
           cell.contentConfiguration = contentConfiguration
           cell.backgroundConfiguration = UIBackgroundConfiguration.clear()
         }

catalog/MDCDragons/MDCDragonsTableViewCell.swift

@@ -19,14 +19,14 @@ import MaterialComponents.MaterialIcons_ic_arrow_back
 class MDCDragonsTableViewCell: UITableViewCell {
 
   lazy var collapsedAccessoryView: UIView = {
-    let image = MDCIcons.imageFor_ic_chevron_right()
+    let image = MDCIcons.imageFor_ic_chevron_right()?.withRenderingMode(.alwaysTemplate)
     let view = UIImageView(image: image)
     view.frame = CGRect(x: 0, y: 0, width: 20, height: 20)
     return view
   }()
 
   lazy var expandedAccessoryView: UIView = {
-    let image = MDCIcons.imageFor_ic_chevron_right()
+    let image = MDCIcons.imageFor_ic_chevron_right()?.withRenderingMode(.alwaysTemplate)
     let view = UIImageView(image: image)
     view.frame = CGRect(x: 0, y: 0, width: 20, height: 20)
     view.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 2)