diff --git a/clocks/display.go b/clocks/display.go index 114d487d..4dd16b77 100644 --- a/clocks/display.go +++ b/clocks/display.go @@ -16,7 +16,7 @@ func (widget *Widget) display(clocks []Clock) { for idx, clock := range clocks { str = str + fmt.Sprintf( " [%s]%-12s %-10s %7s[white]\n", - widget.rowColor(idx), + wtf.RowColor("clocks", idx), clock.Label, clock.LocalTime.Format(wtf.SimpleTimeFormat), clock.LocalTime.Format(wtf.SimpleDateFormat), @@ -25,13 +25,3 @@ func (widget *Widget) display(clocks []Clock) { fmt.Fprintf(widget.View, "%s", str) } - -func (widget *Widget) rowColor(idx int) string { - rowCol := Config.UString("wtf.mods.clocks.colors.row.even", "lightblue") - - if idx%2 == 0 { - rowCol = Config.UString("wtf.mods.clocks.colors.row.odd", "white") - } - - return rowCol -} diff --git a/jira/widget.go b/jira/widget.go index 9bac0aee..19102d6e 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -64,7 +64,7 @@ func (widget *Widget) contentFrom(searchResult *SearchResult) string { widget.issueTypeColor(&issue), issue.IssueFields.IssueType.Name, issue.Key, - widget.rowColor(idx), + wtf.RowColor("jira", idx), issue.IssueFields.Summary, ) } @@ -88,13 +88,3 @@ func (widget *Widget) issueTypeColor(issue *Issue) string { return color } - -func (widget *Widget) rowColor(idx int) string { - rowCol := Config.UString("wtf.mods.jira.colors.row.even", "lightblue") - - if idx%2 == 0 { - rowCol = Config.UString("wtf.mods.jira.colors.row.odd", "white") - } - - return rowCol -} diff --git a/wtf/utils.go b/wtf/utils.go index f1868927..5ec2dbed 100644 --- a/wtf/utils.go +++ b/wtf/utils.go @@ -103,6 +103,17 @@ func RightAlignFormat(view *tview.TextView) string { return fmt.Sprintf("%%%ds", w-1) } +func RowColor(module string, idx int) string { + evenKey := fmt.Sprintf("wtf.mods.%s.colors.row.even", module) + oddKey := fmt.Sprintf("wtf.mods.%s.colors.row.odd", module) + + if idx%2 == 0 { + return Config.UString(evenKey, "white") + } else { + return Config.UString(oddKey, "lightblue") + } +} + /* -------------------- Slice Conversion -------------------- */ func ToInts(slice []interface{}) []int {