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

Commit 1827d1c

Browse files
ajsecordajsecord
committed
Merge branch 'release-1.0.0'
2 parents 3747fbd + df0b497 commit 1827d1c

File tree

146 files changed

+2687
-4188
lines changed

Some content is hidden

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

146 files changed

+2687
-4188
lines changed

‎CHANGELOG.md‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,37 @@
1-
## Master
1+
## In progress since last release
2+
3+
##### Breaking
4+
##### Enhancements
5+
##### Bug Fixes
6+
7+
## 1.0.0
28

39
##### Breaking
410

11+
* [MDCFlexibleHeaderView] Removed `shadowIntensity` property, use setShadowLayer:intensityDidChangeBlock: instead. [Jeff Verkoeyen](https://github.com/jverkoey)
12+
* [MDCInkTouchControllerDelegate] Renamed `inkTouchControllerShouldProcessInkTouches:` to `inkTouchController:shouldProcessInkTouchesAtTouchLocation:`. [Chris Cox](https://github.com/chriscox)
13+
14+
##### Deprecations
15+
16+
* MDCFlexibleHeaderParentViewController, +[MDCFlexibleHeaderViewController addToParent], and
17+
-[MDCFlexibleHeaderViewController addFlexibleHeaderViewToParentViewControllerView]. These APIs
18+
are being deprecated in favor of the eventual equivalent AppBar convenience APIs. In the meantime
19+
the FlexibleHeader will need to be instantiated and configured like a typical UIViewController.
20+
521
##### Enhancements
622

23+
* [MDCFlexibleHeaderView] Added setShadowLayer:intensityDidChangeBlock:. [Jeff Verkoeyen](https://github.com/jverkoey)
24+
* [MDCHeaderStackView] Added MDCHeaderStackView. [Jeff Verkoeyen](https://github.com/jverkoey)
25+
* [MDCSlider] Changed default color. [Randall Li](https://github.com/randallli)
26+
* [MDCSlider] Readme.md copy edits. [Randall Li](https://github.com/randallli)
27+
* [MDCSwitch] Readme.md copy edits. [Randall Li](https://github.com/randallli)
28+
* [MDCTypograpy:example] Refactored to be compatible with catalog by convention [Randall Li](https://github.com/randallli)
29+
* [Shrine] First pass at a new Swift demo app, "Shrine". [Junius Gunaratne](https://github.com/jgunaratne)
30+
731
##### Bug Fixes
832

33+
* Fixed issue where MDCShadowLayer would ghost behind the MDCFlexibleHeaderView. [Jeff Verkoeyen](https://github.com/jverkoey)
34+
935
## 0.2.1
1036

1137
##### Bug Fixes

‎Catalog.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material-components-ios.podspec renamed to MaterialComponents.podspec

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
2-
s.name = "material-components-ios"
3-
s.version = "0.2.1"
2+
s.name = "MaterialComponents"
3+
s.version = "1.0.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"
@@ -42,10 +42,10 @@ Pod::Spec.new do |s|
4242
ss.public_header_files = 'components/Buttons/src/*.h'
4343
ss.source_files = 'components/Buttons/src/*.{h,m}', 'components/Buttons/src/Private/*.{h,m}'
4444
ss.header_mappings_dir = 'components/Buttons/src/*'
45-
ss.dependency 'material-components-ios/Ink'
46-
ss.dependency 'material-components-ios/ShadowElevations'
47-
ss.dependency 'material-components-ios/ShadowLayer'
48-
ss.dependency 'material-components-ios/Typography'
45+
ss.dependency 'MaterialComponents/Ink'
46+
ss.dependency 'MaterialComponents/ShadowElevations'
47+
ss.dependency 'MaterialComponents/ShadowLayer'
48+
ss.dependency 'MaterialComponents/Typography'
4949
end
5050

5151
s.subspec 'FlexibleHeader' do |ss|
@@ -54,6 +54,12 @@ Pod::Spec.new do |s|
5454
ss.header_mappings_dir = 'components/FlexibleHeader/src/*'
5555
end
5656

57+
s.subspec 'HeaderStackView' do |ss|
58+
ss.public_header_files = 'components/HeaderStackView/src/*.h'
59+
ss.source_files = 'components/HeaderStackView/src/*.{h,m}'
60+
ss.header_mappings_dir = 'components/HeaderStackView/src/*'
61+
end
62+
5763
s.subspec 'Ink' do |ss|
5864
ss.public_header_files = 'components/Ink/src/*.h'
5965
ss.source_files = 'components/Ink/src/*.{h,m}', 'components/Ink/src/private/*.{h,m}'
@@ -88,7 +94,7 @@ Pod::Spec.new do |s|
8894
ss.public_header_files = 'components/Slider/src/*.h'
8995
ss.source_files = 'components/Slider/src/*.{h,m}', 'components/Slider/src/private/*.{h,m}'
9096
ss.header_mappings_dir = 'components/Slider/src/*'
91-
ss.dependency 'material-components-ios/private/ThumbTrack'
97+
ss.dependency 'MaterialComponents/private/ThumbTrack'
9298
end
9399

94100
s.subspec 'SpritedAnimationView' do |ss|
@@ -104,7 +110,7 @@ Pod::Spec.new do |s|
104110
ss.resource_bundles = {
105111
'MaterialSwitch' => ['components/Switch/src/MaterialSwitch.bundle/*']
106112
}
107-
ss.dependency 'material-components-ios/private/ThumbTrack'
113+
ss.dependency 'MaterialComponents/private/ThumbTrack'
108114
end
109115

110116
s.subspec 'Typography' do |ss|
@@ -129,9 +135,9 @@ Pod::Spec.new do |s|
129135
ss.public_header_files = 'components/private/ThumbTrack/src/*.h'
130136
ss.source_files = 'components/private/ThumbTrack/src/*.{h,m}'
131137
ss.header_mappings_dir = 'components/private/ThumbTrack/src/*'
132-
ss.dependency 'material-components-ios/ShadowElevations'
133-
ss.dependency 'material-components-ios/ShadowLayer'
134-
ss.dependency 'material-components-ios/private/Color'
138+
ss.dependency 'MaterialComponents/ShadowElevations'
139+
ss.dependency 'MaterialComponents/ShadowLayer'
140+
ss.dependency 'MaterialComponents/private/Color'
135141
end
136142

137143
end

material-components-ios-catalog.podspec renamed to MaterialComponentsCatalog.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
2-
s.name = "material-components-ios-catalog"
3-
s.version = "0.2.1"
2+
s.name = "MaterialComponentsCatalog"
3+
s.version = "1.0.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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Pod::Spec.new do |s|
2+
s.name = "MaterialComponentsUnitTests"
3+
s.version = "1.0.0"
4+
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
5+
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
6+
s.homepage = "https://github.com/google/material-components-ios"
7+
s.license = 'Apache 2.0'
8+
s.source = { :git => "https://github.com/google/material-components-ios.git", :tag => s.version.to_s }
9+
s.platform = :ios, '7.0'
10+
s.requires_arc = true
11+
s.source_files = 'components/*/tests/unit/*.{h,m,swift}'
12+
s.framework = 'XCTest'
13+
end

‎build_tests/CocoapodsObjCApp/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pod 'material-components-ios', :path => '../../'
1+
pod 'MaterialComponents', :path => '../../'

‎build_tests/CocoapodsObjCApp/Podfile.lock‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,53 @@
11
PODS:
2-
- material-components-ios (0.2.1):
3-
- material-components-ios/Buttons (= 0.2.1)
4-
- material-components-ios/FlexibleHeader (= 0.2.1)
5-
- material-components-ios/Ink (= 0.2.1)
6-
- material-components-ios/PageControl (= 0.2.1)
7-
- material-components-ios/private (= 0.2.1)
8-
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
9-
- material-components-ios/ShadowElevations (= 0.2.1)
10-
- material-components-ios/ShadowLayer (= 0.2.1)
11-
- material-components-ios/Slider (= 0.2.1)
12-
- material-components-ios/SpritedAnimationView (= 0.2.1)
13-
- material-components-ios/Switch (= 0.2.1)
14-
- material-components-ios/Typography (= 0.2.1)
15-
- material-components-ios/Buttons (0.2.1):
16-
- material-components-ios/Ink
17-
- material-components-ios/ShadowElevations
18-
- material-components-ios/ShadowLayer
19-
- material-components-ios/Typography
20-
- material-components-ios/FlexibleHeader (0.2.1)
21-
- material-components-ios/Ink (0.2.1)
22-
- material-components-ios/PageControl (0.2.1)
23-
- material-components-ios/private (0.2.1):
24-
- material-components-ios/private/Color (= 0.2.1)
25-
- material-components-ios/private/ThumbTrack (= 0.2.1)
26-
- material-components-ios/private/Color (0.2.1)
27-
- material-components-ios/private/ThumbTrack (0.2.1):
28-
- material-components-ios/private/Color
29-
- material-components-ios/ShadowElevations
30-
- material-components-ios/ShadowLayer
31-
- material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
32-
- material-components-ios/ShadowElevations (0.2.1)
33-
- material-components-ios/ShadowLayer (0.2.1)
34-
- material-components-ios/Slider (0.2.1):
35-
- material-components-ios/private/ThumbTrack
36-
- material-components-ios/SpritedAnimationView (0.2.1)
37-
- material-components-ios/Switch (0.2.1):
38-
- material-components-ios/private/ThumbTrack
39-
- material-components-ios/Typography (0.2.1)
2+
- MaterialComponents (1.0.0):
3+
- MaterialComponents/Buttons (= 1.0.0)
4+
- MaterialComponents/FlexibleHeader (= 1.0.0)
5+
- MaterialComponents/HeaderStackView (= 1.0.0)
6+
- MaterialComponents/Ink (= 1.0.0)
7+
- MaterialComponents/PageControl (= 1.0.0)
8+
- MaterialComponents/private (= 1.0.0)
9+
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
10+
- MaterialComponents/ShadowElevations (= 1.0.0)
11+
- MaterialComponents/ShadowLayer (= 1.0.0)
12+
- MaterialComponents/Slider (= 1.0.0)
13+
- MaterialComponents/SpritedAnimationView (= 1.0.0)
14+
- MaterialComponents/Switch (= 1.0.0)
15+
- MaterialComponents/Typography (= 1.0.0)
16+
- MaterialComponents/Buttons (1.0.0):
17+
- MaterialComponents/Ink
18+
- MaterialComponents/ShadowElevations
19+
- MaterialComponents/ShadowLayer
20+
- MaterialComponents/Typography
21+
- MaterialComponents/FlexibleHeader (1.0.0)
22+
- MaterialComponents/HeaderStackView (1.0.0)
23+
- MaterialComponents/Ink (1.0.0)
24+
- MaterialComponents/PageControl (1.0.0)
25+
- MaterialComponents/private (1.0.0):
26+
- MaterialComponents/private/Color (= 1.0.0)
27+
- MaterialComponents/private/ThumbTrack (= 1.0.0)
28+
- MaterialComponents/private/Color (1.0.0)
29+
- MaterialComponents/private/ThumbTrack (1.0.0):
30+
- MaterialComponents/private/Color
31+
- MaterialComponents/ShadowElevations
32+
- MaterialComponents/ShadowLayer
33+
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
34+
- MaterialComponents/ShadowElevations (1.0.0)
35+
- MaterialComponents/ShadowLayer (1.0.0)
36+
- MaterialComponents/Slider (1.0.0):
37+
- MaterialComponents/private/ThumbTrack
38+
- MaterialComponents/SpritedAnimationView (1.0.0)
39+
- MaterialComponents/Switch (1.0.0):
40+
- MaterialComponents/private/ThumbTrack
41+
- MaterialComponents/Typography (1.0.0)
4042

4143
DEPENDENCIES:
42-
- material-components-ios (from `../../`)
44+
- MaterialComponents (from `../../`)
4345

4446
EXTERNAL SOURCES:
45-
material-components-ios:
47+
MaterialComponents:
4648
:path: ../../
4749

4850
SPEC CHECKSUMS:
49-
material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
51+
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
5052

5153
COCOAPODS: 0.39.0

‎build_tests/CocoapodsSwiftApp/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pod 'material-components-ios', :path => '../../'
1+
pod ‘MaterialComponents’, :path => '../../'
22

33
use_frameworks!

‎build_tests/CocoapodsSwiftApp/Podfile.lock‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,53 @@
11
PODS:
2-
- material-components-ios (0.2.1):
3-
- material-components-ios/Buttons (= 0.2.1)
4-
- material-components-ios/FlexibleHeader (= 0.2.1)
5-
- material-components-ios/Ink (= 0.2.1)
6-
- material-components-ios/PageControl (= 0.2.1)
7-
- material-components-ios/private (= 0.2.1)
8-
- material-components-ios/ScrollViewDelegateMultiplexer (= 0.2.1)
9-
- material-components-ios/ShadowElevations (= 0.2.1)
10-
- material-components-ios/ShadowLayer (= 0.2.1)
11-
- material-components-ios/Slider (= 0.2.1)
12-
- material-components-ios/SpritedAnimationView (= 0.2.1)
13-
- material-components-ios/Switch (= 0.2.1)
14-
- material-components-ios/Typography (= 0.2.1)
15-
- material-components-ios/Buttons (0.2.1):
16-
- material-components-ios/Ink
17-
- material-components-ios/ShadowElevations
18-
- material-components-ios/ShadowLayer
19-
- material-components-ios/Typography
20-
- material-components-ios/FlexibleHeader (0.2.1)
21-
- material-components-ios/Ink (0.2.1)
22-
- material-components-ios/PageControl (0.2.1)
23-
- material-components-ios/private (0.2.1):
24-
- material-components-ios/private/Color (= 0.2.1)
25-
- material-components-ios/private/ThumbTrack (= 0.2.1)
26-
- material-components-ios/private/Color (0.2.1)
27-
- material-components-ios/private/ThumbTrack (0.2.1):
28-
- material-components-ios/private/Color
29-
- material-components-ios/ShadowElevations
30-
- material-components-ios/ShadowLayer
31-
- material-components-ios/ScrollViewDelegateMultiplexer (0.2.1)
32-
- material-components-ios/ShadowElevations (0.2.1)
33-
- material-components-ios/ShadowLayer (0.2.1)
34-
- material-components-ios/Slider (0.2.1):
35-
- material-components-ios/private/ThumbTrack
36-
- material-components-ios/SpritedAnimationView (0.2.1)
37-
- material-components-ios/Switch (0.2.1):
38-
- material-components-ios/private/ThumbTrack
39-
- material-components-ios/Typography (0.2.1)
2+
- MaterialComponents (1.0.0):
3+
- MaterialComponents/Buttons (= 1.0.0)
4+
- MaterialComponents/FlexibleHeader (= 1.0.0)
5+
- MaterialComponents/HeaderStackView (= 1.0.0)
6+
- MaterialComponents/Ink (= 1.0.0)
7+
- MaterialComponents/PageControl (= 1.0.0)
8+
- MaterialComponents/private (= 1.0.0)
9+
- MaterialComponents/ScrollViewDelegateMultiplexer (= 1.0.0)
10+
- MaterialComponents/ShadowElevations (= 1.0.0)
11+
- MaterialComponents/ShadowLayer (= 1.0.0)
12+
- MaterialComponents/Slider (= 1.0.0)
13+
- MaterialComponents/SpritedAnimationView (= 1.0.0)
14+
- MaterialComponents/Switch (= 1.0.0)
15+
- MaterialComponents/Typography (= 1.0.0)
16+
- MaterialComponents/Buttons (1.0.0):
17+
- MaterialComponents/Ink
18+
- MaterialComponents/ShadowElevations
19+
- MaterialComponents/ShadowLayer
20+
- MaterialComponents/Typography
21+
- MaterialComponents/FlexibleHeader (1.0.0)
22+
- MaterialComponents/HeaderStackView (1.0.0)
23+
- MaterialComponents/Ink (1.0.0)
24+
- MaterialComponents/PageControl (1.0.0)
25+
- MaterialComponents/private (1.0.0):
26+
- MaterialComponents/private/Color (= 1.0.0)
27+
- MaterialComponents/private/ThumbTrack (= 1.0.0)
28+
- MaterialComponents/private/Color (1.0.0)
29+
- MaterialComponents/private/ThumbTrack (1.0.0):
30+
- MaterialComponents/private/Color
31+
- MaterialComponents/ShadowElevations
32+
- MaterialComponents/ShadowLayer
33+
- MaterialComponents/ScrollViewDelegateMultiplexer (1.0.0)
34+
- MaterialComponents/ShadowElevations (1.0.0)
35+
- MaterialComponents/ShadowLayer (1.0.0)
36+
- MaterialComponents/Slider (1.0.0):
37+
- MaterialComponents/private/ThumbTrack
38+
- MaterialComponents/SpritedAnimationView (1.0.0)
39+
- MaterialComponents/Switch (1.0.0):
40+
- MaterialComponents/private/ThumbTrack
41+
- MaterialComponents/Typography (1.0.0)
4042

4143
DEPENDENCIES:
42-
- material-components-ios (from `../../`)
44+
- MaterialComponents (from `../../`)
4345

4446
EXTERNAL SOURCES:
45-
material-components-ios:
47+
MaterialComponents:
4648
:path: ../../
4749

4850
SPEC CHECKSUMS:
49-
material-components-ios: b50d9c7d943980c8f9918da0101b0364aade4413
51+
MaterialComponents: 049b75aa69d6790c9ed2ee6e2f54d7294c65429d
5052

5153
COCOAPODS: 0.39.0

‎build_tests/classes/swift/MDCBuildTestViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
import UIKit
1818

19-
import material_components_ios
19+
import MaterialComponents
2020

2121
class MDCBuildTestViewController: UIViewController {
2222

0 commit comments

Comments
 (0)