diff --git a/color_hex/curated.go b/color_hex/curated.go deleted file mode 100644 index a40e49b..0000000 --- a/color_hex/curated.go +++ /dev/null @@ -1,3 +0,0 @@ -package color_hex - -var Curated = append(Palettes["ESO MOTD Color Text"], append(Palettes["Cyberpunk Neon"], Palettes["cool"]...)...) diff --git a/hexcolor/curated.go b/hexcolor/curated.go new file mode 100644 index 0000000..87d4a36 --- /dev/null +++ b/hexcolor/curated.go @@ -0,0 +1,5 @@ +package hexcolor + +var Curated = append(Palettes["ESO MOTD Color Text"], + append(Palettes["Cyberpunk Neon"], + Palettes["cool"]...)...) diff --git a/color_hex/popular.go b/hexcolor/popular.go similarity index 99% rename from color_hex/popular.go rename to hexcolor/popular.go index e9196c1..8a7a4ec 100644 --- a/color_hex/popular.go +++ b/hexcolor/popular.go @@ -1,7 +1,7 @@ -package color_hex +package hexcolor -var palettes = map[string][]int{"#3": {0x2A4D69, - 0x4B86B4, 0xADCBE3, 0xE7EFF6, 0x63ACE5}, +var Palettes = map[string][]int{ + "#3": {0x2A4D69, 0x4B86B4, 0xADCBE3, 0xE7EFF6, 0x63ACE5}, "- Lips -": {0xF98787, 0xE76A6A, 0xD65B5B, 0xC14B4B, 0xB83F3F}, "24K GOLD": {0xA67C00, 0xBF9B30, 0xFFBF00, 0xFFCF40, 0xFFDC73}, "80s": {0xFF48C4, 0x2BD1FC, 0xF3EA5F, 0xC04DF9, 0xFF3F3F}, diff --git a/simplecolor/simplecolors.go b/simplecolor/simplecolors.go index 1a65c3c..44f6a71 100644 --- a/simplecolor/simplecolors.go +++ b/simplecolor/simplecolors.go @@ -7,10 +7,12 @@ import ( "strings" ) -type SimpleColor int -type NamedPalette map[string]SimpleColor -type SimplePalette []SimpleColor -type conversionPalette []color.Color +type ( + SimpleColor int + NamedPalette map[string]SimpleColor + SimplePalette []SimpleColor + conversionPalette []color.Color +) func (s SimplePalette) ToPalette() color.Palette { var x color.Palette @@ -28,8 +30,8 @@ func (input SimpleColor) ToAnsi16() SimpleColor { color := ansi[0:16].ToPalette().Convert(input) r, g, b, _ := color.RGBA() return SimpleColor(uint32(r)<<16 + uint32(g)<<8 + b) - } + func (input SimpleColor) ToExtendedAnsi() SimpleColor { color := ansi.ToPalette().Convert(input) r, g, b, _ := color.RGBA() @@ -78,7 +80,7 @@ func (p SimplePalette) ToAnsi16() (sp SimplePalette) { return } -func FromRGBA(r, g, b, a uint32) SimpleColor { +func FromRGBA(r, g, b, _ uint32) SimpleColor { c := r c = c<<8 + g c = c<<8 + b