Merge branch 'release-0.2.1'

material-components · Feb 24, 2016 · 3747fbd · 3747fbd
2 parents 8ca4051 + e100b3d
commit 3747fbd
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 ##### Bug Fixes
 
+## 0.2.1
+
+##### Bug Fixes
+
+* Bumped CocoaPod version numbers. [Adrian Secord](https://github.com/ajsecord)
+
 ## 0.2.0
 
 ##### Enhancements

diff --git a/build_tests/CocoapodsObjCApp/Podfile.lock b/build_tests/CocoapodsObjCApp/Podfile.lock
@@ -1,42 +1,42 @@
 PODS:
-  - material-components-ios (0.1.0):
-    - material-components-ios/Buttons (= 0.1.0)
-    - material-components-ios/FlexibleHeader (= 0.1.0)
-    - material-components-ios/Ink (= 0.1.0)
-    - material-components-ios/PageControl (= 0.1.0)
-    - material-components-ios/private (= 0.1.0)
-    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
-    - material-components-ios/ShadowElevations (= 0.1.0)
-    - material-components-ios/ShadowLayer (= 0.1.0)
-    - material-components-ios/Slider (= 0.1.0)
-    - material-components-ios/SpritedAnimationView (= 0.1.0)
-    - material-components-ios/Switch (= 0.1.0)
-    - material-components-ios/Typography (= 0.1.0)
-  - material-components-ios/Buttons (0.1.0):
+  - material-components-ios (0.2.1):
+    - material-components-ios/Buttons (= 0.2.1)
+    - material-components-ios/FlexibleHeader (= 0.2.1)
+    - material-components-ios/Ink (= 0.2.1)
+    - material-components-ios/PageControl (= 0.2.1)
+    - material-components-ios/private (= 0.2.1)
+    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
+    - material-components-ios/ShadowElevations (= 0.2.1)
+    - material-components-ios/ShadowLayer (= 0.2.1)
+    - material-components-ios/Slider (= 0.2.1)
+    - material-components-ios/SpritedAnimationView (= 0.2.1)
+    - material-components-ios/Switch (= 0.2.1)
+    - material-components-ios/Typography (= 0.2.1)
+  - material-components-ios/Buttons (0.2.1):
     - material-components-ios/Ink
     - material-components-ios/ShadowElevations
     - material-components-ios/ShadowLayer
     - material-components-ios/Typography
-  - material-components-ios/FlexibleHeader (0.1.0)
-  - material-components-ios/Ink (0.1.0)
-  - material-components-ios/PageControl (0.1.0)
-  - material-components-ios/private (0.1.0):
-    - material-components-ios/private/Color (= 0.1.0)
-    - material-components-ios/private/ThumbTrack (= 0.1.0)
-  - material-components-ios/private/Color (0.1.0)
-  - material-components-ios/private/ThumbTrack (0.1.0):
+  - material-components-ios/FlexibleHeader (0.2.1)
+  - material-components-ios/Ink (0.2.1)
+  - material-components-ios/PageControl (0.2.1)
+  - material-components-ios/private (0.2.1):
+    - material-components-ios/private/Color (= 0.2.1)
+    - material-components-ios/private/ThumbTrack (= 0.2.1)
+  - material-components-ios/private/Color (0.2.1)
+  - material-components-ios/private/ThumbTrack (0.2.1):
     - material-components-ios/private/Color
     - material-components-ios/ShadowElevations
     - material-components-ios/ShadowLayer
-  - material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
-  - material-components-ios/ShadowElevations (0.1.0)
-  - material-components-ios/ShadowLayer (0.1.0)
-  - material-components-ios/Slider (0.1.0):
+  - material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
+  - material-components-ios/ShadowElevations (0.2.1)
+  - material-components-ios/ShadowLayer (0.2.1)
+  - material-components-ios/Slider (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/SpritedAnimationView (0.1.0)
-  - material-components-ios/Switch (0.1.0):
+  - material-components-ios/SpritedAnimationView (0.2.1)
+  - material-components-ios/Switch (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/Typography (0.1.0)
+  - material-components-ios/Typography (0.2.1)
 
 DEPENDENCIES:
   - material-components-ios (from `../../`)
@@ -46,6 +46,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: ceb1a78b45aa87ce45d8d52eff3451392e57a920
+  material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
 
 COCOAPODS: 0.39.0
diff --git a/build_tests/CocoapodsSwiftApp/Podfile.lock b/build_tests/CocoapodsSwiftApp/Podfile.lock
@@ -1,42 +1,42 @@
 PODS:
-  - material-components-ios (0.1.0):
-    - material-components-ios/Buttons (= 0.1.0)
-    - material-components-ios/FlexibleHeader (= 0.1.0)
-    - material-components-ios/Ink (= 0.1.0)
-    - material-components-ios/PageControl (= 0.1.0)
-    - material-components-ios/private (= 0.1.0)
-    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
-    - material-components-ios/ShadowElevations (= 0.1.0)
-    - material-components-ios/ShadowLayer (= 0.1.0)
-    - material-components-ios/Slider (= 0.1.0)
-    - material-components-ios/SpritedAnimationView (= 0.1.0)
-    - material-components-ios/Switch (= 0.1.0)
-    - material-components-ios/Typography (= 0.1.0)
-  - material-components-ios/Buttons (0.1.0):
+  - material-components-ios (0.2.1):
+    - material-components-ios/Buttons (= 0.2.1)
+    - material-components-ios/FlexibleHeader (= 0.2.1)
+    - material-components-ios/Ink (= 0.2.1)
+    - material-components-ios/PageControl (= 0.2.1)
+    - material-components-ios/private (= 0.2.1)
+    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
+    - material-components-ios/ShadowElevations (= 0.2.1)
+    - material-components-ios/ShadowLayer (= 0.2.1)
+    - material-components-ios/Slider (= 0.2.1)
+    - material-components-ios/SpritedAnimationView (= 0.2.1)
+    - material-components-ios/Switch (= 0.2.1)
+    - material-components-ios/Typography (= 0.2.1)
+  - material-components-ios/Buttons (0.2.1):
     - material-components-ios/Ink
     - material-components-ios/ShadowElevations
     - material-components-ios/ShadowLayer
     - material-components-ios/Typography
-  - material-components-ios/FlexibleHeader (0.1.0)
-  - material-components-ios/Ink (0.1.0)
-  - material-components-ios/PageControl (0.1.0)
-  - material-components-ios/private (0.1.0):
-    - material-components-ios/private/Color (= 0.1.0)
-    - material-components-ios/private/ThumbTrack (= 0.1.0)
-  - material-components-ios/private/Color (0.1.0)
-  - material-components-ios/private/ThumbTrack (0.1.0):
+  - material-components-ios/FlexibleHeader (0.2.1)
+  - material-components-ios/Ink (0.2.1)
+  - material-components-ios/PageControl (0.2.1)
+  - material-components-ios/private (0.2.1):
+    - material-components-ios/private/Color (= 0.2.1)
+    - material-components-ios/private/ThumbTrack (= 0.2.1)
+  - material-components-ios/private/Color (0.2.1)
+  - material-components-ios/private/ThumbTrack (0.2.1):
     - material-components-ios/private/Color
     - material-components-ios/ShadowElevations
     - material-components-ios/ShadowLayer
-  - material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
-  - material-components-ios/ShadowElevations (0.1.0)
-  - material-components-ios/ShadowLayer (0.1.0)
-  - material-components-ios/Slider (0.1.0):
+  - material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
+  - material-components-ios/ShadowElevations (0.2.1)
+  - material-components-ios/ShadowLayer (0.2.1)
+  - material-components-ios/Slider (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/SpritedAnimationView (0.1.0)
-  - material-components-ios/Switch (0.1.0):
+  - material-components-ios/SpritedAnimationView (0.2.1)
+  - material-components-ios/Switch (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/Typography (0.1.0)
+  - material-components-ios/Typography (0.2.1)
 
 DEPENDENCIES:
   - material-components-ios (from `../../`)
@@ -46,6 +46,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: ceb1a78b45aa87ce45d8d52eff3451392e57a920
+  material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
 
 COCOAPODS: 0.39.0
diff --git a/catalog/Podfile.lock b/catalog/Podfile.lock
@@ -1,37 +1,43 @@
 PODS:
-  - material-components-ios (0.1.0):
-    - material-components-ios/FlexibleHeader (= 0.1.0)
-    - material-components-ios/Ink (= 0.1.0)
-    - material-components-ios/PageControl (= 0.1.0)
-    - material-components-ios/private (= 0.1.0)
-    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
-    - material-components-ios/ShadowElevations (= 0.1.0)
-    - material-components-ios/ShadowLayer (= 0.1.0)
-    - material-components-ios/Slider (= 0.1.0)
-    - material-components-ios/SpritedAnimationView (= 0.1.0)
-    - material-components-ios/Switch (= 0.1.0)
-    - material-components-ios/Typography (= 0.1.0)
-  - material-components-ios-catalog (0.1.0)
-  - material-components-ios/FlexibleHeader (0.1.0)
-  - material-components-ios/Ink (0.1.0)
-  - material-components-ios/PageControl (0.1.0)
-  - material-components-ios/private (0.1.0):
-    - material-components-ios/private/Color (= 0.1.0)
-    - material-components-ios/private/ThumbTrack (= 0.1.0)
-  - material-components-ios/private/Color (0.1.0)
-  - material-components-ios/private/ThumbTrack (0.1.0):
+  - material-components-ios (0.2.1):
+    - material-components-ios/Buttons (= 0.2.1)
+    - material-components-ios/FlexibleHeader (= 0.2.1)
+    - material-components-ios/Ink (= 0.2.1)
+    - material-components-ios/PageControl (= 0.2.1)
+    - material-components-ios/private (= 0.2.1)
+    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
+    - material-components-ios/ShadowElevations (= 0.2.1)
+    - material-components-ios/ShadowLayer (= 0.2.1)
+    - material-components-ios/Slider (= 0.2.1)
+    - material-components-ios/SpritedAnimationView (= 0.2.1)
+    - material-components-ios/Switch (= 0.2.1)
+    - material-components-ios/Typography (= 0.2.1)
+  - material-components-ios-catalog (0.2.1)
+  - material-components-ios/Buttons (0.2.1):
+    - material-components-ios/Ink
+    - material-components-ios/ShadowElevations
+    - material-components-ios/ShadowLayer
+    - material-components-ios/Typography
+  - material-components-ios/FlexibleHeader (0.2.1)
+  - material-components-ios/Ink (0.2.1)
+  - material-components-ios/PageControl (0.2.1)
+  - material-components-ios/private (0.2.1):
+    - material-components-ios/private/Color (= 0.2.1)
+    - material-components-ios/private/ThumbTrack (= 0.2.1)
+  - material-components-ios/private/Color (0.2.1)
+  - material-components-ios/private/ThumbTrack (0.2.1):
     - material-components-ios/private/Color
     - material-components-ios/ShadowElevations
     - material-components-ios/ShadowLayer
-  - material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
-  - material-components-ios/ShadowElevations (0.1.0)
-  - material-components-ios/ShadowLayer (0.1.0)
-  - material-components-ios/Slider (0.1.0):
+  - material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
+  - material-components-ios/ShadowElevations (0.2.1)
+  - material-components-ios/ShadowLayer (0.2.1)
+  - material-components-ios/Slider (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/SpritedAnimationView (0.1.0)
-  - material-components-ios/Switch (0.1.0):
+  - material-components-ios/SpritedAnimationView (0.2.1)
+  - material-components-ios/Switch (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/Typography (0.1.0)
+  - material-components-ios/Typography (0.2.1)
 
 DEPENDENCIES:
   - material-components-ios (from `../`)
@@ -44,7 +50,7 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  material-components-ios: 463b80af2a7388584df19727b09f00f9ec43e4b1
-  material-components-ios-catalog: 9e0e0b97321c38c0335293b8355d838071614f78
+  material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
+  material-components-ios-catalog: 0641ffef40b562087afa35bf9634cd1a8020bd32
 
 COCOAPODS: 0.39.0
diff --git a/demos/Pesto/Pesto/PestoCardCollectionViewCell.m b/demos/Pesto/Pesto/PestoCardCollectionViewCell.m
@@ -80,14 +80,12 @@ - (void)layoutSubviews {
 - (void)prepareForReuse {
   [super prepareForReuse];
 
-  for (UIView *subview in [self.contentView subviews]) {
-    [subview removeFromSuperview];
-  }
-
   _author = nil;
   _icon = nil;
   _imageURL = nil;
   _title = nil;
+  _image = nil;
+  _imageView.image = nil;
 }
 
 + (Class)layerClass {

diff --git a/demos/Pesto/Pesto/PestoCollectionViewController.m b/demos/Pesto/Pesto/PestoCollectionViewController.m
@@ -3,6 +3,9 @@
 #import "PestoData.h"
 #import "PestoRemoteImageService.h"
 
+#import "MaterialShadowElevations.h"
+#import "MaterialShadowLayer.h"
+
 static CGFloat kPestoCollectionViewControllerAnimationDuration = 0.33f;
 static CGFloat kPestoCollectionViewControllerDefaultHeaderHeight = 240.f;
 static CGFloat kPestoCollectionViewControllerInset = 5.f;
@@ -40,6 +43,12 @@ - (void)setFlexHeaderContainerVC:(MDCFlexibleHeaderContainerViewController *)fle
   headerView.maximumHeight = kPestoCollectionViewControllerDefaultHeaderHeight;
   headerView.minimumHeight = kPestoCollectionViewControllerSmallHeaderHeight;
   [headerView.contentView addSubview:[self pestoHeaderView]];
+
+  // Use a custom shadow under the flexible header.
+  MDCShadowLayer *shadowLayer = [MDCShadowLayer layer];
+  shadowLayer.shadowMaskEnabled = NO;
+  [shadowLayer setElevation:MDCShadowElevationNone];
+  headerView.shadowLayer = shadowLayer;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -158,6 +167,11 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
                      }];
   }
   _logoView.transform = CGAffineTransformScale(CGAffineTransformIdentity, _logoScale, _logoScale);
+
+  MDCFlexibleHeaderView *headerView = _flexHeaderContainerVC.headerViewController.headerView;
+  MDCShadowLayer *shadowLayer = (MDCShadowLayer *)headerView.shadowLayer;
+  CGFloat elevation = MDCShadowElevationAppBar * headerView.shadowIntensity;
+  [shadowLayer setElevation:elevation];
 }
 
 #pragma mark - Private methods

diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock
@@ -1,36 +1,42 @@
 PODS:
-  - material-components-ios (0.1.0):
-    - material-components-ios/FlexibleHeader (= 0.1.0)
-    - material-components-ios/Ink (= 0.1.0)
-    - material-components-ios/PageControl (= 0.1.0)
-    - material-components-ios/private (= 0.1.0)
-    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
-    - material-components-ios/ShadowElevations (= 0.1.0)
-    - material-components-ios/ShadowLayer (= 0.1.0)
-    - material-components-ios/Slider (= 0.1.0)
-    - material-components-ios/SpritedAnimationView (= 0.1.0)
-    - material-components-ios/Switch (= 0.1.0)
-    - material-components-ios/Typography (= 0.1.0)
-  - material-components-ios/FlexibleHeader (0.1.0)
-  - material-components-ios/Ink (0.1.0)
-  - material-components-ios/PageControl (0.1.0)
-  - material-components-ios/private (0.1.0):
-    - material-components-ios/private/Color (= 0.1.0)
-    - material-components-ios/private/ThumbTrack (= 0.1.0)
-  - material-components-ios/private/Color (0.1.0)
-  - material-components-ios/private/ThumbTrack (0.1.0):
+  - material-components-ios (0.2.1):
+    - material-components-ios/Buttons (= 0.2.1)
+    - material-components-ios/FlexibleHeader (= 0.2.1)
+    - material-components-ios/Ink (= 0.2.1)
+    - material-components-ios/PageControl (= 0.2.1)
+    - material-components-ios/private (= 0.2.1)
+    - material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
+    - material-components-ios/ShadowElevations (= 0.2.1)
+    - material-components-ios/ShadowLayer (= 0.2.1)
+    - material-components-ios/Slider (= 0.2.1)
+    - material-components-ios/SpritedAnimationView (= 0.2.1)
+    - material-components-ios/Switch (= 0.2.1)
+    - material-components-ios/Typography (= 0.2.1)
+  - material-components-ios/Buttons (0.2.1):
+    - material-components-ios/Ink
+    - material-components-ios/ShadowElevations
+    - material-components-ios/ShadowLayer
+    - material-components-ios/Typography
+  - material-components-ios/FlexibleHeader (0.2.1)
+  - material-components-ios/Ink (0.2.1)
+  - material-components-ios/PageControl (0.2.1)
+  - material-components-ios/private (0.2.1):
+    - material-components-ios/private/Color (= 0.2.1)
+    - material-components-ios/private/ThumbTrack (= 0.2.1)
+  - material-components-ios/private/Color (0.2.1)
+  - material-components-ios/private/ThumbTrack (0.2.1):
     - material-components-ios/private/Color
     - material-components-ios/ShadowElevations
     - material-components-ios/ShadowLayer
-  - material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
-  - material-components-ios/ShadowElevations (0.1.0)
-  - material-components-ios/ShadowLayer (0.1.0)
-  - material-components-ios/Slider (0.1.0):
+  - material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
+  - material-components-ios/ShadowElevations (0.2.1)
+  - material-components-ios/ShadowLayer (0.2.1)
+  - material-components-ios/Slider (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/SpritedAnimationView (0.1.0)
-  - material-components-ios/Switch (0.1.0):
+  - material-components-ios/SpritedAnimationView (0.2.1)
+  - material-components-ios/Switch (0.2.1):
     - material-components-ios/private/ThumbTrack
-  - material-components-ios/Typography (0.1.0)
+  - material-components-ios/Typography (0.2.1)
 
 DEPENDENCIES:
   - material-components-ios (from `../../`)
@@ -40,6 +46,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  material-components-ios: 463b80af2a7388584df19727b09f00f9ec43e4b1
+  material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
 
 COCOAPODS: 0.39.0
diff --git a/material-components-ios-catalog.podspec b/material-components-ios-catalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "material-components-ios-catalog"
-  s.version      = "0.1.0"
+  s.version      = "0.2.1"
   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"