diff options
author | Michael Muré <batolettre@gmail.com> | 2019-11-03 13:09:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-03 13:09:55 +0000 |
commit | 8c7c9880b1adcf876ad63ea39e46e62bd7ebde5d (patch) | |
tree | f9c6369a6593e3c00cfb3c0b45009dfb6d055d7b /bug | |
parent | f5193cc76dd1a1c1bb55194a64ef90bae2278115 (diff) | |
parent | 912b5ca320891f2a4f1a88f1a137ce8ee46a1a03 (diff) | |
download | git-bug-8c7c9880b1adcf876ad63ea39e46e62bd7ebde5d.tar.gz |
Merge pull request #228 from ludovicm67/patch-cli-label-colors
Display label colors in termui
Diffstat (limited to 'bug')
-rw-r--r-- | bug/label.go | 66 | ||||
-rw-r--r-- | bug/label_test.go | 17 |
2 files changed, 53 insertions, 30 deletions
diff --git a/bug/label.go b/bug/label.go index 0d6d4142..1344d97e 100644 --- a/bug/label.go +++ b/bug/label.go @@ -15,32 +15,34 @@ func (l Label) String() string { return string(l) } +type LabelColor color.RGBA + // RGBA from a Label computed in a deterministic way -func (l Label) RGBA() color.RGBA { +func (l Label) Color() LabelColor { id := 0 hash := sha1.Sum([]byte(l)) // colors from: https://material-ui.com/style/color/ - colors := []color.RGBA{ - color.RGBA{R: 244, G: 67, B: 54, A: 255}, // red - color.RGBA{R: 233, G: 30, B: 99, A: 255}, // pink - color.RGBA{R: 156, G: 39, B: 176, A: 255}, // purple - color.RGBA{R: 103, G: 58, B: 183, A: 255}, // deepPurple - color.RGBA{R: 63, G: 81, B: 181, A: 255}, // indigo - color.RGBA{R: 33, G: 150, B: 243, A: 255}, // blue - color.RGBA{R: 3, G: 169, B: 244, A: 255}, // lightBlue - color.RGBA{R: 0, G: 188, B: 212, A: 255}, // cyan - color.RGBA{R: 0, G: 150, B: 136, A: 255}, // teal - color.RGBA{R: 76, G: 175, B: 80, A: 255}, // green - color.RGBA{R: 139, G: 195, B: 74, A: 255}, // lightGreen - color.RGBA{R: 205, G: 220, B: 57, A: 255}, // lime - color.RGBA{R: 255, G: 235, B: 59, A: 255}, // yellow - color.RGBA{R: 255, G: 193, B: 7, A: 255}, // amber - color.RGBA{R: 255, G: 152, B: 0, A: 255}, // orange - color.RGBA{R: 255, G: 87, B: 34, A: 255}, // deepOrange - color.RGBA{R: 121, G: 85, B: 72, A: 255}, // brown - color.RGBA{R: 158, G: 158, B: 158, A: 255}, // grey - color.RGBA{R: 96, G: 125, B: 139, A: 255}, // blueGrey + colors := []LabelColor{ + LabelColor{R: 244, G: 67, B: 54, A: 255}, // red + LabelColor{R: 233, G: 30, B: 99, A: 255}, // pink + LabelColor{R: 156, G: 39, B: 176, A: 255}, // purple + LabelColor{R: 103, G: 58, B: 183, A: 255}, // deepPurple + LabelColor{R: 63, G: 81, B: 181, A: 255}, // indigo + LabelColor{R: 33, G: 150, B: 243, A: 255}, // blue + LabelColor{R: 3, G: 169, B: 244, A: 255}, // lightBlue + LabelColor{R: 0, G: 188, B: 212, A: 255}, // cyan + LabelColor{R: 0, G: 150, B: 136, A: 255}, // teal + LabelColor{R: 76, G: 175, B: 80, A: 255}, // green + LabelColor{R: 139, G: 195, B: 74, A: 255}, // lightGreen + LabelColor{R: 205, G: 220, B: 57, A: 255}, // lime + LabelColor{R: 255, G: 235, B: 59, A: 255}, // yellow + LabelColor{R: 255, G: 193, B: 7, A: 255}, // amber + LabelColor{R: 255, G: 152, B: 0, A: 255}, // orange + LabelColor{R: 255, G: 87, B: 34, A: 255}, // deepOrange + LabelColor{R: 121, G: 85, B: 72, A: 255}, // brown + LabelColor{R: 158, G: 158, B: 158, A: 255}, // grey + LabelColor{R: 96, G: 125, B: 139, A: 255}, // blueGrey } for _, char := range hash { @@ -50,6 +52,28 @@ func (l Label) RGBA() color.RGBA { return colors[id] } +func (lc LabelColor) RGBA() color.RGBA { + return color.RGBA(lc) +} + +type Term256 int + +func (lc LabelColor) Term256() Term256 { + red := Term256(lc.R) * 6 / 256 + green := Term256(lc.G) * 6 / 256 + blue := Term256(lc.B) * 6 / 256 + + return red*36 + green*6 + blue + 16 +} + +func (t Term256) Escape() string { + return fmt.Sprintf("\x1b[38;5;%dm", t) +} + +func (t Term256) Unescape() string { + return "\x1b[0m" +} + func (l Label) Validate() error { str := string(l) diff --git a/bug/label_test.go b/bug/label_test.go index f87c7411..225e1352 100644 --- a/bug/label_test.go +++ b/bug/label_test.go @@ -1,36 +1,35 @@ package bug import ( - "image/color" "testing" "github.com/stretchr/testify/require" ) func TestLabelRGBA(t *testing.T) { - rgba := Label("test").RGBA() - expected := color.RGBA{R: 255, G: 87, B: 34, A: 255} + rgba := Label("test").Color() + expected := LabelColor{R: 255, G: 87, B: 34, A: 255} require.Equal(t, expected, rgba) } func TestLabelRGBASimilar(t *testing.T) { - rgba := Label("test1").RGBA() - expected := color.RGBA{R: 0, G: 188, B: 212, A: 255} + rgba := Label("test1").Color() + expected := LabelColor{R: 0, G: 188, B: 212, A: 255} require.Equal(t, expected, rgba) } func TestLabelRGBAReverse(t *testing.T) { - rgba := Label("tset").RGBA() - expected := color.RGBA{R: 233, G: 30, B: 99, A: 255} + rgba := Label("tset").Color() + expected := LabelColor{R: 233, G: 30, B: 99, A: 255} require.Equal(t, expected, rgba) } func TestLabelRGBAEqual(t *testing.T) { - color1 := Label("test").RGBA() - color2 := Label("test").RGBA() + color1 := Label("test").Color() + color2 := Label("test").Color() require.Equal(t, color1, color2) } |