Skip to content

Commit f0fa977

Browse files
Stepan KhapuginChromium LUCI CQ
Stepan Khapugin
authored and
Chromium LUCI CQ
committed
[iOS] Update touch down color of swiftui popup rows.
Use a new tertiary background color, which is not the same as the old one. Fixed: 1324975 Change-Id: Ibb5d93d67c7546d7f46a8f04cc07feb052dd9956 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3648185 Auto-Submit: Stepan Khapugin <stkhapugin@chromium.org> Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org> Reviewed-by: Robbie Gibson <rkgibson@google.com> Cr-Commit-Position: refs/heads/main@{#1003276}
1 parent 5174a7e commit f0fa977

File tree

6 files changed

+52
-1
lines changed

6 files changed

+52
-1
lines changed

ios/chrome/browser/ui/omnibox/popup/shared/popup_match_row_view.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ struct PopupMatchRowView: View {
138138
if isHighlighted {
139139
LinearGradient(gradient: Colors.highlightingGradient, startPoint: .top, endPoint: .bottom)
140140
} else if self.isPressed {
141-
Color.tableRowViewHighlight
141+
Color.updatedTertiaryBackground
142142
}
143143

144144
button

ios/chrome/common/ui/colors/Color+Chrome.swift

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ extension Color {
2121
return Color(kTertiaryBackgroundColor)
2222
}
2323

24+
/// The updated tertiary background color
25+
public static var updatedTertiaryBackground: Color {
26+
return Color(kUpdatedTertiaryBackgroundColor)
27+
}
28+
2429
/// The primary grouped background color.
2530
public static var groupedPrimaryBackground: Color {
2631
return Color(kGroupedPrimaryBackgroundColor)

ios/chrome/common/ui/colors/resources/BUILD.gn

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ group("resources") {
5151
":textfield_placeholder_color",
5252
":toolbar_button_color",
5353
":toolbar_shadow_color",
54+
":updated_tertiary_background_color",
5455
]
5556
}
5657

@@ -178,6 +179,10 @@ colorset("tertiary_background_color") {
178179
sources = [ "tertiary_background_color.colorset/Contents.json" ]
179180
}
180181

182+
colorset("updated_tertiary_background_color") {
183+
sources = [ "updated_tertiary_background_color.colorset/Contents.json" ]
184+
}
185+
181186
colorset("text_tertiary_color") {
182187
sources = [ "text_tertiary_color.colorset/Contents.json" ]
183188
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"info": {
3+
"version": 1,
4+
"author": "xcode"
5+
},
6+
"colors": [
7+
{
8+
"idiom": "universal",
9+
"color": {
10+
"color-space": "display-p3",
11+
"components": {
12+
"alpha": "1.000",
13+
"red": "0xDA",
14+
"green": "0xDC",
15+
"blue": "0xE0"
16+
}
17+
}
18+
},
19+
{
20+
"idiom": "universal",
21+
"appearances": [
22+
{
23+
"appearance": "luminosity",
24+
"value": "dark"
25+
}
26+
],
27+
"color": {
28+
"color-space": "display-p3",
29+
"components": {
30+
"alpha": "1.000",
31+
"red": "0x46",
32+
"green": "0x4A",
33+
"blue": "0x4E"
34+
}
35+
}
36+
}
37+
]
38+
}

ios/chrome/common/ui/colors/semantic_color_names.h

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ extern NSString* const kSeparatorColor;
3535
extern NSString* const kSolidButtonTextColor;
3636
extern NSString* const kTableViewRowHighlightColor;
3737
extern NSString* const kTertiaryBackgroundColor;
38+
extern NSString* const kUpdatedTertiaryBackgroundColor;
3839
extern NSString* const kTextPrimaryColor;
3940
extern NSString* const kTextSecondaryColor;
4041
extern NSString* const kTextTertiaryColor;

ios/chrome/common/ui/colors/semantic_color_names.mm

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
NSString* const kSolidButtonTextColor = @"solid_button_text_color";
2929
NSString* const kTableViewRowHighlightColor = @"table_view_row_highlight_color";
3030
NSString* const kTertiaryBackgroundColor = @"tertiary_background_color";
31+
NSString* const kUpdatedTertiaryBackgroundColor =
32+
@"updated_tertiary_background_color";
3133
NSString* const kTextPrimaryColor = @"text_primary_color";
3234
NSString* const kTextSecondaryColor = @"text_secondary_color";
3335
NSString* const kTextTertiaryColor = @"text_tertiary_color";

0 commit comments

Comments
 (0)