Skip to content

Commit 3659bf4

Browse files
ShepJGoogleShepJGoogle
committed
Merge branch 'release-candidate'
2 parents 544552f + 0052184 commit 3659bf4

File tree

21 files changed

+590
-385
lines changed

21 files changed

+590
-385
lines changed

‎CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
# 16.1.0
2+
3+
## Component changes
4+
5+
### ActivityIndicator
6+
7+
#### Changes
8+
9+
* [Implement intrinsicContentSize (#795)](https://github.com/google/material-components-ios/commit/731eb321d94eb4957613e1059570cae17a584133) (Louis Romero)
10+
11+
### Buttons
12+
13+
#### Changes
14+
15+
* [MDC #329 - Bounded ink should ignore the maxRippleRadius property (#771)](https://github.com/google/material-components-ios/commit/01b73cf1478083baeb9976d4af12a67f02f9cb82) (Justin Shephard)
16+
17+
### Dialogs
18+
19+
#### Changes
20+
21+
* [Improve snackbar and dialogs docs (#785)](https://github.com/google/material-components-ios/commit/386964baf25fa9264516f9f0c9ed19410873f1fe) (Sam Morrison)
22+
23+
### Ink
24+
25+
#### Changes
26+
27+
* [Added MDCInkGestureRecognizer.h to Ink's umbrella header. (#801)](https://github.com/google/material-components-ios/commit/d24532bc40e0082dc8383d6431feceafa38ec050) (Adrian Secord)
28+
* [MDC #329 - Bounded ink should ignore the maxRippleRadius property (#771)](https://github.com/google/material-components-ios/commit/01b73cf1478083baeb9976d4af12a67f02f9cb82) (Justin Shephard)
29+
* [[MDCInkView] cancelAllAnimationsAnimated should support disabling animation (#786)](https://github.com/google/material-components-ios/commit/8008e82bd7bea04534ad7ecb2c3aa1903254553e) (Junius Gunaratne)
30+
31+
### ProgressView
32+
33+
#### Changes
34+
35+
* [[MDCProgressView] Execute completion block when setHidden:animated:completion is called sequentially (#787)](https://github.com/google/material-components-ios/commit/45c0b06275e88c65c7aae8bba1b78889cba2f93c) (Junius Gunaratne)
36+
37+
### Snackbar
38+
39+
#### Changes
40+
41+
* [Improve snackbar and dialogs docs (#785)](https://github.com/google/material-components-ios/commit/386964baf25fa9264516f9f0c9ed19410873f1fe) (Sam Morrison)
42+
43+
44+
145
# 16.0.0
246

347
## API diffs

‎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.0.0"
5+
s.version = "16.1.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.0.0"
3+
s.version = "16.1.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.0.0"
3+
s.version = "16.1.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"

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ Material Components for iOS uses
151151
copyright Google Inc. and licensed under
152152
[CC BY 4.0](http://creativecommons.org/licenses/by/4.0/).
153153

154+
Several components use
155+
[MDFTextAccessibility](https://github.com/material-foundation/material-text-accessibility-ios),
156+
copyright Google Inc. and licensed under
157+
[Apache 2.0](https://github.com/material-foundation/material-text-accessibility-ios/blob/master/LICENSE)
158+
without a NOTICE file.
159+
154160
Roboto Font Loader uses the
155161
[Roboto font](https://github.com/google/fonts/tree/master/apache/roboto),
156162
copyright 2011 Google Inc. and licensed under

‎catalog/Podfile.lock

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
PODS:
22
- CatalogByConvention (2.0.0)
33
- EarlGrey (1.4.0)
4-
- MaterialComponents (16.0.0):
5-
- MaterialComponents/ActivityIndicator (= 16.0.0)
6-
- MaterialComponents/AnimationTiming (= 16.0.0)
7-
- MaterialComponents/AppBar (= 16.0.0)
8-
- MaterialComponents/ButtonBar (= 16.0.0)
9-
- MaterialComponents/Buttons (= 16.0.0)
10-
- MaterialComponents/CollectionCells (= 16.0.0)
11-
- MaterialComponents/CollectionLayoutAttributes (= 16.0.0)
12-
- MaterialComponents/Collections (= 16.0.0)
13-
- MaterialComponents/Dialogs (= 16.0.0)
14-
- MaterialComponents/FlexibleHeader (= 16.0.0)
15-
- MaterialComponents/FontDiskLoader (= 16.0.0)
16-
- MaterialComponents/HeaderStackView (= 16.0.0)
17-
- MaterialComponents/Ink (= 16.0.0)
18-
- MaterialComponents/NavigationBar (= 16.0.0)
19-
- MaterialComponents/OverlayWindow (= 16.0.0)
20-
- MaterialComponents/PageControl (= 16.0.0)
21-
- MaterialComponents/Palettes (= 16.0.0)
22-
- MaterialComponents/private (= 16.0.0)
23-
- MaterialComponents/ProgressView (= 16.0.0)
24-
- MaterialComponents/RobotoFontLoader (= 16.0.0)
25-
- MaterialComponents/ShadowElevations (= 16.0.0)
26-
- MaterialComponents/ShadowLayer (= 16.0.0)
27-
- MaterialComponents/Slider (= 16.0.0)
28-
- MaterialComponents/Snackbar (= 16.0.0)
29-
- MaterialComponents/SpritedAnimationView (= 16.0.0)
30-
- MaterialComponents/Switch (= 16.0.0)
31-
- MaterialComponents/Typography (= 16.0.0)
32-
- MaterialComponents/ActivityIndicator (16.0.0):
4+
- MaterialComponents (16.1.0):
5+
- MaterialComponents/ActivityIndicator (= 16.1.0)
6+
- MaterialComponents/AnimationTiming (= 16.1.0)
7+
- MaterialComponents/AppBar (= 16.1.0)
8+
- MaterialComponents/ButtonBar (= 16.1.0)
9+
- MaterialComponents/Buttons (= 16.1.0)
10+
- MaterialComponents/CollectionCells (= 16.1.0)
11+
- MaterialComponents/CollectionLayoutAttributes (= 16.1.0)
12+
- MaterialComponents/Collections (= 16.1.0)
13+
- MaterialComponents/Dialogs (= 16.1.0)
14+
- MaterialComponents/FlexibleHeader (= 16.1.0)
15+
- MaterialComponents/FontDiskLoader (= 16.1.0)
16+
- MaterialComponents/HeaderStackView (= 16.1.0)
17+
- MaterialComponents/Ink (= 16.1.0)
18+
- MaterialComponents/NavigationBar (= 16.1.0)
19+
- MaterialComponents/OverlayWindow (= 16.1.0)
20+
- MaterialComponents/PageControl (= 16.1.0)
21+
- MaterialComponents/Palettes (= 16.1.0)
22+
- MaterialComponents/private (= 16.1.0)
23+
- MaterialComponents/ProgressView (= 16.1.0)
24+
- MaterialComponents/RobotoFontLoader (= 16.1.0)
25+
- MaterialComponents/ShadowElevations (= 16.1.0)
26+
- MaterialComponents/ShadowLayer (= 16.1.0)
27+
- MaterialComponents/Slider (= 16.1.0)
28+
- MaterialComponents/Snackbar (= 16.1.0)
29+
- MaterialComponents/SpritedAnimationView (= 16.1.0)
30+
- MaterialComponents/Switch (= 16.1.0)
31+
- MaterialComponents/Typography (= 16.1.0)
32+
- MaterialComponents/ActivityIndicator (16.1.0):
3333
- MaterialComponents/private/RTL
34-
- MaterialComponents/AnimationTiming (16.0.0)
35-
- MaterialComponents/AppBar (16.0.0):
34+
- MaterialComponents/AnimationTiming (16.1.0)
35+
- MaterialComponents/AppBar (16.1.0):
3636
- MaterialComponents/FlexibleHeader
3737
- MaterialComponents/HeaderStackView
3838
- MaterialComponents/NavigationBar
@@ -41,16 +41,16 @@ PODS:
4141
- MaterialComponents/ShadowElevations
4242
- MaterialComponents/ShadowLayer
4343
- MaterialComponents/Typography
44-
- MaterialComponents/ButtonBar (16.0.0):
44+
- MaterialComponents/ButtonBar (16.1.0):
4545
- MaterialComponents/Buttons
4646
- MaterialComponents/private/RTL
47-
- MaterialComponents/Buttons (16.0.0):
47+
- MaterialComponents/Buttons (16.1.0):
4848
- MaterialComponents/Ink
4949
- MaterialComponents/ShadowElevations
5050
- MaterialComponents/ShadowLayer
5151
- MaterialComponents/Typography
5252
- MDFTextAccessibility
53-
- MaterialComponents/CollectionCells (16.0.0):
53+
- MaterialComponents/CollectionCells (16.1.0):
5454
- MaterialComponents/CollectionLayoutAttributes
5555
- MaterialComponents/Ink
5656
- MaterialComponents/private/Icons/ic_check
@@ -61,95 +61,95 @@ PODS:
6161
- MaterialComponents/private/Icons/ic_reorder
6262
- MaterialComponents/private/RTL
6363
- MaterialComponents/Typography
64-
- MaterialComponents/CollectionLayoutAttributes (16.0.0)
65-
- MaterialComponents/Collections (16.0.0):
64+
- MaterialComponents/CollectionLayoutAttributes (16.1.0)
65+
- MaterialComponents/Collections (16.1.0):
6666
- MaterialComponents/CollectionCells
6767
- MaterialComponents/CollectionLayoutAttributes
6868
- MaterialComponents/Ink
6969
- MaterialComponents/ShadowElevations
7070
- MaterialComponents/ShadowLayer
7171
- MaterialComponents/Typography
72-
- MaterialComponents/Dialogs (16.0.0):
72+
- MaterialComponents/Dialogs (16.1.0):
7373
- MaterialComponents/Buttons
7474
- MaterialComponents/private/KeyboardWatcher
7575
- MaterialComponents/ShadowElevations
7676
- MaterialComponents/ShadowLayer
77-
- MaterialComponents/FlexibleHeader (16.0.0):
77+
- MaterialComponents/FlexibleHeader (16.1.0):
7878
- MDFTextAccessibility
79-
- MaterialComponents/FontDiskLoader (16.0.0)
80-
- MaterialComponents/HeaderStackView (16.0.0)
81-
- MaterialComponents/Ink (16.0.0)
82-
- MaterialComponents/NavigationBar (16.0.0):
79+
- MaterialComponents/FontDiskLoader (16.1.0)
80+
- MaterialComponents/HeaderStackView (16.1.0)
81+
- MaterialComponents/Ink (16.1.0)
82+
- MaterialComponents/NavigationBar (16.1.0):
8383
- MaterialComponents/ButtonBar
8484
- MaterialComponents/private/RTL
8585
- MaterialComponents/Typography
86-
- MaterialComponents/OverlayWindow (16.0.0)
87-
- MaterialComponents/PageControl (16.0.0)
88-
- MaterialComponents/Palettes (16.0.0)
89-
- MaterialComponents/private (16.0.0):
90-
- MaterialComponents/private/Color (= 16.0.0)
91-
- MaterialComponents/private/Icons (= 16.0.0)
92-
- MaterialComponents/private/KeyboardWatcher (= 16.0.0)
93-
- MaterialComponents/private/Overlay (= 16.0.0)
94-
- MaterialComponents/private/RTL (= 16.0.0)
95-
- MaterialComponents/private/ThumbTrack (= 16.0.0)
96-
- MaterialComponents/private/Color (16.0.0)
97-
- MaterialComponents/private/Icons (16.0.0):
98-
- MaterialComponents/private/Icons/Base (= 16.0.0)
99-
- MaterialComponents/private/Icons/ic_arrow_back (= 16.0.0)
100-
- MaterialComponents/private/Icons/ic_check (= 16.0.0)
101-
- MaterialComponents/private/Icons/ic_check_circle (= 16.0.0)
102-
- MaterialComponents/private/Icons/ic_chevron_right (= 16.0.0)
103-
- MaterialComponents/private/Icons/ic_info (= 16.0.0)
104-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.0.0)
105-
- MaterialComponents/private/Icons/ic_reorder (= 16.0.0)
106-
- MaterialComponents/private/Icons/Base (16.0.0)
107-
- MaterialComponents/private/Icons/ic_arrow_back (16.0.0):
86+
- MaterialComponents/OverlayWindow (16.1.0)
87+
- MaterialComponents/PageControl (16.1.0)
88+
- MaterialComponents/Palettes (16.1.0)
89+
- MaterialComponents/private (16.1.0):
90+
- MaterialComponents/private/Color (= 16.1.0)
91+
- MaterialComponents/private/Icons (= 16.1.0)
92+
- MaterialComponents/private/KeyboardWatcher (= 16.1.0)
93+
- MaterialComponents/private/Overlay (= 16.1.0)
94+
- MaterialComponents/private/RTL (= 16.1.0)
95+
- MaterialComponents/private/ThumbTrack (= 16.1.0)
96+
- MaterialComponents/private/Color (16.1.0)
97+
- MaterialComponents/private/Icons (16.1.0):
98+
- MaterialComponents/private/Icons/Base (= 16.1.0)
99+
- MaterialComponents/private/Icons/ic_arrow_back (= 16.1.0)
100+
- MaterialComponents/private/Icons/ic_check (= 16.1.0)
101+
- MaterialComponents/private/Icons/ic_check_circle (= 16.1.0)
102+
- MaterialComponents/private/Icons/ic_chevron_right (= 16.1.0)
103+
- MaterialComponents/private/Icons/ic_info (= 16.1.0)
104+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.1.0)
105+
- MaterialComponents/private/Icons/ic_reorder (= 16.1.0)
106+
- MaterialComponents/private/Icons/Base (16.1.0)
107+
- MaterialComponents/private/Icons/ic_arrow_back (16.1.0):
108108
- MaterialComponents/private/Icons/Base
109-
- MaterialComponents/private/Icons/ic_check (16.0.0):
109+
- MaterialComponents/private/Icons/ic_check (16.1.0):
110110
- MaterialComponents/private/Icons/Base
111-
- MaterialComponents/private/Icons/ic_check_circle (16.0.0):
111+
- MaterialComponents/private/Icons/ic_check_circle (16.1.0):
112112
- MaterialComponents/private/Icons/Base
113-
- MaterialComponents/private/Icons/ic_chevron_right (16.0.0):
113+
- MaterialComponents/private/Icons/ic_chevron_right (16.1.0):
114114
- MaterialComponents/private/Icons/Base
115-
- MaterialComponents/private/Icons/ic_info (16.0.0):
115+
- MaterialComponents/private/Icons/ic_info (16.1.0):
116116
- MaterialComponents/private/Icons/Base
117-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.0.0):
117+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.1.0):
118118
- MaterialComponents/private/Icons/Base
119-
- MaterialComponents/private/Icons/ic_reorder (16.0.0):
119+
- MaterialComponents/private/Icons/ic_reorder (16.1.0):
120120
- MaterialComponents/private/Icons/Base
121-
- MaterialComponents/private/KeyboardWatcher (16.0.0)
122-
- MaterialComponents/private/Overlay (16.0.0)
123-
- MaterialComponents/private/RTL (16.0.0)
124-
- MaterialComponents/private/ThumbTrack (16.0.0):
121+
- MaterialComponents/private/KeyboardWatcher (16.1.0)
122+
- MaterialComponents/private/Overlay (16.1.0)
123+
- MaterialComponents/private/RTL (16.1.0)
124+
- MaterialComponents/private/ThumbTrack (16.1.0):
125125
- MaterialComponents/Ink
126126
- MaterialComponents/private/Color
127127
- MaterialComponents/ShadowElevations
128128
- MaterialComponents/ShadowLayer
129129
- MaterialComponents/Typography
130-
- MaterialComponents/ProgressView (16.0.0):
130+
- MaterialComponents/ProgressView (16.1.0):
131131
- MaterialComponents/private/RTL
132-
- MaterialComponents/RobotoFontLoader (16.0.0):
132+
- MaterialComponents/RobotoFontLoader (16.1.0):
133133
- MaterialComponents/FontDiskLoader
134134
- MaterialComponents/Typography
135-
- MaterialComponents/ShadowElevations (16.0.0)
136-
- MaterialComponents/ShadowLayer (16.0.0)
137-
- MaterialComponents/Slider (16.0.0):
135+
- MaterialComponents/ShadowElevations (16.1.0)
136+
- MaterialComponents/ShadowLayer (16.1.0)
137+
- MaterialComponents/Slider (16.1.0):
138138
- MaterialComponents/private/ThumbTrack
139-
- MaterialComponents/Snackbar (16.0.0):
139+
- MaterialComponents/Snackbar (16.1.0):
140140
- MaterialComponents/AnimationTiming
141141
- MaterialComponents/Buttons
142142
- MaterialComponents/OverlayWindow
143143
- MaterialComponents/private/KeyboardWatcher
144144
- MaterialComponents/private/Overlay
145-
- MaterialComponents/SpritedAnimationView (16.0.0)
146-
- MaterialComponents/Switch (16.0.0):
145+
- MaterialComponents/SpritedAnimationView (16.1.0)
146+
- MaterialComponents/Switch (16.1.0):
147147
- MaterialComponents/private/RTL
148148
- MaterialComponents/private/ThumbTrack
149-
- MaterialComponents/Typography (16.0.0)
150-
- MaterialComponentsCatalog (16.0.0):
149+
- MaterialComponents/Typography (16.1.0)
150+
- MaterialComponentsCatalog (16.1.0):
151151
- MaterialComponents
152-
- MaterialComponentsUnitTests (16.0.0):
152+
- MaterialComponentsUnitTests (16.1.0):
153153
- MaterialComponents
154154
- MDFTextAccessibility
155155
- MDFTextAccessibility (1.1.3)
@@ -163,18 +163,18 @@ DEPENDENCIES:
163163

164164
EXTERNAL SOURCES:
165165
MaterialComponents:
166-
:path: ../
166+
:path: "../"
167167
MaterialComponentsCatalog:
168-
:path: ../
168+
:path: "../"
169169
MaterialComponentsUnitTests:
170-
:path: ../
170+
:path: "../"
171171

172172
SPEC CHECKSUMS:
173173
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
174174
EarlGrey: 763d04569f96d910cf17e4fe5aa0d3842e07c0b4
175-
MaterialComponents: 9e8475453d0e5e0da7af16e79f5ba89e1f85cf96
176-
MaterialComponentsCatalog: 3ac8085dae5ca469f9b94e15f3ea0d2b33dc3456
177-
MaterialComponentsUnitTests: c2cd169967f28fe46e851f31a0c1eda37a3d1531
175+
MaterialComponents: 5c73b785d39aa619bbe7c8819596aebedfb3444b
176+
MaterialComponentsCatalog: fbfa56710a1ac11204415211826b264dd7b6f4d0
177+
MaterialComponentsUnitTests: 182574d19a06f8c19aed1434d82a2a4f71717cbe
178178
MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601
179179

180180
PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

‎components/ActivityIndicator/src/MDCActivityIndicator.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ - (void)willMoveToWindow:(UIWindow *)newWindow {
189189
}
190190
}
191191

192+
- (CGSize)intrinsicContentSize {
193+
CGFloat edge = 2 * _radius + _strokeWidth;
194+
return CGSizeMake(edge, edge);
195+
}
196+
192197
#pragma mark - Public methods
193198

194199
- (void)startAnimating {

‎components/Buttons/src/MDCButton.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
/*
6363
Maximum radius of the button's ink. If the radius <= 0 then half the length of the diagonal of
64-
self.bounds is used.
64+
self.bounds is used. This value is ignored if button's @c inkStyle is set to |MDCInkStyleBounded|.
6565
*/
6666
@property(nonatomic, assign) CGFloat inkMaxRippleRadius;
6767

0 commit comments

Comments
 (0)