Skip to content

Commit 544552f

Browse files
ShepJGoogleShepJGoogle
committed
Merge branch 'release-candidate'
2 parents 4dd600a + e1efdea commit 544552f

File tree

27 files changed

+712
-397
lines changed

27 files changed

+712
-397
lines changed

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
# 16.0.0
2+
3+
## API diffs
4+
5+
### InkTouchController
6+
7+
- [deleted] [`MDCInkTouchController.inkView`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Ink/src/MDCInkTouchController.h#L119)
8+
9+
## Component changes
10+
11+
### AppBar
12+
13+
#### Changes
14+
15+
* [Let the content view controller decide orientation](https://github.com/google/material-components-ios/commit/1a3069ff8de8eb406c037a1ff6738093c57efeee) (Louis Romero)
16+
17+
### Dialogs
18+
19+
#### Changes
20+
21+
* [Documentation Updates](https://github.com/google/material-components-ios/commit/f1b983465f304efc52d8c792af19b76d88a4a7b2) (Ian Gordon)
22+
23+
### Ink
24+
25+
#### Changes
26+
27+
* [Remove deprecated inkView property](https://github.com/google/material-components-ios/commit/2ce6d648292b8dcae90241a5c39405bfa368e1e4) (Junius Gunaratne)
28+
* [define UIGestureRecognizerStateRecognized (#751)](https://github.com/google/material-components-ios/commit/4873362130f5d5c1893383dd9f6bfc71506dbbd9) (Junius Gunaratne)
29+
30+
### ShadowElevations
31+
32+
#### Changes
33+
34+
* [Documentation Updates](https://github.com/google/material-components-ios/commit/f1b983465f304efc52d8c792af19b76d88a4a7b2) (Ian Gordon)
35+
36+
### ShadowLayer
37+
38+
#### Changes
39+
40+
* [Documentation Updates](https://github.com/google/material-components-ios/commit/f1b983465f304efc52d8c792af19b76d88a4a7b2) (Ian Gordon)
41+
42+
### Switch
43+
44+
#### Changes
45+
46+
* [Update colours of MDCSwitch when changing tint color. (#758)](https://github.com/google/material-components-ios/commit/6f7b4ebf2b8c0225f02ef27779c204cc181d3abb) (Sylvain Defresne)
47+
* [[MDCSwitch] Update objective-c example to match swift (#777)](https://github.com/google/material-components-ios/commit/ceeba259683892b63c474c6d51f86ee20aae0e07) (Chuck Hays)
48+
49+
50+
151
# 15.2.0
252

353
## 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 = "15.2.0"
5+
s.version = "16.0.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 = "15.2.0"
3+
s.version = "16.0.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.2.0"
3+
s.version = "16.0.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/MDCCatalog.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@
391391
};
392392
664524B21C6BA62A001ADBF8 = {
393393
CreatedOnToolsVersion = 7.3;
394+
DevelopmentTeam = EQHXZ8M8AV;
394395
LastSwiftMigration = 0800;
395396
};
396397
};
@@ -785,6 +786,7 @@
785786
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
786787
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
787788
CLANG_ENABLE_MODULES = YES;
789+
DEVELOPMENT_TEAM = EQHXZ8M8AV;
788790
INFOPLIST_FILE = MDCCatalog/Info.plist;
789791
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
790792
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
@@ -802,6 +804,7 @@
802804
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
803805
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
804806
CLANG_ENABLE_MODULES = YES;
807+
DEVELOPMENT_TEAM = EQHXZ8M8AV;
805808
INFOPLIST_FILE = MDCCatalog/Info.plist;
806809
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
807810
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;

‎catalog/Podfile.lock

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
PODS:
2-
- CatalogByConvention (1.0.1)
3-
- EarlGrey (1.3.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):
2+
- CatalogByConvention (2.0.0)
3+
- 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):
3333
- MaterialComponents/private/RTL
34-
- MaterialComponents/AnimationTiming (15.2.0)
35-
- MaterialComponents/AppBar (15.2.0):
34+
- MaterialComponents/AnimationTiming (16.0.0)
35+
- MaterialComponents/AppBar (16.0.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.2.0):
44+
- MaterialComponents/ButtonBar (16.0.0):
4545
- MaterialComponents/Buttons
4646
- MaterialComponents/private/RTL
47-
- MaterialComponents/Buttons (15.2.0):
47+
- MaterialComponents/Buttons (16.0.0):
4848
- MaterialComponents/Ink
4949
- MaterialComponents/ShadowElevations
5050
- MaterialComponents/ShadowLayer
5151
- MaterialComponents/Typography
5252
- MDFTextAccessibility
53-
- MaterialComponents/CollectionCells (15.2.0):
53+
- MaterialComponents/CollectionCells (16.0.0):
5454
- MaterialComponents/CollectionLayoutAttributes
5555
- MaterialComponents/Ink
5656
- MaterialComponents/private/Icons/ic_check
@@ -61,98 +61,98 @@ PODS:
6161
- MaterialComponents/private/Icons/ic_reorder
6262
- MaterialComponents/private/RTL
6363
- MaterialComponents/Typography
64-
- MaterialComponents/CollectionLayoutAttributes (15.2.0)
65-
- MaterialComponents/Collections (15.2.0):
64+
- MaterialComponents/CollectionLayoutAttributes (16.0.0)
65+
- MaterialComponents/Collections (16.0.0):
6666
- MaterialComponents/CollectionCells
6767
- MaterialComponents/CollectionLayoutAttributes
6868
- MaterialComponents/Ink
6969
- MaterialComponents/ShadowElevations
7070
- MaterialComponents/ShadowLayer
7171
- MaterialComponents/Typography
72-
- MaterialComponents/Dialogs (15.2.0):
72+
- MaterialComponents/Dialogs (16.0.0):
7373
- MaterialComponents/Buttons
7474
- MaterialComponents/private/KeyboardWatcher
7575
- MaterialComponents/ShadowElevations
7676
- MaterialComponents/ShadowLayer
77-
- MaterialComponents/FlexibleHeader (15.2.0):
77+
- MaterialComponents/FlexibleHeader (16.0.0):
7878
- MDFTextAccessibility
79-
- MaterialComponents/FontDiskLoader (15.2.0)
80-
- MaterialComponents/HeaderStackView (15.2.0)
81-
- MaterialComponents/Ink (15.2.0)
82-
- MaterialComponents/NavigationBar (15.2.0):
79+
- MaterialComponents/FontDiskLoader (16.0.0)
80+
- MaterialComponents/HeaderStackView (16.0.0)
81+
- MaterialComponents/Ink (16.0.0)
82+
- MaterialComponents/NavigationBar (16.0.0):
8383
- MaterialComponents/ButtonBar
8484
- MaterialComponents/private/RTL
8585
- MaterialComponents/Typography
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):
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):
108108
- MaterialComponents/private/Icons/Base
109-
- MaterialComponents/private/Icons/ic_check (15.2.0):
109+
- MaterialComponents/private/Icons/ic_check (16.0.0):
110110
- MaterialComponents/private/Icons/Base
111-
- MaterialComponents/private/Icons/ic_check_circle (15.2.0):
111+
- MaterialComponents/private/Icons/ic_check_circle (16.0.0):
112112
- MaterialComponents/private/Icons/Base
113-
- MaterialComponents/private/Icons/ic_chevron_right (15.2.0):
113+
- MaterialComponents/private/Icons/ic_chevron_right (16.0.0):
114114
- MaterialComponents/private/Icons/Base
115-
- MaterialComponents/private/Icons/ic_info (15.2.0):
115+
- MaterialComponents/private/Icons/ic_info (16.0.0):
116116
- MaterialComponents/private/Icons/Base
117-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.2.0):
117+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.0.0):
118118
- MaterialComponents/private/Icons/Base
119-
- MaterialComponents/private/Icons/ic_reorder (15.2.0):
119+
- MaterialComponents/private/Icons/ic_reorder (16.0.0):
120120
- MaterialComponents/private/Icons/Base
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):
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):
125125
- MaterialComponents/Ink
126126
- MaterialComponents/private/Color
127127
- MaterialComponents/ShadowElevations
128128
- MaterialComponents/ShadowLayer
129129
- MaterialComponents/Typography
130-
- MaterialComponents/ProgressView (15.2.0):
130+
- MaterialComponents/ProgressView (16.0.0):
131131
- MaterialComponents/private/RTL
132-
- MaterialComponents/RobotoFontLoader (15.2.0):
132+
- MaterialComponents/RobotoFontLoader (16.0.0):
133133
- MaterialComponents/FontDiskLoader
134134
- MaterialComponents/Typography
135-
- MaterialComponents/ShadowElevations (15.2.0)
136-
- MaterialComponents/ShadowLayer (15.2.0)
137-
- MaterialComponents/Slider (15.2.0):
135+
- MaterialComponents/ShadowElevations (16.0.0)
136+
- MaterialComponents/ShadowLayer (16.0.0)
137+
- MaterialComponents/Slider (16.0.0):
138138
- MaterialComponents/private/ThumbTrack
139-
- MaterialComponents/Snackbar (15.2.0):
139+
- MaterialComponents/Snackbar (16.0.0):
140140
- MaterialComponents/AnimationTiming
141141
- MaterialComponents/Buttons
142142
- MaterialComponents/OverlayWindow
143143
- MaterialComponents/private/KeyboardWatcher
144144
- MaterialComponents/private/Overlay
145-
- MaterialComponents/SpritedAnimationView (15.2.0)
146-
- MaterialComponents/Switch (15.2.0):
145+
- MaterialComponents/SpritedAnimationView (16.0.0)
146+
- MaterialComponents/Switch (16.0.0):
147147
- MaterialComponents/private/RTL
148148
- MaterialComponents/private/ThumbTrack
149-
- MaterialComponents/Typography (15.2.0)
150-
- MaterialComponentsCatalog (15.2.0):
149+
- MaterialComponents/Typography (16.0.0)
150+
- MaterialComponentsCatalog (16.0.0):
151151
- MaterialComponents
152-
- MaterialComponentsUnitTests (15.2.0):
152+
- MaterialComponentsUnitTests (16.0.0):
153153
- MaterialComponents
154154
- MDFTextAccessibility
155-
- MDFTextAccessibility (1.1.1)
155+
- MDFTextAccessibility (1.1.3)
156156

157157
DEPENDENCIES:
158158
- CatalogByConvention
@@ -163,19 +163,19 @@ 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:
173-
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
174-
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
175-
MaterialComponents: afa91c7e2ac6b4de1406035a86dd26fb178a9243
176-
MaterialComponentsCatalog: 9ac9cbaa764b3f5b2e19900ff5e01cbcdadca924
177-
MaterialComponentsUnitTests: d960a72b969898af51f42a8f8bd312e88f327374
178-
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
173+
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
174+
EarlGrey: 763d04569f96d910cf17e4fe5aa0d3842e07c0b4
175+
MaterialComponents: 9e8475453d0e5e0da7af16e79f5ba89e1f85cf96
176+
MaterialComponentsCatalog: 3ac8085dae5ca469f9b94e15f3ea0d2b33dc3456
177+
MaterialComponentsUnitTests: c2cd169967f28fe46e851f31a0c1eda37a3d1531
178+
MDFTextAccessibility: f05246cc165f78733bfad535365807ec6fef9601
179179

180180
PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01
181181

‎components/AppBar/src/MDCAppBarContainerViewController.m

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,16 @@ - (UIStatusBarStyle)preferredStatusBarStyle {
5656
return self.appBar.headerViewController.preferredStatusBarStyle;
5757
}
5858

59+
- (BOOL)shouldAutorotate {
60+
return self.contentViewController.shouldAutorotate;
61+
}
62+
63+
- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
64+
return self.contentViewController.supportedInterfaceOrientations;
65+
}
66+
67+
- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
68+
return self.contentViewController.preferredInterfaceOrientationForPresentation;
69+
}
70+
5971
@end

0 commit comments

Comments
 (0)