Skip to content

Commit 3c2feb9

Browse files
authored
Merge pull request #7604 from woocommerce/issue/7599-hubmenu-admin-color
Rename WooFoundation SemanticColors to avoid UIColor conflicts
2 parents c48cc42 + f426a07 commit 3c2feb9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ extension HubMenuViewModel {
208208

209209
let title: String = Localization.woocommerceAdmin
210210
let icon: UIImage = .wordPressLogoImage
211-
let iconColor: UIColor = .blue
211+
let iconColor: UIColor = .wooBlue
212212
let badge: HubMenuBadgeType = .number(number: 0)
213213
let accessibilityIdentifier: String = "menu-woocommerce-admin"
214214
let trackingOption: String = "admin_menu"

WooCommerce/Classes/ViewRelated/Reviews/ReviewViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class ReviewViewModel {
4343
return NSAttributedString(string: review.review.strippedHTML).trimNewlines()
4444
}
4545

46-
let accentColor = UIColor.orange
46+
let accentColor = UIColor.wooOrange
4747
let textColor = UIColor.textSubtle
4848

4949
let pendingReviewLiteral = NSAttributedString(string: Strings.pendingReviews,

WooFoundation/WooFoundation/Colors/UIColor+SemanticColors.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ public extension UIColor {
6464

6565
/// Blue. Blue-50 (< iOS 13 and Light Mode) and Blue-30 (Dark Mode)
6666
///
67-
static var blue: UIColor {
67+
static var wooBlue: UIColor {
6868
return UIColor(light: .withColorStudio(.blue, shade: .shade50),
6969
dark: .withColorStudio(.blue, shade: .shade30))
7070
}
7171

7272
/// Orange. Orange-50 (< iOS 13 and Light Mode) and Orange-30 (Dark Mode)
7373
///
74-
static var orange: UIColor {
74+
static var wooOrange: UIColor {
7575
return UIColor(light: .withColorStudio(.orange, shade: .shade50),
7676
dark: .withColorStudio(.orange, shade: .shade30))
7777
}

0 commit comments

Comments
 (0)