From ad6a9f11b728ddce21953a3a56cb90c4e3bd40f2 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 8 Nov 2024 23:16:17 +0200 Subject: change of colors --- internal/colour/colour.go | 15 ++++++--------- internal/prompt/file.go | 2 +- internal/prompt/prompt.go | 2 +- internal/schedule/stats.go | 18 +++++++++--------- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/internal/colour/colour.go b/internal/colour/colour.go index 5d1133a..71cb16a 100644 --- a/internal/colour/colour.go +++ b/internal/colour/colour.go @@ -3,15 +3,12 @@ package colour import "github.com/fatih/color" var ( - // Printf function(s) - info = color.New(color.FgHiBlack, color.BgBlack) - Infof = info.PrintfFunc() - Infoln = info.PrintlnFunc() - Info1f = color.New(color.FgCyan, color.BgBlue, color.Bold).PrintfFunc() - Info2f = color.New(color.FgHiYellow, color.BgHiBlack, color.Bold).PrintfFunc() + infoCol = color.New(color.FgCyan, color.BgBlue, color.Bold) + Infof = infoCol.PrintfFunc() + Infoln = infoCol.PrintlnFunc() + info2Col = color.New(color.FgHiYellow, color.BgBlue) + Info2f = info2Col.PrintfFunc() + SInfo2f = info2Col.SprintfFunc() Ackf = color.New(color.FgBlack, color.BgHiYellow, color.Bold).PrintfFunc() Successf = color.New(color.FgWhite, color.BgGreen).PrintfFunc() - - // Sprintf function(s) - Sstatsf = color.New(color.FgHiYellow, color.BgBlue).SprintfFunc() ) diff --git a/internal/prompt/file.go b/internal/prompt/file.go index 1136b5a..365dc42 100644 --- a/internal/prompt/file.go +++ b/internal/prompt/file.go @@ -20,7 +20,7 @@ var ( func FileAction(question, content, filePath string) error { colour.Info2f(filePath + ":") fmt.Print("\n") - colour.Info1f(content) + colour.Info2f(content) fmt.Print("\n") reader := bufio.NewReader(os.Stdin) diff --git a/internal/prompt/prompt.go b/internal/prompt/prompt.go index 47e8da3..d2002d7 100644 --- a/internal/prompt/prompt.go +++ b/internal/prompt/prompt.go @@ -11,7 +11,7 @@ import ( func Acknowledge(messages ...string) error { if len(messages) > 1 { for _, content := range messages[1:] { - colour.Info1f(content) + colour.Info2f(content) fmt.Print("\n") } } diff --git a/internal/schedule/stats.go b/internal/schedule/stats.go index f792675..1cbc4ec 100644 --- a/internal/schedule/stats.go +++ b/internal/schedule/stats.go @@ -47,26 +47,26 @@ func (s stats) String() string { func (s stats) Render(platform string) { var sb strings.Builder - sep := colour.Sstatsf("+%s+%s+", strings.Repeat("-", 22), strings.Repeat("-", 13)) + sep := colour.SInfo2f("+%s+%s+", strings.Repeat("-", 22), strings.Repeat("-", 13)) sb.WriteString(sep) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", platform, "Stat. value")) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", platform, "Stat. value")) sb.WriteString("\n") sb.WriteString(sep) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "Stats since (days)", fmt.Sprintf("%.02f", s.sinceDays))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "Stats since (days)", fmt.Sprintf("%.02f", s.sinceDays))) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "#Posted entries", strconv.Itoa(s.posted))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "#Posted entries", strconv.Itoa(s.posted))) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "#Queued entries", strconv.Itoa(s.queued))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "#Queued entries", strconv.Itoa(s.queued))) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "Enough for (days)", fmt.Sprintf("%.02f", s.queuedForDays))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "Enough for (days)", fmt.Sprintf("%.02f", s.queuedForDays))) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "Last post (days ago)", fmt.Sprintf("%.02f", s.lastPostDaysAgo))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "Last post (days ago)", fmt.Sprintf("%.02f", s.lastPostDaysAgo))) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "Posts per day", fmt.Sprintf("%.02f", s.postsPerDay))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "Posts per day", fmt.Sprintf("%.02f", s.postsPerDay))) sb.WriteString("\n") - sb.WriteString(colour.Sstatsf("| %-20s | %-11s |", "Posts per day target", fmt.Sprintf("%.02f", s.postsPerDayTarget))) + sb.WriteString(colour.SInfo2f("| %-20s | %-11s |", "Posts per day target", fmt.Sprintf("%.02f", s.postsPerDayTarget))) sb.WriteString("\n") sb.WriteString(sep) sb.WriteString("\n") -- cgit v1.2.3