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

Commit 7967e9e

Browse files
committed
Merge branch 'release-candidate' into stable
2 parents 286cf2a + c13c0cb commit 7967e9e

File tree

91 files changed

+600
-477
lines changed

Some content is hidden

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

91 files changed

+600
-477
lines changed

CHANGELOG.md

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,83 @@
1+
# 98.0.0
2+
3+
In this major release we deleted and deprecated numerous APIs in ActionSheet, BottomNavigation,
4+
Cards, List.
5+
Fix issue with unbounded ink. NavigationDrawer now allows its trackingScrollView to be resettable.
6+
7+
## Breaking changes
8+
9+
### ActionSheet
10+
11+
Delete inkColor and enableRippleBehavior from MDCActionSheetItemTableViewCell
12+
13+
### BottomNavigation
14+
15+
Delete MDCBottomNavigationBarTypographyThemer
16+
17+
## New deprecations
18+
19+
### List
20+
21+
Deprecate MDCListColorThemer
22+
23+
Deprecate MDCListTypographyThemer
24+
25+
## API changes
26+
27+
### BottomNavigation
28+
29+
*removed* class: `MDCBottomNavigationBarTypographyThemer`. Please use the Theming extension instead.
30+
31+
### List
32+
33+
*deprecated* class: `MDCListColorThemer`. Please use MaterialList+Theming instead.
34+
35+
*deprecated* class: `MDCListTypographyThemer`. Please use MDCSelfSizingStereoCell+MaterialTheming instead. (Note: Typography theming is no longer available as an independent API.)
36+
37+
## Component changes
38+
39+
### ActionSheet
40+
41+
* [Delete inkColor and enableRippleBehavior from MDCActionSheetItemTableViewCell (#9240)](https://github.com/material-components/material-components-ios/commit/eb46b2810eb98068146d8bbdf1b0e320bf3a8820) (Bryan Oltman)
42+
43+
### Banner
44+
45+
* [Update Readme to remove Beta related information. (#9248)](https://github.com/material-components/material-components-ios/commit/e47bedadb2fb6681522161d3fe86ff1fab5e072c) (Wenyu Zhang)
46+
47+
### BottomNavigation
48+
49+
* [Use NotoNastaliq for Arabic/RTL tests. (#9260)](https://github.com/material-components/material-components-ios/commit/19c810d61d38ca735b8256adac0ef734ade87141) (Robert Moore)
50+
* [delete-MDCBottomNavigationBarTypographyThemer (#9234)](https://github.com/material-components/material-components-ios/commit/d89eb249aacf6c9204e6544a3a3667fe6e3120e5) (Andrew Overton)
51+
52+
### Cards
53+
54+
* [Remove references to Themer from README (#9261)](https://github.com/material-components/material-components-ios/commit/08a2b20d70079342f0556dc55bdd52b4aa6b8dcc) (Bryan Oltman)
55+
56+
### Ink
57+
58+
* [Fix issue with unbounded ink (#9254)](https://github.com/material-components/material-components-ios/commit/fd63f37684fd28b8c8ecf2f0137a0d98084bc921) (Andrew Overton)
59+
60+
### List
61+
62+
* [Deprecaet MDCListColorThemer (#9265)](https://github.com/material-components/material-components-ios/commit/6e8fdfff36938475c4a8d253a55577cbed98db91) (Galia Kaufman)
63+
* [Deprecate MDCListTypographyThemer (#9269)](https://github.com/material-components/material-components-ios/commit/20c4cad5297889cf41b430b823b7bbb2cc4a15f0) (Galia Kaufman)
64+
* [Remove usage of MDCListTypographyThemer within our library (#9189)](https://github.com/material-components/material-components-ios/commit/6271396e6c027025310df8917604cca19bbb3441) (Galia Kaufman)
65+
66+
### NavigationDrawer
67+
68+
* [Resolve runtime warning from example in iOS… (#9251)](https://github.com/material-components/material-components-ios/commit/cf44736503819fe24c6eb37be6332b082f5eaebe) (Yarden Eitan)
69+
* [allow trackingScrollView to be resettable (#9206)](https://github.com/material-components/material-components-ios/commit/ead4785d5c4c7179a114964ab138f608bc58a3e5) (Yarden Eitan)
70+
71+
### Tabs
72+
73+
* [removed build file dep that was deleted but the colorThemer revert accidentally readd it (#9278)](https://github.com/material-components/material-components-ios/commit/98ad8eb4a431cb1c414e696ab4414388f87ea44e) (Randall Li)
74+
75+
## Multi-component changes
76+
77+
* [Add Swift example for MDCTabBarView (#9246)](https://github.com/material-components/material-components-ios/commit/687ca49597ba420ba552a70677df0f057fbdb20d) (Bryan Oltman)
78+
79+
---
80+
181
# 97.0.1
282

383
This hotfix patch release fixes the podspec. The previous release forgot to remove deleted references to card themers.

MaterialComponents.podspec

Lines changed: 1 addition & 14 deletions
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 = "97.0.1"
5+
mdc.version = "98.0.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"
@@ -325,22 +325,9 @@ Pod::Spec.new do |mdc|
325325
"components/#{component.base_name}/tests/unit/MDCBottomNavigationBarControllerTests.m"
326326
]
327327
unit_tests.resources = "components/#{component.base_name}/tests/unit/resources/*"
328-
unit_tests.dependency "MaterialComponents/BottomNavigation+TypographyThemer"
329328
end
330329
end
331330

332-
mdc.subspec "BottomNavigation+TypographyThemer" do |extension|
333-
extension.ios.deployment_target = '9.0'
334-
extension.public_header_files = [
335-
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
336-
]
337-
extension.source_files = [
338-
"components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}"
339-
]
340-
extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
341-
extension.dependency "MaterialComponents/schemes/Typography"
342-
end
343-
344331
mdc.subspec "BottomNavigation+Theming" do |extension|
345332
extension.ios.deployment_target = '9.0'
346333
extension.public_header_files = "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.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 = "97.0.1"
3+
mdc.version = "98.0.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 = "97.0.1"
3+
s.version = "98.0.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 = "97.0.1"
3+
s.version = "98.0.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 = "97.0.1"
56+
s.version = "98.0.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-
97.0.1
1+
98.0.0

catalog/MDCCatalog.xcodeproj/project.pbxproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
66CD19292072A54000DE6340 /* AppTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD19282072A54000DE6340 /* AppTheme.swift */; };
2929
66D3389520730A3E00FFA1AB /* MDCThemePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66D3389420730A3E00FFA1AB /* MDCThemePickerViewController.swift */; };
3030
75F4516F2130AB879A7EDBD5 /* Pods_MDCCatalog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A55EA1CC69E40D5EF866144 /* Pods_MDCCatalog.framework */; };
31-
A77B0FE922BBDBB400C0CEB3 /* MDCTabBarViewTypicalExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A77B0FE822BBDBB400C0CEB3 /* MDCTabBarViewTypicalExampleViewController.m */; };
3231
DE309CF31C8DEB8400E73247 /* MDCCatalogComponentsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE309CF21C8DEB8400E73247 /* MDCCatalogComponentsController.swift */; };
3332
DEF64EA41C8DEE83007C4EA0 /* MDCCatalogCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF64EA31C8DEE83007C4EA0 /* MDCCatalogCollectionViewCell.swift */; };
3433
/* End PBXBuildFile section */
@@ -123,7 +122,6 @@
123122
88AB955E76304B684707293E /* Pods_MDCActionExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MDCActionExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
124123
90B4FE989AA27838D0FB6A13 /* Pods-MDCCatalog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MDCCatalog.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog.debug.xcconfig"; sourceTree = "<group>"; };
125124
93314CA227FB65FEC87098C3 /* EarlGrey.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EarlGrey.framework; path = Pods/EarlGrey/EarlGrey/EarlGrey.framework; sourceTree = SOURCE_ROOT; };
126-
A77B0FE822BBDBB400C0CEB3 /* MDCTabBarViewTypicalExampleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MDCTabBarViewTypicalExampleViewController.m; path = ../../components/Tabs/examples/MDCTabBarViewTypicalExampleViewController.m; sourceTree = "<group>"; };
127125
BB375464F626CD555584A27F /* Pods_MDCSnapshotTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MDCSnapshotTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
128126
C250A4553B960CD6E1604CB7 /* Pods-MDCCatalog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MDCCatalog.release.xcconfig"; path = "Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog.release.xcconfig"; sourceTree = "<group>"; };
129127
D0ECF9608E1CF6AA39139933 /* Pods-MDCSnapshotTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MDCSnapshotTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MDCSnapshotTests/Pods-MDCSnapshotTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -217,7 +215,6 @@
217215
66D3389420730A3E00FFA1AB /* MDCThemePickerViewController.swift */,
218216
5CBA08362090E4DF009EA9D0 /* MDCMenuViewController.swift */,
219217
665A34DE1C6BDAE700962055 /* Resources */,
220-
A77B0FE822BBDBB400C0CEB3 /* MDCTabBarViewTypicalExampleViewController.m */,
221218
);
222219
path = MDCCatalog;
223220
sourceTree = "<group>";
@@ -333,6 +330,7 @@
333330
developmentRegion = English;
334331
hasScannedForEncodings = 0;
335332
knownRegions = (
333+
English,
336334
en,
337335
Base,
338336
ar,
@@ -499,7 +497,6 @@
499497
66CD19292072A54000DE6340 /* AppTheme.swift in Sources */,
500498
664524B91C6BA62A001ADBF8 /* MDCNodeListViewController.swift in Sources */,
501499
64F6D8811F91522A00AA4B24 /* MDCCatalogDebugAlert.swift in Sources */,
502-
A77B0FE922BBDBB400C0CEB3 /* MDCTabBarViewTypicalExampleViewController.m in Sources */,
503500
5CBA08372090E4DF009EA9D0 /* MDCMenuViewController.swift in Sources */,
504501
64F6D8831F915CA600AA4B24 /* MDCDebugSafeAreaInsetsView.swift in Sources */,
505502
66D3389520730A3E00FFA1AB /* MDCThemePickerViewController.swift in Sources */,

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

catalog/MDCDragons/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>97.0.1</string>
18+
<string>98.0.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>97.0.1</string>
20+
<string>98.0.0</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>UILaunchStoryboardName</key>

0 commit comments

Comments
 (0)