Skip to content

Commit e164ec9

Browse files
ajsecordajsecord
committed
Merge branch 'release-candidate'
2 parents 56e4432 + be8b0f7 commit e164ec9

25 files changed

+427
-347
lines changed

‎CHANGELOG.md

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
# 16.3.0
2+
3+
## API diffs
4+
5+
### Snackbar
6+
7+
- [new] [`MDCSnackbar setPresentationHostView:`](https://github.com/google/material-components-ios/commit/ee84a40885724453da69ca90bfa6a874008dc0b0)
8+
9+
## Component changes
10+
11+
### CollectionCells
12+
13+
#### Changes
14+
15+
* [[CollectionViewCell] Call |layoutSubviews| when editing (#798)](https://github.com/google/material-components-ios/commit/393d6214e08b1ff5bc359a1cfc6f816abe7b2e67) (Gauthier Ambard)
16+
17+
### Collections
18+
19+
#### Changes
20+
21+
* [Change layout invalidation in MDCCollectionViewStyler (#790)](https://github.com/google/material-components-ios/commit/82f7758bad9d4573f49d3656816df128642a8968) (Gauthier Ambard)
22+
23+
### FeatureHighlight
24+
25+
#### Changes
26+
27+
* [Convert CGFloats to float for 32 bit compilation (#834)](https://github.com/google/material-components-ios/commit/28f1d43595cd2a3fa109acb275214e50c810e94d) (Sam Morrison)
28+
29+
### Snackbar
30+
31+
#### Changes
32+
33+
* [[MDCSnackbar]! Add presentationHostView property to snackbar (#784)](https://github.com/google/material-components-ios/commit/ee84a40885724453da69ca90bfa6a874008dc0b0) (Sam Morrison)
34+
135
# 16.2.0
236

337
## API diffs
@@ -147,7 +181,7 @@
147181

148182
### Palettes
149183

150-
- [new] [`MDCPalette.paletteGeneratedFromColor](https://github.com/google/material-components-ios/blob/fad8519b6a1ba5c29a0368fb470cca3c6da74431/components/Palettes/src/MDCPalettes.h#L137)
184+
- [new] [`MDCPalette.paletteGeneratedFromColor`](https://github.com/google/material-components-ios/blob/fad8519b6a1ba5c29a0368fb470cca3c6da74431/components/Palettes/src/MDCPalettes.h#L137)
151185

152186
## Component changes
153187

‎MaterialComponents.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
22

33
Pod::Spec.new do |s|
44
s.name = "MaterialComponents"
5-
s.version = "16.2.0"
5+
s.version = "16.3.0"
66
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
77
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
88
s.homepage = "https://github.com/google/material-components-ios"

‎MaterialComponentsCatalog.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 = "MaterialComponentsCatalog"
3-
s.version = "16.2.0"
3+
s.version = "16.3.0"
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"

‎MaterialComponentsUnitTests.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 = "MaterialComponentsUnitTests"
3-
s.version = "16.2.0"
3+
s.version = "16.3.0"
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"

‎catalog/Podfile.lock

Lines changed: 92 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
PODS:
22
- CatalogByConvention (2.0.0)
33
- EarlGrey (1.4.0)
4-
- MaterialComponents (16.2.0):
5-
- MaterialComponents/ActivityIndicator (= 16.2.0)
6-
- MaterialComponents/AnimationTiming (= 16.2.0)
7-
- MaterialComponents/AppBar (= 16.2.0)
8-
- MaterialComponents/ButtonBar (= 16.2.0)
9-
- MaterialComponents/Buttons (= 16.2.0)
10-
- MaterialComponents/CollectionCells (= 16.2.0)
11-
- MaterialComponents/CollectionLayoutAttributes (= 16.2.0)
12-
- MaterialComponents/Collections (= 16.2.0)
13-
- MaterialComponents/Dialogs (= 16.2.0)
14-
- MaterialComponents/FeatureHighlight (= 16.2.0)
15-
- MaterialComponents/FlexibleHeader (= 16.2.0)
16-
- MaterialComponents/FontDiskLoader (= 16.2.0)
17-
- MaterialComponents/HeaderStackView (= 16.2.0)
18-
- MaterialComponents/Ink (= 16.2.0)
19-
- MaterialComponents/NavigationBar (= 16.2.0)
20-
- MaterialComponents/OverlayWindow (= 16.2.0)
21-
- MaterialComponents/PageControl (= 16.2.0)
22-
- MaterialComponents/Palettes (= 16.2.0)
23-
- MaterialComponents/private (= 16.2.0)
24-
- MaterialComponents/ProgressView (= 16.2.0)
25-
- MaterialComponents/RobotoFontLoader (= 16.2.0)
26-
- MaterialComponents/ShadowElevations (= 16.2.0)
27-
- MaterialComponents/ShadowLayer (= 16.2.0)
28-
- MaterialComponents/Slider (= 16.2.0)
29-
- MaterialComponents/Snackbar (= 16.2.0)
30-
- MaterialComponents/SpritedAnimationView (= 16.2.0)
31-
- MaterialComponents/Switch (= 16.2.0)
32-
- MaterialComponents/Typography (= 16.2.0)
33-
- MaterialComponents/ActivityIndicator (16.2.0):
4+
- MaterialComponents (16.3.0):
5+
- MaterialComponents/ActivityIndicator (= 16.3.0)
6+
- MaterialComponents/AnimationTiming (= 16.3.0)
7+
- MaterialComponents/AppBar (= 16.3.0)
8+
- MaterialComponents/ButtonBar (= 16.3.0)
9+
- MaterialComponents/Buttons (= 16.3.0)
10+
- MaterialComponents/CollectionCells (= 16.3.0)
11+
- MaterialComponents/CollectionLayoutAttributes (= 16.3.0)
12+
- MaterialComponents/Collections (= 16.3.0)
13+
- MaterialComponents/Dialogs (= 16.3.0)
14+
- MaterialComponents/FeatureHighlight (= 16.3.0)
15+
- MaterialComponents/FlexibleHeader (= 16.3.0)
16+
- MaterialComponents/FontDiskLoader (= 16.3.0)
17+
- MaterialComponents/HeaderStackView (= 16.3.0)
18+
- MaterialComponents/Ink (= 16.3.0)
19+
- MaterialComponents/NavigationBar (= 16.3.0)
20+
- MaterialComponents/OverlayWindow (= 16.3.0)
21+
- MaterialComponents/PageControl (= 16.3.0)
22+
- MaterialComponents/Palettes (= 16.3.0)
23+
- MaterialComponents/private (= 16.3.0)
24+
- MaterialComponents/ProgressView (= 16.3.0)
25+
- MaterialComponents/RobotoFontLoader (= 16.3.0)
26+
- MaterialComponents/ShadowElevations (= 16.3.0)
27+
- MaterialComponents/ShadowLayer (= 16.3.0)
28+
- MaterialComponents/Slider (= 16.3.0)
29+
- MaterialComponents/Snackbar (= 16.3.0)
30+
- MaterialComponents/SpritedAnimationView (= 16.3.0)
31+
- MaterialComponents/Switch (= 16.3.0)
32+
- MaterialComponents/Typography (= 16.3.0)
33+
- MaterialComponents/ActivityIndicator (16.3.0):
3434
- MaterialComponents/private/RTL
35-
- MaterialComponents/AnimationTiming (16.2.0)
36-
- MaterialComponents/AppBar (16.2.0):
35+
- MaterialComponents/AnimationTiming (16.3.0)
36+
- MaterialComponents/AppBar (16.3.0):
3737
- MaterialComponents/FlexibleHeader
3838
- MaterialComponents/HeaderStackView
3939
- MaterialComponents/NavigationBar
@@ -42,16 +42,16 @@ PODS:
4242
- MaterialComponents/ShadowElevations
4343
- MaterialComponents/ShadowLayer
4444
- MaterialComponents/Typography
45-
- MaterialComponents/ButtonBar (16.2.0):
45+
- MaterialComponents/ButtonBar (16.3.0):
4646
- MaterialComponents/Buttons
4747
- MaterialComponents/private/RTL
48-
- MaterialComponents/Buttons (16.2.0):
48+
- MaterialComponents/Buttons (16.3.0):
4949
- MaterialComponents/Ink
5050
- MaterialComponents/ShadowElevations
5151
- MaterialComponents/ShadowLayer
5252
- MaterialComponents/Typography
5353
- MDFTextAccessibility
54-
- MaterialComponents/CollectionCells (16.2.0):
54+
- MaterialComponents/CollectionCells (16.3.0):
5555
- MaterialComponents/CollectionLayoutAttributes
5656
- MaterialComponents/Ink
5757
- MaterialComponents/private/Icons/ic_check
@@ -62,96 +62,98 @@ PODS:
6262
- MaterialComponents/private/Icons/ic_reorder
6363
- MaterialComponents/private/RTL
6464
- MaterialComponents/Typography
65-
- MaterialComponents/CollectionLayoutAttributes (16.2.0)
66-
- MaterialComponents/Collections (16.2.0):
65+
- MaterialComponents/CollectionLayoutAttributes (16.3.0)
66+
- MaterialComponents/Collections (16.3.0):
6767
- MaterialComponents/CollectionCells
6868
- MaterialComponents/CollectionLayoutAttributes
6969
- MaterialComponents/Ink
7070
- MaterialComponents/ShadowElevations
7171
- MaterialComponents/ShadowLayer
7272
- MaterialComponents/Typography
73-
- MaterialComponents/Dialogs (16.2.0):
73+
- MaterialComponents/Dialogs (16.3.0):
7474
- MaterialComponents/Buttons
7575
- MaterialComponents/private/KeyboardWatcher
7676
- MaterialComponents/ShadowElevations
7777
- MaterialComponents/ShadowLayer
78-
- MaterialComponents/FeatureHighlight (16.2.0)
79-
- MaterialComponents/FlexibleHeader (16.2.0):
78+
- MaterialComponents/FeatureHighlight (16.3.0):
79+
- MaterialComponents/Typography
80+
- MDFTextAccessibility
81+
- MaterialComponents/FlexibleHeader (16.3.0):
8082
- MDFTextAccessibility
81-
- MaterialComponents/FontDiskLoader (16.2.0)
82-
- MaterialComponents/HeaderStackView (16.2.0)
83-
- MaterialComponents/Ink (16.2.0)
84-
- MaterialComponents/NavigationBar (16.2.0):
83+
- MaterialComponents/FontDiskLoader (16.3.0)
84+
- MaterialComponents/HeaderStackView (16.3.0)
85+
- MaterialComponents/Ink (16.3.0)
86+
- MaterialComponents/NavigationBar (16.3.0):
8587
- MaterialComponents/ButtonBar
8688
- MaterialComponents/private/RTL
8789
- MaterialComponents/Typography
88-
- MaterialComponents/OverlayWindow (16.2.0)
89-
- MaterialComponents/PageControl (16.2.0)
90-
- MaterialComponents/Palettes (16.2.0)
91-
- MaterialComponents/private (16.2.0):
92-
- MaterialComponents/private/Color (= 16.2.0)
93-
- MaterialComponents/private/Icons (= 16.2.0)
94-
- MaterialComponents/private/KeyboardWatcher (= 16.2.0)
95-
- MaterialComponents/private/Overlay (= 16.2.0)
96-
- MaterialComponents/private/RTL (= 16.2.0)
97-
- MaterialComponents/private/ThumbTrack (= 16.2.0)
98-
- MaterialComponents/private/Color (16.2.0)
99-
- MaterialComponents/private/Icons (16.2.0):
100-
- MaterialComponents/private/Icons/Base (= 16.2.0)
101-
- MaterialComponents/private/Icons/ic_arrow_back (= 16.2.0)
102-
- MaterialComponents/private/Icons/ic_check (= 16.2.0)
103-
- MaterialComponents/private/Icons/ic_check_circle (= 16.2.0)
104-
- MaterialComponents/private/Icons/ic_chevron_right (= 16.2.0)
105-
- MaterialComponents/private/Icons/ic_info (= 16.2.0)
106-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.2.0)
107-
- MaterialComponents/private/Icons/ic_reorder (= 16.2.0)
108-
- MaterialComponents/private/Icons/Base (16.2.0)
109-
- MaterialComponents/private/Icons/ic_arrow_back (16.2.0):
90+
- MaterialComponents/OverlayWindow (16.3.0)
91+
- MaterialComponents/PageControl (16.3.0)
92+
- MaterialComponents/Palettes (16.3.0)
93+
- MaterialComponents/private (16.3.0):
94+
- MaterialComponents/private/Color (= 16.3.0)
95+
- MaterialComponents/private/Icons (= 16.3.0)
96+
- MaterialComponents/private/KeyboardWatcher (= 16.3.0)
97+
- MaterialComponents/private/Overlay (= 16.3.0)
98+
- MaterialComponents/private/RTL (= 16.3.0)
99+
- MaterialComponents/private/ThumbTrack (= 16.3.0)
100+
- MaterialComponents/private/Color (16.3.0)
101+
- MaterialComponents/private/Icons (16.3.0):
102+
- MaterialComponents/private/Icons/Base (= 16.3.0)
103+
- MaterialComponents/private/Icons/ic_arrow_back (= 16.3.0)
104+
- MaterialComponents/private/Icons/ic_check (= 16.3.0)
105+
- MaterialComponents/private/Icons/ic_check_circle (= 16.3.0)
106+
- MaterialComponents/private/Icons/ic_chevron_right (= 16.3.0)
107+
- MaterialComponents/private/Icons/ic_info (= 16.3.0)
108+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.3.0)
109+
- MaterialComponents/private/Icons/ic_reorder (= 16.3.0)
110+
- MaterialComponents/private/Icons/Base (16.3.0)
111+
- MaterialComponents/private/Icons/ic_arrow_back (16.3.0):
110112
- MaterialComponents/private/Icons/Base
111-
- MaterialComponents/private/Icons/ic_check (16.2.0):
113+
- MaterialComponents/private/Icons/ic_check (16.3.0):
112114
- MaterialComponents/private/Icons/Base
113-
- MaterialComponents/private/Icons/ic_check_circle (16.2.0):
115+
- MaterialComponents/private/Icons/ic_check_circle (16.3.0):
114116
- MaterialComponents/private/Icons/Base
115-
- MaterialComponents/private/Icons/ic_chevron_right (16.2.0):
117+
- MaterialComponents/private/Icons/ic_chevron_right (16.3.0):
116118
- MaterialComponents/private/Icons/Base
117-
- MaterialComponents/private/Icons/ic_info (16.2.0):
119+
- MaterialComponents/private/Icons/ic_info (16.3.0):
118120
- MaterialComponents/private/Icons/Base
119-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.2.0):
121+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.3.0):
120122
- MaterialComponents/private/Icons/Base
121-
- MaterialComponents/private/Icons/ic_reorder (16.2.0):
123+
- MaterialComponents/private/Icons/ic_reorder (16.3.0):
122124
- MaterialComponents/private/Icons/Base
123-
- MaterialComponents/private/KeyboardWatcher (16.2.0)
124-
- MaterialComponents/private/Overlay (16.2.0)
125-
- MaterialComponents/private/RTL (16.2.0)
126-
- MaterialComponents/private/ThumbTrack (16.2.0):
125+
- MaterialComponents/private/KeyboardWatcher (16.3.0)
126+
- MaterialComponents/private/Overlay (16.3.0)
127+
- MaterialComponents/private/RTL (16.3.0)
128+
- MaterialComponents/private/ThumbTrack (16.3.0):
127129
- MaterialComponents/Ink
128130
- MaterialComponents/private/Color
129131
- MaterialComponents/ShadowElevations
130132
- MaterialComponents/ShadowLayer
131133
- MaterialComponents/Typography
132-
- MaterialComponents/ProgressView (16.2.0):
134+
- MaterialComponents/ProgressView (16.3.0):
133135
- MaterialComponents/private/RTL
134-
- MaterialComponents/RobotoFontLoader (16.2.0):
136+
- MaterialComponents/RobotoFontLoader (16.3.0):
135137
- MaterialComponents/FontDiskLoader
136138
- MaterialComponents/Typography
137-
- MaterialComponents/ShadowElevations (16.2.0)
138-
- MaterialComponents/ShadowLayer (16.2.0)
139-
- MaterialComponents/Slider (16.2.0):
139+
- MaterialComponents/ShadowElevations (16.3.0)
140+
- MaterialComponents/ShadowLayer (16.3.0)
141+
- MaterialComponents/Slider (16.3.0):
140142
- MaterialComponents/private/ThumbTrack
141-
- MaterialComponents/Snackbar (16.2.0):
143+
- MaterialComponents/Snackbar (16.3.0):
142144
- MaterialComponents/AnimationTiming
143145
- MaterialComponents/Buttons
144146
- MaterialComponents/OverlayWindow
145147
- MaterialComponents/private/KeyboardWatcher
146148
- MaterialComponents/private/Overlay
147-
- MaterialComponents/SpritedAnimationView (16.2.0)
148-
- MaterialComponents/Switch (16.2.0):
149+
- MaterialComponents/SpritedAnimationView (16.3.0)
150+
- MaterialComponents/Switch (16.3.0):
149151
- MaterialComponents/private/RTL
150152
- MaterialComponents/private/ThumbTrack
151-
- MaterialComponents/Typography (16.2.0)
152-
- MaterialComponentsCatalog (16.2.0):
153+
- MaterialComponents/Typography (16.3.0)
154+
- MaterialComponentsCatalog (16.3.0):
153155
- MaterialComponents
154-
- MaterialComponentsUnitTests (16.2.0):
156+
- MaterialComponentsUnitTests (16.3.0):
155157
- MaterialComponents
156158
- MDFTextAccessibility
157159
- MDFTextAccessibility (1.1.3)
@@ -174,9 +176,9 @@ EXTERNAL SOURCES:
174176
SPEC CHECKSUMS:
175177
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
176178
EarlGrey: 763d04569f96d910cf17e4fe5aa0d3842e07c0b4
177-
MaterialComponents: 4c676a55ac7ac303bc9df78ffe9598f848a3ee46
178-
MaterialComponentsCatalog: c66a111e2a412232c67b36b333c14f6cf746dcf5
179-
MaterialComponentsUnitTests: 9bdcf1262f7a911c832b1b9787133480f52015f4
179+
MaterialComponents: 1db6dde6f468cb24d5ed3f2d857a15b5942a3d27
180+
MaterialComponentsCatalog: 51e6b7852dc8a679c8d7ff434b45421a8b676472
181+
MaterialComponentsUnitTests: c548a83a7973727c70516c337e6b016518fff4f7
180182
MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601
181183

182184
PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

‎components/CollectionCells/src/MDCCollectionViewCell.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ - (void)setEditing:(BOOL)editing animated:(BOOL)animated {
318318
}
319319
_shouldAnimateEditingViews = animated;
320320
_editing = editing;
321-
[self updateInterfaceForEditing];
321+
[self setNeedsLayout];
322+
[self layoutIfNeeded];
322323
}
323324

324325
- (void)updateInterfaceForEditing {

‎components/Collections/src/private/MDCCollectionViewStyler.m

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,12 +405,15 @@ - (void)updateLayoutAnimated:(BOOL)animated {
405405
- (void)updateLayoutAnimated:(BOOL)animated completion:(void (^)(BOOL finished))completion {
406406
if (animated) {
407407
// Invalidate current layout while allowing animation to new layout.
408-
[_collectionView performBatchUpdates:nil
409-
completion:^(BOOL finished) {
410-
if (completion) {
411-
completion(finished);
412-
}
413-
}];
408+
[UIView animateWithDuration:0
409+
animations:^{
410+
[_collectionView.collectionViewLayout invalidateLayout];
411+
}
412+
completion:^(BOOL finished) {
413+
if (completion) {
414+
completion(finished);
415+
}
416+
}];
414417
} else {
415418
_shouldInvalidateLayout = YES;
416419

‎components/FeatureHighlight/src/MDCFeatureHighlightViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#import "private/MDCFeatureHighlightAnimationController.h"
2020
#import "private/MDCFeatureHighlightView.h"
2121

22-
const CGFloat kMDCFeatureHighlightOuterHighlightAlpha = 0.96;
22+
const CGFloat kMDCFeatureHighlightOuterHighlightAlpha = 0.96f;
2323

24-
static const CGFloat kMDCFeatureHighlightPulseAnimationInterval = 1.5;
24+
static const CGFloat kMDCFeatureHighlightPulseAnimationInterval = 1.5f;
2525

2626
@interface MDCFeatureHighlightViewController () <UIViewControllerTransitioningDelegate>
2727
@end

‎components/FeatureHighlight/src/private/MDCFeatureHighlightAnimationController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#import "MDCFeatureHighlightView.h"
2020

21-
const CGFloat kMDCFeatureHighlightPresentationDuration = 0.35;
22-
const CGFloat kMDCFeatureHighlightDismissalDuration = 0.2;
21+
const NSTimeInterval kMDCFeatureHighlightPresentationDuration = 0.35f;
22+
const NSTimeInterval kMDCFeatureHighlightDismissalDuration = 0.2f;
2323

2424
@implementation MDCFeatureHighlightAnimationController
2525

‎components/FeatureHighlight/src/private/MDCFeatureHighlightView.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ typedef void(^MDCFeatureHighlightInteractionBlock)(BOOL accepted);
3232
- (void)layoutAppearing;
3333
- (void)layoutDisappearing;
3434

35-
- (void)animateDiscover:(CGFloat)duration;
36-
- (void)animateAccepted:(CGFloat)duration;
37-
- (void)animateRejected:(CGFloat)duration;
35+
- (void)animateDiscover:(NSTimeInterval)duration;
36+
- (void)animateAccepted:(NSTimeInterval)duration;
37+
- (void)animateRejected:(NSTimeInterval)duration;
3838
- (void)animatePulse;
3939

4040
@end

0 commit comments

Comments
 (0)