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

Commit ec923ed

Browse files
committed
Merge branch 'release-candidate'
2 parents 5ba368f + f54d33f commit ec923ed

File tree

56 files changed

+1584
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1584
-268
lines changed

CHANGELOG.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,69 @@
1+
# 12.1.0
2+
3+
## API diffs
4+
5+
### NavigationBar
6+
7+
- [new] [`MDCNavigationBar.titleTextAttributes`](https://github.com/google/material-components-ios/blob/4687c48a55316f2ff6aa6ea5edeb73ea3a3173c5/components/NavigationBar/src/MDCNavigationBar.h#L71)
8+
9+
### ProgressView
10+
11+
**New component.**
12+
13+
## Component changes
14+
15+
### ActivityIndicator
16+
17+
#### Changes
18+
19+
* [Added missing Jazzy configs by running scripts/generate_jazzy_yamls.sh.](https://github.com/google/material-components-ios/commit/2b8ef4160fdafd9d103b09c6842d647d41b00780) (Adrian Secord)
20+
21+
### Collections
22+
23+
#### Changes
24+
25+
* [Add more conformances to CAAnimationDelegate on iOS 10 SDK](https://github.com/google/material-components-ios/commit/8f4a71ea54ff2a7ae01850109919181474bd8104) (Brian Moore)
26+
* [Adds storyboard example.](https://github.com/google/material-components-ios/commit/627206634f45721c547eec155f4426c59f5fb2e5) (Chris Cox)
27+
28+
### Ink
29+
30+
#### Changes
31+
32+
* [Add conformances to CAAnimationDelegate on iOS 10 SDK](https://github.com/google/material-components-ios/commit/d4ee92a107ebc3d0801cb62d60e5b38e06c9a1dc) (Brian Moore)
33+
34+
### NavigationBar
35+
36+
#### Changes
37+
38+
* [MDC_#623 - Added titleTextAttributes property to MDCNavigationBar](https://github.com/google/material-components-ios/commit/1309e628b6aac1e5e83a2e19759e45edb787e061) (Justin Shephard)
39+
40+
### OverlayWindow
41+
42+
#### Changes
43+
44+
* [Added missing Jazzy configs by running scripts/generate_jazzy_yamls.sh.](https://github.com/google/material-components-ios/commit/2b8ef4160fdafd9d103b09c6842d647d41b00780) (Adrian Secord)
45+
46+
### Palettes
47+
48+
#### Changes
49+
50+
* [Added missing Jazzy configs by running scripts/generate_jazzy_yamls.sh.](https://github.com/google/material-components-ios/commit/2b8ef4160fdafd9d103b09c6842d647d41b00780) (Adrian Secord)
51+
52+
### ProgressView
53+
54+
#### Changes
55+
56+
* [Add the ProgressView component.](https://github.com/google/material-components-ios/commit/a806413bd6414f684899c9a0fae10c3fc8aa54fd) (Louis Romero)
57+
58+
### Snackbar
59+
60+
#### Changes
61+
62+
* [Add more conformances to CAAnimationDelegate on iOS 10 SDK](https://github.com/google/material-components-ios/commit/8f4a71ea54ff2a7ae01850109919181474bd8104) (Brian Moore)
63+
* [Added missing Jazzy configs by running scripts/generate_jazzy_yamls.sh.](https://github.com/google/material-components-ios/commit/2b8ef4160fdafd9d103b09c6842d647d41b00780) (Adrian Secord)
64+
* [Align text correctly in RTL layout](https://github.com/google/material-components-ios/commit/112ff5446f567374324e5e7c685625f7ada238bd) (Louis Romero)
65+
* [The button a11y identifier is the action's](https://github.com/google/material-components-ios/commit/b92d724d906f6c0f072bca17f92177db819651c5) (Louis Romero)
66+
167
# 12.0.1
268

369
## API diffs

MaterialComponents.podspec

Lines changed: 9 additions & 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 = "12.0.1"
5+
s.version = "12.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"
@@ -183,6 +183,14 @@ Pod::Spec.new do |s|
183183
ss.header_mappings_dir = "components/#{ss.base_name}/src"
184184
end
185185

186+
s.subspec "ProgressView" do |ss|
187+
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
188+
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
189+
ss.header_mappings_dir = "components/#{ss.base_name}/src"
190+
191+
ss.dependency "MaterialComponents/private/RTL"
192+
end
193+
186194
s.subspec "RobotoFontLoader" do |ss|
187195
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
188196
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"

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 = "12.0.1"
3+
s.version = "12.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 = "12.0.1"
3+
s.version = "12.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"

ROADMAP.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
For the coming months, the Material Components iOS team is focused on developing the following
22
components:
33

4-
- HUD
5-
- Textfields
6-
- ActivityIndicator
7-
- ProgressBar
4+
High priority:
5+
- Snackbar
6+
- Text fields
7+
- Progress and Activity Indicator
8+
- Dialogs
9+
- Animation Curves
10+
11+
Next priority:
12+
- Tabs
13+
- Bottom Navigation
14+
- Bottom Sheets
15+
- Chips
16+
- Date and Time Pickers
17+
818

919
For suggestions, please [file a GitHub issue](https://github.com/google/material-components-ios/issues).

catalog/CatalogByConvention/example/CatalogUnitTests.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 = "CatalogUnitTests"
3-
s.version = "1.0.0"
3+
s.version = "12.1.0"
44
s.summary = "Convention specification for the catalog examples."
55
s.homepage = "https://github.com/google/catalog-by-convention"
66
s.authors = "Google Inc."

catalog/CatalogByConvention/example/catalog/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
22
- CatalogByConvention (1.0.0)
33
- CatalogExamples (1.0.0)
4-
- CatalogUnitTests (1.0.0)
5-
- Resistor (1.0.0)
4+
- CatalogUnitTests (12.1.0)
5+
- Resistor (12.1.0)
66

77
DEPENDENCIES:
88
- CatalogByConvention (from `../../`)
@@ -23,8 +23,8 @@ EXTERNAL SOURCES:
2323
SPEC CHECKSUMS:
2424
CatalogByConvention: 0137d280781667dd3d856a14cdf507f5ac8eedc0
2525
CatalogExamples: 27e215f180dff5c7753195a54819086512fca89c
26-
CatalogUnitTests: a6fd65fa28a9ac14d49a66418848cb626d9ae49f
27-
Resistor: 36a9ae98666be3b4f34d8133fad442fa87fdbce2
26+
CatalogUnitTests: b4134d2a704fbbdaa60fe24c93e24f6c7e7e4091
27+
Resistor: 6951c0267af3e254ae388711e391afaad598c737
2828

2929
PODFILE CHECKSUM: f14a477885bb971999b5fa8afb20a539b2bcabdc
3030

catalog/CatalogByConvention/example/components/Resistor/Resistor.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 = "Resistor"
3-
s.version = "1.0.0"
3+
s.version = "12.1.0"
44
s.summary = "An example component."
55
s.homepage = "https://github.com/google/catalog-by-convention"
66
s.authors = "Google Inc."

catalog/MDCCatalog/MDCCatalogComponentsController.swift

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,44 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
8989
width: containerView.bounds.size.width,
9090
height: titleSize.height)
9191
titleLabel.autoresizingMask = [.FlexibleTopMargin, .FlexibleWidth]
92+
titleLabel.translatesAutoresizingMaskIntoConstraints = false
9293

9394
containerView.addSubview(titleLabel)
95+
_ = NSLayoutConstraint(
96+
item: titleLabel,
97+
attribute: .Leading,
98+
relatedBy: .Equal,
99+
toItem: containerView,
100+
attribute: .Leading,
101+
multiplier: 1.0,
102+
constant: titleInsets.left).active = true
103+
104+
_ = NSLayoutConstraint(
105+
item: titleLabel,
106+
attribute: .Trailing,
107+
relatedBy: .Equal,
108+
toItem: containerView,
109+
attribute: .Trailing,
110+
multiplier: 1.0,
111+
constant: 0).active = true
112+
113+
_ = NSLayoutConstraint(
114+
item: titleLabel,
115+
attribute: .Bottom,
116+
relatedBy: .Equal,
117+
toItem: containerView,
118+
attribute: .Bottom,
119+
multiplier: 1.0,
120+
constant: -titleInsets.bottom).active = true
121+
122+
_ = NSLayoutConstraint(
123+
item: titleLabel,
124+
attribute: .Height,
125+
relatedBy: .Equal,
126+
toItem: nil,
127+
attribute: .NotAnAttribute,
128+
multiplier: 1.0,
129+
constant: titleSize.height).active = true
94130

95131
self.headerViewController.headerView.addSubview(containerView)
96132

catalog/MDCCatalog/MDCCatalogTileDataActivityIndicator.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ + (UIImage*)drawTileImage:(CGRect)frame {
2626
}
2727

2828
/* Auto-generated code using PaintCode and formatted with clang-format. */
29+
#pragma clang diagnostic push
30+
#pragma clang diagnostic ignored "-Wconversion"
2931
+ (void)draw:(CGRect)frame {
3032
UIColor* fillColor = [UIColor colorWithRed:0 green:0.655 blue:0.969 alpha:1];
3133

@@ -67,5 +69,6 @@ + (void)draw:(CGRect)frame {
6769
[fillColor setFill];
6870
[bezierPath fill];
6971
}
72+
#pragma clang diagnostic pop
7073

7174
@end

0 commit comments

Comments
 (0)