From 42734a502c8c58d39ba36a560e8138a0d9b06294 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 6 Apr 2018 21:55:44 -0700 Subject: [PATCH] Widget text spacing --- bamboohr/widget.go | 2 +- gcal/widget.go | 4 ++-- git/widget.go | 3 +-- github/widget.go | 3 +-- newrelic/widget.go | 3 +-- opsgenie/widget.go | 2 +- weather/widget.go | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/bamboohr/widget.go b/bamboohr/widget.go index 4e9eee9d..19ad1ad7 100644 --- a/bamboohr/widget.go +++ b/bamboohr/widget.go @@ -66,7 +66,7 @@ func (widget *Widget) contentFrom(items []Item) string { return fmt.Sprintf("\n\n\n\n\n\n\n\n%s", wtf.CenterText("[grey]no one[white]", 50)) } - str := "\n" + str := "" for _, item := range items { str = str + widget.format(item) } diff --git a/gcal/widget.go b/gcal/widget.go index f518dc78..cfe393e8 100644 --- a/gcal/widget.go +++ b/gcal/widget.go @@ -70,7 +70,7 @@ func (widget *Widget) contentFrom(events *calendar.Events) string { str := "" for _, event := range events.Items { str = str + fmt.Sprintf( - "%s\n [%s]%s[white]\n [%s]%s %s[white]\n", + "%s [%s]%s[white]\n [%s]%s %s[white]\n\n", widget.dayDivider(event, prevEvent), widget.titleColor(event), widget.eventSummary(event), @@ -91,7 +91,7 @@ func (widget *Widget) dayDivider(event, prevEvent *calendar.Event) string { currStartTime, _ := time.Parse(time.RFC3339, event.Start.DateTime) if currStartTime.Day() != prevStartTime.Day() { - return "[green]⎯[white]" + return "\n" } } diff --git a/git/widget.go b/git/widget.go index def035ce..b7abf22c 100644 --- a/git/widget.go +++ b/git/widget.go @@ -62,8 +62,7 @@ func (widget *Widget) addView() { } func (widget *Widget) contentFrom(data map[string][]string) string { - str := "\n" - str = str + " [red]Branch[white]\n" + str := " [red]Branch[white]\n" str = str + fmt.Sprintf(" %s", data["branch"][0]) str = str + "\n" str = str + widget.formatChanges(data["changes"]) diff --git a/github/widget.go b/github/widget.go index a27eb9d0..9cc17547 100644 --- a/github/widget.go +++ b/github/widget.go @@ -47,8 +47,7 @@ func (widget *Widget) Refresh() { widget.View.SetTitle(fmt.Sprintf(" Github: %s ", title)) widget.RefreshedAt = time.Now() - str := "\n" - str = str + " [red]Open Review Requests[white]\n" + str := " [red]Open Review Requests[white]\n" str = str + widget.prsForReview(prs) str = str + "\n" str = str + " [red]Open Pull Requests[white]\n" diff --git a/newrelic/widget.go b/newrelic/widget.go index 9486b5d3..6f7451b5 100644 --- a/newrelic/widget.go +++ b/newrelic/widget.go @@ -61,8 +61,7 @@ func (widget *Widget) addView() { } func (widget *Widget) contentFrom(deploys []nr.ApplicationDeployment) string { - str := "\n" - str = str + " [red]Latest Deploys[white]\n" + str := " [red]Latest Deploys[white]\n" revisions := []string{} diff --git a/opsgenie/widget.go b/opsgenie/widget.go index 6083b8bb..7a929c37 100644 --- a/opsgenie/widget.go +++ b/opsgenie/widget.go @@ -59,7 +59,7 @@ func (widget *Widget) addView() { } func (widget *Widget) contentFrom(onCallResponse *OnCallResponse) string { - str := "\n" + str := "" for _, data := range onCallResponse.OnCallData { str = str + fmt.Sprintf(" [green]%s[white]\n", widget.cleanScheduleName(data.Parent.Name)) diff --git a/weather/widget.go b/weather/widget.go index e5054855..78f6f74b 100644 --- a/weather/widget.go +++ b/weather/widget.go @@ -60,7 +60,7 @@ func (widget *Widget) addView() { } func (widget *Widget) contentFrom(data *owm.CurrentWeatherData) string { - str := fmt.Sprintf("\n") + str := "\n" descs := []string{} for _, weather := range data.Weather {