From 689d9d1333cf29e8ed3feec315c37d497f1b5c87 Mon Sep 17 00:00:00 2001 From: Shane C Date: Sun, 7 Jul 2024 16:59:27 -0400 Subject: [PATCH] switch progress & textinput to use the new color variables --- progress/progress.go | 23 +++++++++----- textinput/text.go | 71 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 75 insertions(+), 19 deletions(-) diff --git a/progress/progress.go b/progress/progress.go index cc85a88..aceb402 100644 --- a/progress/progress.go +++ b/progress/progress.go @@ -2,6 +2,7 @@ package progress import ( "fmt" + "git.shadowhosting.xyz/Eggactyl/tui" "math" "regexp" "strconv" @@ -59,9 +60,9 @@ func (p *ProgressBar) render(final bool) { var blockColor string if final { - blockColor = "34" + blockColor = tui.FgColorGreen } else { - blockColor = "214" + blockColor = tui.FgColorGold } sb.WriteString(p.desc) @@ -76,11 +77,13 @@ func (p *ProgressBar) render(final bool) { sb.WriteString(percentString) - sb.WriteString("\033[1m\033[38;5;247m [\033[0m") + sb.WriteString(tui.Format(tui.FmtBold, tui.FgColorGrey) + " [" + tui.FmtReset) + //sb.WriteString("\033[1m\033[38;5;247m [\033[0m") for i := 0; i < int(numFilled); i++ { - sb.WriteString(fmt.Sprintf("\033[38;5;%sm█\033[0m", blockColor)) + sb.WriteString(blockColor + "█" + tui.FmtReset) + //sb.WriteString(fmt.Sprintf("%sm█\033[0m", blockColor)) } @@ -88,21 +91,25 @@ func (p *ProgressBar) render(final bool) { numBlank = numBlank - 1 - sb.WriteString("\033[38;5;214m▒\033[0m") + sb.WriteString(tui.FgColorGold + "▒" + tui.FmtReset) + //sb.WriteString("\033[38;5;214m▒\033[0m") for i := 0; i < int(numBlank); i++ { - sb.WriteString("\033[38;5;247m░\033[0m") + sb.WriteString(tui.FgColorGrey + "░" + tui.FmtReset) + //sb.WriteString("\033[38;5;247m░\033[0m") } } else { for i := 0; i < int(numBlank); i++ { - sb.WriteString("\033[38;5;247m░\033[0m") + sb.WriteString(tui.FgColorGrey + "░" + tui.FmtReset) + //sb.WriteString("\033[38;5;247m░\033[0m") } } - sb.WriteString("\033[1m\033[38;5;247m]\033[0m") + sb.WriteString(tui.Format(tui.FmtBold, tui.FgColorGrey) + "]" + tui.FmtReset) + //sb.WriteString("\033[1m\033[38;5;247m]\033[0m") width, _, err := term.GetSize(0) if err != nil { diff --git a/textinput/text.go b/textinput/text.go index 6340dd9..4dab140 100644 --- a/textinput/text.go +++ b/textinput/text.go @@ -2,6 +2,7 @@ package textinput import ( "fmt" + "git.shadowhosting.xyz/Eggactyl/tui" "git.shadowhosting.xyz/Eggactyl/tui/validators" "golang.org/x/term" @@ -17,13 +18,26 @@ type InputData struct { func New(data InputData) (*string, error) { if data.Notice != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Notice) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + tui.FmtItalic + data.Notice + tui.FmtReset + "\n", + ) } else if data.Validator != nil && data.Validator.Notice() != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Validator.Notice()) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + tui.FmtItalic + data.Validator.Notice() + tui.FmtReset + "\n", + ) + //fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Validator.Notice()) } if data.Question != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m?\033[38;5;247m]\033[0m %s \033[38;5;247m>>\033[3m\033[38;5;214m\n", data.Question) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "?" + tui.FgColorGrey + "]" + tui.FmtReset + " " + + data.Question + " " + tui.FgColorGrey + ">>" + tui.Format(tui.FmtItalic, tui.FgColorGold) + "\n", + ) } var input string @@ -59,16 +73,33 @@ func New(data InputData) (*string, error) { for i := 0; i < lineNum; i++ { fmt.Printf("\033[A\033[K\033[0G") } - fmt.Println("\033[0m\033[1m\033[38;5;247m[\033[38;5;167m!\033[38;5;247m]\033[0m Invalid input, please try again!\n ") + + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorRed + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + " Invalid input, please try again!\n", + ) if data.Notice != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Notice) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + tui.FmtItalic + data.Notice + tui.FmtReset + "\n", + ) } else if data.Validator != nil { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Validator.Notice()) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + tui.FmtItalic + data.Validator.Notice() + tui.FmtReset + "\n", + ) } if data.Question != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m?\033[38;5;247m]\033[0m %s \033[38;5;247m>>\033[3m\033[38;5;214m\n", data.Question) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "?" + tui.FgColorGrey + "]" + tui.FmtReset + " " + + data.Question + " " + tui.FgColorGrey + ">>" + tui.Format(tui.FmtItalic, tui.FgColorGold) + "\n", + ) } continue } @@ -97,16 +128,34 @@ func New(data InputData) (*string, error) { fmt.Printf("\033[A\033[K\033[0G") } - fmt.Println("\033[0m\033[1m\033[38;5;247m[\033[38;5;167m!\033[38;5;247m]\033[0m Invalid input, please try again!\n ") + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorRed + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + " Invalid input, please try again!\n", + ) if data.Notice != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Notice) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + tui.FmtItalic + data.Notice + tui.FmtReset + "\n", + ) + //fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Notice) } else if data.Validator.Notice() != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m!\033[38;5;247m]\033[22m \033[3m%s\033[0m\n", data.Validator.Notice()) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "!" + tui.FgColorGrey + "]" + tui.FmtBoldReset + " " + + tui.FmtItalic + data.Validator.Notice() + tui.FmtReset + "\n", + ) } if data.Question != "" { - fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m?\033[38;5;247m]\033[0m %s \033[38;5;247m>>\033[3m\033[38;5;214m\n", data.Question) + fmt.Printf( + tui.Format(tui.FmtBold, tui.FgColorGrey) + + "[" + tui.FgColorGold + "?" + tui.FgColorGrey + "]" + tui.FmtReset + " " + + data.Question + " " + tui.FgColorGrey + ">>" + tui.Format(tui.FmtItalic, tui.FgColorGold) + "\n", + ) + //fmt.Printf("\033[1m\033[38;5;247m[\033[38;5;214m?\033[38;5;247m]\033[0m %s \033[38;5;247m>>\033[3m\033[38;5;214m\n", data.Question) } continue }