Skip to content

Commit 4dd600a

Browse files
ajsecordajsecord
committed
Merge branch 'release-candidate'
2 parents 5c8c77b + ece361d commit 4dd600a

23 files changed

+1093
-375
lines changed

‎CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
# 15.2.0
2+
3+
## API diffs
4+
5+
### Palettes
6+
7+
- [new] [`MDCPalette.paletteGeneratedFromColor](https://github.com/google/material-components-ios/blob/fad8519b6a1ba5c29a0368fb470cca3c6da74431/components/Palettes/src/MDCPalettes.h#L137)
8+
9+
## Component changes
10+
11+
### FlexibleHeader
12+
13+
#### Changes
14+
15+
* [MDC_#121 - Added write-up for re-applying swipe to go back feature on MDCFlexibleHeaderController with hidden navigation bar in README.md](https://github.com/google/material-components-ios/commit/1aadd7f468d1d00b7fcbc6c4f9979986229f3df7) (Justin Shephard)
16+
17+
### Ink
18+
19+
#### Changes
20+
21+
* [Added emphasis to reference count warning.](https://github.com/google/material-components-ios/commit/6a7a48a9ebb2cb94cdb253e06298a07132db92bd) (Will Larche)
22+
* [Handling lack of strong reference to ink touch controller in both examples and instructions.](https://github.com/google/material-components-ios/commit/ca5b9a9ef775e06234cec8f64477402d65153670) (Will Larche)
23+
24+
### NavigationBar
25+
26+
#### Changes
27+
28+
* [[NavBar] Corrected mapping of NSTextAlignment to MDCNavigationBarTitleAligment](https://github.com/google/material-components-ios/commit/fdf1ff083d3c27c00263251c7fac5738317ce896) (randallli)
29+
30+
### Palettes
31+
32+
#### Changes
33+
34+
* [Added missing example initializer.](https://github.com/google/material-components-ios/commit/f5378746668facc793bf31c96a27a4e6b47324d3) (Adrian Secord)
35+
* [Generate palettes to match a target color (#729)](https://github.com/google/material-components-ios/commit/fad8519b6a1ba5c29a0368fb470cca3c6da74431) (Adrian Secord)
36+
137
# 15.1.0
238

339
## API diffs

‎MaterialComponents.podspec

Lines changed: 2 additions & 2 deletions
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 = "15.1.0"
5+
s.version = "15.2.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"
@@ -216,7 +216,7 @@ Pod::Spec.new do |s|
216216
s.subspec "Palettes" do |ss|
217217
ss.ios.deployment_target = '7.0'
218218
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
219-
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
219+
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
220220
ss.header_mappings_dir = "components/#{ss.base_name}/src"
221221
end
222222

‎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 = "15.1.0"
3+
s.version = "15.2.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 = "15.1.0"
3+
s.version = "15.2.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: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
PODS:
22
- CatalogByConvention (1.0.1)
33
- EarlGrey (1.3.0)
4-
- MaterialComponents (15.1.0):
5-
- MaterialComponents/ActivityIndicator (= 15.1.0)
6-
- MaterialComponents/AnimationTiming (= 15.1.0)
7-
- MaterialComponents/AppBar (= 15.1.0)
8-
- MaterialComponents/ButtonBar (= 15.1.0)
9-
- MaterialComponents/Buttons (= 15.1.0)
10-
- MaterialComponents/CollectionCells (= 15.1.0)
11-
- MaterialComponents/CollectionLayoutAttributes (= 15.1.0)
12-
- MaterialComponents/Collections (= 15.1.0)
13-
- MaterialComponents/Dialogs (= 15.1.0)
14-
- MaterialComponents/FlexibleHeader (= 15.1.0)
15-
- MaterialComponents/FontDiskLoader (= 15.1.0)
16-
- MaterialComponents/HeaderStackView (= 15.1.0)
17-
- MaterialComponents/Ink (= 15.1.0)
18-
- MaterialComponents/NavigationBar (= 15.1.0)
19-
- MaterialComponents/OverlayWindow (= 15.1.0)
20-
- MaterialComponents/PageControl (= 15.1.0)
21-
- MaterialComponents/Palettes (= 15.1.0)
22-
- MaterialComponents/private (= 15.1.0)
23-
- MaterialComponents/ProgressView (= 15.1.0)
24-
- MaterialComponents/RobotoFontLoader (= 15.1.0)
25-
- MaterialComponents/ShadowElevations (= 15.1.0)
26-
- MaterialComponents/ShadowLayer (= 15.1.0)
27-
- MaterialComponents/Slider (= 15.1.0)
28-
- MaterialComponents/Snackbar (= 15.1.0)
29-
- MaterialComponents/SpritedAnimationView (= 15.1.0)
30-
- MaterialComponents/Switch (= 15.1.0)
31-
- MaterialComponents/Typography (= 15.1.0)
32-
- MaterialComponents/ActivityIndicator (15.1.0):
4+
- MaterialComponents (15.2.0):
5+
- MaterialComponents/ActivityIndicator (= 15.2.0)
6+
- MaterialComponents/AnimationTiming (= 15.2.0)
7+
- MaterialComponents/AppBar (= 15.2.0)
8+
- MaterialComponents/ButtonBar (= 15.2.0)
9+
- MaterialComponents/Buttons (= 15.2.0)
10+
- MaterialComponents/CollectionCells (= 15.2.0)
11+
- MaterialComponents/CollectionLayoutAttributes (= 15.2.0)
12+
- MaterialComponents/Collections (= 15.2.0)
13+
- MaterialComponents/Dialogs (= 15.2.0)
14+
- MaterialComponents/FlexibleHeader (= 15.2.0)
15+
- MaterialComponents/FontDiskLoader (= 15.2.0)
16+
- MaterialComponents/HeaderStackView (= 15.2.0)
17+
- MaterialComponents/Ink (= 15.2.0)
18+
- MaterialComponents/NavigationBar (= 15.2.0)
19+
- MaterialComponents/OverlayWindow (= 15.2.0)
20+
- MaterialComponents/PageControl (= 15.2.0)
21+
- MaterialComponents/Palettes (= 15.2.0)
22+
- MaterialComponents/private (= 15.2.0)
23+
- MaterialComponents/ProgressView (= 15.2.0)
24+
- MaterialComponents/RobotoFontLoader (= 15.2.0)
25+
- MaterialComponents/ShadowElevations (= 15.2.0)
26+
- MaterialComponents/ShadowLayer (= 15.2.0)
27+
- MaterialComponents/Slider (= 15.2.0)
28+
- MaterialComponents/Snackbar (= 15.2.0)
29+
- MaterialComponents/SpritedAnimationView (= 15.2.0)
30+
- MaterialComponents/Switch (= 15.2.0)
31+
- MaterialComponents/Typography (= 15.2.0)
32+
- MaterialComponents/ActivityIndicator (15.2.0):
3333
- MaterialComponents/private/RTL
34-
- MaterialComponents/AnimationTiming (15.1.0)
35-
- MaterialComponents/AppBar (15.1.0):
34+
- MaterialComponents/AnimationTiming (15.2.0)
35+
- MaterialComponents/AppBar (15.2.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 (15.1.0):
44+
- MaterialComponents/ButtonBar (15.2.0):
4545
- MaterialComponents/Buttons
4646
- MaterialComponents/private/RTL
47-
- MaterialComponents/Buttons (15.1.0):
47+
- MaterialComponents/Buttons (15.2.0):
4848
- MaterialComponents/Ink
4949
- MaterialComponents/ShadowElevations
5050
- MaterialComponents/ShadowLayer
5151
- MaterialComponents/Typography
5252
- MDFTextAccessibility
53-
- MaterialComponents/CollectionCells (15.1.0):
53+
- MaterialComponents/CollectionCells (15.2.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 (15.1.0)
65-
- MaterialComponents/Collections (15.1.0):
64+
- MaterialComponents/CollectionLayoutAttributes (15.2.0)
65+
- MaterialComponents/Collections (15.2.0):
6666
- MaterialComponents/CollectionCells
6767
- MaterialComponents/CollectionLayoutAttributes
6868
- MaterialComponents/Ink
6969
- MaterialComponents/ShadowElevations
7070
- MaterialComponents/ShadowLayer
7171
- MaterialComponents/Typography
72-
- MaterialComponents/Dialogs (15.1.0):
72+
- MaterialComponents/Dialogs (15.2.0):
7373
- MaterialComponents/Buttons
7474
- MaterialComponents/private/KeyboardWatcher
7575
- MaterialComponents/ShadowElevations
7676
- MaterialComponents/ShadowLayer
77-
- MaterialComponents/FlexibleHeader (15.1.0):
77+
- MaterialComponents/FlexibleHeader (15.2.0):
7878
- MDFTextAccessibility
79-
- MaterialComponents/FontDiskLoader (15.1.0)
80-
- MaterialComponents/HeaderStackView (15.1.0)
81-
- MaterialComponents/Ink (15.1.0)
82-
- MaterialComponents/NavigationBar (15.1.0):
79+
- MaterialComponents/FontDiskLoader (15.2.0)
80+
- MaterialComponents/HeaderStackView (15.2.0)
81+
- MaterialComponents/Ink (15.2.0)
82+
- MaterialComponents/NavigationBar (15.2.0):
8383
- MaterialComponents/ButtonBar
8484
- MaterialComponents/private/RTL
8585
- MaterialComponents/Typography
86-
- MaterialComponents/OverlayWindow (15.1.0)
87-
- MaterialComponents/PageControl (15.1.0)
88-
- MaterialComponents/Palettes (15.1.0)
89-
- MaterialComponents/private (15.1.0):
90-
- MaterialComponents/private/Color (= 15.1.0)
91-
- MaterialComponents/private/Icons (= 15.1.0)
92-
- MaterialComponents/private/KeyboardWatcher (= 15.1.0)
93-
- MaterialComponents/private/Overlay (= 15.1.0)
94-
- MaterialComponents/private/RTL (= 15.1.0)
95-
- MaterialComponents/private/ThumbTrack (= 15.1.0)
96-
- MaterialComponents/private/Color (15.1.0)
97-
- MaterialComponents/private/Icons (15.1.0):
98-
- MaterialComponents/private/Icons/Base (= 15.1.0)
99-
- MaterialComponents/private/Icons/ic_arrow_back (= 15.1.0)
100-
- MaterialComponents/private/Icons/ic_check (= 15.1.0)
101-
- MaterialComponents/private/Icons/ic_check_circle (= 15.1.0)
102-
- MaterialComponents/private/Icons/ic_chevron_right (= 15.1.0)
103-
- MaterialComponents/private/Icons/ic_info (= 15.1.0)
104-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.1.0)
105-
- MaterialComponents/private/Icons/ic_reorder (= 15.1.0)
106-
- MaterialComponents/private/Icons/Base (15.1.0)
107-
- MaterialComponents/private/Icons/ic_arrow_back (15.1.0):
86+
- MaterialComponents/OverlayWindow (15.2.0)
87+
- MaterialComponents/PageControl (15.2.0)
88+
- MaterialComponents/Palettes (15.2.0)
89+
- MaterialComponents/private (15.2.0):
90+
- MaterialComponents/private/Color (= 15.2.0)
91+
- MaterialComponents/private/Icons (= 15.2.0)
92+
- MaterialComponents/private/KeyboardWatcher (= 15.2.0)
93+
- MaterialComponents/private/Overlay (= 15.2.0)
94+
- MaterialComponents/private/RTL (= 15.2.0)
95+
- MaterialComponents/private/ThumbTrack (= 15.2.0)
96+
- MaterialComponents/private/Color (15.2.0)
97+
- MaterialComponents/private/Icons (15.2.0):
98+
- MaterialComponents/private/Icons/Base (= 15.2.0)
99+
- MaterialComponents/private/Icons/ic_arrow_back (= 15.2.0)
100+
- MaterialComponents/private/Icons/ic_check (= 15.2.0)
101+
- MaterialComponents/private/Icons/ic_check_circle (= 15.2.0)
102+
- MaterialComponents/private/Icons/ic_chevron_right (= 15.2.0)
103+
- MaterialComponents/private/Icons/ic_info (= 15.2.0)
104+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.2.0)
105+
- MaterialComponents/private/Icons/ic_reorder (= 15.2.0)
106+
- MaterialComponents/private/Icons/Base (15.2.0)
107+
- MaterialComponents/private/Icons/ic_arrow_back (15.2.0):
108108
- MaterialComponents/private/Icons/Base
109-
- MaterialComponents/private/Icons/ic_check (15.1.0):
109+
- MaterialComponents/private/Icons/ic_check (15.2.0):
110110
- MaterialComponents/private/Icons/Base
111-
- MaterialComponents/private/Icons/ic_check_circle (15.1.0):
111+
- MaterialComponents/private/Icons/ic_check_circle (15.2.0):
112112
- MaterialComponents/private/Icons/Base
113-
- MaterialComponents/private/Icons/ic_chevron_right (15.1.0):
113+
- MaterialComponents/private/Icons/ic_chevron_right (15.2.0):
114114
- MaterialComponents/private/Icons/Base
115-
- MaterialComponents/private/Icons/ic_info (15.1.0):
115+
- MaterialComponents/private/Icons/ic_info (15.2.0):
116116
- MaterialComponents/private/Icons/Base
117-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.1.0):
117+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.2.0):
118118
- MaterialComponents/private/Icons/Base
119-
- MaterialComponents/private/Icons/ic_reorder (15.1.0):
119+
- MaterialComponents/private/Icons/ic_reorder (15.2.0):
120120
- MaterialComponents/private/Icons/Base
121-
- MaterialComponents/private/KeyboardWatcher (15.1.0)
122-
- MaterialComponents/private/Overlay (15.1.0)
123-
- MaterialComponents/private/RTL (15.1.0)
124-
- MaterialComponents/private/ThumbTrack (15.1.0):
121+
- MaterialComponents/private/KeyboardWatcher (15.2.0)
122+
- MaterialComponents/private/Overlay (15.2.0)
123+
- MaterialComponents/private/RTL (15.2.0)
124+
- MaterialComponents/private/ThumbTrack (15.2.0):
125125
- MaterialComponents/Ink
126126
- MaterialComponents/private/Color
127127
- MaterialComponents/ShadowElevations
128128
- MaterialComponents/ShadowLayer
129129
- MaterialComponents/Typography
130-
- MaterialComponents/ProgressView (15.1.0):
130+
- MaterialComponents/ProgressView (15.2.0):
131131
- MaterialComponents/private/RTL
132-
- MaterialComponents/RobotoFontLoader (15.1.0):
132+
- MaterialComponents/RobotoFontLoader (15.2.0):
133133
- MaterialComponents/FontDiskLoader
134134
- MaterialComponents/Typography
135-
- MaterialComponents/ShadowElevations (15.1.0)
136-
- MaterialComponents/ShadowLayer (15.1.0)
137-
- MaterialComponents/Slider (15.1.0):
135+
- MaterialComponents/ShadowElevations (15.2.0)
136+
- MaterialComponents/ShadowLayer (15.2.0)
137+
- MaterialComponents/Slider (15.2.0):
138138
- MaterialComponents/private/ThumbTrack
139-
- MaterialComponents/Snackbar (15.1.0):
139+
- MaterialComponents/Snackbar (15.2.0):
140140
- MaterialComponents/AnimationTiming
141141
- MaterialComponents/Buttons
142142
- MaterialComponents/OverlayWindow
143143
- MaterialComponents/private/KeyboardWatcher
144144
- MaterialComponents/private/Overlay
145-
- MaterialComponents/SpritedAnimationView (15.1.0)
146-
- MaterialComponents/Switch (15.1.0):
145+
- MaterialComponents/SpritedAnimationView (15.2.0)
146+
- MaterialComponents/Switch (15.2.0):
147147
- MaterialComponents/private/RTL
148148
- MaterialComponents/private/ThumbTrack
149-
- MaterialComponents/Typography (15.1.0)
150-
- MaterialComponentsCatalog (15.1.0):
149+
- MaterialComponents/Typography (15.2.0)
150+
- MaterialComponentsCatalog (15.2.0):
151151
- MaterialComponents
152-
- MaterialComponentsUnitTests (15.1.0):
152+
- MaterialComponentsUnitTests (15.2.0):
153153
- MaterialComponents
154154
- MDFTextAccessibility
155155
- MDFTextAccessibility (1.1.1)
@@ -172,9 +172,9 @@ EXTERNAL SOURCES:
172172
SPEC CHECKSUMS:
173173
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
174174
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
175-
MaterialComponents: 6a31779376e67f6422ce3d391e053dc1d43b6785
176-
MaterialComponentsCatalog: b6d8151b3e62ef2ad650969f850ed520e938bec6
177-
MaterialComponentsUnitTests: d06fda653cfc7dfc746b4e694184300fc5aaf339
175+
MaterialComponents: afa91c7e2ac6b4de1406035a86dd26fb178a9243
176+
MaterialComponentsCatalog: 9ac9cbaa764b3f5b2e19900ff5e01cbcdadca924
177+
MaterialComponentsUnitTests: d960a72b969898af51f42a8f8bd312e88f327374
178178
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
179179

180180
PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

0 commit comments

Comments
 (0)