Skip to content

Commit 180499a

Browse files
committed
Merge branch 'release-candidate' into stable
2 parents 90914be + fa723f9 commit 180499a

File tree

131 files changed

+3621
-1459
lines changed

Some content is hidden

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

131 files changed

+3621
-1459
lines changed

CHANGELOG.md

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,120 @@
1+
# 109.7.0
2+
3+
This minor release makes accessibility improvements related to high contrast colors, adds new functionality to Buttons, Chips, Dialogs, Snackbars, and Tabs, and adds a new TextControls text field, `MDCUnderlinedTextField`, which is intended to replace `MDCTextInputControllerLegacyDefault` and `MDCTextInputControllerUnderline`.
4+
5+
## New features
6+
7+
### ActionSheet
8+
9+
- `MDCActionSheetControllerDelegate` has a new method, `-actionSheetControllerDismissalAnimationCompleted:`.
10+
11+
### Buttons
12+
13+
- `MDCFloatingButton` has a new `visibleHitAreaInsets` property.
14+
15+
### Chips
16+
17+
- `MDCChipView` has a new `cornerRadius` property.
18+
19+
### Dialogs
20+
21+
- `MDCAlertController` has improved attributed link support.
22+
23+
### Snackbar
24+
25+
- `MDCSnackbarMessage` has a new `completionHandlerWithError` property.
26+
27+
### Tabs
28+
29+
- `MDCItemBarCell` has a new `selectedImage` property.
30+
31+
### TextControls
32+
33+
- There is a new text field class, `MDCUnderlinedTextField`.
34+
35+
## Component changes
36+
37+
### ActionSheet
38+
39+
* [Add actionSheetControllerDismissalAnimationCompleted method to MDCActionSheetControllerDelegate.](https://github.com/material-components/material-components-ios/commit/e5f4e3fcb044a47d1a4e83b2148224ac4b1261be) (Bryan Oltman)
40+
41+
### Banner
42+
43+
* [Apply primary color to icon in theming.](https://github.com/material-components/material-components-ios/commit/1591b685646089020affd50e2625bd6d40b0f264) (Wenyu Zhang)
44+
45+
### BottomNavigation
46+
47+
* [Replace bottom navigation README](https://github.com/material-components/material-components-ios/commit/87595333681e82b3ecbd26caa8483a6c84142f4a) (Andrew Overton)
48+
49+
### BottomSheet
50+
51+
* [Add BottomSheetPresentationControllerDelegateExample to demonstrate usage of MDCBottomSheetPresentationControllerDelegate.](https://github.com/material-components/material-components-ios/commit/4e461e2c13e5472a15e445d98353a5975b994500) (Bryan Oltman)
52+
* [Add bottomSheetDismissalAnimationCompleted method to MDCBottomSheetPresentationController.](https://github.com/material-components/material-components-ios/commit/464f202058020bee9f1f647f03e875eecd8b8460) (Bryan Oltman)
53+
* [Internal change](https://github.com/material-components/material-components-ios/commit/b169119b9f8af5ccbad15cd08cc989b480f9d676) (Bryan Oltman)
54+
* [Rename BottomSheetPresentationExample to BottomSheetModalPresentationExample to better represent its purpose.](https://github.com/material-components/material-components-ios/commit/ee0b388c5ccc129020154c1702bad528587e13f4) (Bryan Oltman)
55+
* [Updating BottomSheet examples organization](https://github.com/material-components/material-components-ios/commit/87c8968e667106e9eda8669ed1a178624ed4a571) (Nobody)
56+
57+
### ButtonBar
58+
59+
* [Remove excess iPad insets from the button bar buttons.](https://github.com/material-components/material-components-ios/commit/b9e978c6e51715a9cd6498d2a9497b3553d420d4) (Jeff Verkoeyen)
60+
61+
### Buttons
62+
63+
* [Add a boolean for when observing cornerRadius so that we won't try to add 2 observers or remove a non-existent observer](https://github.com/material-components/material-components-ios/commit/3d5c27f12b93afddb3f43a33ff80daa2fecf0c19) (Yarden Eitan)
64+
* [Add visibleAreaInsets support for the FAB.](https://github.com/material-components/material-components-ios/commit/afb87e9860dfa444a5d999064c791240968c4df0) (Yarden Eitan)
65+
* [Put pointerStyleProvider API under a respondsToSelector conditional to ensure no crashes for 13.4 beta users.](https://github.com/material-components/material-components-ios/commit/da469c7660721d69f187f56db73ca76bc8868102) (Yarden Eitan)
66+
* [When visibleAreaInsets are set, don't allow additional setting of the shapeGenerator API directly.](https://github.com/material-components/material-components-ios/commit/dee8934c69d66b70b05a2cf2ccf02b5c805349f3) (Yarden Eitan)
67+
68+
### Chips
69+
70+
* [Add cornerRadius API to support customizing chip's corner radius.](https://github.com/material-components/material-components-ios/commit/ab2801297f0ac18d6fe1cea72d64e47e0e4fff96) (Wenyu Zhang)
71+
72+
### Dialogs
73+
74+
* [Adding attributed link color API and updating theming extension](https://github.com/material-components/material-components-ios/commit/ea8887e284310b81c16c1f7f0bc23786db2c47d4) (Galia Kaufman)
75+
* [Annotate API using UITextItemInteraction to be iOS 10 only](https://github.com/material-components/material-components-ios/commit/aa955479536c3a1c4e0c418204ac9885f861f855) (Andrew Overton)
76+
* [Disable UIDataDetectorTypeLink by default for attributed messages.](https://github.com/material-components/material-components-ios/commit/24ce1c979cfa1b97b21cc82abaa335e086d58d15) (Galia Kaufman)
77+
* [Fix mixed top and bottom insets for the actions.](https://github.com/material-components/material-components-ios/commit/5832985581a52767aa5823e286b42411e36a7cbf) (Iryna Berezan)
78+
* [Header file comments cleanup](https://github.com/material-components/material-components-ios/commit/c273dfcfb4867746063a7175ae4886de25e86944) (Galia Kaufman)
79+
* [Improve Dialogs docs Improve alt text and use string literals in Dialogs README examples.](https://github.com/material-components/material-components-ios/commit/226596fd7db10ddc2cc5224c9662632d2918d631) (Andrew Overton)
80+
* [Setting `orderVerticalActionsByEmphasis` incorrectly calculates top and bottom insets for actions.](https://github.com/material-components/material-components-ios/commit/ba359990d58d468cdf8878973c680e895ea03c1f) (Galia Kaufman)
81+
82+
### Snackbar
83+
84+
* [Add completion handler with error parameter to snackbar message.](https://github.com/material-components/material-components-ios/commit/7593c0dc3aef726757cf9fd06cc02e6d6c3e0bde) (Randall Li)
85+
* [Added error domain and code.](https://github.com/material-components/material-components-ios/commit/d4bc31276d19c459ad79f401f69b1f424634acc0) (Randall Li)
86+
* [Added more information in description to Message and MessageView.](https://github.com/material-components/material-components-ios/commit/70dd23c6807ee8cea536c69c0d4129286464e131) (Randall Li)
87+
* [Making the an internal read write Error property for messages.](https://github.com/material-components/material-components-ios/commit/86f5ae1f4a19e8f73af4cb30e2c9d3f10f53e875) (Randall Li)
88+
* [Remove the unneeded hitAreaInsets usage, and set minimumSize instead.](https://github.com/material-components/material-components-ios/commit/2bc13bf9815153d15e9e67ea89cf7dd21f3fc64d) (Yarden Eitan)
89+
90+
### Tabs
91+
92+
* [Add selectedImage property to MDCItemBarCell to allow MDCTabBar to support selected images.](https://github.com/material-components/material-components-ios/commit/863af97e65c2d23a8b6efd4c7708690667b6d1fe) (Bryan Oltman)
93+
* [Add snapshot test to expose MDCTabBar not respecting UITabBarItem's selectedImage property.](https://github.com/material-components/material-components-ios/commit/e7717be32c81da93c5ccacdfbca6d099ba08b6f6) (Bryan Oltman)
94+
95+
### TextControls
96+
97+
* [Add underlined text field](https://github.com/material-components/material-components-ios/commit/55f0fead0042f6610b272d45ecd2fd23e04042a5) (Andrew Overton)
98+
99+
### private/TextControlsPrivate
100+
101+
* [Add underlined style object](https://github.com/material-components/material-components-ios/commit/617675f3137259ed0cb0b7ca5875304284d1d2ce) (Andrew Overton)
102+
* [Extract duplicated methods to C function](https://github.com/material-components/material-components-ios/commit/80bbc9fc03b4eb57c369bcf1d8b1e40c5dc6b737) (Andrew Overton)
103+
* [Extract some duplicated methods to C functions](https://github.com/material-components/material-components-ios/commit/1d6faa1e6d92bb9ca5f7c170277dffb9644d56bf) (Andrew Overton)
104+
105+
### schemes/Color
106+
107+
* [[schemes/Color]Add high contrast color to MDCColorSchemeDefaultsMaterial201907 scheme to support Increase Contrast feature.](https://github.com/material-components/material-components-ios/commit/52ee2909025c3541284bae02d83b0d0d10bc90db) (Wenyu Zhang)
108+
109+
## Multi-component changes
110+
111+
* [Add notion of horizontal positioning reference](https://github.com/material-components/material-components-ios/commit/1b63eabe19a648e09f4c73175e4b3ee426c15422) (Andrew Overton)
112+
* [Adding feedback menu option](https://github.com/material-components/material-components-ios/commit/ff5e5cfa2257d631f34857d9bca955f45c187780) (Galia Kaufman)
113+
* [Move private text fields files to TextControlsPrivate](https://github.com/material-components/material-components-ios/commit/9b2e7ecd7ab8ab88b81b2c8b60e6c7e6e7158fde) (Andrew Overton)
114+
* [Update Podspec after TextControls changes](https://github.com/material-components/material-components-ios/commit/6f169c99507495abc932f7bf1fa81b4b2f7ca003) (Andrew Overton)
115+
116+
---
117+
1118
# 109.6.0
2119

3120
This minor release adds new functionality to NavigationDrawer, ActionSheet, and Dialogs, and adds accessibility improvements to Buttons, Chips, and private/Color.

MaterialComponents.podspec

Lines changed: 59 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.6.0"
5+
mdc.version = "109.7.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"
@@ -1617,6 +1617,7 @@ Pod::Spec.new do |mdc|
16171617

16181618
component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
16191619
component.dependency "MaterialComponents/private/TextControlsPrivate+BaseStyle"
1620+
component.dependency "MaterialComponents/private/TextControlsPrivate+TextFields"
16201621
component.dependency "MDFInternationalization"
16211622

16221623
component.test_spec 'UnitTests' do |unit_tests|
@@ -1796,6 +1797,35 @@ Pod::Spec.new do |mdc|
17961797
end
17971798
end
17981799

1800+
# TextControls+UnderlinedTextFields
1801+
1802+
mdc.subspec "TextControls+UnderlinedTextFields" do |component|
1803+
component.ios.deployment_target = '9.0'
1804+
component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
1805+
component.source_files = [
1806+
"components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
1807+
"components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
1808+
]
1809+
1810+
component.dependency "MaterialComponents/Availability"
1811+
component.dependency "MaterialComponents/TextControls+BaseTextFields"
1812+
component.dependency "MaterialComponents/private/TextControlsPrivate+UnderlinedStyle"
1813+
end
1814+
1815+
# TextControls+UnderlinedTextFieldsTheming
1816+
1817+
mdc.subspec "TextControls+UnderlinedTextFieldsTheming" do |component|
1818+
component.ios.deployment_target = '9.0'
1819+
component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
1820+
component.source_files = [
1821+
"components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
1822+
"components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
1823+
]
1824+
1825+
component.dependency "MaterialComponents/TextControls+UnderlinedTextFields"
1826+
component.dependency "MaterialComponents/schemes/Container"
1827+
end
1828+
17991829
mdc.subspec "TextFields+ColorThemer" do |extension|
18001830
extension.ios.deployment_target = '9.0'
18011831
extension.public_header_files = [
@@ -2068,6 +2098,7 @@ Pod::Spec.new do |mdc|
20682098
component.dependency "MaterialComponents/AnimationTiming"
20692099
component.dependency "MaterialComponents/private/Math"
20702100
component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
2101+
component.dependency "MaterialComponents/private/TextControlsPrivate+UnderlinedStyle"
20712102
end
20722103

20732104
private_spec.subspec "TextControlsPrivate+OutlinedStyle" do |component|
@@ -2081,6 +2112,33 @@ Pod::Spec.new do |mdc|
20812112
component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
20822113
end
20832114

2115+
private_spec.subspec "TextControlsPrivate+TextFields" do |component|
2116+
component.ios.deployment_target = '9.0'
2117+
component.public_header_files = "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
2118+
component.source_files = [ "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
2119+
]
2120+
component.dependency "MaterialComponents/private/Math"
2121+
component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
2122+
2123+
component.test_spec 'UnitTests' do |unit_tests|
2124+
unit_tests.source_files = [
2125+
"components/private/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/*.{h,m,swift}"
2126+
]
2127+
unit_tests.dependency "MaterialComponents/schemes/Container"
2128+
end
2129+
end
2130+
2131+
private_spec.subspec "TextControlsPrivate+UnderlinedStyle" do |component|
2132+
component.ios.deployment_target = '9.0'
2133+
component.public_header_files = "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
2134+
component.source_files = [ "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
2135+
]
2136+
component.dependency "MaterialComponents/Availability"
2137+
component.dependency "MaterialComponents/AnimationTiming"
2138+
component.dependency "MaterialComponents/private/Math"
2139+
component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
2140+
end
2141+
20842142
private_spec.subspec "ThumbTrack" do |component|
20852143
component.ios.deployment_target = '9.0'
20862144
component.public_header_files = "components/private/#{component.base_name}/src/*.h"

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.6.0"
3+
mdc.version = "109.7.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.6.0"
3+
s.version = "109.7.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.6.0"
3+
s.version = "109.7.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.6.0"
56+
s.version = "109.7.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.6.0
1+
109.7.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.6.0</string>
18+
<string>109.7.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>109.6.0</string>
22+
<string>109.7.0</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UIAppFonts</key>

catalog/MDCCatalog/MDCCatalogWindow.swift

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313
// limitations under the License.
1414

1515
import UIKit
16-
17-
import MaterialComponents.MaterialOverlayWindow
1816
import MaterialComponents.MaterialDialogs
17+
import MaterialComponents.MaterialOverlayWindow
1918

20-
/**
21-
A custom UIWindow that displays the user's touches for recording video or demos.
22-
23-
Triple tapping anywhere will toggle the visible touches.
24-
*/
19+
/// A custom UIWindow that displays the user's touches for recording video or demos.
20+
///
21+
/// Triple tapping anywhere will toggle the visible touches.
2522
class MDCCatalogWindow: MDCOverlayWindow {
2623
var showTouches = false
2724

@@ -103,13 +100,14 @@ class MDCCatalogWindow: MDCOverlayWindow {
103100
let view = touchViews[touch.hash]
104101
touchViews[touch.hash] = nil
105102

106-
UIView.animate(withDuration: fadeDuration,
107-
animations: { view?.alpha = 0 },
108-
completion: { _ in view?.removeFromSuperview() })
103+
UIView.animate(
104+
withDuration: fadeDuration,
105+
animations: { view?.alpha = 0 },
106+
completion: { _ in view?.removeFromSuperview() })
109107
}
110108
}
111109

112-
/** A circular view that represents a user's touch. */
110+
/// A circular view that represents a user's touch.
113111
class MDCTouchView: UIView {
114112
fileprivate let touchCircleSize: CGFloat = 80
115113
fileprivate let touchCircleAlpha: CGFloat = 0.25
@@ -137,3 +135,7 @@ class MDCTouchView: UIView {
137135
isUserInteractionEnabled = false
138136
}
139137
}
138+
139+
protocol MDCFeedback {
140+
func showFeedbackDialog()
141+
}

0 commit comments

Comments
 (0)