Remove another color layer

cointop/conversion.go

@@ -7,7 +7,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/cointop-sh/cointop/pkg/color"
+	fcolor "github.com/fatih/color"
+
 	"github.com/cointop-sh/cointop/pkg/pad"
 	"github.com/mattn/go-runewidth"
 	log "github.com/sirupsen/logrus"
@@ -177,9 +178,10 @@ func (ct *Cointop) UpdateConvertMenu() error {
 		}
 		shortcut := string(alphanumericcharacters[i])
 		if key == ct.State.currencyConversion {
-			shortcut = ct.colorscheme.MenuLabelActive(color.Bold("*"))
-			key = ct.colorscheme.Menu(color.Bold(key))
-			currency = ct.colorscheme.MenuLabelActive(color.Bold(currency))
+			Bold := fcolor.New(fcolor.Bold).SprintFunc()
+			shortcut = ct.colorscheme.MenuLabelActive(Bold("*"))
+			key = ct.colorscheme.Menu(Bold(key))
+			currency = ct.colorscheme.MenuLabelActive(Bold(currency))
 		} else {
 			key = ct.colorscheme.Menu(key)
 			currency = ct.colorscheme.MenuLabel(currency)

cointop/marketbar.go

@@ -6,8 +6,9 @@ import (
 	"strings"
 	"time"
 
+	fcolor "github.com/fatih/color"
+
 	"github.com/cointop-sh/cointop/pkg/api/types"
-	"github.com/cointop-sh/cointop/pkg/color"
 	"github.com/cointop-sh/cointop/pkg/humanize"
 	"github.com/cointop-sh/cointop/pkg/pad"
 	"github.com/cointop-sh/cointop/pkg/ui"
@@ -28,7 +29,9 @@ func (ct *Cointop) UpdateMarketbar() error {
 	maxX := ct.Width()
 	logo := "❯❯❯cointop"
 	if ct.colorschemeName == "cointop" {
-		logo = fmt.Sprintf("%s%s%s%s", color.Green("❯"), color.Cyan("❯"), color.Green("❯"), color.Cyan("cointop"))
+		Green := fcolor.New(fcolor.FgGreen).SprintFunc()
+		Cyan := fcolor.New(fcolor.FgCyan).SprintFunc()
+		logo = fmt.Sprintf("%s%s%s%s", Green("❯"), Cyan("❯"), Green("❯"), Cyan("cointop"))
 	}
 	var content string
 

pkg/color/color.go

@@ -1,39 +0,0 @@
-package color
-
-import "github.com/fatih/color"
-
-// Color struct
-type Color color.Color
-
-var (
-	// Bold color
-	Bold = color.New(color.Bold).SprintFunc()
-	// Black color
-	Black = color.New(color.FgBlack).SprintFunc()
-	// BlackBg color
-	BlackBg = color.New(color.BgBlack, color.FgWhite).SprintFunc()
-	// White color
-	White = color.New(color.FgWhite).SprintFunc()
-	// WhiteBold bold
-	WhiteBold = color.New(color.FgWhite, color.Bold).SprintFunc()
-	// Yellow color
-	Yellow = color.New(color.FgYellow).SprintFunc()
-	// YellowBold color
-	YellowBold = color.New(color.FgYellow, color.Bold).SprintFunc()
-	// YellowBg color
-	YellowBg = color.New(color.BgYellow, color.FgBlack).SprintFunc()
-	// Green color
-	Green = color.New(color.FgGreen).SprintFunc()
-	// GreenBg color
-	GreenBg = color.New(color.BgGreen, color.FgBlack).SprintFunc()
-	// Red color
-	Red = color.New(color.FgRed).SprintFunc()
-	// Cyan color
-	Cyan = color.New(color.FgCyan).SprintFunc()
-	// CyanBg color
-	CyanBg = color.New(color.BgCyan, color.FgBlack).SprintFunc()
-	// Blue color
-	Blue = color.New(color.FgBlue).SprintFunc()
-	// BlueBg color
-	BlueBg = color.New(color.BgBlue).SprintFunc()
-)