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

Commit 56e4432

Browse files
ajsecordajsecord
committed
Merge branch 'release-candidate'
2 parents 3659bf4 + a1c2633 commit 56e4432

File tree

55 files changed

+2723
-814
lines changed

Some content is hidden

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

55 files changed

+2723
-814
lines changed

‎CHANGELOG.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
# 16.2.0
2+
3+
## API diffs
4+
5+
### FeatureHighlight
6+
7+
* [FeatureHighlight](https://github.com/google/material-components-ios/commit/d4806473e49e65f0e9cc52139e39c3f1eba4f499) is a new component that lets you highlight a particular feature of your interface to the user.
8+
9+
## Component changes
10+
11+
### AppBar
12+
13+
#### Changes
14+
15+
* [Ensure typical use examples match for Objective C and Swift (#815)](https://github.com/google/material-components-ios/commit/09fb272376e814677f2936651906fd764618ea05) (Junius Gunaratne)
16+
17+
### CollectionCells
18+
19+
#### Changes
20+
21+
* [Align text labels frames to the upper pixel.](https://github.com/google/material-components-ios/commit/5a1a23d3c69c1c652b317219e1bb51d163000d4d) (Louis Romero)
22+
* [Show/hide the editing box as entering/leaving edit](https://github.com/google/material-components-ios/commit/12206c44e72bd133f77a8d7373614f19cc73ec88) (Louis Romero)
23+
24+
### Collections
25+
26+
#### Changes
27+
28+
* [Fix -[MDCCollectionViewFlowLayout updateCellStateMaskWithAttribute:] (#732)](https://github.com/google/material-components-ios/commit/f2b93ae1119b28ee0685b780ccdd7e2a8044da2d) (Jackie Quinn)
29+
30+
### FeatureHighlight
31+
32+
#### Changes
33+
34+
* [MDCFeatureHighlightViewController implementation (#765)](https://github.com/google/material-components-ios/commit/d4806473e49e65f0e9cc52139e39c3f1eba4f499) (Sam Morrison)
35+
* [Minor feature highlight fixes (#814)](https://github.com/google/material-components-ios/commit/b1c814d038b2cccaed76a7048deac1ae3771d7cd) (Sam Morrison)
36+
37+
### NavigationBar
38+
39+
#### Changes
40+
41+
* [Setting default state of textAlignment (#817)](https://github.com/google/material-components-ios/commit/9e947eba06b09ab8ad901af9d2a8001fac824daf) (Randall Li)
42+
* [[Navigation Bar] Fixed text alignment in a better way that accepts the pre iOS8 default. (#820)](https://github.com/google/material-components-ios/commit/328631c19a2b89b0f4d8c11c24796ad0963976ee) (Randall Li)
43+
44+
### Switch
45+
46+
#### Changes
47+
48+
* [Added haptic feedback to MDCSwitch (#812)](https://github.com/google/material-components-ios/commit/6aae38dfa70db77929ef2952ff3b8fce3caea60b) (Adrian Secord)
49+
150
# 16.1.0
251

352
## Component changes

‎MaterialComponents.podspec‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ load 'scripts/generated/icons.rb'
22

33
Pod::Spec.new do |s|
44
s.name = "MaterialComponents"
5-
s.version = "16.1.0"
5+
s.version = "16.2.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"
99
s.license = "Apache 2.0"
10-
s.source = { :git => "https://github.com/google/material-components-ios.git", :tag => s.version.to_s }
10+
s.source = { :git => "https://github.com/google/material-components-ios.git", :tag => "v#{s.version}" }
1111
s.platform = :ios
1212
s.requires_arc = true
1313

@@ -21,8 +21,8 @@ Pod::Spec.new do |s|
2121
#
2222
# ## Optional properties
2323
#
24-
# resource_bundles => If your component has a bundle, add a dictionary mapping from the bundle
25-
# name to the bundle path.
24+
# resources => If your component has a bundle, add a dictionary mapping from the bundle
25+
# name to the bundle path. NOTE: Do not use resource_bundle property.
2626
#
2727
# # Template subspec
2828
#
@@ -32,9 +32,8 @@ Pod::Spec.new do |s|
3232
# ss.header_mappings_dir = "components/#{ss.base_name}/src"
3333
#
3434
# # Only if you have a resource bundle
35-
# ss.resource_bundles = {
36-
# "Material#{ss.base_name}" => ["components/#{ss.base_name}/Material#{ss.base_name}.bundle/*"]
37-
# }
35+
# ss.resources = ["components/#{ss.base_name}/Material#{ss.base_name}.bundle"]
36+
#
3837
# end
3938
#
4039

@@ -128,9 +127,7 @@ Pod::Spec.new do |s|
128127
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
129128
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
130129
ss.header_mappings_dir = "components/#{ss.base_name}/src"
131-
ss.resource_bundles = {
132-
"Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
133-
}
130+
ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
134131

135132
ss.framework = "CoreGraphics", "QuartzCore"
136133

@@ -154,6 +151,15 @@ Pod::Spec.new do |s|
154151
ss.dependency "MaterialComponents/private/KeyboardWatcher"
155152
end
156153

154+
s.subspec "FeatureHighlight" do |ss|
155+
ss.ios.deployment_target = '7.0'
156+
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
157+
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
158+
ss.header_mappings_dir = "components/#{ss.base_name}/src"
159+
ss.dependency "MaterialComponents/Typography"
160+
ss.dependency "MDFTextAccessibility"
161+
end
162+
157163
s.subspec "FlexibleHeader" do |ss|
158164
ss.ios.deployment_target = '7.0'
159165
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
@@ -208,9 +214,7 @@ Pod::Spec.new do |s|
208214
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
209215
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}", "components/#{ss.base_name}/src/private/*.{h,m}"
210216
ss.header_mappings_dir = "components/#{ss.base_name}/src"
211-
ss.resource_bundles = {
212-
"Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
213-
}
217+
ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
214218
end
215219

216220
s.subspec "Palettes" do |ss|
@@ -236,9 +240,7 @@ Pod::Spec.new do |s|
236240
ss.header_mappings_dir = "components/#{ss.base_name}/src"
237241

238242
# Only if you have a resource bundle
239-
ss.resource_bundles = {
240-
"Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
241-
}
243+
ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
242244

243245
ss.dependency "MaterialComponents/FontDiskLoader"
244246
ss.dependency "MaterialComponents/Typography"
@@ -292,9 +294,7 @@ Pod::Spec.new do |s|
292294
ss.public_header_files = "components/#{ss.base_name}/src/*.h"
293295
ss.source_files = "components/#{ss.base_name}/src/*.{h,m}"
294296
ss.header_mappings_dir = "components/#{ss.base_name}/src"
295-
ss.resource_bundles = {
296-
"Material#{ss.base_name}" => ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle/*"]
297-
}
297+
ss.resources = ["components/#{ss.base_name}/src/Material#{ss.base_name}.bundle"]
298298

299299
ss.dependency "MaterialComponents/private/ThumbTrack"
300300
ss.dependency "MaterialComponents/private/RTL"

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

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ Choose from Objective-C or Swift:
115115
116116
#### Swift
117117
118-
~~~swift
119-
import MaterialComponents
118+
~~~ swift
119+
import MaterialComponents.MaterialButtons
120120
121121
class MDCBuildTestViewController: UIViewController {
122122

‎catalog/MDCCatalog.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
403860EF1D24328A00FB8216 /* MDCCatalogTileDataDialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = 403860EE1D24328A00FB8216 /* MDCCatalogTileDataDialogs.m */; };
1414
5D090E571C9AEB8D0061344A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5D090E341C9AEB8C0061344A /* Localizable.strings */; };
1515
5D2B1DB2BD8D444E630A80AC /* EarlGrey.framework in EarlGrey Copy Files */ = {isa = PBXBuildFile; fileRef = E94681B7591B9CD40924C92C /* EarlGrey.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
16+
645594551D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m in Sources */ = {isa = PBXBuildFile; fileRef = 645594541D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m */; };
1617
664524B71C6BA62A001ADBF8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664524B61C6BA62A001ADBF8 /* AppDelegate.swift */; };
1718
664524B91C6BA62A001ADBF8 /* MDCNodeListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664524B81C6BA62A001ADBF8 /* MDCNodeListViewController.swift */; };
1819
664524BE1C6BA62A001ADBF8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 664524BD1C6BA62A001ADBF8 /* Assets.xcassets */; };
@@ -119,6 +120,8 @@
119120
5D090E541C9AEB8D0061344A /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
120121
5D090E551C9AEB8D0061344A /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Localizable.strings; sourceTree = "<group>"; };
121122
5D090E561C9AEB8D0061344A /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
123+
645594531D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MDCCatalogTileDataFeatureHighlight.h; sourceTree = "<group>"; };
124+
645594541D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MDCCatalogTileDataFeatureHighlight.m; sourceTree = "<group>"; };
122125
664524B31C6BA62A001ADBF8 /* MDCCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MDCCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
123126
664524B61C6BA62A001ADBF8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
124127
664524B81C6BA62A001ADBF8 /* MDCNodeListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MDCNodeListViewController.swift; sourceTree = "<group>"; };
@@ -289,6 +292,8 @@
289292
DE7A17C41CCAC1EA00B66230 /* MDCCatalogTileDataCollections.m */,
290293
403860ED1D24328A00FB8216 /* MDCCatalogTileDataDialogs.h */,
291294
403860EE1D24328A00FB8216 /* MDCCatalogTileDataDialogs.m */,
295+
645594531D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.h */,
296+
645594541D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m */,
292297
DE19446F1CBD9E40009E0321 /* MDCCatalogTileDataFlexibleHeader.h */,
293298
DE1944701CBD9E40009E0321 /* MDCCatalogTileDataFlexibleHeader.m */,
294299
DE1944711CBD9E40009E0321 /* MDCCatalogTileDataHeaderStackView.h */,
@@ -575,6 +580,7 @@
575580
buildActionMask = 2147483647;
576581
files = (
577582
DE1944901CBD9E40009E0321 /* MDCCatalogTileDataShadowLayer.m in Sources */,
583+
645594551D9F03E80072AB06 /* MDCCatalogTileDataFeatureHighlight.m in Sources */,
578584
DE1944911CBD9E40009E0321 /* MDCCatalogTileDataSlider.m in Sources */,
579585
DE19448E1CBD9E40009E0321 /* MDCCatalogTileDataNavigationBar.m in Sources */,
580586
DE19448F1CBD9E40009E0321 /* MDCCatalogTileDataPageControl.m in Sources */,

‎catalog/MDCCatalog/MDCCatalogTileDataFeatureHighlight.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
#import "MDCCatalogTileData.h"
18+
19+
@interface MDCCatalogTileDataFeatureHighlight : MDCCatalogTileData
20+
21+
+ (UIImage *)drawTileImage:(CGRect)frame;
22+
23+
@end

‎catalog/MDCCatalog/MDCCatalogTileDataFeatureHighlight.m‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
#import "MDCCatalogTileDataFeatureHighlight.h"
18+
19+
@implementation MDCCatalogTileDataFeatureHighlight
20+
21+
+ (UIImage *)drawTileImage:(CGRect)frame {
22+
return [self drawImageWithFrame:frame drawBlock:^(CGRect blockFrame) {
23+
}];
24+
}
25+
26+
@end

‎catalog/MDCCatalog/MDCCatalogTileView.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ class MDCCatalogTileView: UIView {
8282
newImage = MDCCatalogTileDataButtons.drawTileImage(centeredFrame)
8383
case "Collections":
8484
newImage = MDCCatalogTileDataCollections.drawTileImage(centeredFrame)
85+
case "Feature Highlight":
86+
newImage = MDCCatalogTileDataFeatureHighlight.drawTileImage(centeredFrame)
8587
case "Flexible Header":
8688
newImage = MDCCatalogTileDataFlexibleHeader.drawTileImage(centeredFrame)
8789
case "Header Stack View":

‎catalog/MDCCatalog/MDCCatalogTiles.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#import "MDCCatalogTileDataButtonBar.h"
2121
#import "MDCCatalogTileDataButtons.h"
2222
#import "MDCCatalogTileDataCollections.h"
23+
#import "MDCCatalogTileDataFeatureHighlight.h"
2324
#import "MDCCatalogTileDataFlexibleHeader.h"
2425
#import "MDCCatalogTileDataHeaderStackView.h"
2526
#import "MDCCatalogTileDataInk.h"

0 commit comments

Comments
 (0)