Merge branch 'release-candidate'

material-components · Nov 9, 2016 · e164ec9 · e164ec9
2 parents 56e4432 + be8b0f7
commit e164ec9
Show file tree

Hide file tree

Showing 25 changed files with 427 additions and 347 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,37 @@
+# 16.3.0
+
+## API diffs
+
+### Snackbar
+
+- [new] [`MDCSnackbar setPresentationHostView:`](https://github.com/google/material-components-ios/commit/ee84a40885724453da69ca90bfa6a874008dc0b0)
+
+## Component changes
+
+### CollectionCells
+
+#### Changes
+
+* [[CollectionViewCell] Call |layoutSubviews| when editing (#798)](https://github.com/google/material-components-ios/commit/393d6214e08b1ff5bc359a1cfc6f816abe7b2e67) (Gauthier Ambard)
+
+### Collections
+
+#### Changes
+
+* [Change layout invalidation in MDCCollectionViewStyler (#790)](https://github.com/google/material-components-ios/commit/82f7758bad9d4573f49d3656816df128642a8968) (Gauthier Ambard)
+
+### FeatureHighlight
+
+#### Changes
+
+* [Convert CGFloats to float for 32 bit compilation (#834)](https://github.com/google/material-components-ios/commit/28f1d43595cd2a3fa109acb275214e50c810e94d) (Sam Morrison)
+
+### Snackbar
+
+#### Changes
+
+* [[MDCSnackbar]! Add presentationHostView property to snackbar (#784)](https://github.com/google/material-components-ios/commit/ee84a40885724453da69ca90bfa6a874008dc0b0) (Sam Morrison)
+
 # 16.2.0
 
 ## API diffs
@@ -147,7 +181,7 @@
 
 ### Palettes
 
-- [new] [`MDCPalette.paletteGeneratedFromColor](https://github.com/google/material-components-ios/blob/fad8519b6a1ba5c29a0368fb470cca3c6da74431/components/Palettes/src/MDCPalettes.h#L137)
+- [new] [`MDCPalette.paletteGeneratedFromColor`](https://github.com/google/material-components-ios/blob/fad8519b6a1ba5c29a0368fb470cca3c6da74431/components/Palettes/src/MDCPalettes.h#L137)
 
 ## Component changes
 

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.2.0"
+  s.version      = "16.3.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.2.0"
+  s.version      = "16.3.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.2.0"
+  s.version      = "16.3.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/Podfile.lock b/catalog/Podfile.lock
@@ -1,39 +1,39 @@
 PODS:
   - CatalogByConvention (2.0.0)
   - EarlGrey (1.4.0)
-  - MaterialComponents (16.2.0):
-    - MaterialComponents/ActivityIndicator (= 16.2.0)
-    - MaterialComponents/AnimationTiming (= 16.2.0)
-    - MaterialComponents/AppBar (= 16.2.0)
-    - MaterialComponents/ButtonBar (= 16.2.0)
-    - MaterialComponents/Buttons (= 16.2.0)
-    - MaterialComponents/CollectionCells (= 16.2.0)
-    - MaterialComponents/CollectionLayoutAttributes (= 16.2.0)
-    - MaterialComponents/Collections (= 16.2.0)
-    - MaterialComponents/Dialogs (= 16.2.0)
-    - MaterialComponents/FeatureHighlight (= 16.2.0)
-    - MaterialComponents/FlexibleHeader (= 16.2.0)
-    - MaterialComponents/FontDiskLoader (= 16.2.0)
-    - MaterialComponents/HeaderStackView (= 16.2.0)
-    - MaterialComponents/Ink (= 16.2.0)
-    - MaterialComponents/NavigationBar (= 16.2.0)
-    - MaterialComponents/OverlayWindow (= 16.2.0)
-    - MaterialComponents/PageControl (= 16.2.0)
-    - MaterialComponents/Palettes (= 16.2.0)
-    - MaterialComponents/private (= 16.2.0)
-    - MaterialComponents/ProgressView (= 16.2.0)
-    - MaterialComponents/RobotoFontLoader (= 16.2.0)
-    - MaterialComponents/ShadowElevations (= 16.2.0)
-    - MaterialComponents/ShadowLayer (= 16.2.0)
-    - MaterialComponents/Slider (= 16.2.0)
-    - MaterialComponents/Snackbar (= 16.2.0)
-    - MaterialComponents/SpritedAnimationView (= 16.2.0)
-    - MaterialComponents/Switch (= 16.2.0)
-    - MaterialComponents/Typography (= 16.2.0)
-  - MaterialComponents/ActivityIndicator (16.2.0):
+  - MaterialComponents (16.3.0):
+    - MaterialComponents/ActivityIndicator (= 16.3.0)
+    - MaterialComponents/AnimationTiming (= 16.3.0)
+    - MaterialComponents/AppBar (= 16.3.0)
+    - MaterialComponents/ButtonBar (= 16.3.0)
+    - MaterialComponents/Buttons (= 16.3.0)
+    - MaterialComponents/CollectionCells (= 16.3.0)
+    - MaterialComponents/CollectionLayoutAttributes (= 16.3.0)
+    - MaterialComponents/Collections (= 16.3.0)
+    - MaterialComponents/Dialogs (= 16.3.0)
+    - MaterialComponents/FeatureHighlight (= 16.3.0)
+    - MaterialComponents/FlexibleHeader (= 16.3.0)
+    - MaterialComponents/FontDiskLoader (= 16.3.0)
+    - MaterialComponents/HeaderStackView (= 16.3.0)
+    - MaterialComponents/Ink (= 16.3.0)
+    - MaterialComponents/NavigationBar (= 16.3.0)
+    - MaterialComponents/OverlayWindow (= 16.3.0)
+    - MaterialComponents/PageControl (= 16.3.0)
+    - MaterialComponents/Palettes (= 16.3.0)
+    - MaterialComponents/private (= 16.3.0)
+    - MaterialComponents/ProgressView (= 16.3.0)
+    - MaterialComponents/RobotoFontLoader (= 16.3.0)
+    - MaterialComponents/ShadowElevations (= 16.3.0)
+    - MaterialComponents/ShadowLayer (= 16.3.0)
+    - MaterialComponents/Slider (= 16.3.0)
+    - MaterialComponents/Snackbar (= 16.3.0)
+    - MaterialComponents/SpritedAnimationView (= 16.3.0)
+    - MaterialComponents/Switch (= 16.3.0)
+    - MaterialComponents/Typography (= 16.3.0)
+  - MaterialComponents/ActivityIndicator (16.3.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/AnimationTiming (16.2.0)
-  - MaterialComponents/AppBar (16.2.0):
+  - MaterialComponents/AnimationTiming (16.3.0)
+  - MaterialComponents/AppBar (16.3.0):
     - MaterialComponents/FlexibleHeader
     - MaterialComponents/HeaderStackView
     - MaterialComponents/NavigationBar
@@ -42,16 +42,16 @@ PODS:
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ButtonBar (16.2.0):
+  - MaterialComponents/ButtonBar (16.3.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/RTL
-  - MaterialComponents/Buttons (16.2.0):
+  - MaterialComponents/Buttons (16.3.0):
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
     - MDFTextAccessibility
-  - MaterialComponents/CollectionCells (16.2.0):
+  - MaterialComponents/CollectionCells (16.3.0):
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/private/Icons/ic_check
@@ -62,96 +62,98 @@ PODS:
     - MaterialComponents/private/Icons/ic_reorder
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/CollectionLayoutAttributes (16.2.0)
-  - MaterialComponents/Collections (16.2.0):
+  - MaterialComponents/CollectionLayoutAttributes (16.3.0)
+  - MaterialComponents/Collections (16.3.0):
     - MaterialComponents/CollectionCells
     - MaterialComponents/CollectionLayoutAttributes
     - MaterialComponents/Ink
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/Dialogs (16.2.0):
+  - MaterialComponents/Dialogs (16.3.0):
     - MaterialComponents/Buttons
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
-  - MaterialComponents/FeatureHighlight (16.2.0)
-  - MaterialComponents/FlexibleHeader (16.2.0):
+  - MaterialComponents/FeatureHighlight (16.3.0):
+    - MaterialComponents/Typography
+    - MDFTextAccessibility
+  - MaterialComponents/FlexibleHeader (16.3.0):
     - MDFTextAccessibility
-  - MaterialComponents/FontDiskLoader (16.2.0)
-  - MaterialComponents/HeaderStackView (16.2.0)
-  - MaterialComponents/Ink (16.2.0)
-  - MaterialComponents/NavigationBar (16.2.0):
+  - MaterialComponents/FontDiskLoader (16.3.0)
+  - MaterialComponents/HeaderStackView (16.3.0)
+  - MaterialComponents/Ink (16.3.0)
+  - MaterialComponents/NavigationBar (16.3.0):
     - MaterialComponents/ButtonBar
     - MaterialComponents/private/RTL
     - MaterialComponents/Typography
-  - MaterialComponents/OverlayWindow (16.2.0)
-  - MaterialComponents/PageControl (16.2.0)
-  - MaterialComponents/Palettes (16.2.0)
-  - MaterialComponents/private (16.2.0):
-    - MaterialComponents/private/Color (= 16.2.0)
-    - MaterialComponents/private/Icons (= 16.2.0)
-    - MaterialComponents/private/KeyboardWatcher (= 16.2.0)
-    - MaterialComponents/private/Overlay (= 16.2.0)
-    - MaterialComponents/private/RTL (= 16.2.0)
-    - MaterialComponents/private/ThumbTrack (= 16.2.0)
-  - MaterialComponents/private/Color (16.2.0)
-  - MaterialComponents/private/Icons (16.2.0):
-    - MaterialComponents/private/Icons/Base (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_arrow_back (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_check (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_check_circle (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_chevron_right (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_info (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.2.0)
-    - MaterialComponents/private/Icons/ic_reorder (= 16.2.0)
-  - MaterialComponents/private/Icons/Base (16.2.0)
-  - MaterialComponents/private/Icons/ic_arrow_back (16.2.0):
+  - MaterialComponents/OverlayWindow (16.3.0)
+  - MaterialComponents/PageControl (16.3.0)
+  - MaterialComponents/Palettes (16.3.0)
+  - MaterialComponents/private (16.3.0):
+    - MaterialComponents/private/Color (= 16.3.0)
+    - MaterialComponents/private/Icons (= 16.3.0)
+    - MaterialComponents/private/KeyboardWatcher (= 16.3.0)
+    - MaterialComponents/private/Overlay (= 16.3.0)
+    - MaterialComponents/private/RTL (= 16.3.0)
+    - MaterialComponents/private/ThumbTrack (= 16.3.0)
+  - MaterialComponents/private/Color (16.3.0)
+  - MaterialComponents/private/Icons (16.3.0):
+    - MaterialComponents/private/Icons/Base (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_arrow_back (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_check (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_check_circle (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_chevron_right (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_info (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.3.0)
+    - MaterialComponents/private/Icons/ic_reorder (= 16.3.0)
+  - MaterialComponents/private/Icons/Base (16.3.0)
+  - MaterialComponents/private/Icons/ic_arrow_back (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check (16.2.0):
+  - MaterialComponents/private/Icons/ic_check (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_check_circle (16.2.0):
+  - MaterialComponents/private/Icons/ic_check_circle (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_chevron_right (16.2.0):
+  - MaterialComponents/private/Icons/ic_chevron_right (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_info (16.2.0):
+  - MaterialComponents/private/Icons/ic_info (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_radio_button_unchecked (16.2.0):
+  - MaterialComponents/private/Icons/ic_radio_button_unchecked (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/Icons/ic_reorder (16.2.0):
+  - MaterialComponents/private/Icons/ic_reorder (16.3.0):
     - MaterialComponents/private/Icons/Base
-  - MaterialComponents/private/KeyboardWatcher (16.2.0)
-  - MaterialComponents/private/Overlay (16.2.0)
-  - MaterialComponents/private/RTL (16.2.0)
-  - MaterialComponents/private/ThumbTrack (16.2.0):
+  - MaterialComponents/private/KeyboardWatcher (16.3.0)
+  - MaterialComponents/private/Overlay (16.3.0)
+  - MaterialComponents/private/RTL (16.3.0)
+  - MaterialComponents/private/ThumbTrack (16.3.0):
     - MaterialComponents/Ink
     - MaterialComponents/private/Color
     - MaterialComponents/ShadowElevations
     - MaterialComponents/ShadowLayer
     - MaterialComponents/Typography
-  - MaterialComponents/ProgressView (16.2.0):
+  - MaterialComponents/ProgressView (16.3.0):
     - MaterialComponents/private/RTL
-  - MaterialComponents/RobotoFontLoader (16.2.0):
+  - MaterialComponents/RobotoFontLoader (16.3.0):
     - MaterialComponents/FontDiskLoader
     - MaterialComponents/Typography
-  - MaterialComponents/ShadowElevations (16.2.0)
-  - MaterialComponents/ShadowLayer (16.2.0)
-  - MaterialComponents/Slider (16.2.0):
+  - MaterialComponents/ShadowElevations (16.3.0)
+  - MaterialComponents/ShadowLayer (16.3.0)
+  - MaterialComponents/Slider (16.3.0):
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Snackbar (16.2.0):
+  - MaterialComponents/Snackbar (16.3.0):
     - MaterialComponents/AnimationTiming
     - MaterialComponents/Buttons
     - MaterialComponents/OverlayWindow
     - MaterialComponents/private/KeyboardWatcher
     - MaterialComponents/private/Overlay
-  - MaterialComponents/SpritedAnimationView (16.2.0)
-  - MaterialComponents/Switch (16.2.0):
+  - MaterialComponents/SpritedAnimationView (16.3.0)
+  - MaterialComponents/Switch (16.3.0):
     - MaterialComponents/private/RTL
     - MaterialComponents/private/ThumbTrack
-  - MaterialComponents/Typography (16.2.0)
-  - MaterialComponentsCatalog (16.2.0):
+  - MaterialComponents/Typography (16.3.0)
+  - MaterialComponentsCatalog (16.3.0):
     - MaterialComponents
-  - MaterialComponentsUnitTests (16.2.0):
+  - MaterialComponentsUnitTests (16.3.0):
     - MaterialComponents
     - MDFTextAccessibility
   - MDFTextAccessibility (1.1.3)
@@ -174,9 +176,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
   EarlGrey: 763d04569f96d910cf17e4fe5aa0d3842e07c0b4
-  MaterialComponents: 4c676a55ac7ac303bc9df78ffe9598f848a3ee46
-  MaterialComponentsCatalog: c66a111e2a412232c67b36b333c14f6cf746dcf5
-  MaterialComponentsUnitTests: 9bdcf1262f7a911c832b1b9787133480f52015f4
+  MaterialComponents: 1db6dde6f468cb24d5ed3f2d857a15b5942a3d27
+  MaterialComponentsCatalog: 51e6b7852dc8a679c8d7ff434b45421a8b676472
+  MaterialComponentsUnitTests: c548a83a7973727c70516c337e6b016518fff4f7
   MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601
 
 PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

diff --git a/components/CollectionCells/src/MDCCollectionViewCell.m b/components/CollectionCells/src/MDCCollectionViewCell.m
@@ -318,7 +318,8 @@ - (void)setEditing:(BOOL)editing animated:(BOOL)animated {
   }
   _shouldAnimateEditingViews = animated;
   _editing = editing;
-  [self updateInterfaceForEditing];
+  [self setNeedsLayout];
+  [self layoutIfNeeded];
 }
 
 - (void)updateInterfaceForEditing {

diff --git a/components/Collections/src/private/MDCCollectionViewStyler.m b/components/Collections/src/private/MDCCollectionViewStyler.m
@@ -405,12 +405,15 @@ - (void)updateLayoutAnimated:(BOOL)animated {
 - (void)updateLayoutAnimated:(BOOL)animated completion:(void (^)(BOOL finished))completion {
   if (animated) {
     // Invalidate current layout while allowing animation to new layout.
-    [_collectionView performBatchUpdates:nil
-                              completion:^(BOOL finished) {
-                                if (completion) {
-                                  completion(finished);
-                                }
-                              }];
+    [UIView animateWithDuration:0
+                     animations:^{
+                       [_collectionView.collectionViewLayout invalidateLayout];
+                     }
+                     completion:^(BOOL finished) {
+                       if (completion) {
+                         completion(finished);
+                       }
+                     }];
   } else {
     _shouldInvalidateLayout = YES;
 

diff --git a/components/FeatureHighlight/src/MDCFeatureHighlightViewController.m b/components/FeatureHighlight/src/MDCFeatureHighlightViewController.m
@@ -19,9 +19,9 @@
 #import "private/MDCFeatureHighlightAnimationController.h"
 #import "private/MDCFeatureHighlightView.h"
 
-const CGFloat kMDCFeatureHighlightOuterHighlightAlpha = 0.96;
+const CGFloat kMDCFeatureHighlightOuterHighlightAlpha = 0.96f;
 
-static const CGFloat kMDCFeatureHighlightPulseAnimationInterval = 1.5;
+static const CGFloat kMDCFeatureHighlightPulseAnimationInterval = 1.5f;
 
 @interface MDCFeatureHighlightViewController () <UIViewControllerTransitioningDelegate>
 @end

diff --git a/components/FeatureHighlight/src/private/MDCFeatureHighlightAnimationController.m b/components/FeatureHighlight/src/private/MDCFeatureHighlightAnimationController.m
@@ -18,8 +18,8 @@
 
 #import "MDCFeatureHighlightView.h"
 
-const CGFloat kMDCFeatureHighlightPresentationDuration = 0.35;
-const CGFloat kMDCFeatureHighlightDismissalDuration = 0.2;
+const NSTimeInterval kMDCFeatureHighlightPresentationDuration = 0.35f;
+const NSTimeInterval kMDCFeatureHighlightDismissalDuration = 0.2f;
 
 @implementation MDCFeatureHighlightAnimationController
 

diff --git a/components/FeatureHighlight/src/private/MDCFeatureHighlightView.h b/components/FeatureHighlight/src/private/MDCFeatureHighlightView.h
@@ -32,9 +32,9 @@ typedef void(^MDCFeatureHighlightInteractionBlock)(BOOL accepted);
 - (void)layoutAppearing;
 - (void)layoutDisappearing;
 
-- (void)animateDiscover:(CGFloat)duration;
-- (void)animateAccepted:(CGFloat)duration;
-- (void)animateRejected:(CGFloat)duration;
+- (void)animateDiscover:(NSTimeInterval)duration;
+- (void)animateAccepted:(NSTimeInterval)duration;
+- (void)animateRejected:(NSTimeInterval)duration;
 - (void)animatePulse;
 
 @end