Skip to content
This repository was archived by the owner on Dec 11, 2025. It is now read-only.

Commit cdbe7e4

Browse files
randalllirandallli
committed
Merge branch 'release-candidate'
2 parents 2153f8f + e998732 commit cdbe7e4

28 files changed

+389
-353
lines changed

‎CHANGELOG.md‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,71 @@
1+
# 8.0.0
2+
3+
## API diffs
4+
5+
Auto-generated by running the following while checked out at
6+
`4bc99e8ad0fe0ac7e9acc044591a8581165fb5c2`:
7+
8+
scripts/api_diff -o 2153f8fa453ecec4dfe48a328e331846d5d37aac -n bbabb375953fbd01c3f818ac9092b55fe56dd9b9
9+
10+
### AppBar
11+
12+
- [deleted] [`-[MDCAppBarContainerViewController headerViewController]`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/AppBar/src/MDCAppBarContainerViewController.h#L69)
13+
- [deleted] [`MDCAppBarContainerViewController ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/AppBar/src/MDCAppBarContainerViewController.h#L66)
14+
15+
### ButtonBar
16+
17+
- [deleted] [`-[MDCButtonBar reloadButtonViews]`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L166)
18+
- [deleted] [`MDCButtonBar ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L155)
19+
- [deleted] [`MDCButtonBar.buttonItems`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L158)
20+
- [deleted] [`MDCButtonBar.delegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/ButtonBar/src/MDCButtonBar.h#L162)
21+
- [moved] [`MDCButtonBar (Builder)`](https://github.com/google/material-components-ios/blob/bbabb375953fbd01c3f818ac9092b55fe56dd9b9/components/ButtonBar/src/MDCButtonBar.h#L177).
22+
From *MDCButtonBar.h* to *private/MDCButtonBar+Private.h*.
23+
24+
### NavigationBar
25+
26+
- [deleted] [`MDCNavigationBar ()`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L94)
27+
- [deleted] [`MDCNavigationBar.leftButtonBarDelegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L97)
28+
- [deleted] [`MDCNavigationBar.rightButtonBarDelegate`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L101)
29+
- [deleted] [`MDCUINavigationItemKVO`](https://github.com/google/material-components-ios/blob/2153f8fa453ecec4dfe48a328e331846d5d37aac/components/NavigationBar/src/MDCNavigationBar.h#L91)
30+
31+
## Component changes
32+
33+
### AppBar
34+
35+
#### Breaking changes
36+
37+
* [Remove deprecated headerViewController property from MDCAppBarContainerViewController.](https://github.com/google/material-components-ios/commit/dbfc6b783d40e229708af1ee956ded363f621601) (Jeff Verkoeyen)
38+
39+
### ButtonBar
40+
41+
#### Breaking changes
42+
43+
* [Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen)
44+
45+
#### Changes
46+
47+
* [Propagate the NavigationBar tint color to the bar button items.](https://github.com/google/material-components-ios/commit/39bda0a60728a5989971cb0a09ee8d40b7bd4f09) (Louis Romero)
48+
49+
50+
### CollectionCells
51+
52+
#### Changes
53+
54+
* [[Collections|CollectionCells] Updates outdated comments referring to style/editing manager.](https://github.com/google/material-components-ios/commit/120030631e3a695559a49100e62cb7a88502cb3b) (Chris Cox)
55+
56+
### Collections
57+
58+
#### Changes
59+
60+
* [Adds border to editing action bar](https://github.com/google/material-components-ios/commit/3e7ce26bacd4ee94177bf3daab0c03d2281a6723) (Chris Cox)
61+
* [[Collections|CollectionCells] Updates outdated comments referring to style/editing manager.](https://github.com/google/material-components-ios/commit/120030631e3a695559a49100e62cb7a88502cb3b) (Chris Cox)
62+
63+
### NavigationBar
64+
65+
#### Breaking changes
66+
67+
* [[ButtonBar] Remove deprecated APIs.](https://github.com/google/material-components-ios/commit/f7c84317ec01774be169bd3486ebb8a561376250) (Jeff Verkoeyen)
68+
169
# 7.0.0
270

371
## 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 = "7.0.0"
5+
s.version = "8.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 = "7.0.0"
3+
s.version = "8.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 = "7.0.0"
3+
s.version = "8.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"

‎README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ Material Components’ visual style is based on the
44
[material design](http://www.google.com/design/spec/material-design/introduction.html)
55
specification, developed by a team of iOS engineers and UX designers at Google.
66

7+
## Catalog
8+
9+
Catalog is a demonstration application that showcases the Material Components.
10+
11+
### If you haven't checked out the repo yet:
12+
13+
~~~ bash
14+
pod try MaterialComponents
15+
~~~
16+
17+
### If you have checked out the repo:
18+
19+
~~~ bash
20+
pod install --project-directory=catalog/ --no-repo-update
21+
~~~
22+
723
## Quickstart
824

925
### 1. Install CocoaPods

‎catalog/MDCCatalog/MDCNodeListViewController.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ class NodeViewTableViewDemoCell: UITableViewCell {
3131
super.init(coder: coder)!
3232
}
3333

34+
override func prepareForReuse() {
35+
super.prepareForReuse()
36+
textLabel!.textColor = UIColor.blackColor()
37+
imageView!.image = UIImage(named: "Demo")
38+
}
3439
}
3540

3641
class MDCNodeListViewController: CBCNodeListViewController {
@@ -166,7 +171,7 @@ class MDCNodeListViewController: CBCNodeListViewController {
166171
textView.frame = CGRectMake(20,
167172
40,
168173
tableView.frame.size.width - 40,
169-
(MDCTypography.captionFont().lineHeight) * 3)
174+
ceil(MDCTypography.captionFont().lineHeight * 3))
170175
textView.autoresizingMask = .FlexibleWidth
171176
textView.contentInset = UIEdgeInsetsMake(-8, -5, -8, -5)
172177
textView.editable = false

‎catalog/Podfile.lock‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
PODS:
2-
- MaterialComponents (7.0.0):
3-
- MaterialComponents/AppBar (= 7.0.0)
4-
- MaterialComponents/ButtonBar (= 7.0.0)
5-
- MaterialComponents/Buttons (= 7.0.0)
6-
- MaterialComponents/CollectionCells (= 7.0.0)
7-
- MaterialComponents/CollectionLayoutAttributes (= 7.0.0)
8-
- MaterialComponents/Collections (= 7.0.0)
9-
- MaterialComponents/FlexibleHeader (= 7.0.0)
10-
- MaterialComponents/FontDiskLoader (= 7.0.0)
11-
- MaterialComponents/HeaderStackView (= 7.0.0)
12-
- MaterialComponents/Ink (= 7.0.0)
13-
- MaterialComponents/NavigationBar (= 7.0.0)
14-
- MaterialComponents/PageControl (= 7.0.0)
15-
- MaterialComponents/Palettes (= 7.0.0)
16-
- MaterialComponents/private (= 7.0.0)
17-
- MaterialComponents/RobotoFontLoader (= 7.0.0)
18-
- MaterialComponents/ShadowElevations (= 7.0.0)
19-
- MaterialComponents/ShadowLayer (= 7.0.0)
20-
- MaterialComponents/Slider (= 7.0.0)
21-
- MaterialComponents/SpritedAnimationView (= 7.0.0)
22-
- MaterialComponents/Switch (= 7.0.0)
23-
- MaterialComponents/Typography (= 7.0.0)
24-
- MaterialComponents/AppBar (7.0.0):
2+
- MaterialComponents (8.0.0):
3+
- MaterialComponents/AppBar (= 8.0.0)
4+
- MaterialComponents/ButtonBar (= 8.0.0)
5+
- MaterialComponents/Buttons (= 8.0.0)
6+
- MaterialComponents/CollectionCells (= 8.0.0)
7+
- MaterialComponents/CollectionLayoutAttributes (= 8.0.0)
8+
- MaterialComponents/Collections (= 8.0.0)
9+
- MaterialComponents/FlexibleHeader (= 8.0.0)
10+
- MaterialComponents/FontDiskLoader (= 8.0.0)
11+
- MaterialComponents/HeaderStackView (= 8.0.0)
12+
- MaterialComponents/Ink (= 8.0.0)
13+
- MaterialComponents/NavigationBar (= 8.0.0)
14+
- MaterialComponents/PageControl (= 8.0.0)
15+
- MaterialComponents/Palettes (= 8.0.0)
16+
- MaterialComponents/private (= 8.0.0)
17+
- MaterialComponents/RobotoFontLoader (= 8.0.0)
18+
- MaterialComponents/ShadowElevations (= 8.0.0)
19+
- MaterialComponents/ShadowLayer (= 8.0.0)
20+
- MaterialComponents/Slider (= 8.0.0)
21+
- MaterialComponents/SpritedAnimationView (= 8.0.0)
22+
- MaterialComponents/Switch (= 8.0.0)
23+
- MaterialComponents/Typography (= 8.0.0)
24+
- MaterialComponents/AppBar (8.0.0):
2525
- MaterialComponents/FlexibleHeader
2626
- MaterialComponents/HeaderStackView
2727
- MaterialComponents/NavigationBar
2828
- MaterialComponents/private/Icons/ic_arrow_back
2929
- MaterialComponents/ShadowElevations
3030
- MaterialComponents/ShadowLayer
3131
- MaterialComponents/Typography
32-
- MaterialComponents/ButtonBar (7.0.0):
32+
- MaterialComponents/ButtonBar (8.0.0):
3333
- MaterialComponents/Buttons
34-
- MaterialComponents/Buttons (7.0.0):
34+
- MaterialComponents/Buttons (8.0.0):
3535
- MaterialComponents/Ink
3636
- MaterialComponents/ShadowElevations
3737
- MaterialComponents/ShadowLayer
3838
- MaterialComponents/Typography
39-
- MaterialComponents/CollectionCells (7.0.0):
39+
- MaterialComponents/CollectionCells (8.0.0):
4040
- MaterialComponents/CollectionLayoutAttributes
4141
- MaterialComponents/Ink
4242
- MaterialComponents/private/Icons/ic_check
@@ -46,71 +46,71 @@ PODS:
4646
- MaterialComponents/private/Icons/ic_radio_button_unchecked
4747
- MaterialComponents/private/Icons/ic_reorder
4848
- MaterialComponents/Typography
49-
- MaterialComponents/CollectionLayoutAttributes (7.0.0)
50-
- MaterialComponents/Collections (7.0.0):
49+
- MaterialComponents/CollectionLayoutAttributes (8.0.0)
50+
- MaterialComponents/Collections (8.0.0):
5151
- MaterialComponents/CollectionCells
5252
- MaterialComponents/CollectionLayoutAttributes
5353
- MaterialComponents/Ink
5454
- MaterialComponents/ShadowElevations
5555
- MaterialComponents/ShadowLayer
5656
- MaterialComponents/Typography
57-
- MaterialComponents/FlexibleHeader (7.0.0)
58-
- MaterialComponents/FontDiskLoader (7.0.0)
59-
- MaterialComponents/HeaderStackView (7.0.0)
60-
- MaterialComponents/Ink (7.0.0)
61-
- MaterialComponents/NavigationBar (7.0.0):
57+
- MaterialComponents/FlexibleHeader (8.0.0)
58+
- MaterialComponents/FontDiskLoader (8.0.0)
59+
- MaterialComponents/HeaderStackView (8.0.0)
60+
- MaterialComponents/Ink (8.0.0)
61+
- MaterialComponents/NavigationBar (8.0.0):
6262
- MaterialComponents/ButtonBar
6363
- MaterialComponents/Typography
64-
- MaterialComponents/PageControl (7.0.0)
65-
- MaterialComponents/Palettes (7.0.0)
66-
- MaterialComponents/private (7.0.0):
67-
- MaterialComponents/private/Color (= 7.0.0)
68-
- MaterialComponents/private/Icons (= 7.0.0)
69-
- MaterialComponents/private/ThumbTrack (= 7.0.0)
70-
- MaterialComponents/private/Color (7.0.0)
71-
- MaterialComponents/private/Icons (7.0.0):
72-
- MaterialComponents/private/Icons/Base (= 7.0.0)
73-
- MaterialComponents/private/Icons/ic_arrow_back (= 7.0.0)
74-
- MaterialComponents/private/Icons/ic_check (= 7.0.0)
75-
- MaterialComponents/private/Icons/ic_check_circle (= 7.0.0)
76-
- MaterialComponents/private/Icons/ic_chevron_right (= 7.0.0)
77-
- MaterialComponents/private/Icons/ic_info (= 7.0.0)
78-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 7.0.0)
79-
- MaterialComponents/private/Icons/ic_reorder (= 7.0.0)
80-
- MaterialComponents/private/Icons/Base (7.0.0)
81-
- MaterialComponents/private/Icons/ic_arrow_back (7.0.0):
64+
- MaterialComponents/PageControl (8.0.0)
65+
- MaterialComponents/Palettes (8.0.0)
66+
- MaterialComponents/private (8.0.0):
67+
- MaterialComponents/private/Color (= 8.0.0)
68+
- MaterialComponents/private/Icons (= 8.0.0)
69+
- MaterialComponents/private/ThumbTrack (= 8.0.0)
70+
- MaterialComponents/private/Color (8.0.0)
71+
- MaterialComponents/private/Icons (8.0.0):
72+
- MaterialComponents/private/Icons/Base (= 8.0.0)
73+
- MaterialComponents/private/Icons/ic_arrow_back (= 8.0.0)
74+
- MaterialComponents/private/Icons/ic_check (= 8.0.0)
75+
- MaterialComponents/private/Icons/ic_check_circle (= 8.0.0)
76+
- MaterialComponents/private/Icons/ic_chevron_right (= 8.0.0)
77+
- MaterialComponents/private/Icons/ic_info (= 8.0.0)
78+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 8.0.0)
79+
- MaterialComponents/private/Icons/ic_reorder (= 8.0.0)
80+
- MaterialComponents/private/Icons/Base (8.0.0)
81+
- MaterialComponents/private/Icons/ic_arrow_back (8.0.0):
8282
- MaterialComponents/private/Icons/Base
83-
- MaterialComponents/private/Icons/ic_check (7.0.0):
83+
- MaterialComponents/private/Icons/ic_check (8.0.0):
8484
- MaterialComponents/private/Icons/Base
85-
- MaterialComponents/private/Icons/ic_check_circle (7.0.0):
85+
- MaterialComponents/private/Icons/ic_check_circle (8.0.0):
8686
- MaterialComponents/private/Icons/Base
87-
- MaterialComponents/private/Icons/ic_chevron_right (7.0.0):
87+
- MaterialComponents/private/Icons/ic_chevron_right (8.0.0):
8888
- MaterialComponents/private/Icons/Base
89-
- MaterialComponents/private/Icons/ic_info (7.0.0):
89+
- MaterialComponents/private/Icons/ic_info (8.0.0):
9090
- MaterialComponents/private/Icons/Base
91-
- MaterialComponents/private/Icons/ic_radio_button_unchecked (7.0.0):
91+
- MaterialComponents/private/Icons/ic_radio_button_unchecked (8.0.0):
9292
- MaterialComponents/private/Icons/Base
93-
- MaterialComponents/private/Icons/ic_reorder (7.0.0):
93+
- MaterialComponents/private/Icons/ic_reorder (8.0.0):
9494
- MaterialComponents/private/Icons/Base
95-
- MaterialComponents/private/ThumbTrack (7.0.0):
95+
- MaterialComponents/private/ThumbTrack (8.0.0):
9696
- MaterialComponents/Ink
9797
- MaterialComponents/private/Color
9898
- MaterialComponents/ShadowElevations
9999
- MaterialComponents/ShadowLayer
100-
- MaterialComponents/RobotoFontLoader (7.0.0):
100+
- MaterialComponents/RobotoFontLoader (8.0.0):
101101
- MaterialComponents/FontDiskLoader
102102
- MaterialComponents/Typography
103-
- MaterialComponents/ShadowElevations (7.0.0)
104-
- MaterialComponents/ShadowLayer (7.0.0)
105-
- MaterialComponents/Slider (7.0.0):
103+
- MaterialComponents/ShadowElevations (8.0.0)
104+
- MaterialComponents/ShadowLayer (8.0.0)
105+
- MaterialComponents/Slider (8.0.0):
106106
- MaterialComponents/private/ThumbTrack
107-
- MaterialComponents/SpritedAnimationView (7.0.0)
108-
- MaterialComponents/Switch (7.0.0):
107+
- MaterialComponents/SpritedAnimationView (8.0.0)
108+
- MaterialComponents/Switch (8.0.0):
109109
- MaterialComponents/private/ThumbTrack
110-
- MaterialComponents/Typography (7.0.0)
111-
- MaterialComponentsCatalog (7.0.0):
110+
- MaterialComponents/Typography (8.0.0)
111+
- MaterialComponentsCatalog (8.0.0):
112112
- MaterialComponents
113-
- MaterialComponentsUnitTests (7.0.0):
113+
- MaterialComponentsUnitTests (8.0.0):
114114
- MaterialComponents
115115

116116
DEPENDENCIES:
@@ -127,8 +127,8 @@ EXTERNAL SOURCES:
127127
:path: ../
128128

129129
SPEC CHECKSUMS:
130-
MaterialComponents: 849539c9fd0561ea31475c0c0e66232298ea365b
131-
MaterialComponentsCatalog: 2e00536c71df5c61ea8e92a69dc8244a325f5b57
132-
MaterialComponentsUnitTests: 175a3adb1e4992f4de97b4a8ce4c537dd056427c
130+
MaterialComponents: 90bd29126ba886836955104dde0826133b87b6bf
131+
MaterialComponentsCatalog: 28ec795de4429c127bce24d528d0259fa902fe4d
132+
MaterialComponentsUnitTests: 2d5883eb8da10c778cf81b55a24bc025b8c78a62
133133

134134
COCOAPODS: 0.39.0

‎components/AppBar/src/MDCAppBarContainerViewController.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,3 @@
6161
@property(nonatomic, strong, nonnull, readonly) UIViewController *contentViewController;
6262

6363
@end
64-
65-
// clang-format off
66-
@interface MDCAppBarContainerViewController ()
67-
68-
/** @see appBar.headerViewController */
69-
- (nonnull MDCFlexibleHeaderViewController *)headerViewController
70-
__deprecated_msg("Use appBar.headerViewController instead.");
71-
72-
@end
73-
// clang-format on

‎components/AppBar/src/MDCAppBarContainerViewController.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,4 @@ - (UIStatusBarStyle)preferredStatusBarStyle {
7575
return self.appBar.headerViewController.preferredStatusBarStyle;
7676
}
7777

78-
#pragma mark - Public
79-
80-
- (MDCFlexibleHeaderViewController *)headerViewController {
81-
return self.appBar.headerViewController;
82-
}
83-
8478
@end

‎components/ButtonBar/src/MDCButtonBar.h‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -150,39 +150,3 @@ typedef NS_OPTIONS(NSUInteger, MDCBarButtonItemLayoutHints) {
150150
layoutHints:(MDCBarButtonItemLayoutHints)layoutHints;
151151

152152
@end
153-
154-
// clang-format off
155-
@interface MDCButtonBar ()
156-
157-
/** @see items */
158-
@property(nonatomic, copy) NSArray *buttonItems
159-
__deprecated_msg("Use items instead.");
160-
161-
/** The delegate creates button views from UIBarButtonItem instances. */
162-
@property(nonatomic, weak) id<MDCButtonBarDelegate> delegate
163-
__deprecated_msg("This API will be removed in an upcoming release. It now has a default value.");
164-
165-
/** Tells the receiver to rebuild its button views. */
166-
- (void)reloadButtonViews
167-
__deprecated_msg("This API will be removed in an upcoming release.");
168-
169-
@end
170-
171-
/**
172-
Target selector for buttons created from UIBarButtonItems.
173-
174-
See the MDCButtonBarDelegate documentation for more details on how this method
175-
should be used.
176-
*/
177-
@interface MDCButtonBar (Builder)
178-
179-
/**
180-
Finds the corresponding UIBarButtonItem and calls its target/action with the item as the first
181-
parameter.
182-
*/
183-
- (void)didTapButton:(UIButton *)button event:(UIEvent *)event
184-
__deprecated_msg("This API will be removed in an upcoming release.");
185-
186-
@end
187-
188-
// clang-format on

0 commit comments

Comments
 (0)