Skip to content

Commit 87351aa

Browse files
bryanoltmanbryanoltman
committed
Merge branch 'release-candidate' into stable
2 parents c90e40e + 4464b9a commit 87351aa

File tree

39 files changed

+464
-82
lines changed

39 files changed

+464
-82
lines changed

‎CHANGELOG.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
# 109.5.0
2+
3+
This minor release adds functionality to MDCSnackbarManagerDelegate and includes internal cleanup of FlexibleHeader.
4+
5+
## New features
6+
7+
### Snackbar
8+
9+
MDCSnackbarManagerDelegate has new `snackbarWillDisappear` and `isPresentingSnackbarWithMessageView:` methods.
10+
11+
## Component changes
12+
13+
### AppBar
14+
15+
* [Fix a failing snapshot test](https://github.com/material-components/material-components-ios/commit/09171d15c71e762844bf697f7f9c3541a0179854) (Galia Kaufman)
16+
17+
### Buttons
18+
19+
* [Fix theme being applied to a wrong floating button in the example snapshot.](https://github.com/material-components/material-components-ios/commit/dfd5109f15627b8c159aa77dd8e8e5652146be37) (Wenyu Zhang)
20+
21+
### Chips
22+
23+
* [Adjust hitAreaInsets in the typical example.](https://github.com/material-components/material-components-ios/commit/1992bbdd21a009c345a253a9aa7816bae8841961) (Wenyu Zhang)
24+
25+
### Dialogs
26+
27+
* [Add additional theming screenshot to Dialogs docs](https://github.com/material-components/material-components-ios/commit/112ea0d0894a769dba4384325d04d09ba26362af) (Andrew Overton)
28+
29+
### FlexibleHeader
30+
31+
* [Extract hidesStatusBarWhenShiftedOffscreen to the shifter.](https://github.com/material-components/material-components-ios/commit/9fde103ea50df2f85c3dfc0650fa70a285989cfb) (Jeff Verkoeyen)
32+
* [Move ShiftBehaviorForCurrentAppContext into the MDCFlexibleHeaderShifter.](https://github.com/material-components/material-components-ios/commit/3fc4f0cb472ef91e4761076f5f6444d6bb99aac0) (Jeff Verkoeyen)
33+
* [Move the shift behavior types to separate targets.](https://github.com/material-components/material-components-ios/commit/643170dea99036cac1680faa7045ee4a4ee1aac9) (Jeff Verkoeyen)
34+
* [Turn MDCFlexibleHeaderShiftBehavior into an extensible enum.](https://github.com/material-components/material-components-ios/commit/5b8abd6659b5c2ea71c18cb4ea8c6d04310f19ec) (Jeff Verkoeyen)
35+
36+
### NavigationDrawer
37+
38+
* [Add NavigationDrawer theming target to podspec](https://github.com/material-components/material-components-ios/commit/755a10e3be1344ba1ccb8671a7d8679cb278909a) (Andrew Overton)
39+
40+
### Snackbar
41+
42+
* [Add snackbarIsPresenting to MDCSnackbarManagerDelegate.](https://github.com/material-components/material-components-ios/commit/0fcf353c3abde1b300e5aee8a0c9ca256bbd0212) (Morgan Redding)
43+
* [Add snackbarWillDisappear to SnackbarManagerDelegate](https://github.com/material-components/material-components-ios/commit/c8b569bd60f0702f21b32fe55112e458f0db3a67) (Morgan Redding)
44+
45+
## Multi-component changes
46+
47+
* [Internal change.](https://github.com/material-components/material-components-ios/commit/4d76e54f83e1d55910e1ec599668df6a18502c7c) (Wenyu Zhang)
48+
* [Internal change](https://github.com/material-components/material-components-ios/commit/9c26a7e67aa298a57e5a78e22d7fbe5abc6fe34f) (Bryan Oltman)
49+
* [Internal change](https://github.com/material-components/material-components-ios/commit/b5aa93e81cba6ab5670eb4096bb7c640d02585da) (Jeff Verkoeyen)
50+
51+
---
52+
153
# 109.4.0
254

355
This minor release adds Theming extension support to MDCBottomDrawerViewController and includes bug fixes and minor refactoring.

‎MaterialComponents.podspec

Lines changed: 35 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 |mdc|
44
mdc.name = "MaterialComponents"
5-
mdc.version = "109.4.0"
5+
mdc.version = "109.5.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"
@@ -905,6 +905,8 @@ Pod::Spec.new do |mdc|
905905
component.dependency 'MDFTextAccessibility'
906906
component.dependency "MaterialComponents/Availability"
907907
component.dependency "MaterialComponents/Elevation"
908+
component.dependency "MaterialComponents/FlexibleHeader+ShiftBehavior"
909+
component.dependency "MaterialComponents/FlexibleHeader+ShiftBehaviorEnabledWithStatusBar"
908910
component.dependency "MaterialComponents/ShadowElevations"
909911
component.dependency "MaterialComponents/ShadowLayer"
910912
component.dependency "MaterialComponents/private/Application"
@@ -921,6 +923,28 @@ Pod::Spec.new do |mdc|
921923
end
922924
end
923925

926+
mdc.subspec "FlexibleHeader+ShiftBehavior" do |extension|
927+
extension.ios.deployment_target = '9.0'
928+
extension.public_header_files = [
929+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
930+
]
931+
extension.source_files = [
932+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
933+
]
934+
end
935+
936+
mdc.subspec "FlexibleHeader+ShiftBehaviorEnabledWithStatusBar" do |extension|
937+
extension.ios.deployment_target = '9.0'
938+
extension.public_header_files = [
939+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
940+
]
941+
extension.source_files = [
942+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
943+
]
944+
945+
extension.dependency "MaterialComponents/FlexibleHeader+ShiftBehavior"
946+
end
947+
924948
mdc.subspec "FlexibleHeader+CanAlwaysExpandToMaximumHeight" do |extension|
925949
extension.ios.deployment_target = '9.0'
926950
extension.public_header_files = [
@@ -1144,6 +1168,16 @@ Pod::Spec.new do |mdc|
11441168
extension.dependency "MaterialComponents/schemes/Color"
11451169
end
11461170

1171+
mdc.subspec "NavigationDrawer+Theming" do |extension|
1172+
extension.ios.deployment_target = '9.0'
1173+
extension.public_header_files = "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
1174+
extension.source_files = [
1175+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}",
1176+
]
1177+
extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
1178+
extension.dependency "MaterialComponents/schemes/Container"
1179+
end
1180+
11471181
# OverlayWindow
11481182

11491183
mdc.subspec "OverlayWindow" do |component|

‎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 = "109.4.0"
3+
mdc.version = "109.5.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 = "109.4.0"
3+
s.version = "109.5.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 = "109.4.0"
3+
s.version = "109.5.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 = "109.4.0"
56+
s.version = "109.5.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-
109.4.0
1+
109.5.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>109.4.0</string>
18+
<string>109.5.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>109.4.0</string>
22+
<string>109.5.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>109.4.0</string>
18+
<string>109.5.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>109.4.0</string>
20+
<string>109.5.0</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>UILaunchStoryboardName</key>

‎catalog/MaterialCatalog/MaterialCatalog.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 = "MaterialCatalog"
3-
s.version = "109.4.0"
3+
s.version = "109.5.0"
44
s.summary = "Helper Objective-C classes for the MDC catalog."
55
s.description = "This spec is made for use in the MDC Catalog."
66
s.homepage = "https://github.com/material-components/material-components-ios"

0 commit comments

Comments
 (0)