Merge branch 'release-candidate'

Author: randallli

.swiftlint.yml

@@ -2,9 +2,15 @@ excluded:
   - Carthage
   - Pods
   - third_party
+  - catalog/third_party
 
 disabled_rules:
   - cyclomatic_complexity
+  - force_cast
+  - todo
+  - type_name
+
+line_length: 100
 
 force_cast: warning
 force_try: warning

.travis.yml

@@ -15,8 +15,7 @@ env:
     - DESTINATION="platform=iOS Simulator,name=iPhone 7,OS=10.2" SDK="iphonesimulator10.2"
 before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
-  - brew update
-  - brew install swiftlint || true  # If already installed, don't fail.
+  - scripts/install_contributor_tools
 # The travis_wait prefix ensures that the build doesn't error out because too much time went past
 # without any output being produced.
 script:

CHANGELOG.md

@@ -1,3 +1,77 @@
+# 20.1.0 
+
+## API diffs
+
+### Snackbar
+
+* Message View Styling
+
+## Component changes
+
+### AppBar
+
+#### Changes
+
+* [- Added Modal Presentation App Bar Example (#1153)](https://github.com/material-components/material-components-ios/commit/8ab5505d0e438d7e9a7a31cf9e1ffea113e3be7c) (Justin Shephard)
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### Buttons
+
+#### Changes
+
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### Collections
+
+#### Changes
+
+* [Added custom Storyboard cell to the Storyboard example. (#1152)](https://github.com/material-components/material-components-ios/commit/6843303f9d54a5a11a70abae6976f0b4d011636f) (Adrian Secord)
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### Dialogs
+
+#### Changes
+
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### FeatureHighlight
+
+#### Changes
+
+* [Build fix: CGFloat casts missing from MDCFeatureHighlightView.m.](https://github.com/material-components/material-components-ios/commit/99d59f3fc6e2be46ebbe93c2784965516615a4ba) (Adrian Secord)
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+* [[Feature highlight] Dynamically size inner highlight (#1151)](https://github.com/material-components/material-components-ios/commit/771496f6c6044866ea30622006646e7a7193e070) (Sam Morrison)
+
+### FlexibleHeader
+
+#### Changes
+
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### PageControl
+
+#### Changes
+
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### Palettes
+
+#### Changes
+
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### ShadowLayer
+
+#### Changes
+
+* [More SwiftLint fixes for unit tests and example apps. (#1154)](https://github.com/material-components/material-components-ios/commit/8bcb19781cd8387464f46be51cdd72787d3f12ef) (Adrian Secord)
+
+### Snackbar
+
+#### Changes
+
+* [Message View Styling. (#1120)](https://github.com/material-components/material-components-ios/commit/95891e1130e6ee9351d5e7bad8f1ceb68bc22500) (Sean O'Shea)
+
 # 20.0.0
 
 ## API changes
@@ -296,6 +370,7 @@ This point release removes the examples from `private/ThumbTrack`; they didn't f
 
 * [Remove all references to removed components (#1067)](https://github.com/material-components/material-components-ios/commit/03059189e5c929d877a6fd83d33c1a5614273527) (Adrian Secord)
 * [Removed old refs to API docs. (#1084)](https://github.com/material-components/material-components-ios/commit/e8c45d53942908ceece95bfadbc98db7a92089b0) (Adrian Secord)
+
 # 19.0.1
 
 This point release fixes stale references to MDFFontDiskLoader, MDFSpritedAnimationView, and MDFRobotoFontLoader in our CocoaPods podspec.

MaterialComponents.podspec

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

MaterialComponentsCatalog.podspec

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

MaterialComponentsUnitTests.podspec

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

README.md

@@ -18,7 +18,7 @@ Material Components for iOS are written in Objective-C and support Swift and Int
 - [MDC-iOS on Stack Overflow](https://www.stackoverflow.com/questions/tagged/material-components+ios) (external site)
 - [Material.io](https://www.material.io) (external site)
 - [Material Design Guidelines](https://material.google.com) (external site)
-  
+
 ## Trying out Material Components
 
 Our [catalog](catalog/) showcases Material Components. You can use the `pod try` command from anywhere on your machine to try the components, even if you haven't checked out the repo yet:
@@ -33,6 +33,9 @@ In case you have already checked out the repo, run the following command:
 pod install --project-directory=catalog/
 ~~~
 
+If you want to take a look at the implementation of the components, you can find the code inside the `Development Pods` folder.
+Use `cmd-1` to open the project navigator within Xcode. Peal open the `Pods` project and inside the `Development Pods` folder you will find the component source code.
+
 ## Installation
 
 ### Getting Started with a New Project

catalog/MDCCatalog.xcodeproj/project.pbxproj

@@ -507,7 +507,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${SRCROOT}/../scripts/lint.sh";
+			shellScript = "${SRCROOT}/../scripts/lint_all";
 		};
 		72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;

catalog/MDCCatalog/AppDelegate.swift

@@ -23,7 +23,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+  func application(_ application: UIApplication, didFinishLaunchingWithOptions
+                   launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
     self.window = MDCCatalogWindow(frame: UIScreen.main.bounds)
 
     let tree = CBCCreateNavigationTree()

catalog/MDCCatalog/MDCCatalogComponentsController.swift

@@ -44,7 +44,10 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
 
     let layout = UICollectionViewFlowLayout()
     let sectionInset: CGFloat = spacing
-    layout.sectionInset = UIEdgeInsets(top: sectionInset, left: sectionInset, bottom: sectionInset, right: sectionInset)
+    layout.sectionInset = UIEdgeInsets(top: sectionInset,
+                                       left: sectionInset,
+                                       bottom: sectionInset,
+                                       right: sectionInset)
     layout.minimumInteritemSpacing = spacing
     layout.minimumLineSpacing = spacing
 
@@ -102,41 +105,10 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
     titleLabel.translatesAutoresizingMaskIntoConstraints = false
 
     containerView.addSubview(titleLabel)
-    _ = NSLayoutConstraint(
-      item: titleLabel,
-      attribute: .leading,
-      relatedBy: .equal,
-      toItem: containerView,
-      attribute: .leading,
-      multiplier: 1.0,
-      constant: titleInsets.left).isActive = true
-
-    _ = NSLayoutConstraint(
-      item: titleLabel,
-      attribute: .trailing,
-      relatedBy: .equal,
-      toItem: containerView,
-      attribute: .trailing,
-      multiplier: 1.0,
-      constant: 0).isActive = true
-
-    _ = NSLayoutConstraint(
-      item: titleLabel,
-      attribute: .bottom,
-      relatedBy: .equal,
-      toItem: containerView,
-      attribute: .bottom,
-      multiplier: 1.0,
-      constant: -titleInsets.bottom).isActive = true
-
-    _ = NSLayoutConstraint(
-      item: titleLabel,
-      attribute: .height,
-      relatedBy: .equal,
-      toItem: nil,
-      attribute: .notAnAttribute,
-      multiplier: 1.0,
-      constant: titleSize.height).isActive = true
+    constrainLabel(label: titleLabel,
+                   containerView: containerView,
+                   insets: titleInsets,
+                   height: titleSize.height)
 
     self.headerViewController.headerView.addSubview(containerView)
 
@@ -183,11 +155,13 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
 
   // MARK: MDCInkTouchControllerDelegate
 
-  func inkTouchController(_ inkTouchController: MDCInkTouchController, shouldProcessInkTouchesAtTouchLocation location: CGPoint) -> Bool {
+  func inkTouchController(_ inkTouchController: MDCInkTouchController,
+                          shouldProcessInkTouchesAtTouchLocation location: CGPoint) -> Bool {
     return self.collectionView!.indexPathForItem(at: location) != nil
   }
 
-  func inkTouchController(_ inkTouchController: MDCInkTouchController, inkViewAtTouchLocation location: CGPoint) -> MDCInkView {
+  func inkTouchController(_ inkTouchController: MDCInkTouchController,
+                          inkViewAtTouchLocation location: CGPoint) -> MDCInkView {
     if let indexPath = self.collectionView!.indexPathForItem(at: location) {
       let cell = self.collectionView!.cellForItem(at: indexPath)
       return self.inkViewForView(cell!)
@@ -197,9 +171,11 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
 
   // MARK: UICollectionViewDelegate
 
-  override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-    let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "MDCCatalogCollectionViewCell",
-      for: indexPath)
+  override func collectionView(_ collectionView: UICollectionView,
+                               cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+    let cell =
+        collectionView.dequeueReusableCell(withReuseIdentifier: "MDCCatalogCollectionViewCell",
+                                           for: indexPath)
     cell.backgroundColor = UIColor.white
 
     let componentName = self.node.children[indexPath.row].title
@@ -213,7 +189,9 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
     return cell
   }
 
-  func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: IndexPath) -> CGSize {
+  func collectionView(_ collectionView: UICollectionView,
+                      layout collectionViewLayout: UICollectionViewLayout,
+                      sizeForItemAtIndexPath indexPath: IndexPath) -> CGSize {
     let pad = CGFloat(1)
     var cellWidth = (self.view.frame.size.width - 3 * pad) / 2
     if self.view.frame.size.width > self.view.frame.size.height {
@@ -234,6 +212,47 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
     self.navigationController?.pushViewController(vc, animated: true)
   }
 
+  // MARK: Private
+  func constrainLabel(label: UILabel,
+                      containerView: UIView,
+                      insets: UIEdgeInsets,
+                      height: CGFloat) {
+    _ = NSLayoutConstraint(
+      item: label,
+      attribute: .leading,
+      relatedBy: .equal,
+      toItem: containerView,
+      attribute: .leading,
+      multiplier: 1.0,
+      constant: insets.left).isActive = true
+
+    _ = NSLayoutConstraint(
+      item: label,
+      attribute: .trailing,
+      relatedBy: .equal,
+      toItem: containerView,
+      attribute: .trailing,
+      multiplier: 1.0,
+      constant: 0).isActive = true
+
+    _ = NSLayoutConstraint(
+      item: label,
+      attribute: .bottom,
+      relatedBy: .equal,
+      toItem: containerView,
+      attribute: .bottom,
+      multiplier: 1.0,
+      constant: -insets.bottom).isActive = true
+
+    _ = NSLayoutConstraint(
+      item: label,
+      attribute: .height,
+      relatedBy: .equal,
+      toItem: nil,
+      attribute: .notAnAttribute,
+      multiplier: 1.0,
+      constant: height).isActive = true
+  }
 }
 
 // UIScrollViewDelegate