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

Commit da19cc8

Browse files
ajsecordajsecord
committed
Merge branch 'release-candidate'
2 parents 037551f + aad2d08 commit da19cc8

File tree

123 files changed

+1445
-795
lines changed

Some content is hidden

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

123 files changed

+1445
-795
lines changed

‎.arclint‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"( *func )",
3333
"(^[-+@].+)",
3434
"(NS_UNAVAILABLE;$)",
35+
"(autoresizingMask)",
3536
"(^ )",
3637
"(^#define)",
3738
"(^excerpt:)",

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@ fastlane/screenshots
6969
/gh-pages
7070
/site-source
7171

72+
# Compiled python
73+
*.pyc
74+
75+

‎CHANGELOG.md‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,146 @@
1+
# 5.1.0
2+
3+
## API diffs
4+
5+
Auto-generated by running:
6+
7+
scripts/api_diff -o 037551fa3b17c25f6546d290e41f747e3713bc4f -n 4b6b0a414e599af1fe3a29bba66af8e04ba67b4d
8+
9+
No public API changes.
10+
11+
## Component changes
12+
13+
### AppBar
14+
15+
#### Changes
16+
17+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
18+
* [Move AppBar header configuration into init so that status bar style is accurate in Hero demo.](https://github.com/google/material-components-ios/commit/e46893e0ef87be5629281e1f4c1212a634b2f11c) (Jeff Verkoeyen)
19+
20+
### ButtonBar
21+
22+
#### Changes
23+
24+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
25+
26+
### Buttons
27+
28+
#### Changes
29+
30+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
31+
32+
### CollectionCells
33+
34+
#### Changes
35+
36+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
37+
* [Remove unused MaterialCollectionCells.xcassets.](https://github.com/google/material-components-ios/commit/4b6b0a414e599af1fe3a29bba66af8e04ba67b4d) (Louis Romero)
38+
* [Rename all images with @2x/@3x.](https://github.com/google/material-components-ios/commit/2df5344ee2a5a35d2e2c6d7d33ac79ecbdc1afba) (Louis Romero)
39+
40+
### CollectionLayoutAttributes
41+
42+
#### Changes
43+
44+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
45+
46+
### Collections
47+
48+
#### Changes
49+
50+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
51+
* [Global find-and-replace of 'kMDC' with 'k'.](https://github.com/google/material-components-ios/commit/21d5cf1d04c4a6f296eb07fa82bf2d865674c7bb) (Jeff Verkoeyen)
52+
53+
### FlexibleHeader
54+
55+
#### Changes
56+
57+
* [Add contentOffset side effect tests.](https://github.com/google/material-components-ios/commit/c042c5f4e43c65b3cb1b35dd3be9f0c4e4606fa5) (Jeff Verkoeyen)
58+
* [Always provide a valid frame for the issue176 tests.](https://github.com/google/material-components-ios/commit/283c87e9eb73d4d2d1f8b863a45f2a0ea966a129) (Jeff Verkoeyen)
59+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
60+
* [Remove the internal contentOffset property.](https://github.com/google/material-components-ios/commit/3d4db0172e6e06109d6a6afdeaf148824a129bef) (Jeff Verkoeyen)
61+
* [Revert "Resolve iOS 8.4 unit test failure of issue176 tests."](https://github.com/google/material-components-ios/commit/fe1ac2f14b7ad4179c84b01590df9c93289f2e36) (Jeff Verkoeyen)
62+
63+
### FontDiskLoader
64+
65+
#### Changes
66+
67+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
68+
69+
### HeaderStackView
70+
71+
#### Changes
72+
73+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
74+
* [Ran arc lint --everything --apply-patches.](https://github.com/google/material-components-ios/commit/b2639f397b7639716957f03a2b3421633796b877) (Jeff Verkoeyen)
75+
76+
### Ink
77+
78+
#### Changes
79+
80+
* [Clarified MDCInkTouchControllerDelegate inkTouchController:shouldProcessInkTouchesAtTouchLocation: documentation.](https://github.com/google/material-components-ios/commit/6241d918df44a82218349223285d6b9881d8534b) (Adrian Secord)
81+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
82+
* [Global find-and-replace of 'kMDC' with 'k'.](https://github.com/google/material-components-ios/commit/21d5cf1d04c4a6f296eb07fa82bf2d865674c7bb) (Jeff Verkoeyen)
83+
84+
### NavigationBar
85+
86+
#### Changes
87+
88+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
89+
90+
### PageControl
91+
92+
#### Changes
93+
94+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
95+
* [Global find-and-replace of 'kMDC' with 'k'.](https://github.com/google/material-components-ios/commit/21d5cf1d04c4a6f296eb07fa82bf2d865674c7bb) (Jeff Verkoeyen)
96+
97+
### RobotoFontLoader
98+
99+
#### Changes
100+
101+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
102+
103+
### ShadowElevations
104+
105+
#### Changes
106+
107+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
108+
109+
### ShadowLayer
110+
111+
#### Changes
112+
113+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
114+
* [Global find-and-replace of 'kMDC' with 'k'.](https://github.com/google/material-components-ios/commit/21d5cf1d04c4a6f296eb07fa82bf2d865674c7bb) (Jeff Verkoeyen)
115+
116+
### Slider
117+
118+
#### Changes
119+
120+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
121+
122+
### SpritedAnimationView
123+
124+
#### Changes
125+
126+
* [Global find-and-replace of 'kMDC' with 'k'.](https://github.com/google/material-components-ios/commit/21d5cf1d04c4a6f296eb07fa82bf2d865674c7bb) (Jeff Verkoeyen)
127+
* [Rename all images with @2x/@3x.](https://github.com/google/material-components-ios/commit/2df5344ee2a5a35d2e2c6d7d33ac79ecbdc1afba) (Louis Romero)
128+
129+
### Switch
130+
131+
#### Changes
132+
133+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
134+
* [Global find-and-replace of 'kMDC' with 'k'.](https://github.com/google/material-components-ios/commit/21d5cf1d04c4a6f296eb07fa82bf2d865674c7bb) (Jeff Verkoeyen)
135+
* [Set the switch's ink's max ripple radius to the spec value.](https://github.com/google/material-components-ios/commit/c15fd0c5c18e442947728472b7b33381cae78f45) (Adrian Secord)
136+
137+
### Typography
138+
139+
#### Changes
140+
141+
* [Correct links for deploy on various deployment environment.](https://github.com/google/material-components-ios/commit/2b6f7f40a75410e57e13c20cab2d18dd09ae2566) (Yiran Mao)
142+
143+
1144
# 5.0.0
2145

3146
## API diffs

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -27,47 +27,8 @@ Our additions:
2727
### Conventions
2828

2929
This repository follows a file layout convention that ensures consistency and
30-
predictability across all of our components. The convention for a given
31-
component is as follows:
32-
33-
ComponentName/
34-
CHANGELOG.md <- Release notes and history.
35-
README.md <- Essential installation and usage guide.
36-
ComponentName.podspec <- The podspec for the library.
37-
38-
docs/ <- In-depth technical documentation.
39-
TechnicalDoc1.md <- Docs are written in Markdown.
40-
assets/ <- All documentation assets live here.
41-
image.png <- Pngs, movs, gifs, etc...
42-
43-
examples/
44-
Example.swift <- Examples can be Swift,
45-
Example.m <- or Objective-C.
46-
apps/ <- Example applications live in this sub-directory.
47-
ExampleApp/ <- Example application.
48-
AnotherApp/ <- Another example application.
49-
resources/ <- Resources required by the examples.
50-
supplemental/ <- Supplemental example source code.
51-
52-
src/ <- All component source lives here.
53-
ComponentName.h <- Umbrella header.
54-
GOSObject.h <- Component source must be written in Objective-C.
55-
GOSObject.m
56-
private/ <- Private APIs live in a sub-directory
57-
GOSPrivateAPI.h
58-
GOSPrivateAPI.m
59-
ComponentName.bundle/ <- All assets required by the source.
60-
61-
tests/
62-
ui/ <- All user interface tests.
63-
SomeAPITest.swift <- Tests can be Swift,
64-
AnotherTest.m <- or Objective-C.
65-
unit/ <- All unit tests.
66-
SomeAPITest.swift <- Tests can be Swift,
67-
AnotherTest.m <- or Objective-C.
68-
69-
Note that all directories are **lower-cased** except the component's root
70-
directory.
30+
predictability across all of our components. The conventions are described in
31+
the [GOS-conventions](https://github.com/google/GOS-conventions) repository.
7132

7233
### Before you contribute
7334

‎MaterialComponents.podspec‎

Lines changed: 1 addition & 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 = "5.0.0"
5+
s.version = "5.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"

‎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 = "5.0.0"
3+
s.version = "5.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 = "5.0.0"
3+
s.version = "5.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"

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

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0720"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "664524B21C6BA62A001ADBF8"
18+
BuildableName = "MDCCatalog.app"
19+
BlueprintName = "MDCCatalog"
20+
ReferencedContainer = "container:MDCCatalog.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "66CB712B1C853DB30099B932"
36+
BuildableName = "MDCUnitTests.xctest"
37+
BlueprintName = "MDCUnitTests"
38+
ReferencedContainer = "container:MDCUnitTests.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "664524B21C6BA62A001ADBF8"
46+
BuildableName = "MDCCatalog.app"
47+
BlueprintName = "MDCCatalog"
48+
ReferencedContainer = "container:MDCCatalog.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "664524B21C6BA62A001ADBF8"
69+
BuildableName = "MDCCatalog.app"
70+
BlueprintName = "MDCCatalog"
71+
ReferencedContainer = "container:MDCCatalog.xcodeproj">
72+
</BuildableReference>
73+
</BuildableProductRunnable>
74+
<AdditionalOptions>
75+
</AdditionalOptions>
76+
</LaunchAction>
77+
<ProfileAction
78+
buildConfiguration = "Release"
79+
shouldUseLaunchSchemeArgsEnv = "YES"
80+
savedToolIdentifier = ""
81+
useCustomWorkingDirectory = "NO"
82+
debugDocumentVersioning = "YES">
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
85+
<BuildableReference
86+
BuildableIdentifier = "primary"
87+
BlueprintIdentifier = "664524B21C6BA62A001ADBF8"
88+
BuildableName = "MDCCatalog.app"
89+
BlueprintName = "MDCCatalog"
90+
ReferencedContainer = "container:MDCCatalog.xcodeproj">
91+
</BuildableReference>
92+
</BuildableProductRunnable>
93+
</ProfileAction>
94+
<AnalyzeAction
95+
buildConfiguration = "Debug">
96+
</AnalyzeAction>
97+
<ArchiveAction
98+
buildConfiguration = "Release"
99+
revealArchiveInOrganizer = "YES">
100+
</ArchiveAction>
101+
</Scheme>

0 commit comments

Comments
 (0)