Make every widget a keyboard widget

Signed-off-by: Chris Cummer <chriscummer@me.com>

modules/weatherservices/arpansagovau/widget.go

@@ -9,6 +9,7 @@ import (
 
 type Widget struct {
 	view.TextWidget
+
 	location  *location
 	lastError error
 	settings  *Settings
@@ -17,10 +18,11 @@ type Widget struct {
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	locationData, err := GetLocationData(settings.city)
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
-		location:   locationData,
-		lastError:  err,
-		settings:   settings,
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
+
+		location:  locationData,
+		lastError: err,
+		settings:  settings,
 	}
 
 	widget.View.SetWrap(true)
@@ -42,7 +44,6 @@ func (widget *Widget) content() (string, string, bool) {
 }
 
 func (widget *Widget) Refresh() {
-
 	widget.Redraw(widget.content)
 }
 

modules/weatherservices/prettyweather/widget.go

@@ -19,7 +19,7 @@ type Widget struct {
 
 func NewWidget(app *tview.Application, settings *Settings) *Widget {
 	widget := Widget{
-		TextWidget: view.NewTextWidget(app, settings.common),
+		TextWidget: view.NewTextWidget(app, nil, settings.common),
 
 		settings: settings,
 	}

modules/weatherservices/weather/keyboard.go

@@ -3,7 +3,7 @@ package weather
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.InitializeCommonControls(widget.Refresh)
+	widget.InitializeRefreshKeyboardControl(widget.Refresh)
 
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous city")
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next city")

modules/weatherservices/weather/widget.go

@@ -9,7 +9,6 @@ import (
 
 // Widget is the container for weather data.
 type Widget struct {
-	view.KeyboardWidget
 	view.MultiSourceWidget
 	view.TextWidget
 
@@ -23,16 +22,14 @@ type Widget struct {
 // NewWidget creates and returns a new instance of the weather Widget
 func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
 	widget := Widget{
-		KeyboardWidget:    view.NewKeyboardWidget(app, pages, settings.common),
 		MultiSourceWidget: view.NewMultiSourceWidget(settings.common, "cityid", "cityids"),
-		TextWidget:        view.NewTextWidget(app, settings.common),
+		TextWidget:        view.NewTextWidget(app, pages, settings.common),
 
 		pages:    pages,
 		settings: settings,
 	}
 
 	widget.initializeKeyboardControls()
-	widget.View.SetInputCapture(widget.InputCapture)
 
 	widget.SetDisplayFunction(widget.display)
 
@@ -69,10 +66,6 @@ func (widget *Widget) Refresh() {
 	widget.display()
 }
 
-func (widget *Widget) HelpText() string {
-	return widget.KeyboardWidget.HelpText()
-}
-
 /* -------------------- Unexported Functions -------------------- */
 
 func (widget *Widget) apiKeyValid() bool {