taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

WTF-427 Use new keyboard implementation for widgets. Closes #427

Browse Source
This commit is contained in:
Chris Cummer
2019-05-06 08:56:01 -07:00
parent a9c5dc3be8
commit 2d0706c40b
45 changed files with 589 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/spotify/keyboard.go Normal file
View File

@@ -0,0 +1,30 @@
package spotify
import (
"time"
)
func (widget *Widget) initializeKeyboardControls() {
widget.SetKeyboardChar("/", widget.ShowHelp)
widget.SetKeyboardChar("h", widget.previous)
widget.SetKeyboardChar("l", widget.next)
widget.SetKeyboardChar(" ", widget.playPause)
}
func (widget *Widget) previous() {
widget.SpotifyClient.Previous()
time.Sleep(time.Second * 1)
widget.Refresh()
}
func (widget *Widget) next() {
widget.SpotifyClient.Next()
time.Sleep(time.Second * 1)
widget.Refresh()
}
func (widget *Widget) playPause() {
widget.SpotifyClient.PlayPause()
time.Sleep(time.Second * 1)
widget.Refresh()
}

39
modules/spotify/widget.go
View File

@@ -2,9 +2,7 @@ package spotify
import (
"fmt"
"time"
"github.com/gdamore/tcell"
"github.com/rivo/tview"
"github.com/sticreations/spotigopher/spotigopher"
"github.com/wtfutil/wtf/wtf"
@@ -17,8 +15,10 @@ const HelpText = `
[l] for Next Song
`
// A Widget represents a Spotify widget
type Widget struct {
wtf.HelpfulWidget
wtf.KeyboardWidget
wtf.TextWidget
app *tview.Application
@@ -27,11 +27,13 @@ type Widget struct {
spotigopher.SpotifyClient
}
// NewWidget creates a new instance of a widget
func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *Widget {
spotifyClient := spotigopher.NewClient()
widget := Widget{
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
HelpfulWidget: wtf.NewHelpfulWidget(app, pages, HelpText),
KeyboardWidget: wtf.NewKeyboardWidget(),
TextWidget: wtf.NewTextWidget(app, settings.common, true),
Info: spotigopher.Info{},
SpotifyClient: spotifyClient,
@@ -42,11 +44,15 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
widget.settings.common.RefreshInterval = 5
widget.HelpfulWidget.SetView(widget.View)
widget.View.SetInputCapture(widget.captureInput)
widget.initializeKeyboardControls()
widget.View.SetInputCapture(widget.InputCapture)
widget.View.SetWrap(true)
widget.View.SetWordWrap(true)
widget.View.SetTitle(fmt.Sprint("[green]Spotify[white]"))
widget.HelpfulWidget.SetView(widget.View)
return &widget
}
@@ -72,27 +78,6 @@ func (w *Widget) render() {
}
}
func (w *Widget) captureInput(event *tcell.EventKey) *tcell.EventKey {
switch (string)(event.Rune()) {
case "h":
w.SpotifyClient.Previous()
time.Sleep(time.Second * 1)
w.Refresh()
return nil
case "l":
w.SpotifyClient.Next()
time.Sleep(time.Second * 1)
w.Refresh()
return nil
case " ":
w.SpotifyClient.PlayPause()
time.Sleep(time.Second * 1)
w.Refresh()
return nil
}
return nil
}
func (w *Widget) createOutput() string {
output := wtf.CenterText(fmt.Sprintf("[green]Now %v [white]\n", w.Info.Status), w.Width())
output += wtf.CenterText(fmt.Sprintf("[green]Title:[white] %v\n ", w.Info.Title), w.Width())