Skip to content

Commit 3747fbd

Browse files
ajsecordajsecord
committed
Merge branch 'release-0.2.1'
2 parents 8ca4051 + e100b3d commit 3747fbd

File tree

9 files changed

+154
-124
lines changed

9 files changed

+154
-124
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
##### Bug Fixes
88

9+
## 0.2.1
10+
11+
##### Bug Fixes
12+
13+
* Bumped CocoaPod version numbers. [Adrian Secord](https://github.com/ajsecord)
14+
915
## 0.2.0
1016

1117
##### Enhancements

‎build_tests/CocoapodsObjCApp/Podfile.lock

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
PODS:
2-
- material-components-ios (0.1.0):
3-
- material-components-ios/Buttons (= 0.1.0)
4-
- material-components-ios/FlexibleHeader (= 0.1.0)
5-
- material-components-ios/Ink (= 0.1.0)
6-
- material-components-ios/PageControl (= 0.1.0)
7-
- material-components-ios/private (= 0.1.0)
8-
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
9-
- material-components-ios/ShadowElevations (= 0.1.0)
10-
- material-components-ios/ShadowLayer (= 0.1.0)
11-
- material-components-ios/Slider (= 0.1.0)
12-
- material-components-ios/SpritedAnimationView (= 0.1.0)
13-
- material-components-ios/Switch (= 0.1.0)
14-
- material-components-ios/Typography (= 0.1.0)
15-
- material-components-ios/Buttons (0.1.0):
2+
- material-components-ios (0.2.1):
3+
- material-components-ios/Buttons (= 0.2.1)
4+
- material-components-ios/FlexibleHeader (= 0.2.1)
5+
- material-components-ios/Ink (= 0.2.1)
6+
- material-components-ios/PageControl (= 0.2.1)
7+
- material-components-ios/private (= 0.2.1)
8+
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
9+
- material-components-ios/ShadowElevations (= 0.2.1)
10+
- material-components-ios/ShadowLayer (= 0.2.1)
11+
- material-components-ios/Slider (= 0.2.1)
12+
- material-components-ios/SpritedAnimationView (= 0.2.1)
13+
- material-components-ios/Switch (= 0.2.1)
14+
- material-components-ios/Typography (= 0.2.1)
15+
- material-components-ios/Buttons (0.2.1):
1616
- material-components-ios/Ink
1717
- material-components-ios/ShadowElevations
1818
- material-components-ios/ShadowLayer
1919
- material-components-ios/Typography
20-
- material-components-ios/FlexibleHeader (0.1.0)
21-
- material-components-ios/Ink (0.1.0)
22-
- material-components-ios/PageControl (0.1.0)
23-
- material-components-ios/private (0.1.0):
24-
- material-components-ios/private/Color (= 0.1.0)
25-
- material-components-ios/private/ThumbTrack (= 0.1.0)
26-
- material-components-ios/private/Color (0.1.0)
27-
- material-components-ios/private/ThumbTrack (0.1.0):
20+
- material-components-ios/FlexibleHeader (0.2.1)
21+
- material-components-ios/Ink (0.2.1)
22+
- material-components-ios/PageControl (0.2.1)
23+
- material-components-ios/private (0.2.1):
24+
- material-components-ios/private/Color (= 0.2.1)
25+
- material-components-ios/private/ThumbTrack (= 0.2.1)
26+
- material-components-ios/private/Color (0.2.1)
27+
- material-components-ios/private/ThumbTrack (0.2.1):
2828
- material-components-ios/private/Color
2929
- material-components-ios/ShadowElevations
3030
- material-components-ios/ShadowLayer
31-
- material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
32-
- material-components-ios/ShadowElevations (0.1.0)
33-
- material-components-ios/ShadowLayer (0.1.0)
34-
- material-components-ios/Slider (0.1.0):
31+
- material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
32+
- material-components-ios/ShadowElevations (0.2.1)
33+
- material-components-ios/ShadowLayer (0.2.1)
34+
- material-components-ios/Slider (0.2.1):
3535
- material-components-ios/private/ThumbTrack
36-
- material-components-ios/SpritedAnimationView (0.1.0)
37-
- material-components-ios/Switch (0.1.0):
36+
- material-components-ios/SpritedAnimationView (0.2.1)
37+
- material-components-ios/Switch (0.2.1):
3838
- material-components-ios/private/ThumbTrack
39-
- material-components-ios/Typography (0.1.0)
39+
- material-components-ios/Typography (0.2.1)
4040

4141
DEPENDENCIES:
4242
- material-components-ios (from `../../`)
@@ -46,6 +46,6 @@ EXTERNAL SOURCES:
4646
:path: ../../
4747

4848
SPEC CHECKSUMS:
49-
material-components-ios: ceb1a78b45aa87ce45d8d52eff3451392e57a920
49+
material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
5050

5151
COCOAPODS: 0.39.0

‎build_tests/CocoapodsSwiftApp/Podfile.lock

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
PODS:
2-
- material-components-ios (0.1.0):
3-
- material-components-ios/Buttons (= 0.1.0)
4-
- material-components-ios/FlexibleHeader (= 0.1.0)
5-
- material-components-ios/Ink (= 0.1.0)
6-
- material-components-ios/PageControl (= 0.1.0)
7-
- material-components-ios/private (= 0.1.0)
8-
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
9-
- material-components-ios/ShadowElevations (= 0.1.0)
10-
- material-components-ios/ShadowLayer (= 0.1.0)
11-
- material-components-ios/Slider (= 0.1.0)
12-
- material-components-ios/SpritedAnimationView (= 0.1.0)
13-
- material-components-ios/Switch (= 0.1.0)
14-
- material-components-ios/Typography (= 0.1.0)
15-
- material-components-ios/Buttons (0.1.0):
2+
- material-components-ios (0.2.1):
3+
- material-components-ios/Buttons (= 0.2.1)
4+
- material-components-ios/FlexibleHeader (= 0.2.1)
5+
- material-components-ios/Ink (= 0.2.1)
6+
- material-components-ios/PageControl (= 0.2.1)
7+
- material-components-ios/private (= 0.2.1)
8+
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
9+
- material-components-ios/ShadowElevations (= 0.2.1)
10+
- material-components-ios/ShadowLayer (= 0.2.1)
11+
- material-components-ios/Slider (= 0.2.1)
12+
- material-components-ios/SpritedAnimationView (= 0.2.1)
13+
- material-components-ios/Switch (= 0.2.1)
14+
- material-components-ios/Typography (= 0.2.1)
15+
- material-components-ios/Buttons (0.2.1):
1616
- material-components-ios/Ink
1717
- material-components-ios/ShadowElevations
1818
- material-components-ios/ShadowLayer
1919
- material-components-ios/Typography
20-
- material-components-ios/FlexibleHeader (0.1.0)
21-
- material-components-ios/Ink (0.1.0)
22-
- material-components-ios/PageControl (0.1.0)
23-
- material-components-ios/private (0.1.0):
24-
- material-components-ios/private/Color (= 0.1.0)
25-
- material-components-ios/private/ThumbTrack (= 0.1.0)
26-
- material-components-ios/private/Color (0.1.0)
27-
- material-components-ios/private/ThumbTrack (0.1.0):
20+
- material-components-ios/FlexibleHeader (0.2.1)
21+
- material-components-ios/Ink (0.2.1)
22+
- material-components-ios/PageControl (0.2.1)
23+
- material-components-ios/private (0.2.1):
24+
- material-components-ios/private/Color (= 0.2.1)
25+
- material-components-ios/private/ThumbTrack (= 0.2.1)
26+
- material-components-ios/private/Color (0.2.1)
27+
- material-components-ios/private/ThumbTrack (0.2.1):
2828
- material-components-ios/private/Color
2929
- material-components-ios/ShadowElevations
3030
- material-components-ios/ShadowLayer
31-
- material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
32-
- material-components-ios/ShadowElevations (0.1.0)
33-
- material-components-ios/ShadowLayer (0.1.0)
34-
- material-components-ios/Slider (0.1.0):
31+
- material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
32+
- material-components-ios/ShadowElevations (0.2.1)
33+
- material-components-ios/ShadowLayer (0.2.1)
34+
- material-components-ios/Slider (0.2.1):
3535
- material-components-ios/private/ThumbTrack
36-
- material-components-ios/SpritedAnimationView (0.1.0)
37-
- material-components-ios/Switch (0.1.0):
36+
- material-components-ios/SpritedAnimationView (0.2.1)
37+
- material-components-ios/Switch (0.2.1):
3838
- material-components-ios/private/ThumbTrack
39-
- material-components-ios/Typography (0.1.0)
39+
- material-components-ios/Typography (0.2.1)
4040

4141
DEPENDENCIES:
4242
- material-components-ios (from `../../`)
@@ -46,6 +46,6 @@ EXTERNAL SOURCES:
4646
:path: ../../
4747

4848
SPEC CHECKSUMS:
49-
material-components-ios: ceb1a78b45aa87ce45d8d52eff3451392e57a920
49+
material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
5050

5151
COCOAPODS: 0.39.0

‎catalog/Podfile.lock

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
11
PODS:
2-
- material-components-ios (0.1.0):
3-
- material-components-ios/FlexibleHeader (= 0.1.0)
4-
- material-components-ios/Ink (= 0.1.0)
5-
- material-components-ios/PageControl (= 0.1.0)
6-
- material-components-ios/private (= 0.1.0)
7-
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
8-
- material-components-ios/ShadowElevations (= 0.1.0)
9-
- material-components-ios/ShadowLayer (= 0.1.0)
10-
- material-components-ios/Slider (= 0.1.0)
11-
- material-components-ios/SpritedAnimationView (= 0.1.0)
12-
- material-components-ios/Switch (= 0.1.0)
13-
- material-components-ios/Typography (= 0.1.0)
14-
- material-components-ios-catalog (0.1.0)
15-
- material-components-ios/FlexibleHeader (0.1.0)
16-
- material-components-ios/Ink (0.1.0)
17-
- material-components-ios/PageControl (0.1.0)
18-
- material-components-ios/private (0.1.0):
19-
- material-components-ios/private/Color (= 0.1.0)
20-
- material-components-ios/private/ThumbTrack (= 0.1.0)
21-
- material-components-ios/private/Color (0.1.0)
22-
- material-components-ios/private/ThumbTrack (0.1.0):
2+
- material-components-ios (0.2.1):
3+
- material-components-ios/Buttons (= 0.2.1)
4+
- material-components-ios/FlexibleHeader (= 0.2.1)
5+
- material-components-ios/Ink (= 0.2.1)
6+
- material-components-ios/PageControl (= 0.2.1)
7+
- material-components-ios/private (= 0.2.1)
8+
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
9+
- material-components-ios/ShadowElevations (= 0.2.1)
10+
- material-components-ios/ShadowLayer (= 0.2.1)
11+
- material-components-ios/Slider (= 0.2.1)
12+
- material-components-ios/SpritedAnimationView (= 0.2.1)
13+
- material-components-ios/Switch (= 0.2.1)
14+
- material-components-ios/Typography (= 0.2.1)
15+
- material-components-ios-catalog (0.2.1)
16+
- material-components-ios/Buttons (0.2.1):
17+
- material-components-ios/Ink
18+
- material-components-ios/ShadowElevations
19+
- material-components-ios/ShadowLayer
20+
- material-components-ios/Typography
21+
- material-components-ios/FlexibleHeader (0.2.1)
22+
- material-components-ios/Ink (0.2.1)
23+
- material-components-ios/PageControl (0.2.1)
24+
- material-components-ios/private (0.2.1):
25+
- material-components-ios/private/Color (= 0.2.1)
26+
- material-components-ios/private/ThumbTrack (= 0.2.1)
27+
- material-components-ios/private/Color (0.2.1)
28+
- material-components-ios/private/ThumbTrack (0.2.1):
2329
- material-components-ios/private/Color
2430
- material-components-ios/ShadowElevations
2531
- material-components-ios/ShadowLayer
26-
- material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
27-
- material-components-ios/ShadowElevations (0.1.0)
28-
- material-components-ios/ShadowLayer (0.1.0)
29-
- material-components-ios/Slider (0.1.0):
32+
- material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
33+
- material-components-ios/ShadowElevations (0.2.1)
34+
- material-components-ios/ShadowLayer (0.2.1)
35+
- material-components-ios/Slider (0.2.1):
3036
- material-components-ios/private/ThumbTrack
31-
- material-components-ios/SpritedAnimationView (0.1.0)
32-
- material-components-ios/Switch (0.1.0):
37+
- material-components-ios/SpritedAnimationView (0.2.1)
38+
- material-components-ios/Switch (0.2.1):
3339
- material-components-ios/private/ThumbTrack
34-
- material-components-ios/Typography (0.1.0)
40+
- material-components-ios/Typography (0.2.1)
3541

3642
DEPENDENCIES:
3743
- material-components-ios (from `../`)
@@ -44,7 +50,7 @@ EXTERNAL SOURCES:
4450
:path: ../
4551

4652
SPEC CHECKSUMS:
47-
material-components-ios: 463b80af2a7388584df19727b09f00f9ec43e4b1
48-
material-components-ios-catalog: 9e0e0b97321c38c0335293b8355d838071614f78
53+
material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
54+
material-components-ios-catalog: 0641ffef40b562087afa35bf9634cd1a8020bd32
4955

5056
COCOAPODS: 0.39.0

‎demos/Pesto/Pesto/PestoCardCollectionViewCell.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,12 @@ - (void)layoutSubviews {
8080
- (void)prepareForReuse {
8181
[super prepareForReuse];
8282

83-
for (UIView *subview in [self.contentView subviews]) {
84-
[subview removeFromSuperview];
85-
}
86-
8783
_author = nil;
8884
_icon = nil;
8985
_imageURL = nil;
9086
_title = nil;
87+
_image = nil;
88+
_imageView.image = nil;
9189
}
9290

9391
+ (Class)layerClass {

‎demos/Pesto/Pesto/PestoCollectionViewController.m

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
#import "PestoData.h"
44
#import "PestoRemoteImageService.h"
55

6+
#import "MaterialShadowElevations.h"
7+
#import "MaterialShadowLayer.h"
8+
69
static CGFloat kPestoCollectionViewControllerAnimationDuration = 0.33f;
710
static CGFloat kPestoCollectionViewControllerDefaultHeaderHeight = 240.f;
811
static CGFloat kPestoCollectionViewControllerInset = 5.f;
@@ -40,6 +43,12 @@ - (void)setFlexHeaderContainerVC:(MDCFlexibleHeaderContainerViewController *)fle
4043
headerView.maximumHeight = kPestoCollectionViewControllerDefaultHeaderHeight;
4144
headerView.minimumHeight = kPestoCollectionViewControllerSmallHeaderHeight;
4245
[headerView.contentView addSubview:[self pestoHeaderView]];
46+
47+
// Use a custom shadow under the flexible header.
48+
MDCShadowLayer *shadowLayer = [MDCShadowLayer layer];
49+
shadowLayer.shadowMaskEnabled = NO;
50+
[shadowLayer setElevation:MDCShadowElevationNone];
51+
headerView.shadowLayer = shadowLayer;
4352
}
4453

4554
- (void)viewWillAppear:(BOOL)animated {
@@ -158,6 +167,11 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
158167
}];
159168
}
160169
_logoView.transform = CGAffineTransformScale(CGAffineTransformIdentity, _logoScale, _logoScale);
170+
171+
MDCFlexibleHeaderView *headerView = _flexHeaderContainerVC.headerViewController.headerView;
172+
MDCShadowLayer *shadowLayer = (MDCShadowLayer *)headerView.shadowLayer;
173+
CGFloat elevation = MDCShadowElevationAppBar * headerView.shadowIntensity;
174+
[shadowLayer setElevation:elevation];
161175
}
162176

