-
Notifications
You must be signed in to change notification settings - Fork 91
Adding color helper functions and better validation on style registration #673
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.
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
kyasbal
merged 1 commit into
GoogleCloudPlatform:epic/file-schema-v6
from
kyasbal:push-rvnxysqvppvn
May 21, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Copyright 2026 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package style | ||
|
|
||
| import ( | ||
| "strconv" | ||
| ) | ||
|
|
||
| // ColorWhite represents the white color (1.0, 1.0, 1.0, 1.0). | ||
| var ColorWhite = Color{R: 1, G: 1, B: 1, A: 1} | ||
|
|
||
| // ColorBlack represents the black color (0.0, 0.0, 0.0, 1.0). | ||
| var ColorBlack = Color{R: 0, G: 0, B: 0, A: 1} | ||
|
|
||
| // MustForceConvertSRGBHex converts an sRGB hex color string to a Color. | ||
| // | ||
| // Deprecated: | ||
| // The timeline style uses the display-p3 color space. Directly mapping sRGB | ||
| // hex values to the 0.0-1.0 range in display-p3 is mathematically incorrect. | ||
| // Ideally, you should define a Color struct directly with proper display-p3 values. | ||
| func MustForceConvertSRGBHex(hex string) Color { | ||
| if len(hex) != 7 && len(hex) != 9 { | ||
| panic("invalid hex color length: " + hex) | ||
| } | ||
| if hex[0] != '#' { | ||
| panic("invalid hex color format (must start with '#'): " + hex) | ||
| } | ||
| r, err := strconv.ParseInt(hex[1:3], 16, 32) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| g, err := strconv.ParseInt(hex[3:5], 16, 32) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| b, err := strconv.ParseInt(hex[5:7], 16, 32) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| var a int64 = 255 | ||
| if len(hex) == 9 { | ||
| a, err = strconv.ParseInt(hex[7:9], 16, 32) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| } | ||
| return Color{ | ||
| R: float32(r) / 255.0, | ||
| G: float32(g) / 255.0, | ||
| B: float32(b) / 255.0, | ||
| A: float32(a) / 255.0, | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // Copyright 2026 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package style | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
| ) | ||
|
|
||
| func TestMustForceConvertSRGBHex(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
| hex string | ||
| want Color | ||
| wantPanic bool | ||
| }{ | ||
| { | ||
| name: "valid 7-char hex", | ||
| hex: "#CC33CC", | ||
| want: Color{R: 204.0 / 255.0, G: 51.0 / 255.0, B: 204.0 / 255.0, A: 1.0}, | ||
| }, | ||
| { | ||
| name: "valid 9-char hex with alpha", | ||
| hex: "#0000FF80", | ||
| want: Color{R: 0.0, G: 0.0, B: 1.0, A: 128.0 / 255.0}, | ||
| }, | ||
| { | ||
| name: "invalid length 5-char", | ||
| hex: "#FFFF", | ||
| wantPanic: true, | ||
| }, | ||
| { | ||
| name: "invalid characters", | ||
| hex: "#GGGGGG", | ||
| wantPanic: true, | ||
| }, | ||
| { | ||
| name: "missing hash prefix", | ||
| hex: "CC33CC", | ||
| wantPanic: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| if tc.wantPanic { | ||
| defer func() { | ||
| if r := recover(); r == nil { | ||
| t.Errorf("expected panic, but did not panic") | ||
| } | ||
| }() | ||
| } | ||
| got := MustForceConvertSRGBHex(tc.hex) | ||
| if !tc.wantPanic { | ||
| if diff := cmp.Diff(tc.want, got); diff != "" { | ||
| t.Errorf("MustForceConvertSRGBHex() mismatch (-want +got):\n%s", diff) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.