Skip to content

Commit 2035625

Browse files
ajsecordajsecord
committed
Merge branch 'release-candidate'
2 parents 1926458 + 3118c37 commit 2035625

38 files changed

+924
-434
lines changed

‎.arcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
"coverage": {
2222
"product": "MaterialComponents.framework/MaterialComponents"
2323
},
24-
"pre-build": "pod install --project-directory=catalog/ --no-repo-update"
24+
"pre-build": "pushd catalog; pod install; popd"
2525
}
2626
}

‎CHANGELOG.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,79 @@
1+
# 15.0.0
2+
3+
## API diffs
4+
5+
Auto-generated by running:
6+
7+
scripts/api_diff -o 1926458f491c928adfb573a6eda38b6d5b5bc55e -n c39811a2344114302327b6fa64d86346bacbea9a
8+
9+
### Dialogs
10+
11+
- [new] [`MDCDialogPresentationController.dismissOnBackgroundTap`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Dialogs/src/MDCDialogPresentationController.h#L47)
12+
- [new] [`UIViewController (MaterialDialogs)`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Dialogs/src/UIViewController+MaterialDialogs.h#L28)
13+
- [new] [`UIViewController.mdc_dialogPresentationController`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Dialogs/src/UIViewController+MaterialDialogs.h#L35)
14+
15+
### Ink
16+
17+
- [new] [`MDCInkTouchController.gestureRecognizer`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Ink/src/MDCInkTouchController.h#L73)
18+
19+
### NavigationBar
20+
21+
- [new] [`MDCNavigationBar.textAlignment`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/NavigationBar/src/MDCNavigationBar.h#L110)
22+
23+
### Switch
24+
25+
- [protocols changed] [`MDCSwitch`](https://github.com/google/material-components-ios/blob/c39811a2344114302327b6fa64d86346bacbea9a/components/Switch/src/MDCSwitch.h#L32).
26+
Removed *NSCoding*.
27+
Added *NSSecureCoding*.
28+
29+
## Component changes
30+
31+
### Collections
32+
33+
#### Changes
34+
35+
* [- Added autoscroll functionality to MDCCollectionViewEditor class](https://github.com/google/material-components-ios/commit/54e319f6ab8ed52bb7e6810d3fae3c7829396f75) (Justin Shephard)
36+
37+
### Dialogs
38+
39+
#### Changes
40+
41+
* [Add disable background dismiss property](https://github.com/google/material-components-ios/commit/0e3b8b2a3521ebc3961df0938e8089b9969e9fa9) (Ian Gordon)
42+
* [[Catalog] Restore Xcode 7 compatibility](https://github.com/google/material-components-ios/commit/7f596f6f2a82bf13e1392a3611ff885c04ce3c1e) (Ian Gordon)
43+
44+
### Ink
45+
46+
#### Changes
47+
48+
* [Expose ink gesture recognizer in MDCInkTouchController, prevent inkLayer color from being set to nil](https://github.com/google/material-components-ios/commit/868fa6677d6b4a9dd05e7231ce35fd693ecf3d97) (Junius Gunaratne)
49+
50+
### NavigationBar
51+
52+
#### Changes
53+
54+
* [[MDCNavigationBar] Add ability to center title based on iOS design guidelines](https://github.com/google/material-components-ios/commit/2afee9916a8ca37706d408b46e3fe64100cd56db) (randallli)
55+
56+
### Slider
57+
58+
#### Changes
59+
60+
* [Change MDCSlider and MDCSwitch to use NSSecureCoding](https://github.com/google/material-components-ios/commit/19a06ed4251e66f04e9fe8a0184e0937066270e0) (Sam Morrison)
61+
* [MDC_#767 - Removed bad import and changed public delegate declaration of MDCThumbTrackDelegate to private.](https://github.com/google/material-components-ios/commit/4a7ee8154e7b175c91715b4f53217decabdb12ee) (Justin Shephard)
62+
63+
### Snackbar
64+
65+
#### Changes
66+
67+
* [Fix incorrect type annotation found by clang static analyzer. (#700)](https://github.com/google/material-components-ios/commit/e92b8bcecaaa9ad8347ee1eaba944cd37edeefa2) (Sylvain Defresne)
68+
69+
### Switch
70+
71+
#### Changes
72+
73+
* [Change MDCSlider and MDCSwitch to use NSSecureCoding](https://github.com/google/material-components-ios/commit/19a06ed4251e66f04e9fe8a0184e0937066270e0) (Sam Morrison)
74+
* [Fixed Xcode 7 analyzer warnings about leaking CGPaths in MDCSwitch.](https://github.com/google/material-components-ios/commit/c2b4b3d258add88da728ed5016b50f94ef72ceff) (Adrian Secord)
75+
* [[MDCSwitch] Only dispatch control events for user generated changes](https://github.com/google/material-components-ios/commit/90d54bcd555495aaa2c0a038b26e032636a00377) (Sam Morrison)
76+
177
# 14.0.0
278

379
## 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 = "14.0.0"
5+
s.version = "15.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 = "14.0.0"
3+
s.version = "15.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 = "14.0.0"
3+
s.version = "15.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/MDCNodeListViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
7777

7878
self.addChildViewController(appBar.headerViewController)
7979
appBar.headerViewController.headerView.backgroundColor = UIColor.whiteColor()
80+
appBar.navigationBar.textAlignment = .Center
8081
}
8182

8283
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
@@ -315,6 +316,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
315316
vc = contentVC
316317
} else {
317318
let container = MDCAppBarContainerViewController(contentViewController: contentVC)
319+
container.appBar.navigationBar.textAlignment = .Center
318320

319321
// TODO(featherless): Remove once
320322
// https://github.com/google/material-components-ios/issues/367 is resolved.

‎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 (14.0.0):
5-
- MaterialComponents/ActivityIndicator (= 14.0.0)
6-
- MaterialComponents/AnimationTiming (= 14.0.0)
7-
- MaterialComponents/AppBar (= 14.0.0)
8-
- MaterialComponents/ButtonBar (= 14.0.0)
9-
- MaterialComponents/Buttons (= 14.0.0)
10-
- MaterialComponents/CollectionCells (= 14.0.0)
11-
- MaterialComponents/CollectionLayoutAttributes (= 14.0.0)
12-
- MaterialComponents/Collections (= 14.0.0)
13-
- MaterialComponents/Dialogs (= 14.0.0)
14-
- MaterialComponents/FlexibleHeader (= 14.0.0)
15-
- MaterialComponents/FontDiskLoader (= 14.0.0)
16-
- MaterialComponents/HeaderStackView (= 14.0.0)
17-
- MaterialComponents/Ink (= 14.0.0)
18-
- MaterialComponents/NavigationBar (= 14.0.0)
19-
- MaterialComponents/OverlayWindow (= 14.0.0)
20-
- MaterialComponents/PageControl (= 14.0.0)
21-
- MaterialComponents/Palettes (= 14.0.0)
22-
- MaterialComponents/private (= 14.0.0)
23-
- MaterialComponents/ProgressView (= 14.0.0)
24-
- MaterialComponents/RobotoFontLoader (= 14.0.0)
25-
- MaterialComponents/ShadowElevations (= 14.0.0)
26-
- MaterialComponents/ShadowLayer (= 14.0.0)
27-
- MaterialComponents/Slider (= 14.0.0)
28-
- MaterialComponents/Snackbar (= 14.0.0)
29-
- MaterialComponents/SpritedAnimationView (= 14.0.0)
30-
- MaterialComponents/Switch (= 14.0.0)
31-
- MaterialComponents/Typography (= 14.0.0)
32-
- MaterialComponents/ActivityIndicator (14.0.0):
4+
- MaterialComponents (15.0.0):
5+
- MaterialComponents/ActivityIndicator (= 15.0.0)
6+
- MaterialComponents/AnimationTiming (= 15.0.0)
7+
- MaterialComponents/AppBar (= 15.0.0)
8+
- MaterialComponents/ButtonBar (= 15.0.0)
9+
- MaterialComponents/Buttons (= 15.0.0)
10+
- MaterialComponents/CollectionCells (= 15.0.0)
11+
- MaterialComponents/CollectionLayoutAttributes (= 15.0.0)
12+
- MaterialComponents/Collections (= 15.0.0)
13+
- MaterialComponents/Dialogs (= 15.0.0)
14+
- MaterialComponents/FlexibleHeader (= 15.0.0)
15+
- MaterialComponents/FontDiskLoader (= 15.0.0)
16+
- MaterialComponents/HeaderStackView (= 15.0.0)
17+
- MaterialComponents/Ink (= 15.0.0)
18+
- MaterialComponents/NavigationBar (= 15.0.0)
19+
- MaterialComponents/OverlayWindow (= 15.0.0)
20+
- MaterialComponents/PageControl (= 15.0.0)
21+
- MaterialComponents/Palettes (= 15.0.0)
22+
- MaterialComponents/private (= 15.0.0)
23+
- MaterialComponents/ProgressView (= 15.0.0)
24+
- MaterialComponents/RobotoFontLoader (= 15.0.0)
25+
- MaterialComponents/ShadowElevations (= 15.0.0)
26+
- MaterialComponents/ShadowLayer (= 15.0.0)
27+
- MaterialComponents/Slider (= 15.0.0)
28+
- MaterialComponents/Snackbar (= 15.0.0)
29+
- MaterialComponents/SpritedAnimationView (= 15.0.0)
30+
- MaterialComponents/Switch (= 15.0.0)
31+
- MaterialComponents/Typography (= 15.0.0)
32+
- MaterialComponents/ActivityIndicator (15.0.0):
3333
- MaterialComponents/private/RTL
34-
- MaterialComponents/AnimationTiming (14.0.0)
35-
- MaterialComponents/AppBar (14.0.0):
34+
- MaterialComponents/AnimationTiming (15.0.0)
35+
- MaterialComponents/AppBar (15.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 (14.0.0):
44+
- MaterialComponents/ButtonBar (15.0.0):
4545
- MaterialComponents/Buttons
4646
- MaterialComponents/private/RTL
47-
- MaterialComponents/Buttons (14.0.0):
47+
- MaterialComponents/Buttons (15.0.0):
4848
- MaterialComponents/Ink
4949
- MaterialComponents/ShadowElevations
5050
- MaterialComponents/ShadowLayer
5151
- MaterialComponents/Typography
5252
- MDFTextAccessibility
53-
- MaterialComponents/CollectionCells (14.0.0):
53+
- MaterialComponents/CollectionCells (15.0.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 (14.0.0)
65-
- MaterialComponents/Collections (14.0.0):
64+
- MaterialComponents/CollectionLayoutAttributes (15.0.0)
65+
- MaterialComponents/Collections (15.0.0):
6666
- MaterialComponents/CollectionCells
6767
- MaterialComponents/CollectionLayoutAttributes
6868
- MaterialComponents/Ink
6969
- MaterialComponents/ShadowElevations
7070
- MaterialComponents/ShadowLayer
7171
- MaterialComponents/Typography
72-
- MaterialComponents/Dialogs (14.0.0):
72+
- MaterialComponents/Dialogs (15.0.0):
7373
- MaterialComponents/Buttons
7474
- MaterialComponents/private/KeyboardWatcher
7575
- MaterialComponents/ShadowElevations
7676
- MaterialComponents/ShadowLayer
77-
- MaterialComponents/FlexibleHeader (14.0.0):
77+
- MaterialComponents/FlexibleHeader (15.0.0):
7878
- MDFTextAccessibility
79-
- MaterialComponents/FontDiskLoader (14.0.0)
80-
- MaterialComponents/HeaderStackView (14.0.0)
81-
- MaterialComponents/Ink (14.0.0)
82-
- MaterialComponents/NavigationBar (14.0.0):
79+
- MaterialComponents/FontDiskLoader (15.0.0)
80+
- MaterialComponents/HeaderStackView (15.0.0)
81+
- MaterialComponents/Ink (15.0.0)
82+
- MaterialComponents/NavigationBar (15.0.0):
8383
- MaterialComponents/ButtonBar
8484
- MaterialComponents/private/RTL
8585
- MaterialComponents/Typography
86-
- MaterialComponents/OverlayWindow (14.0.0)
87-
- MaterialComponents/PageControl (14.0.0)
88-
- MaterialComponents/Palettes (14.0.0)
89-
- MaterialComponents/private (14.0.0):
90-
- MaterialComponents/private/Color (= 14.0.0)
91-
- MaterialComponents/private/Icons (= 14.0.0)
92-
- MaterialComponents/private/KeyboardWatcher (= 14.0.0)
93-
- MaterialComponents/private/Overlay (= 14.0.0)
94-
- MaterialComponents/private/RTL (= 14.0.0)
95-
- MaterialComponents/private/ThumbTrack (= 14.0.0)
96-
- MaterialComponents/private/Color (14.0.0)
97-
- MaterialComponents/private/Icons (14.0.0):
98-
- MaterialComponents/private/Icons/Base (= 14.0.0)
99-
- MaterialComponents/private/Icons/ic_arrow_back (= 14.0.0)
100-
- MaterialComponents/private/Icons/ic_check (= 14.0.0)
101-
- MaterialComponents/private/Icons/ic_check_circle (= 14.0.0)
102-
- MaterialComponents/private/Icons/ic_chevron_right (= 14.0.0)
103-
- MaterialComponents/private/Icons/ic_info (= 14.0.0)
104-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 14.0.0)
105-
- MaterialComponents/private/Icons/ic_reorder (= 14.0.0)
106-
- MaterialComponents/private/Icons/Base (14.0.0)
107-
- MaterialComponents/private/Icons/ic_arrow_back (14.0.0):
86+
- MaterialComponents/OverlayWindow (15.0.0)
87+
- MaterialComponents/PageControl (15.0.0)
88+
- MaterialComponents/Palettes (15.0.0)
89+
- MaterialComponents/private (15.0.0):
90+
- MaterialComponents/private/Color (= 15.0.0)
91+
- MaterialComponents/private/Icons (= 15.0.0)
92+
- MaterialComponents/private/KeyboardWatcher (= 15.0.0)
93+
- MaterialComponents/private/Overlay (= 15.0.0)
94+
- MaterialComponents/private/RTL (= 15.0.0)
95+
- MaterialComponents/private/ThumbTrack (= 15.0.0)
96+
- MaterialComponents/private/Color (15.0.0)
97+
- MaterialComponents/private/Icons (15.0.0):
98+
- MaterialComponents/private/Icons/Base (= 15.0.0)
99+
- MaterialComponents/private/Icons/ic_arrow_back (= 15.0.0)
100+
- MaterialComponents/private/Icons/ic_check (= 15.0.0)
101+
- MaterialComponents/private/Icons/ic_check_circle (= 15.0.0)
102+
- MaterialComponents/private/Icons/ic_chevron_right (= 15.0.0)
103+
- MaterialComponents/private/Icons/ic_info (= 15.0.0)
104+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.0.0)
105+
- MaterialComponents/private/Icons/ic_reorder (= 15.0.0)
106+
- MaterialComponents/private/Icons/Base (15.0.0)
107+
- MaterialComponents/private/Icons/ic_arrow_back (15.0.0):
108108
- MaterialComponents/private/Icons/Base
109-
- MaterialComponents/private/Icons/ic_check (14.0.0):
109+
- MaterialComponents/private/Icons/ic_check (15.0.0):
110110
- MaterialComponents/private/Icons/Base
111-
- MaterialComponents/private/Icons/ic_check_circle (14.0.0):
111+
- MaterialComponents/private/Icons/ic_check_circle (15.0.0):
112112
- MaterialComponents/private/Icons/Base
113-
- MaterialComponents/private/Icons/ic_chevron_right (14.0.0):
113+
- MaterialComponents/private/Icons/ic_chevron_right (15.0.0):
114114
- MaterialComponents/private/Icons/Base
115-
- MaterialComponents/private/Icons/ic_info (14.0.0):
115+
- MaterialComponents/private/Icons/ic_info (15.0.0):
116116
- MaterialComponents/private/Icons/Base
117-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (14.0.0):
117+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.0.0):
118118
- MaterialComponents/private/Icons/Base
119-
- MaterialComponents/private/Icons/ic_reorder (14.0.0):
119+
- MaterialComponents/private/Icons/ic_reorder (15.0.0):
120120
- MaterialComponents/private/Icons/Base
121-
- MaterialComponents/private/KeyboardWatcher (14.0.0)
122-
- MaterialComponents/private/Overlay (14.0.0)
123-
- MaterialComponents/private/RTL (14.0.0)
124-
- MaterialComponents/private/ThumbTrack (14.0.0):
121+
- MaterialComponents/private/KeyboardWatcher (15.0.0)
122+
- MaterialComponents/private/Overlay (15.0.0)
123+
- MaterialComponents/private/RTL (15.0.0)
124+
- MaterialComponents/private/ThumbTrack (15.0.0):
125125
- MaterialComponents/Ink
126126
- MaterialComponents/private/Color
127127
- MaterialComponents/ShadowElevations
128128
- MaterialComponents/ShadowLayer
129129
- MaterialComponents/Typography
130-
- MaterialComponents/ProgressView (14.0.0):
130+
- MaterialComponents/ProgressView (15.0.0):
131131
- MaterialComponents/private/RTL
132-
- MaterialComponents/RobotoFontLoader (14.0.0):
132+
- MaterialComponents/RobotoFontLoader (15.0.0):
133133
- MaterialComponents/FontDiskLoader
134134
- MaterialComponents/Typography
135-
- MaterialComponents/ShadowElevations (14.0.0)
136-
- MaterialComponents/ShadowLayer (14.0.0)
137-
- MaterialComponents/Slider (14.0.0):
135+
- MaterialComponents/ShadowElevations (15.0.0)
136+
- MaterialComponents/ShadowLayer (15.0.0)
137+
- MaterialComponents/Slider (15.0.0):
138138
- MaterialComponents/private/ThumbTrack
139-
- MaterialComponents/Snackbar (14.0.0):
139+
- MaterialComponents/Snackbar (15.0.0):
140140
- MaterialComponents/AnimationTiming
141141
- MaterialComponents/Buttons
142142
- MaterialComponents/OverlayWindow
143143
- MaterialComponents/private/KeyboardWatcher
144144
- MaterialComponents/private/Overlay
145-
- MaterialComponents/SpritedAnimationView (14.0.0)
146-
- MaterialComponents/Switch (14.0.0):
145+
- MaterialComponents/SpritedAnimationView (15.0.0)
146+
- MaterialComponents/Switch (15.0.0):
147147
- MaterialComponents/private/RTL
148148
- MaterialComponents/private/ThumbTrack
149-
- MaterialComponents/Typography (14.0.0)
150-
- MaterialComponentsCatalog (14.0.0):
149+
- MaterialComponents/Typography (15.0.0)
150+
- MaterialComponentsCatalog (15.0.0):
151151
- MaterialComponents
152-
- MaterialComponentsUnitTests (14.0.0):
152+
- MaterialComponentsUnitTests (15.0.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: 2e9e691a79578348d0c1468204387193cd0c0859
176-
MaterialComponentsCatalog: b9884eaca58aa3c5b62b124860362b1f76b9a94f
177-
MaterialComponentsUnitTests: 9bdf33e2cea304a5789a21c17c15e1cf9811cfa6
175+
MaterialComponents: 93b2c5d4ade111902fe63afb293b1d0ff48e4e81
176+
MaterialComponentsCatalog: fe35be22863a94075d9c25b205dead8df53df0ae
177+
MaterialComponentsUnitTests: 5eca3cb1a741ab815a1f820f88119f90696fbdcb
178178
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e
179179

180180
PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

0 commit comments

Comments
 (0)