Create colorize function for colored outputs

mkchoi212 · Dec 29, 2017 · e27a37f · e27a37f
1 parent 43293a7
commit e27a37f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/color.go b/color.go
@@ -2,10 +2,14 @@ package main
 
 import "fmt"
 
-func Red(s string) string {
-	return fmt.Sprintf("\033[3%d;%dm%s\033[0m", 1, 1, s)
-}
+const (
+	Red    = 1
+	Green  = 2
+	Yellow = 3
+	Blue   = 4
+	Purple = 5
+)
 
-func Green(s string) string {
-	return fmt.Sprintf("\033[3%d;%dm%s\033[0m", 2, 1, s)
+func Colorize(s string, c int) string {
+	return fmt.Sprintf("\033[3%d;%dm%s\033[0m", c, 1, s)
 }
diff --git a/conflict.go b/conflict.go
@@ -45,9 +45,9 @@ func (c *Conflict) Select(g *gocui.Gui) error {
 		for idx, conflict := range conflicts {
 			var out string
 			if conflict.Resolved {
-				out = Green(fmt.Sprintf("✅  %s:%d", conflict.FileName, conflict.Start))
+				out = Colorize(fmt.Sprintf("✅  %s:%d", conflict.FileName, conflict.Start), Green)
 			} else {
-				out = Red(fmt.Sprintf("%d.  %s:%d", idx+1, conflict.FileName, conflict.Start))
+				out = Colorize(fmt.Sprintf("%d.  %s:%d", idx+1, conflict.FileName, conflict.Start), Red)
 			}
 
 			if conflict.isEqual(c) {

diff --git a/layout.go b/layout.go
@@ -29,17 +29,17 @@ func layout(g *gocui.Gui) error {
 		v.Title = "Conflicts"
 	}
 
-	if v, err := g.SetView("input prompt", 0, viewHeight, 15, viewHeight+inputHeight); err != nil {
+	if v, err := g.SetView("input prompt", 0, viewHeight, 14, viewHeight+inputHeight); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
 		v.Frame = false
-		prompt := Green("[a | d] >>")
+		prompt := Colorize("[wasd] >>", Green)
 		v.Write([]byte(prompt))
 		v.MoveCursor(11, 0, true)
 	}
 
-	if v, err := g.SetView("input", 11, viewHeight, maxX, viewHeight+inputHeight); err != nil {
+	if v, err := g.SetView("input", 10, viewHeight, maxX, viewHeight+inputHeight); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}

diff --git a/main.go b/main.go
@@ -37,13 +37,15 @@ func parseInput(g *gocui.Gui, v *gocui.View) error {
 	switch {
 	case in == "a":
 		conflicts[cur].Resolve(g, v, Local)
-		printPrompt(g, Green("[a | d] >>"))
 	case in == "d":
 		conflicts[cur].Resolve(g, v, Incoming)
-		printPrompt(g, Green("[a | d] >>"))
+	case in == "h":
+		conflicts[cur].Select(g, true)
 	default:
-		printPrompt(g, Red("[a | d] >>"))
+		printPrompt(g, Colorize("[wasd] >>", Red))
+		return nil
 	}
+	printPrompt(g, Colorize("[wasd] >>", Green))
 	return nil
 }