Merge branch 'release-candidate'

material-components · Oct 10, 2016 · 5c8c77b · 5c8c77b
2 parents 2035625 + 70ce4e1
commit 5c8c77b
Show file tree

Hide file tree

Showing 26 changed files with 593 additions and 397 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,58 @@
+# 15.1.0
+
+## API diffs
+
+Auto-generated by running:
+
+    scripts/api_diff -o 203562553800ed3d3b5eebfd1dd76cda875d833c -n f8e2c8b5e87d0414f6b08f691949ecebfaca41b8
+
+### Ink
+
+- [moved] [`MDCInkGestureRecognizer`](https://github.com/google/material-components-ios/blob/f8e2c8b5e87d0414f6b08f691949ecebfaca41b8/components/Ink/src/MDCInkGestureRecognizer.h#L26).
+From *private/MDCInkGestureRecognizer.h* to *MDCInkGestureRecognizer.h*.
+
+### NavigationBar
+
+- [new] [`MDCNavigationBar.titleAlignment`](https://github.com/google/material-components-ios/blob/f8e2c8b5e87d0414f6b08f691949ecebfaca41b8/components/NavigationBar/src/MDCNavigationBar.h#L121)
+- [new] [`MDCNavigationBarTitleAlignmentCenter`](https://github.com/google/material-components-ios/blob/f8e2c8b5e87d0414f6b08f691949ecebfaca41b8/components/NavigationBar/src/MDCNavigationBar.h#L24)
+- [new] [`MDCNavigationBarTitleAlignmentLeading`](https://github.com/google/material-components-ios/blob/f8e2c8b5e87d0414f6b08f691949ecebfaca41b8/components/NavigationBar/src/MDCNavigationBar.h#L26)
+- [new] [`MDCNavigationBarTitleAlignment`](https://github.com/google/material-components-ios/blob/f8e2c8b5e87d0414f6b08f691949ecebfaca41b8/components/NavigationBar/src/MDCNavigationBar.h#L22)
+- [deprecated] [`MDCNavigationBar.textAlignment`](https://github.com/google/material-components-ios/blob/f8e2c8b5e87d0414f6b08f691949ecebfaca41b8/components/NavigationBar/src/MDCNavigationBar.h#L163).
+*Use titleAlignment instead.*
+
+## Component changes
+
+### ButtonBar
+
+#### Changes
+
+* [Better disabled look (#704)](https://github.com/google/material-components-ios/commit/853a3c5d7591b76ffdd3618baf8890f4c391e61c) (Louis Romero)
+
+### CollectionCells
+
+#### Changes
+
+* [MDC_#803 - Fixed multi touch handling in MDCCollectionViews](https://github.com/google/material-components-ios/commit/b5b128784c6182b5ed9de546adaaed8e9b44fcfa) (Justin Shephard)
+
+### Collections
+
+#### Changes
+
+* [MDC_#803 - Fixed multi touch handling in MDCCollectionViews](https://github.com/google/material-components-ios/commit/b5b128784c6182b5ed9de546adaaed8e9b44fcfa) (Justin Shephard)
+* [Showcase a collectionView footer that does not have card style background in a card style collectionView. (#709)](https://github.com/google/material-components-ios/commit/68651011a0e6072daa9802f1cf2eef812f4c4d64) (Ed Chin)
+
+### Ink
+
+#### Changes
+
+* [Make MDCInkGestureRecognizer public](https://github.com/google/material-components-ios/commit/5ec47cef81370919d92f4561e756ab85f849c19c) (Junius Gunaratne)
+
+### NavigationBar
+
+#### Breaking changes
+
+* [Switch to custom enum rather that reuse the NSTextAlignment so that we can strict our external API surface to the two options we want: Left and Center.](https://github.com/google/material-components-ios/commit/531a53b72ad42b40d16b1677729e33b7205dd6ab) (randallli)
+
 # 15.0.0
 
 ## API diffs

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponents"
-  s.version      = "15.0.0"
+  s.version      = "15.1.0"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/MaterialComponentsCatalog.podspec b/MaterialComponentsCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsCatalog"
-  s.version      = "15.0.0"
+  s.version      = "15.1.0"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/MaterialComponentsUnitTests.podspec b/MaterialComponentsUnitTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsUnitTests"
-  s.version      = "15.0.0"
+  s.version      = "15.1.0"
   s.authors      = { 'Apple platform engineering at Google' => '[email protected]' }
   s.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   s.homepage     = "https://github.com/google/material-components-ios"

diff --git a/catalog/MDCCatalog/MDCNodeListViewController.swift b/catalog/MDCCatalog/MDCNodeListViewController.swift
@@ -77,7 +77,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
 
     self.addChildViewController(appBar.headerViewController)
     appBar.headerViewController.headerView.backgroundColor = UIColor.whiteColor()
-    appBar.navigationBar.textAlignment = .Center
+    appBar.navigationBar.titleAlignment = .Center
   }
 
   override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
@@ -316,7 +316,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
         vc = contentVC
       } else {
         let container = MDCAppBarContainerViewController(contentViewController: contentVC)
-        container.appBar.navigationBar.textAlignment = .Center
+        container.appBar.navigationBar.titleAlignment = .Center
 
         // TODO(featherless): Remove once
         // https://github.com/google/material-components-ios/issues/367 is resolved.

diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,38 +1,38 @@
 PODS:
   - CatalogByConvention (1.0.1)
   - EarlGrey (1.3.0)
-  - MaterialComponents (15.0.0):
-    - MaterialComponents/ActivityIndicator (= 15.0.0)
-    - MaterialComponents/AnimationTiming (= 15.0.0)
-    - MaterialComponents/AppBar (= 15.0.0)
-    - MaterialComponents/ButtonBar (= 15.0.0)
-    - MaterialComponents/Buttons (= 15.0.0)
-    - MaterialComponents/CollectionCells (= 15.0.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 15.0.0)
-    - MaterialComponents/Collections (= 15.0.0)
-    - MaterialComponents/Dialogs (= 15.0.0)
-    - MaterialComponents/FlexibleHeader (= 15.0.0)
-    - MaterialComponents/FontDiskLoader (= 15.0.0)
-    - MaterialComponents/HeaderStackView (= 15.0.0)
-    - MaterialComponents/Ink (= 15.0.0)
-    - MaterialComponents/NavigationBar (= 15.0.0)
-    - MaterialComponents/OverlayWindow (= 15.0.0)
-    - MaterialComponents/PageControl (= 15.0.0)
-    - MaterialComponents/Palettes (= 15.0.0)
-    - MaterialComponents/private (= 15.0.0)
-    - MaterialComponents/ProgressView (= 15.0.0)
-    - MaterialComponents/RobotoFontLoader (= 15.0.0)
-    - MaterialComponents/ShadowElevations (= 15.0.0)
-    - MaterialComponents/ShadowLayer (= 15.0.0)
-    - MaterialComponents/Slider (= 15.0.0)
-    - MaterialComponents/Snackbar (= 15.0.0)
-    - MaterialComponents/SpritedAnimationView (= 15.0.0)
-    - MaterialComponents/Switch (= 15.0.0)
-    - MaterialComponents/Typography (= 15.0.0)
-  - MaterialComponents/ActivityIndicator (15.0.0):
+  - MaterialComponents (15.1.0):
+    - MaterialComponents/ActivityIndicator (= 15.1.0)
+    - MaterialComponents/AnimationTiming (= 15.1.0)
+    - MaterialComponents/AppBar (= 15.1.0)
+    - MaterialComponents/ButtonBar (= 15.1.0)
+    - MaterialComponents/Buttons (= 15.1.0)
+    - MaterialComponents/CollectionCells (= 15.1.0)
+    - MaterialComponents/CollectionLayoutAttributes (= 15.1.0)
+    - MaterialComponents/Collections (= 15.1.0)
+    - MaterialComponents/Dialogs (= 15.1.0)
+    - MaterialComponents/FlexibleHeader (= 15.1.0)
+    - MaterialComponents/FontDiskLoader (= 15.1.0)
+    - MaterialComponents/HeaderStackView (= 15.1.0)
+    - MaterialComponents/Ink (= 15.1.0)
+    - MaterialComponents/NavigationBar (= 15.1.0)
+    - MaterialComponents/OverlayWindow (= 15.1.0)
+    - MaterialComponents/PageControl (= 15.1.0)
+    - MaterialComponents/Palettes (= 15.1.0)
+    - MaterialComponents/private (= 15.1.0)
+    - MaterialComponents/ProgressView (= 15.1.0)
+    - MaterialComponents/RobotoFontLoader (= 15.1.0)
+    - MaterialComponents/ShadowElevations (= 15.1.0)
+    - MaterialComponents/ShadowLayer (= 15.1.0)
+    - MaterialComponents/Slider (= 15.1.0)
+    - MaterialComponents/Snackbar (= 15.1.0)
+    - MaterialComponents/SpritedAnimationView (= 15.1.0)
+    - MaterialComponents/Switch (= 15.1.0)
+    - MaterialComponents/Typography (= 15.1.0)
+  - MaterialComponents/ActivityIndicator (15.1.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/AnimationTiming (15.0.0)
-  - MaterialComponents/AppBar (15.0.0):
+  - MaterialComponents/AnimationTiming (15.1.0)
+  - MaterialComponents/AppBar (15.1.0):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -41,16 +41,16 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (15.0.0):
+  - MaterialComponents/ButtonBar (15.1.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (15.0.0):
+  - MaterialComponents/Buttons (15.1.0):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/CollectionCells (15.0.0):
+  - MaterialComponents/CollectionCells (15.1.0):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -61,95 +61,95 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (15.0.0)
-  - MaterialComponents/Collections (15.0.0):
+  - MaterialComponents/CollectionLayoutAttributes (15.1.0)
+  - MaterialComponents/Collections (15.1.0):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (15.0.0):
+  - MaterialComponents/Dialogs (15.1.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FlexibleHeader (15.0.0):
+  - MaterialComponents/FlexibleHeader (15.1.0):
     - MDFTextAccessibility
-  - MaterialComponents/FontDiskLoader (15.0.0)
-  - MaterialComponents/HeaderStackView (15.0.0)
-  - MaterialComponents/Ink (15.0.0)
-  - MaterialComponents/NavigationBar (15.0.0):
+  - MaterialComponents/FontDiskLoader (15.1.0)
+  - MaterialComponents/HeaderStackView (15.1.0)
+  - MaterialComponents/Ink (15.1.0)
+  - MaterialComponents/NavigationBar (15.1.0):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (15.0.0)
-  - MaterialComponents/PageControl (15.0.0)
-  - MaterialComponents/Palettes (15.0.0)
-  - MaterialComponents/private (15.0.0):
-    - MaterialComponents/private/Color (= 15.0.0)
-    - MaterialComponents/private/Icons (= 15.0.0)
-    - MaterialComponents/private/KeyboardWatcher (= 15.0.0)
-    - MaterialComponents/private/Overlay (= 15.0.0)
-    - MaterialComponents/private/RTL (= 15.0.0)
-    - MaterialComponents/private/ThumbTrack (= 15.0.0)
-  - MaterialComponents/private/Color (15.0.0)
-  - MaterialComponents/private/Icons (15.0.0):
-    - MaterialComponents/private/Icons/Base (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_check (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_info (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.0.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 15.0.0)
-  - MaterialComponents/private/Icons/Base (15.0.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (15.0.0):
+  - MaterialComponents/OverlayWindow (15.1.0)
+  - MaterialComponents/PageControl (15.1.0)
+  - MaterialComponents/Palettes (15.1.0)
+  - MaterialComponents/private (15.1.0):
+    - MaterialComponents/private/Color (= 15.1.0)
+    - MaterialComponents/private/Icons (= 15.1.0)
+    - MaterialComponents/private/KeyboardWatcher (= 15.1.0)
+    - MaterialComponents/private/Overlay (= 15.1.0)
+    - MaterialComponents/private/RTL (= 15.1.0)
+    - MaterialComponents/private/ThumbTrack (= 15.1.0)
+  - MaterialComponents/private/Color (15.1.0)
+  - MaterialComponents/private/Icons (15.1.0):
+    - MaterialComponents/private/Icons/Base (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_check (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_check_circle (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_info (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.1.0)
+    - MaterialComponents/private/Icons/ic_reorder (= 15.1.0)
+  - MaterialComponents/private/Icons/Base (15.1.0)
+  - MaterialComponents/private/Icons/ic_arrow_back (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (15.0.0):
+  - MaterialComponents/private/Icons/ic_check (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (15.0.0):
+  - MaterialComponents/private/Icons/ic_check_circle (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (15.0.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (15.0.0):
+  - MaterialComponents/private/Icons/ic_info (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (15.0.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (15.0.0):
+  - MaterialComponents/private/Icons/ic_reorder (15.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (15.0.0)
-  - MaterialComponents/private/Overlay (15.0.0)
-  - MaterialComponents/private/RTL (15.0.0)
-  - MaterialComponents/private/ThumbTrack (15.0.0):
+  - MaterialComponents/private/KeyboardWatcher (15.1.0)
+  - MaterialComponents/private/Overlay (15.1.0)
+  - MaterialComponents/private/RTL (15.1.0)
+  - MaterialComponents/private/ThumbTrack (15.1.0):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ProgressView (15.0.0):
+  - MaterialComponents/ProgressView (15.1.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/RobotoFontLoader (15.0.0):
+  - MaterialComponents/RobotoFontLoader (15.1.0):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (15.0.0)
-  - MaterialComponents/ShadowLayer (15.0.0)
-  - MaterialComponents/Slider (15.0.0):
+  - MaterialComponents/ShadowElevations (15.1.0)
+  - MaterialComponents/ShadowLayer (15.1.0)
+  - MaterialComponents/Slider (15.1.0):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (15.0.0):
+  - MaterialComponents/Snackbar (15.1.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (15.0.0)
-  - MaterialComponents/Switch (15.0.0):
+  - MaterialComponents/SpritedAnimationView (15.1.0)
+  - MaterialComponents/Switch (15.1.0):
     - MaterialComponents/private/RTL
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (15.0.0)
-  - MaterialComponentsCatalog (15.0.0):
+  - MaterialComponents/Typography (15.1.0)
+  - MaterialComponentsCatalog (15.1.0):
     - MaterialComponents
-  - MaterialComponentsUnitTests (15.0.0):
+  - MaterialComponentsUnitTests (15.1.0):
     - MaterialComponents
     - MDFTextAccessibility
   - MDFTextAccessibility (1.1.1)
@@ -172,9 +172,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
   EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
-  MaterialComponents: 93b2c5d4ade111902fe63afb293b1d0ff48e4e81
-  MaterialComponentsCatalog: fe35be22863a94075d9c25b205dead8df53df0ae
-  MaterialComponentsUnitTests: 5eca3cb1a741ab815a1f820f88119f90696fbdcb
+  MaterialComponents: 6a31779376e67f6422ce3d391e053dc1d43b6785
+  MaterialComponentsCatalog: b6d8151b3e62ef2ad650969f850ed520e938bec6
+  MaterialComponentsUnitTests: d06fda653cfc7dfc746b4e694184300fc5aaf339
   MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
 
 PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

diff --git a/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m b/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m
@@ -36,7 +36,7 @@
 // The default MDCButton's alpha for display state is 0.1f which in the context of bar buttons
 // makes it practically invisible. Setting button to a higher opacity is closer to what the
 // button should look like when it is disabled.
-static const CGFloat kDisabledButtonAlpha = 0.7f;
+static const CGFloat kDisabledButtonAlpha = 0.45f;
 
 // Content insets for text-only buttons.
 static const UIEdgeInsets kTextOnlyButtonInset = {0, 24.f, 0, 24.f};