163177
#pragma mark - Private methods

‎demos/Pesto/Podfile.lock

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
11
PODS:
2-
- material-components-ios (0.1.0):
3-
- material-components-ios/FlexibleHeader (= 0.1.0)
4-
- material-components-ios/Ink (= 0.1.0)
5-
- material-components-ios/PageControl (= 0.1.0)
6-
- material-components-ios/private (= 0.1.0)
7-
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.1.0)
8-
- material-components-ios/ShadowElevations (= 0.1.0)
9-
- material-components-ios/ShadowLayer (= 0.1.0)
10-
- material-components-ios/Slider (= 0.1.0)
11-
- material-components-ios/SpritedAnimationView (= 0.1.0)
12-
- material-components-ios/Switch (= 0.1.0)
13-
- material-components-ios/Typography (= 0.1.0)
14-
- material-components-ios/FlexibleHeader (0.1.0)
15-
- material-components-ios/Ink (0.1.0)
16-
- material-components-ios/PageControl (0.1.0)
17-
- material-components-ios/private (0.1.0):
18-
- material-components-ios/private/Color (= 0.1.0)
19-
- material-components-ios/private/ThumbTrack (= 0.1.0)
20-
- material-components-ios/private/Color (0.1.0)
21-
- material-components-ios/private/ThumbTrack (0.1.0):
2+
- material-components-ios (0.2.1):
3+
- material-components-ios/Buttons (= 0.2.1)
4+
- material-components-ios/FlexibleHeader (= 0.2.1)
5+
- material-components-ios/Ink (= 0.2.1)
6+
- material-components-ios/PageControl (= 0.2.1)
7+
- material-components-ios/private (= 0.2.1)
8+
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
9+
- material-components-ios/ShadowElevations (= 0.2.1)
10+
- material-components-ios/ShadowLayer (= 0.2.1)
11+
- material-components-ios/Slider (= 0.2.1)
12+
- material-components-ios/SpritedAnimationView (= 0.2.1)
13+
- material-components-ios/Switch (= 0.2.1)
14+
- material-components-ios/Typography (= 0.2.1)
15+
- material-components-ios/Buttons (0.2.1):
16+
- material-components-ios/Ink
17+
- material-components-ios/ShadowElevations
18+
- material-components-ios/ShadowLayer
19+
- material-components-ios/Typography
20+
- material-components-ios/FlexibleHeader (0.2.1)
21+
- material-components-ios/Ink (0.2.1)
22+
- material-components-ios/PageControl (0.2.1)
23+
- material-components-ios/private (0.2.1):
24+
- material-components-ios/private/Color (= 0.2.1)
25+
- material-components-ios/private/ThumbTrack (= 0.2.1)
26+
- material-components-ios/private/Color (0.2.1)
27+
- material-components-ios/private/ThumbTrack (0.2.1):
2228
- material-components-ios/private/Color
2329
- material-components-ios/ShadowElevations
2430
- material-components-ios/ShadowLayer
25-
- material-components-ios/ScrollViewDelegateMultiplexer (0.1.0)
26-
- material-components-ios/ShadowElevations (0.1.0)
27-
- material-components-ios/ShadowLayer (0.1.0)
28-
- material-components-ios/Slider (0.1.0):
31+
- material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
32+
- material-components-ios/ShadowElevations (0.2.1)
33+
- material-components-ios/ShadowLayer (0.2.1)
34+
- material-components-ios/Slider (0.2.1):
2935
- material-components-ios/private/ThumbTrack
30-
- material-components-ios/SpritedAnimationView (0.1.0)
31-
- material-components-ios/Switch (0.1.0):
36+
- material-components-ios/SpritedAnimationView (0.2.1)
37+
- material-components-ios/Switch (0.2.1):
3238
- material-components-ios/private/ThumbTrack
33-
- material-components-ios/Typography (0.1.0)
39+
- material-components-ios/Typography (0.2.1)
3440

3541
DEPENDENCIES:
3642
- material-components-ios (from `../../`)
@@ -40,6 +46,6 @@ EXTERNAL SOURCES:
4046
:path: ../../
4147

4248
SPEC CHECKSUMS:
43-
material-components-ios: 463b80af2a7388584df19727b09f00f9ec43e4b1
49+
material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
4450

4551
COCOAPODS: 0.39.0

‎material-components-ios-catalog.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "material-components-ios-catalog"
3-
s.version = "0.1.0"
3+
s.version = "0.2.1"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

0 commit comments

Comments
 (0)