Skip to content

Commit 4195a48

Browse files
randalllimaterial-automation
authored andcommitted
Delete elevationOverlayColor: It is not used in any theming extensions.
This property was added #7924 PiperOrigin-RevId: 351828292
1 parent 4deaee1 commit 4195a48

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

components/schemes/Color/src/MDCSemanticColorScheme.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@
7575
*/
7676
@property(nonnull, readonly, copy, nonatomic) UIColor *onBackgroundColor;
7777

78-
/**
79-
A color that is used for the elevation overlays, applied with an alpha on top of surfaces.
80-
*/
81-
@property(nonnull, readonly, copy, nonatomic) UIColor *elevationOverlayColor;
82-
8378
/**
8479
A flag that indicates whether the overlay color should be applied on an elevated surface in Dark
8580
Mode. There is no elevation overlay applied in Light Mode.
@@ -123,7 +118,6 @@ typedef NS_ENUM(NSInteger, MDCColorSchemeDefaults) {
123118
@property(nonnull, readwrite, copy, nonatomic) UIColor *onSecondaryColor;
124119
@property(nonnull, readwrite, copy, nonatomic) UIColor *onSurfaceColor;
125120
@property(nonnull, readwrite, copy, nonatomic) UIColor *onBackgroundColor;
126-
@property(nonnull, readwrite, copy, nonatomic) UIColor *elevationOverlayColor;
127121
@property(readwrite, assign, nonatomic) BOOL elevationOverlayEnabledForDarkMode;
128122

129123
/**

components/schemes/Color/src/MDCSemanticColorScheme.m

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ - (instancetype)initWithDefaults:(MDCColorSchemeDefaults)defaults {
5454
_onSecondaryColor = ColorFromRGB(0x000000);
5555
_onSurfaceColor = ColorFromRGB(0x000000);
5656
_onBackgroundColor = ColorFromRGB(0x000000);
57-
_elevationOverlayColor = ColorFromRGB(0x000000);
5857
_elevationOverlayEnabledForDarkMode = NO;
5958
break;
6059
case MDCColorSchemeDefaultsMaterialDark201907:
@@ -68,7 +67,6 @@ - (instancetype)initWithDefaults:(MDCColorSchemeDefaults)defaults {
6867
_onSecondaryColor = ColorFromRGB(0x000000);
6968
_onSurfaceColor = ColorFromRGB(0xFFFFFF);
7069
_onBackgroundColor = ColorFromRGB(0xFFFFFF);
71-
_elevationOverlayColor = ColorFromRGB(0xFFFFFF);
7270
_elevationOverlayEnabledForDarkMode = YES;
7371
break;
7472
case MDCColorSchemeDefaultsMaterial201907: {
@@ -123,9 +121,6 @@ - (instancetype)initWithDefaults:(MDCColorSchemeDefaults)defaults {
123121
defaultColor:ColorFromRGB(0x000000)];
124122
_onBackgroundColor = [UIColor colorWithUserInterfaceStyleDarkColor:ColorFromRGB(0xFFFFFF)
125123
defaultColor:ColorFromRGB(0x000000)];
126-
_elevationOverlayColor =
127-
[UIColor colorWithUserInterfaceStyleDarkColor:ColorFromRGB(0xFFFFFF)
128-
defaultColor:ColorFromRGB(0x000000)];
129124
_elevationOverlayEnabledForDarkMode = YES;
130125
break;
131126
}

components/schemes/Color/tests/unit/MDCSemanticColorSchemeTests.m

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ - (void)testInitMatchesInitWithMaterialDefaults {
4848
XCTAssertEqualObjects(initScheme.onSecondaryColor, mdDefaultScheme.onSecondaryColor);
4949
XCTAssertEqualObjects(initScheme.onSurfaceColor, mdDefaultScheme.onSurfaceColor);
5050
XCTAssertEqualObjects(initScheme.onBackgroundColor, mdDefaultScheme.onBackgroundColor);
51-
XCTAssertEqualObjects(initScheme.elevationOverlayColor, mdDefaultScheme.elevationOverlayColor);
5251
XCTAssertEqual(initScheme.elevationOverlayEnabledForDarkMode,
5352
mdDefaultScheme.elevationOverlayEnabledForDarkMode);
5453
}
@@ -69,7 +68,6 @@ - (void)testInitWithMaterialDefaults {
6968
XCTAssertEqualObjects(colorScheme.onSecondaryColor, ColorFromRGB(0x000000));
7069
XCTAssertEqualObjects(colorScheme.onSurfaceColor, ColorFromRGB(0x000000));
7170
XCTAssertEqualObjects(colorScheme.onBackgroundColor, ColorFromRGB(0x000000));
72-
XCTAssertEqualObjects(colorScheme.elevationOverlayColor, ColorFromRGB(0x000000));
7371
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, NO);
7472
}
7573

@@ -89,7 +87,6 @@ - (void)testInitWithMaterialDefaultsDark {
8987
XCTAssertEqualObjects(colorScheme.onSecondaryColor, ColorFromRGB(0x000000));
9088
XCTAssertEqualObjects(colorScheme.onSurfaceColor, ColorFromRGB(0xFFFFFF));
9189
XCTAssertEqualObjects(colorScheme.onBackgroundColor, ColorFromRGB(0xFFFFFF));
92-
XCTAssertEqualObjects(colorScheme.elevationOverlayColor, ColorFromRGB(0xFFFFFF));
9390
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, YES);
9491
}
9592

@@ -134,9 +131,6 @@ - (void)testInitWithMaterialDefaults201907WhenUserInterfaceStyleIsDarkForiOS13 {
134131
XCTAssertEqualObjects(
135132
[colorScheme.onBackgroundColor resolvedColorWithTraitCollection:traitCollection],
136133
ColorFromRGB(0xFFFFFF));
137-
XCTAssertEqualObjects(
138-
[colorScheme.elevationOverlayColor resolvedColorWithTraitCollection:traitCollection],
139-
ColorFromRGB(0xFFFFFF));
140134
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, YES);
141135
}
142136
#endif // MDC_AVAILABLE_SDK_IOS(13_0)
@@ -183,9 +177,6 @@ - (void)testInitWithMaterialDefaults201907WhenUserInterfaceStyleIsLightForiOS13
183177
XCTAssertEqualObjects(
184178
[colorScheme.onBackgroundColor resolvedColorWithTraitCollection:traitCollection],
185179
ColorFromRGB(0x000000));
186-
XCTAssertEqualObjects(
187-
[colorScheme.elevationOverlayColor resolvedColorWithTraitCollection:traitCollection],
188-
ColorFromRGB(0x000000));
189180
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, YES);
190181
}
191182
#endif // MDC_AVAILABLE_SDK_IOS(13_0)
@@ -209,7 +200,6 @@ - (void)testInitWithMaterialDefaults201907WhenUserInterfaceStyleIsLightForPreiOS
209200
XCTAssertEqualObjects(colorScheme.onSecondaryColor, ColorFromRGB(0x000000));
210201
XCTAssertEqualObjects(colorScheme.onSurfaceColor, ColorFromRGB(0x000000));
211202
XCTAssertEqualObjects(colorScheme.onBackgroundColor, ColorFromRGB(0x000000));
212-
XCTAssertEqualObjects(colorScheme.elevationOverlayColor, ColorFromRGB(0x000000));
213203
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, YES);
214204
}
215205
}
@@ -262,9 +252,6 @@ - (void)testInitWithMaterialDefaults201907WhenUserInterfaceStyleIsLightForPreiOS
262252
XCTAssertEqualObjects(
263253
[colorScheme.onBackgroundColor resolvedColorWithTraitCollection:traitCollection],
264254
ColorFromRGB(0xFFFFFF));
265-
XCTAssertEqualObjects(
266-
[colorScheme.elevationOverlayColor resolvedColorWithTraitCollection:traitCollection],
267-
ColorFromRGB(0xFFFFFF));
268255
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, YES);
269256
}
270257
#endif // MDC_AVAILABLE_SDK_IOS(13_0)
@@ -318,9 +305,6 @@ - (void)testInitWithMaterialDefaults201907WhenUserInterfaceStyleIsLightForPreiOS
318305
XCTAssertEqualObjects(
319306
[colorScheme.onBackgroundColor resolvedColorWithTraitCollection:traitCollection],
320307
ColorFromRGB(0x000000));
321-
XCTAssertEqualObjects(
322-
[colorScheme.elevationOverlayColor resolvedColorWithTraitCollection:traitCollection],
323-
ColorFromRGB(0x000000));
324308
XCTAssertEqual(colorScheme.elevationOverlayEnabledForDarkMode, YES);
325309
}
326310
#endif // MDC_AVAILABLE_SDK_IOS(13_0)

0 commit comments

Comments
 (0)