Skip to content

Fix bar chart colors #23712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Fix bar chart colors #23712

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d605731
Fix bar chart colors
kean Oct 28, 2024
30056b6
Update UIAppColor.primary
kean Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions WordPress/Classes/Utility/App Configuration/AppColor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -91,30 +87,41 @@ 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)
}
#endif

#if IS_WORDPRESS
static let tint = brand

static let brand = CSColor.WordPressBlue.base

static func brand(_ shade: ColorStudioShade) -> UIColor {
CSColor.WordPressBlue.shade(shade)
Copy link
Contributor Author

@kean kean Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a bit of a mess with this naming, and it might be worth refining it later.

  • brand is a confusing name because A8C has multiple brands and wpios sometimes uses Jetpack brand colors
  • WordPressBlue is a confusing name because it's actually "WordPress.Com Blue"
  • primary is a confusing name because in SwiftUI Color.primary typically means primary text color (black/white)
  • tint is a confusing name because jpios sometimes uses .label and sometimes uses Jetpack green as a tint color

I don't have suggestions how to solve it because a lot of this complexity isn't incidental.

}

static let primary = CSColor.Blue.base
Copy link
Contributor Author

@kean kean Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested every single place where these are used, but there are a bit obscure parts, and the logic seems sound as it's simply revert to the previous behavior.


static func primary(_ shade: ColorStudioShade) -> UIColor {
CSColor.Blue.shade(shade)
}
#endif

static let divider = CSColor.Gray.shade(.shade10)
static let error = CSColor.Red.base
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)
Expand Down