Skip to content

Commit fea67da

Browse files
committed
Merge branch 'release-candidate' into stable
2 parents 639e5e3 + a40e4ec commit fea67da

File tree

275 files changed

+3771
-2883
lines changed

Some content is hidden

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

275 files changed

+3771
-2883
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ ColumnLimit: 100
99
IndentWrappedFunctionNames: true
1010
ObjCSpaceBeforeProtocolList: true
1111
PointerBindsToType: false
12-
SortIncludes: true
12+
SortIncludes: false

CHANGELOG.md

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,149 @@
1+
# 107.4.0
2+
3+
This minor release includes improvements to Chips, Dialogs, HeaderStackView, ProgressView, NavigationBar, NavigationDrawer, and Tabs.
4+
5+
## New deprecations
6+
7+
### Dialogs
8+
9+
### MDCAlertControllerView
10+
- `titleAlignment`, `messageAlignment`, and `titleIconView` properties have been deprecated.
11+
12+
## API changes
13+
14+
### MDCTabBarView
15+
- The previously private `effectiveLayoutStyle` is now publicly exposed as a readonly property.
16+
17+
## Component changes
18+
19+
### ActionSheet
20+
21+
* [Fix umbrella header imports](https://github.com/material-components/material-components-ios/commit/481aed787781f0d2291e725a2a95be9b0ebbb692) (Bryan Oltman)
22+
* [Move protocol definitions into separate header files (#9926)](https://github.com/material-components/material-components-ios/commit/542261e4059c29ff03c8d20f3638debefac64c94) (copybara-service[bot])
23+
24+
### ActivityIndicator
25+
26+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/ebc52ec3152e63c516bc7ceaf111b469ba13c38d) (Bryan Oltman)
27+
28+
### AppBar
29+
30+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/bf2e9af1a740e29bd262759bbd80ce032c122ba6) (Bryan Oltman)
31+
32+
### BottomNavigation
33+
34+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/b3d6e47e249360a4bac11fa74160afadf4dff7d6) (Bryan Oltman)
35+
36+
### BottomSheet
37+
38+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/7cd01d2fbacc801ba41a261fe46c871179c5acb6) (Bryan Oltman)
39+
* [Remove private header imports from MaterialBottomSheet.h](https://github.com/material-components/material-components-ios/commit/c6a586b72e99f001edb6acf3e45c6b1f34d58f5b) (Bryan Oltman)
40+
41+
### ButtonBar
42+
43+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/0da64e1315738c70d5b7de1b595040c2ffdaa5fc) (Bryan Oltman)
44+
45+
### Chips
46+
47+
* [Add call to invalidateIntrinsicContentSize when text entry moves up or down a line.](https://github.com/material-components/material-components-ios/commit/e4f53d57f47f0627792716fd8e57e33b53d49d6a) (Bryan Oltman)
48+
* [Adds disabling chip example to the Dragons catalog.](https://github.com/material-components/material-components-ios/commit/d9b5a826c826063c75dec945421809b8d30e1637) (Bryan Oltman)
49+
* [Project import generated by Copybara.](https://github.com/material-components/material-components-ios/commit/c97239df854aaf34119024aae5d2a9eba052cc51) (Nobody)
50+
* [Update intrinsicContentSize when text, font, or image change.](https://github.com/material-components/material-components-ios/commit/cfb97206ea2f867ce219f2312fc8a5ebeb871d11) (Cody Weaver)
51+
52+
### Collections
53+
54+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/91856c66ffba91d4b4dbfe9ca8abbe7151b224d5) (Nobody)
55+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/97f26d5767864f49bb0f22d2ef6ce9f18c524736) (Bryan Oltman)
56+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/a245b4468e466bc477d2936365abc4c4aa83d907) (Bryan Oltman)
57+
* [Remove private header imports from MaterialCollections.h](https://github.com/material-components/material-components-ios/commit/41eaca5b962dd22dedbb2cb3f831beb57745a0e4) (Bryan Oltman)
58+
* [Remove private header imports from MaterialCollections.h](https://github.com/material-components/material-components-ios/commit/4d636f111d8bbb9d72b8d0c1cb2bcd23afc69053) (Nobody)
59+
60+
### Dialogs
61+
62+
* [# Problem The current snapshot is inaccurate because there is not enough room to layout all the dialog's elements, so spaces between the elements are inaccurate for many snapshots.](https://github.com/material-components/material-components-ios/commit/5c24a5dcc6a2f1063c7b8e61fcbbee6210773b07) (Galia Kaufman)
63+
* [Add TitleIcon snapshot tests.](https://github.com/material-components/material-components-ios/commit/e79828dc5bf65eb0975398ba03363619558fe2ef) (Galia Kaufman)
64+
* [Custom title icon public API: Flip the priority between title icon and title custom view to mirror UIKit convention.](https://github.com/material-components/material-components-ios/commit/65758b73af4c97551fce65ae4f8bfedd39a360b3) (Iryna Berezan)
65+
* [Fix layout of configuration snapshot test.](https://github.com/material-components/material-components-ios/commit/e2267236b065d0d3f8a171754cce3bbb5036a0d0) (Galia Kaufman)
66+
* [Minor grammatical fix.](https://github.com/material-components/material-components-ios/commit/b377b45dd4f98e9bcc4062aeee9dc0f43b6bf787) (Jeff Verkoeyen)
67+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/8c21f2c8970e99a572482b78ec7779417bd9074e) (Bryan Oltman)
68+
* [Moving non appearance API to private header](https://github.com/material-components/material-components-ios/commit/69d7eaf16fab3fadf3ad5e7d525abeeb955de138) (Galia Kaufman)
69+
* [Refactor titleIconViewSize.](https://github.com/material-components/material-components-ios/commit/7e903a68c3dba12bc246c7a774fdce7b7279ab07) (Galia Kaufman)
70+
* [Support title icon content mode through custom titleIconImageView.](https://github.com/material-components/material-components-ios/commit/73582da9d8872546f6b151331fbb5eee0201b2db) (Galia Kaufman)
71+
* [recalculate alert layout after adding a title icon and title view](https://github.com/material-components/material-components-ios/commit/46f8a2f715044fdca90c96286c61af94b3d66494) (Galia Kaufman)
72+
73+
### FeatureHighlight
74+
75+
* [Minor docs fix.](https://github.com/material-components/material-components-ios/commit/04c7a4b768ed866e7480b59f640dcbc7bf8bfe57) (Jeff Verkoeyen)
76+
77+
### FlexibleHeader
78+
79+
* [Add synonyms to hairline API documentation for increased discovery.](https://github.com/material-components/material-components-ios/commit/fd6d603be8caa9f94c620eea63a0d1132782ecf2) (Jeff Verkoeyen)
80+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/f55a0417b5c3fafcb38572d0dfe554cff68d8192) (Bryan Oltman)
81+
* [Remove imports of private headers from MaterialFlexibleHeader.h](https://github.com/material-components/material-components-ios/commit/02c66a45d8fdacaf3f69881d13abced1a7892a88) (Bryan Oltman)
82+
83+
### HeaderStackView
84+
85+
* [Fix sizeThatFits method for MDCHeaderStackView to take into account both topBar and bottomBar.](https://github.com/material-components/material-components-ios/commit/551b12dbeab5ba0990edb7d4fb9ee1c98d2c0147) (Nobody)
86+
87+
### Ink
88+
89+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/98b464180bef5620eb5c567de37b29e40a45825f) (Bryan Oltman)
90+
91+
### NavigationBar
92+
93+
* [Problem: The title label does not resize in an edge case when the user enables bold text in settings->display & brightness and then opening the app if the title label was already on the screen.](https://github.com/material-components/material-components-ios/commit/8a3118161c18cb98346aa595095134d510ecd934) (Tony Lai)
94+
* [Remove default insets for leading titles.](https://github.com/material-components/material-components-ios/commit/23878968f4f2d18487c580ed3452caa1575773c1) (Jeff Verkoeyen)
95+
96+
### NavigationDrawer
97+
98+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/a5efd6c35034569352a03ac7ee07f6c29b881e2d) (Bryan Oltman)
99+
* [This CL makes it such that when `bottomSafeAreaInsetsToAdjustContainerHeight` is set to YES, for performant scrolling the safe area is respected in calculating the max scroll origin, preventing a safe area presentation issue.](https://github.com/material-components/material-components-ios/commit/5efa798ac349be63acb9768755bf4b6ce2b9928e) (Jake Rockland)
100+
* [This closes b/151091406, which was being caused because the presenting view controller is used to determine the frame of the bottom drawer's scroll view, which caused issues for situations in which the bottom drawer was presented from a modal view controller in the page or form sheet style.](https://github.com/material-components/material-components-ios/commit/800e5b64ec4673e8e9bfadc02be369d9f084685f) (Jake Rockland)
101+
102+
### ProgressView
103+
104+
* [Adding default accessibility label](https://github.com/material-components/material-components-ios/commit/58a181306f5dabb4bbb42f75a479db71b649b3a8) (Nobody)
105+
* [Adding default accessibility label](https://github.com/material-components/material-components-ios/commit/8fe34d13e088105d5b43f264df46032a839b46ce) (Yarden Eitan)
106+
* [Remove MDCProgressViewMotionSpec.](https://github.com/material-components/material-components-ios/commit/ae5515ea4ae94d8bf068d2f622493dc6eebdf619) (Wenyu Zhang)
107+
108+
### Ripple
109+
110+
* [Migrates Ripple to MDCAvailability.](https://github.com/material-components/material-components-ios/commit/608694e26046d3ca3d81b4e3a23ebd78869f3481) (Eric Lee)
111+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/d0f7fe4ab357bdd374307c151de4ba8fe7d9b1af) (Bryan Oltman)
112+
113+
### Slider
114+
115+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/0e9362f933f32915824b1e175421e643a1a3f182) (Bryan Oltman)
116+
117+
### Snackbar
118+
119+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/349fbdccb6812a57aea766fc995257d3f1513b16) (Bryan Oltman)
120+
121+
### Tabs
122+
123+
* [Expose effectiveLayoutStyle as a readonly property.](https://github.com/material-components/material-components-ios/commit/23628cda933848e4722077544439d787b77453e1) (Alvin Wong)
124+
* [For the ScrollableCentered layout, update -contentOffsetNeededToCenterItemView to handle empty itemView.frame, use computed content size, and clamp contentOffsetX when contentSize.width < availableWidth.](https://github.com/material-components/material-components-ios/commit/60b59157f2dd9a13d76ae6a97cae67384743e92a) (Alvin Wong)
125+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/6a7857e8072ba86c16e92b14bf91bc90b9ec6525) (Bryan Oltman)
126+
127+
### TextFields
128+
129+
* [Move protocol definitions into separate header files](https://github.com/material-components/material-components-ios/commit/cc3fa165b8f6f40a185d74f5031982e9e4b2400e) (Bryan Oltman)
130+
131+
### private/Icons/icons/ic_arrow_back
132+
133+
* [Use AssetCatalogs for ic_arrow_back images.](https://github.com/material-components/material-components-ios/commit/eb83589e4167dd56d0fb18244cd0d16461a5c4f1) (Wenyu Zhang)
134+
135+
### private/Icons
136+
137+
* [Use AssetCatalogs for ic_arrow_back images.](https://github.com/material-components/material-components-ios/commit/eb83589e4167dd56d0fb18244cd0d16461a5c4f1) (Wenyu Zhang)
138+
* [Use AssetCatalogs for icons.](https://github.com/material-components/material-components-ios/commit/0e72afc0a64415d79dcf07bac44b2d96c919d82c) (Wenyu Zhang)
139+
140+
## Multi-component changes
141+
142+
* [Remove pathFor_ic_* methods.](https://github.com/material-components/material-components-ios/commit/c005997f654405c3aa90c319e3a5caa776ac7b75) (Wenyu Zhang)
143+
* [Use AssetCatalogs for icons.](https://github.com/material-components/material-components-ios/commit/0e72afc0a64415d79dcf07bac44b2d96c919d82c) (Wenyu Zhang)
144+
145+
---
146+
1147
# 107.3.0
2148

3149
This minor release includes several new APIs and improvements to Dialogs, AppBar, and Slider.

MaterialComponents.podspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
22

33
Pod::Spec.new do |mdc|
44
mdc.name = "MaterialComponents"
5-
mdc.version = "107.3.0"
5+
mdc.version = "107.4.0"
66
mdc.authors = "The Material Components authors."
77
mdc.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
88
mdc.homepage = "https://github.com/material-components/material-components-ios"
@@ -1215,13 +1215,11 @@ Pod::Spec.new do |mdc|
12151215
component.public_header_files = "components/#{component.base_name}/src/*.h"
12161216
component.source_files = [
12171217
"components/#{component.base_name}/src/*.{h,m}",
1218-
"components/#{component.base_name}/src/private/*.{h,m}"
12191218
]
12201219

12211220
component.dependency "MDFInternationalization"
12221221
component.dependency "MaterialComponents/Palettes"
12231222
component.dependency "MaterialComponents/private/Math"
1224-
component.dependency "MotionAnimator", "~> 2.1"
12251223

12261224
component.test_spec 'UnitTests' do |unit_tests|
12271225
unit_tests.source_files = [
@@ -1259,6 +1257,7 @@ Pod::Spec.new do |mdc|
12591257
component.source_files = "components/#{component.base_name}/src/*.{h,m}", "components/#{component.base_name}/src/private/*.{h,m}"
12601258

12611259
component.dependency "MaterialComponents/AnimationTiming"
1260+
component.dependency "MaterialComponents/Availability"
12621261
component.dependency "MaterialComponents/private/Color"
12631262
component.dependency "MaterialComponents/private/Math"
12641263

MaterialComponentsBeta.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |mdc|
22
mdc.name = "MaterialComponentsBeta"
3-
mdc.version = "107.3.0"
3+
mdc.version = "107.4.0"
44
mdc.authors = "The Material Components authors."
55
mdc.summary = "A collection of stand-alone alpha UI libraries that are not yet guaranteed to be ready for general production use. Use with caution."
66
mdc.homepage = "https://github.com/material-components/material-components-ios"

MaterialComponentsEarlGreyTests.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 = "MaterialComponentsEarlGreyTests"
3-
s.version = "107.3.0"
3+
s.version = "107.4.0"
44
s.authors = "The Material Components authors."
55
s.summary = "This spec is an aggregate of all the Material Components EarlGrey tests."
66
s.description = "This spec is made for use in the MDC Catalog."

MaterialComponentsExamples.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 = "MaterialComponentsExamples"
3-
s.version = "107.3.0"
3+
s.version = "107.4.0"
44
s.authors = "The Material Components authors."
55
s.summary = "This spec is an aggregate of all the Material Components examples."
66
s.description = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

MaterialComponentsSnapshotTests.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ end
5353

5454
Pod::Spec.new do |s|
5555
s.name = "MaterialComponentsSnapshotTests"
56-
s.version = "107.3.0"
56+
s.version = "107.4.0"
5757
s.authors = "The Material Components authors."
5858
s.summary = "This spec is an aggregate of all the Material Components snapshot tests."
5959
s.homepage = "https://github.com/material-components/material-components-ios"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
107.3.0
1+
107.4.0

catalog/MDCCatalog/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>107.3.0</string>
18+
<string>107.4.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>107.3.0</string>
22+
<string>107.4.0</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UIAppFonts</key>

catalog/MDCDragons/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>107.3.0</string>
18+
<string>107.4.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>107.3.0</string>
20+
<string>107.4.0</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>UILaunchStoryboardName</key>

0 commit comments

Comments
 (0)