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

Commit 7e2dae8

Browse files
author
Wenyu Zhang
committed
Merge branch 'release-candidate' into stable
2 parents 4695792 + 7ad7ac0 commit 7e2dae8

File tree

73 files changed

+2480
-522
lines changed

Some content is hidden

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

73 files changed

+2480
-522
lines changed

CHANGELOG.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,94 @@
1+
# 94.4.0
2+
3+
This minor release introduces new APIs to ActionSheet, BottomSheet and FlexibleHeader. Additionally, it includes new theming extensions for TextControls component.
4+
5+
## New features
6+
7+
TextControls component now has theming extensions.
8+
9+
```objc
10+
MDCFilledTextField *filledTextField = [[MDCFilledTextField alloc] init];
11+
MDCContainerScheme *containerScheme = [[MDCContainerScheme alloc] init];
12+
13+
[filledTextField applyThemeWithScheme:containerScheme];
14+
```
15+
16+
```swift
17+
let filledTextField = MDCFilledTextField()
18+
let scheme = MDCContainerScheme()
19+
20+
filledTextField.applyTheme(withScheme: scheme)
21+
```
22+
23+
## API changes
24+
25+
### ActionSheet
26+
27+
#### MDCActionSheetController
28+
29+
*new* property: `contentEdgeInsets` in `MDCActionSheetController`
30+
31+
### BottomSheet
32+
33+
#### MDCBottomSheetController
34+
35+
*new* property: `dismissOnDraggingDownSheet` in `MDCBottomSheetController`
36+
37+
#### MDCBottomSheetPresentationController
38+
39+
*new* property: `dismissOnDraggingDownSheet` in `MDCBottomSheetPresentationController`
40+
41+
#### MDCBottomSheetTransitionController
42+
43+
*new* property: `dismissOnDraggingDownSheet` in `MDCBottomSheetTransitionController`
44+
45+
### FlexibleHeader
46+
47+
#### MDCFlexibleHeaderView(ShiftBehavior)
48+
49+
*new* property: `shiftedOffscreen` in `MDCFlexibleHeaderView(ShiftBehavior)`
50+
51+
## Component changes
52+
53+
## Changes
54+
55+
### ActionSheet
56+
57+
* [Add `contentEdgeInsets` API. (#9008)](https://github.com/material-components/material-components-ios/commit/8fb17f7b0ae42be323967d53ddcb43a18f9f1e7e) (Robert Moore)
58+
* [Align title/image to their leading edges directly. (#9013)](https://github.com/material-components/material-components-ios/commit/b5fef2ef75dda92d28c72c61232ab57bea1ff307) (Robert Moore)
59+
* [Correct RTL snapshot tests. (#9011)](https://github.com/material-components/material-components-ios/commit/8405097173b3430c47d43c1fca65be2a38828dee) (Robert Moore)
60+
* [Name unit tests to match class. (#9003)](https://github.com/material-components/material-components-ios/commit/06ea8732d21d7ba6f4376c794206247a2271e1a9) (Robert Moore)
61+
* [Refactor snapshot tests. (#8999)](https://github.com/material-components/material-components-ios/commit/a14720f7d7d4b560a87ad1581ec3a1a692d83bc1) (Robert Moore)
62+
* [Split "insets" API snapshot tests to separate file. (#9020)](https://github.com/material-components/material-components-ios/commit/c33be81182f6dfb0b61564f3f3ccbfe51baf11f5) (Robert Moore)
63+
64+
### BottomSheet
65+
66+
* [Add API to not allow dragging of Bottom Sheet to dismiss. (#9004)](https://github.com/material-components/material-components-ios/commit/8841f90ff478e547c7eb328a393b6f7610d713ad) (Yarden Eitan)
67+
68+
### Buttons
69+
70+
* [Fix dynamic type example. (#8992)](https://github.com/material-components/material-components-ios/commit/613ad1104324e621fd4088284659b09c053a6f4a) (Cody Weaver)
71+
72+
### FeatureHighlight
73+
74+
* [Fix accessibility tests. (#9018)](https://github.com/material-components/material-components-ios/commit/36d950545f34d23867d4a94e50e47bb69d3d0905) (Robert Moore)
75+
76+
### FlexibleHeader
77+
78+
* [Add FlexibleHeaderShiftedOffscreenWithShiftBehaviorDisabledTests. (#9023)](https://github.com/material-components/material-components-ios/commit/91803e3516278684094722205c05c2e68c46b9eb) (featherless)
79+
* [Expose a shiftedOffscreen property. (#9014)](https://github.com/material-components/material-components-ios/commit/61458cca02693614895f222eefbfb02f50c839a7) (featherless)
80+
81+
### ShadowElevations
82+
83+
* [Delete swift example target since there is no input file. (#9005)](https://github.com/material-components/material-components-ios/commit/ef4aad367748f60ddc4fd31cfaadf1a005cd76e7) (Wenyu Zhang)
84+
85+
### TextControls
86+
87+
* [Add Outlined theming extension (#9002)](https://github.com/material-components/material-components-ios/commit/f3daf9b4986e8f0b45b55bc517913cb11e4441ac) (Andrew Overton)
88+
* [Add MDCFilledTextField theming extension (#8993)](https://github.com/material-components/material-components-ios/commit/c806e4b9d0acfcee53336fa54459a0ef22bc30fb) (Andrew Overton)
89+
90+
---
91+
192
# 94.3.0
293

394
This minor release primarily consists of accessibility improvements. A number of components now provide increased support for VoiceOver and Dynamic Type, and many components have been audited to make sure minimum touch target requirements and minimum color contrast requirements are met. Additionally, many examples in our Catalog and Dragons apps have been improved from an accessibility standpoint.

MaterialComponents.podspec

Lines changed: 21 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 = "94.3.0"
5+
mdc.version = "94.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"
@@ -1907,6 +1907,26 @@ Pod::Spec.new do |mdc|
19071907
end
19081908
end
19091909

1910+
mdc.subspec "TextControls+Theming" do |extension|
1911+
extension.ios.deployment_target = '9.0'
1912+
extension.public_header_files = "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
1913+
extension.source_files = [
1914+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}",
1915+
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/private/*.{h,m}"
1916+
]
1917+
extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
1918+
extension.dependency "MaterialComponents/schemes/Color"
1919+
extension.dependency "MaterialComponents/schemes/Container"
1920+
extension.dependency "MaterialComponents/schemes/Typography"
1921+
1922+
extension.test_spec 'UnitTests' do |unit_tests|
1923+
unit_tests.source_files = [
1924+
"components/#{extension.base_name.split('+')[0]}/tests/unit/#{extension.base_name.split('+')[1]}/*.{h,m,swift}"
1925+
]
1926+
unit_tests.dependency "MaterialComponents/schemes/Container"
1927+
end
1928+
end
1929+
19101930
mdc.subspec "TextFields+ColorThemer" do |extension|
19111931
extension.ios.deployment_target = '9.0'
19121932
extension.public_header_files = [

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 = "94.3.0"
3+
mdc.version = "94.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 = "94.3.0"
3+
s.version = "94.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 = "94.3.0"
3+
s.version = "94.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 = "94.3.0"
56+
s.version = "94.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-
94.3.0
1+
94.4.0

catalog/MDCCatalog.xcodeproj/project.pbxproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,13 @@
318318
CreatedOnToolsVersion = 8.2;
319319
DevelopmentTeam = EQHXZ8M8AV;
320320
LastSwiftMigration = 0810;
321-
ProvisioningStyle = Automatic;
321+
ProvisioningStyle = Manual;
322322
};
323323
664524B21C6BA62A001ADBF8 = {
324324
CreatedOnToolsVersion = 7.3;
325325
DevelopmentTeam = EQHXZ8M8AV;
326326
LastSwiftMigration = 0810;
327-
ProvisioningStyle = Automatic;
327+
ProvisioningStyle = Manual;
328328
};
329329
};
330330
};
@@ -589,11 +589,13 @@
589589
CLANG_WARN_INFINITE_RECURSION = YES;
590590
CLANG_WARN_SUSPICIOUS_MOVE = YES;
591591
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
592+
CODE_SIGN_STYLE = Manual;
592593
DEVELOPMENT_TEAM = EQHXZ8M8AV;
593594
INFOPLIST_FILE = MDCActionExtension/Info.plist;
594595
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
595596
PRODUCT_BUNDLE_IDENTIFIER = "com.google.mdc-catalog.MDCActionExtension";
596597
PRODUCT_NAME = "$(TARGET_NAME)";
598+
PROVISIONING_PROFILE_SPECIFIER = "Google Development";
597599
SKIP_INSTALL = YES;
598600
SWIFT_VERSION = 4.2;
599601
};
@@ -609,11 +611,13 @@
609611
CLANG_WARN_INFINITE_RECURSION = YES;
610612
CLANG_WARN_SUSPICIOUS_MOVE = YES;
611613
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
614+
CODE_SIGN_STYLE = Manual;
612615
DEVELOPMENT_TEAM = EQHXZ8M8AV;
613616
INFOPLIST_FILE = MDCActionExtension/Info.plist;
614617
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
615618
PRODUCT_BUNDLE_IDENTIFIER = "com.google.mdc-catalog.MDCActionExtension";
616619
PRODUCT_NAME = "$(TARGET_NAME)";
620+
PROVISIONING_PROFILE_SPECIFIER = "Google Development";
617621
SKIP_INSTALL = YES;
618622
SWIFT_VERSION = 4.2;
619623
};
@@ -733,11 +737,13 @@
733737
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
734738
CLANG_ENABLE_MODULES = YES;
735739
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
740+
CODE_SIGN_STYLE = Manual;
736741
DEVELOPMENT_TEAM = EQHXZ8M8AV;
737742
INFOPLIST_FILE = MDCCatalog/Info.plist;
738743
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
739744
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
740745
PRODUCT_NAME = "$(TARGET_NAME)";
746+
PROVISIONING_PROFILE_SPECIFIER = "Google Development";
741747
SWIFT_OBJC_BRIDGING_HEADER = "MDCCatalog/MDCCatalog-Bridging-Header.h";
742748
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
743749
SWIFT_VERSION = 4.2;
@@ -752,11 +758,13 @@
752758
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
753759
CLANG_ENABLE_MODULES = YES;
754760
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
761+
CODE_SIGN_STYLE = Manual;
755762
DEVELOPMENT_TEAM = EQHXZ8M8AV;
756763
INFOPLIST_FILE = MDCCatalog/Info.plist;
757764
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
758765
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
759766
PRODUCT_NAME = "$(TARGET_NAME)";
767+
PROVISIONING_PROFILE_SPECIFIER = "Google Development";
760768
SWIFT_OBJC_BRIDGING_HEADER = "MDCCatalog/MDCCatalog-Bridging-Header.h";
761769
SWIFT_VERSION = 4.2;
762770
};

catalog/MDCCatalog.xcodeproj/xcshareddata/xcschemes/MDCCatalog.xcscheme

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -723,16 +723,6 @@
723723
ReferencedContainer = "container:Pods/Pods.xcodeproj">
724724
</BuildableReference>
725725
</TestableReference>
726-
<TestableReference
727-
skipped = "NO">
728-
<BuildableReference
729-
BuildableIdentifier = "primary"
730-
BlueprintIdentifier = "3EF1C285419E755C019EC7F5334722D6"
731-
BuildableName = "MaterialComponentsBeta-Unit-ButtonBar+Theming-UnitTests.xctest"
732-
BlueprintName = "MaterialComponentsBeta-Unit-ButtonBar+Theming-UnitTests"
733-
ReferencedContainer = "container:Pods/Pods.xcodeproj">
734-
</BuildableReference>
735-
</TestableReference>
736726
<TestableReference
737727
skipped = "NO">
738728
<BuildableReference
@@ -853,6 +843,16 @@
853843
ReferencedContainer = "container:Pods/Pods.xcodeproj">
854844
</BuildableReference>
855845
</TestableReference>
846+
<TestableReference
847+
skipped = "NO">
848+
<BuildableReference
849+
BuildableIdentifier = "primary"
850+
BlueprintIdentifier = "4C330E19ADEE57C95EA389A9AFEE4749"
851+
BuildableName = "MaterialComponents-Unit-TextControls+Theming-UnitTests.xctest"
852+
BlueprintName = "MaterialComponents-Unit-TextControls+Theming-UnitTests"
853+
ReferencedContainer = "container:Pods/Pods.xcodeproj">
854+
</BuildableReference>
855+
</TestableReference>
856856
</Testables>
857857
</TestAction>
858858
<LaunchAction

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>94.3.0</string>
18+
<string>94.4.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>94.3.0</string>
22+
<string>94.4.0</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UIAppFonts</key>

0 commit comments

Comments
 (0)