From d605731ad1b568ccc3cf92f298ba71d4218b1aba Mon Sep 17 00:00:00 2001 From: kean Date: Mon, 28 Oct 2024 14:01:01 -0400 Subject: [PATCH 1/2] Fix bar chart colors --- .../Classes/Utility/App Configuration/AppColor.swift | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/WordPress/Classes/Utility/App Configuration/AppColor.swift b/WordPress/Classes/Utility/App Configuration/AppColor.swift index b633911759d4..cb5edcac6a8a 100644 --- a/WordPress/Classes/Utility/App Configuration/AppColor.swift +++ b/WordPress/Classes/Utility/App Configuration/AppColor.swift @@ -3,10 +3,6 @@ import ColorStudio import SwiftUI struct UIAppColor { - static func primary(_ shade: ColorStudioShade) -> UIColor { - CSColor.Blue.shade(shade) - } - static func accent(_ shade: ColorStudioShade) -> UIColor { CSColor.Pink.shade(shade) } @@ -96,6 +92,10 @@ struct UIAppColor { static func brand(_ shade: ColorStudioShade) -> UIColor { CSColor.JetpackGreen.shade(shade) } + + static func primary(_ shade: ColorStudioShade) -> UIColor { + CSColor.JetpackGreen.shade(shade) + } #endif #if IS_WORDPRESS @@ -105,6 +105,10 @@ struct UIAppColor { static func brand(_ shade: ColorStudioShade) -> UIColor { CSColor.WordPressBlue.shade(shade) } + + static func primary(_ shade: ColorStudioShade) -> UIColor { + CSColor.Blue.shade(shade) + } #endif static let divider = CSColor.Gray.shade(.shade10) From 30056b67271871443954a3e885422094c3cda458 Mon Sep 17 00:00:00 2001 From: kean Date: Mon, 28 Oct 2024 14:04:58 -0400 Subject: [PATCH 2/2] Update UIAppColor.primary --- .../Classes/Utility/App Configuration/AppColor.swift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/WordPress/Classes/Utility/App Configuration/AppColor.swift b/WordPress/Classes/Utility/App Configuration/AppColor.swift index cb5edcac6a8a..d55f47c19ad4 100644 --- a/WordPress/Classes/Utility/App Configuration/AppColor.swift +++ b/WordPress/Classes/Utility/App Configuration/AppColor.swift @@ -87,12 +87,15 @@ struct UIAppColor { #if IS_JETPACK static let tint = UIColor.label + static let brand = UIColor(light: CSColor.JetpackGreen.shade(.shade40), dark: CSColor.JetpackGreen.shade(.shade30)) static func brand(_ shade: ColorStudioShade) -> UIColor { CSColor.JetpackGreen.shade(shade) } + static let primary = CSColor.JetpackGreen.base + static func primary(_ shade: ColorStudioShade) -> UIColor { CSColor.JetpackGreen.shade(shade) } @@ -100,12 +103,15 @@ struct UIAppColor { #if IS_WORDPRESS static let tint = brand + static let brand = CSColor.WordPressBlue.base static func brand(_ shade: ColorStudioShade) -> UIColor { CSColor.WordPressBlue.shade(shade) } + static let primary = CSColor.Blue.base + static func primary(_ shade: ColorStudioShade) -> UIColor { CSColor.Blue.shade(shade) } @@ -116,9 +122,6 @@ struct UIAppColor { static let gray = CSColor.Gray.base static let blue = CSColor.Blue.base - /// - warning: soft-deprecated, use `UIAppColor.tint`. - static let primary = brand - static let success = CSColor.Green.base static let text = CSColor.Gray.shade(.shade80) static let textSubtle = CSColor.Gray.shade(.shade50)