Merge branch 'release-candidate'

material-components · Oct 27, 2016 · 3659bf4 · 3659bf4
2 parents 544552f + 0052184
commit 3659bf4
Show file tree

Hide file tree

Showing 21 changed files with 590 additions and 385 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,47 @@
+# 16.1.0
+
+## Component changes
+
+### ActivityIndicator
+
+#### Changes
+
+* [Implement intrinsicContentSize (#795)](https://github.com/google/material-components-ios/commit/731eb321d94eb4957613e1059570cae17a584133) (Louis Romero)
+
+### Buttons
+
+#### Changes
+
+* [MDC #329 - Bounded ink should ignore the maxRippleRadius property (#771)](https://github.com/google/material-components-ios/commit/01b73cf1478083baeb9976d4af12a67f02f9cb82) (Justin Shephard)
+
+### Dialogs
+
+#### Changes
+
+* [Improve snackbar and dialogs docs (#785)](https://github.com/google/material-components-ios/commit/386964baf25fa9264516f9f0c9ed19410873f1fe) (Sam Morrison)
+
+### Ink
+
+#### Changes
+
+* [Added MDCInkGestureRecognizer.h to Ink's umbrella header. (#801)](https://github.com/google/material-components-ios/commit/d24532bc40e0082dc8383d6431feceafa38ec050) (Adrian Secord)
+* [MDC #329 - Bounded ink should ignore the maxRippleRadius property (#771)](https://github.com/google/material-components-ios/commit/01b73cf1478083baeb9976d4af12a67f02f9cb82) (Justin Shephard)
+* [[MDCInkView] cancelAllAnimationsAnimated should support disabling animation (#786)](https://github.com/google/material-components-ios/commit/8008e82bd7bea04534ad7ecb2c3aa1903254553e) (Junius Gunaratne)
+
+### ProgressView
+
+#### Changes
+
+* [[MDCProgressView] Execute completion block when setHidden:animated:completion is called sequentially (#787)](https://github.com/google/material-components-ios/commit/45c0b06275e88c65c7aae8bba1b78889cba2f93c) (Junius Gunaratne)
+
+### Snackbar
+
+#### Changes
+
+* [Improve snackbar and dialogs docs (#785)](https://github.com/google/material-components-ios/commit/386964baf25fa9264516f9f0c9ed19410873f1fe) (Sam Morrison)
+
+
+
 # 16.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      = "16.0.0"
+  s.version      = "16.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      = "16.0.0"
+  s.version      = "16.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      = "16.0.0"
+  s.version      = "16.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/README.md b/README.md
@@ -151,6 +151,12 @@ Material Components for iOS uses
 copyright Google Inc. and licensed under
 [CC BY 4.0](http://creativecommons.org/licenses/by/4.0/).
 
+Several components use
+[MDFTextAccessibility](https://github.com/material-foundation/material-text-accessibility-ios),
+copyright Google Inc. and licensed under
+[Apache 2.0](https://github.com/material-foundation/material-text-accessibility-ios/blob/master/LICENSE)
+without a NOTICE file.
+
 Roboto Font Loader uses the
 [Roboto font](https://github.com/google/fonts/tree/master/apache/roboto),
 copyright 2011 Google Inc. and licensed under

diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,38 +1,38 @@
 PODS:
   - CatalogByConvention (2.0.0)
   - EarlGrey (1.4.0)
-  - MaterialComponents (16.0.0):
-    - MaterialComponents/ActivityIndicator (= 16.0.0)
-    - MaterialComponents/AnimationTiming (= 16.0.0)
-    - MaterialComponents/AppBar (= 16.0.0)
-    - MaterialComponents/ButtonBar (= 16.0.0)
-    - MaterialComponents/Buttons (= 16.0.0)
-    - MaterialComponents/CollectionCells (= 16.0.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 16.0.0)
-    - MaterialComponents/Collections (= 16.0.0)
-    - MaterialComponents/Dialogs (= 16.0.0)
-    - MaterialComponents/FlexibleHeader (= 16.0.0)
-    - MaterialComponents/FontDiskLoader (= 16.0.0)
-    - MaterialComponents/HeaderStackView (= 16.0.0)
-    - MaterialComponents/Ink (= 16.0.0)
-    - MaterialComponents/NavigationBar (= 16.0.0)
-    - MaterialComponents/OverlayWindow (= 16.0.0)
-    - MaterialComponents/PageControl (= 16.0.0)
-    - MaterialComponents/Palettes (= 16.0.0)
-    - MaterialComponents/private (= 16.0.0)
-    - MaterialComponents/ProgressView (= 16.0.0)
-    - MaterialComponents/RobotoFontLoader (= 16.0.0)
-    - MaterialComponents/ShadowElevations (= 16.0.0)
-    - MaterialComponents/ShadowLayer (= 16.0.0)
-    - MaterialComponents/Slider (= 16.0.0)
-    - MaterialComponents/Snackbar (= 16.0.0)
-    - MaterialComponents/SpritedAnimationView (= 16.0.0)
-    - MaterialComponents/Switch (= 16.0.0)
-    - MaterialComponents/Typography (= 16.0.0)
-  - MaterialComponents/ActivityIndicator (16.0.0):
+  - MaterialComponents (16.1.0):
+    - MaterialComponents/ActivityIndicator (= 16.1.0)
+    - MaterialComponents/AnimationTiming (= 16.1.0)
+    - MaterialComponents/AppBar (= 16.1.0)
+    - MaterialComponents/ButtonBar (= 16.1.0)
+    - MaterialComponents/Buttons (= 16.1.0)
+    - MaterialComponents/CollectionCells (= 16.1.0)
+    - MaterialComponents/CollectionLayoutAttributes (= 16.1.0)
+    - MaterialComponents/Collections (= 16.1.0)
+    - MaterialComponents/Dialogs (= 16.1.0)
+    - MaterialComponents/FlexibleHeader (= 16.1.0)
+    - MaterialComponents/FontDiskLoader (= 16.1.0)
+    - MaterialComponents/HeaderStackView (= 16.1.0)
+    - MaterialComponents/Ink (= 16.1.0)
+    - MaterialComponents/NavigationBar (= 16.1.0)
+    - MaterialComponents/OverlayWindow (= 16.1.0)
+    - MaterialComponents/PageControl (= 16.1.0)
+    - MaterialComponents/Palettes (= 16.1.0)
+    - MaterialComponents/private (= 16.1.0)
+    - MaterialComponents/ProgressView (= 16.1.0)
+    - MaterialComponents/RobotoFontLoader (= 16.1.0)
+    - MaterialComponents/ShadowElevations (= 16.1.0)
+    - MaterialComponents/ShadowLayer (= 16.1.0)
+    - MaterialComponents/Slider (= 16.1.0)
+    - MaterialComponents/Snackbar (= 16.1.0)
+    - MaterialComponents/SpritedAnimationView (= 16.1.0)
+    - MaterialComponents/Switch (= 16.1.0)
+    - MaterialComponents/Typography (= 16.1.0)
+  - MaterialComponents/ActivityIndicator (16.1.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/AnimationTiming (16.0.0)
-  - MaterialComponents/AppBar (16.0.0):
+  - MaterialComponents/AnimationTiming (16.1.0)
+  - MaterialComponents/AppBar (16.1.0):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -41,16 +41,16 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (16.0.0):
+  - MaterialComponents/ButtonBar (16.1.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (16.0.0):
+  - MaterialComponents/Buttons (16.1.0):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/CollectionCells (16.0.0):
+  - MaterialComponents/CollectionCells (16.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 (16.0.0)
-  - MaterialComponents/Collections (16.0.0):
+  - MaterialComponents/CollectionLayoutAttributes (16.1.0)
+  - MaterialComponents/Collections (16.1.0):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (16.0.0):
+  - MaterialComponents/Dialogs (16.1.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FlexibleHeader (16.0.0):
+  - MaterialComponents/FlexibleHeader (16.1.0):
     - MDFTextAccessibility
-  - MaterialComponents/FontDiskLoader (16.0.0)
-  - MaterialComponents/HeaderStackView (16.0.0)
-  - MaterialComponents/Ink (16.0.0)
-  - MaterialComponents/NavigationBar (16.0.0):
+  - MaterialComponents/FontDiskLoader (16.1.0)
+  - MaterialComponents/HeaderStackView (16.1.0)
+  - MaterialComponents/Ink (16.1.0)
+  - MaterialComponents/NavigationBar (16.1.0):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (16.0.0)
-  - MaterialComponents/PageControl (16.0.0)
-  - MaterialComponents/Palettes (16.0.0)
-  - MaterialComponents/private (16.0.0):
-    - MaterialComponents/private/Color (= 16.0.0)
-    - MaterialComponents/private/Icons (= 16.0.0)
-    - MaterialComponents/private/KeyboardWatcher (= 16.0.0)
-    - MaterialComponents/private/Overlay (= 16.0.0)
-    - MaterialComponents/private/RTL (= 16.0.0)
-    - MaterialComponents/private/ThumbTrack (= 16.0.0)
-  - MaterialComponents/private/Color (16.0.0)
-  - MaterialComponents/private/Icons (16.0.0):
-    - MaterialComponents/private/Icons/Base (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_check (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_info (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.0.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 16.0.0)
-  - MaterialComponents/private/Icons/Base (16.0.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (16.0.0):
+  - MaterialComponents/OverlayWindow (16.1.0)
+  - MaterialComponents/PageControl (16.1.0)
+  - MaterialComponents/Palettes (16.1.0)
+  - MaterialComponents/private (16.1.0):
+    - MaterialComponents/private/Color (= 16.1.0)
+    - MaterialComponents/private/Icons (= 16.1.0)
+    - MaterialComponents/private/KeyboardWatcher (= 16.1.0)
+    - MaterialComponents/private/Overlay (= 16.1.0)
+    - MaterialComponents/private/RTL (= 16.1.0)
+    - MaterialComponents/private/ThumbTrack (= 16.1.0)
+  - MaterialComponents/private/Color (16.1.0)
+  - MaterialComponents/private/Icons (16.1.0):
+    - MaterialComponents/private/Icons/Base (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_check (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_check_circle (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_info (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.1.0)
+    - MaterialComponents/private/Icons/ic_reorder (= 16.1.0)
+  - MaterialComponents/private/Icons/Base (16.1.0)
+  - MaterialComponents/private/Icons/ic_arrow_back (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (16.0.0):
+  - MaterialComponents/private/Icons/ic_check (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (16.0.0):
+  - MaterialComponents/private/Icons/ic_check_circle (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (16.0.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (16.0.0):
+  - MaterialComponents/private/Icons/ic_info (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (16.0.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (16.0.0):
+  - MaterialComponents/private/Icons/ic_reorder (16.1.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (16.0.0)
-  - MaterialComponents/private/Overlay (16.0.0)
-  - MaterialComponents/private/RTL (16.0.0)
-  - MaterialComponents/private/ThumbTrack (16.0.0):
+  - MaterialComponents/private/KeyboardWatcher (16.1.0)
+  - MaterialComponents/private/Overlay (16.1.0)
+  - MaterialComponents/private/RTL (16.1.0)
+  - MaterialComponents/private/ThumbTrack (16.1.0):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ProgressView (16.0.0):
+  - MaterialComponents/ProgressView (16.1.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/RobotoFontLoader (16.0.0):
+  - MaterialComponents/RobotoFontLoader (16.1.0):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (16.0.0)
-  - MaterialComponents/ShadowLayer (16.0.0)
-  - MaterialComponents/Slider (16.0.0):
+  - MaterialComponents/ShadowElevations (16.1.0)
+  - MaterialComponents/ShadowLayer (16.1.0)
+  - MaterialComponents/Slider (16.1.0):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (16.0.0):
+  - MaterialComponents/Snackbar (16.1.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (16.0.0)
-  - MaterialComponents/Switch (16.0.0):
+  - MaterialComponents/SpritedAnimationView (16.1.0)
+  - MaterialComponents/Switch (16.1.0):
     - MaterialComponents/private/RTL
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (16.0.0)
-  - MaterialComponentsCatalog (16.0.0):
+  - MaterialComponents/Typography (16.1.0)
+  - MaterialComponentsCatalog (16.1.0):
     - MaterialComponents
-  - MaterialComponentsUnitTests (16.0.0):
+  - MaterialComponentsUnitTests (16.1.0):
     - MaterialComponents
     - MDFTextAccessibility
   - MDFTextAccessibility (1.1.3)
@@ -163,18 +163,18 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   MaterialComponents:
-    :path: ../
+    :path: "../"
   MaterialComponentsCatalog:
-    :path: ../
+    :path: "../"
   MaterialComponentsUnitTests:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
   EarlGrey: 763d04569f96d910cf17e4fe5aa0d3842e07c0b4
-  MaterialComponents: 9e8475453d0e5e0da7af16e79f5ba89e1f85cf96
-  MaterialComponentsCatalog: 3ac8085dae5ca469f9b94e15f3ea0d2b33dc3456
-  MaterialComponentsUnitTests: c2cd169967f28fe46e851f31a0c1eda37a3d1531
+  MaterialComponents: 5c73b785d39aa619bbe7c8819596aebedfb3444b
+  MaterialComponentsCatalog: fbfa56710a1ac11204415211826b264dd7b6f4d0
+  MaterialComponentsUnitTests: 182574d19a06f8c19aed1434d82a2a4f71717cbe
   MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601
 
 PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

diff --git a/components/ActivityIndicator/src/MDCActivityIndicator.m b/components/ActivityIndicator/src/MDCActivityIndicator.m
@@ -189,6 +189,11 @@ - (void)willMoveToWindow:(UIWindow *)newWindow {
   }
 }
 
+- (CGSize)intrinsicContentSize {
+  CGFloat edge = 2 * _radius + _strokeWidth;
+  return CGSizeMake(edge, edge);
+}
+
 #pragma mark - Public methods
 
 - (void)startAnimating {

diff --git a/components/Buttons/src/MDCButton.h b/components/Buttons/src/MDCButton.h
@@ -61,7 +61,7 @@
 
 /*
  Maximum radius of the button's ink. If the radius <= 0 then half the length of the diagonal of
- self.bounds is used.
+ self.bounds is used. This value is ignored if button's @c inkStyle is set to |MDCInkStyleBounded|.
  */
 @property(nonatomic, assign) CGFloat inkMaxRippleRadius;