Skip to content

Commit a92183c

Browse files
authored
Remove some obsolete muriel colors (#24491)
1 parent 041430d commit a92183c

File tree

5 files changed

+5
-40
lines changed

5 files changed

+5
-40
lines changed

WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift

-35
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ import WordPressUI
2424
return UIAppColor.neutral
2525
}
2626

27-
@available(swift, obsoleted: 1.0)
28-
public static func murielNeutral0() -> UIColor {
29-
return UIAppColor.neutral(.shade0)
30-
}
31-
3227
@available(swift, obsoleted: 1.0)
3328
public static func murielNeutral5() -> UIColor {
3429
return UIAppColor.neutral(.shade5)
@@ -39,11 +34,6 @@ import WordPressUI
3934
return UIAppColor.neutral(.shade10)
4035
}
4136

42-
@available(swift, obsoleted: 1.0)
43-
public static func murielNeutral20() -> UIColor {
44-
return UIAppColor.neutral(.shade20)
45-
}
46-
4737
@available(swift, obsoleted: 1.0)
4838
public static func murielNeutral30() -> UIColor {
4939
return UIAppColor.neutral(.shade30)
@@ -64,11 +54,6 @@ import WordPressUI
6454
return UIAppColor.neutral(.shade70)
6555
}
6656

67-
@available(swift, obsoleted: 1.0)
68-
public static func murielSuccess() -> UIColor {
69-
return UIAppColor.success
70-
}
71-
7257
@available(swift, obsoleted: 1.0)
7358
public static func murielText() -> UIColor {
7459
return .label
@@ -89,26 +74,11 @@ import WordPressUI
8974
return UIAppColor.error
9075
}
9176

92-
@available(swift, obsoleted: 1.0)
93-
public static func murielBasicBackground() -> UIColor {
94-
return .systemBackground
95-
}
96-
97-
@available(swift, obsoleted: 1.0)
98-
public static func murielTextPlaceholder() -> UIColor {
99-
return .tertiaryLabel
100-
}
101-
10277
@available(swift, obsoleted: 1.0)
10378
public static func murielListForeground() -> UIColor {
10479
return .secondarySystemGroupedBackground
10580
}
10681

107-
@available(swift, obsoleted: 1.0)
108-
public static func murielListBackground() -> UIColor {
109-
return .systemGroupedBackground
110-
}
111-
11282
@available(swift, obsoleted: 1.0)
11383
public static func murielListIcon() -> UIColor {
11484
return .secondaryLabel
@@ -118,9 +88,4 @@ import WordPressUI
11888
public static func murielAppBarText() -> UIColor {
11989
return UIAppColor.appBarText
12090
}
121-
122-
@available(swift, obsoleted: 1.0)
123-
public static func murielAppBarBackground() -> UIColor {
124-
return UIAppColor.appBarTint
125-
}
12691
}

WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ - (void)viewDidLoad
3030
[super viewDidLoad];
3131

3232
self.view.translatesAutoresizingMaskIntoConstraints = NO;
33-
self.view.backgroundColor = [UIColor murielListBackground];
33+
self.view.backgroundColor = [UIColor systemGroupedBackgroundColor];
3434

3535
self.stackView.spacing = MenusDesignDefaultContentSpacing / 2.0;
3636

WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ - (void)viewDidLoad
8181
[super viewDidLoad];
8282

8383
self.navigationItem.title = NSLocalizedString(@"Menus", @"Title for screen that allows configuration of your site's menus");
84-
self.view.backgroundColor = [UIColor murielListBackground];
84+
self.view.backgroundColor = [UIColor systemGroupedBackgroundColor];
8585

8686
self.scrollView.backgroundColor = self.view.backgroundColor;
8787
self.scrollView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive;

WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (id)initWithFrame:(CGRect)frame
2525
self = [super initWithFrame:frame];
2626
if (self) {
2727

28-
self.backgroundColor = [UIColor murielBasicBackground];
28+
self.backgroundColor = [UIColor systemBackgroundColor];
2929

3030
[self setupSourceCell];
3131
}

WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ - (id)initAsSearchBar
6363

6464
UIFont *font = [WPFontManager systemRegularFontOfSize:16.0];
6565
NSString *placeholder = NSLocalizedString(@"Search...", @"Menus search bar placeholder text.");
66-
NSDictionary *attributes = @{NSFontAttributeName: font, NSForegroundColorAttributeName: [UIColor murielTextPlaceholder]};
66+
NSDictionary *attributes = @{NSFontAttributeName: font, NSForegroundColorAttributeName: [UIColor tertiaryLabelColor]};
6767
_textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:attributes];
6868
}
6969

@@ -102,7 +102,7 @@ - (void)setupContentStackView
102102
contentView.translatesAutoresizingMaskIntoConstraints = NO;
103103
contentView.layer.borderColor = [[UIColor murielNeutral10] CGColor];
104104
contentView.layer.borderWidth = MenusDesignStrokeWidth;
105-
contentView.backgroundColor = [UIColor murielBasicBackground];
105+
contentView.backgroundColor = [UIColor systemBackgroundColor];
106106

107107
NSAssert(_stackView != nil, @"stackView is nil");
108108

0 commit comments

Comments
 (0)