refactor ui a little, introduce volume widget

Author: Mateusz Lopacinski

pkg/ui/events.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/robopuff/goradio/pkg/driver"
 
@@ -20,11 +21,11 @@ var colorSelected = "(fg:black,bg:white)"
 
 func manageKeyboardEvent(e tui.Event, d driver.Driver) int {
 	if e.Type == tui.ResizeEvent {
-		windowResize()
+		windowResize(e)
 	}
 
 	switch e.ID {
-	case "<Enter>":
+	case "<Enter>", "<MouseLeft>":
 		selected := uiStationsList.SelectedRow
 		selectedStation := stationsList.GetSelected(selected)
 		currentStation := stationsList.GetSelected(current)
@@ -64,9 +65,9 @@ func manageKeyboardEvent(e tui.Event, d driver.Driver) int {
 		d.Mute()
 	case "p":
 		d.Pause()
-	case "k", "<Up>":
+	case "k", "<Up>", "<MouseWheelUp>":
 		uiStationsList.ScrollUp()
-	case "j", "<Down>":
+	case "j", "<Down>", "<MouseWheelDown>":
 		uiStationsList.ScrollDown()
 	case "K", "<PageUp>":
 		uiStationsList.ScrollPageUp()
@@ -80,8 +81,6 @@ func manageKeyboardEvent(e tui.Event, d driver.Driver) int {
 		d.IncVolume()
 	case "-":
 		d.DecVolume()
-	//case "D":
-		//toggleDebug()
 	case "q", "<C-c>", "<Esc>":
 		d.Close()
 		return 1
@@ -114,9 +113,12 @@ func manageDriverLogs(d driver.Driver) {
 				match = volumeRegex.FindStringSubmatch(data)
 				if len(match) > 0 {
 					setVolumeGauge(match[1])
+					continue
 				}
 
-				sendToLog(data[:len(data)-1])
+				if data != "" {
+					sendToLog(strings.Trim(data, "\n"))
+				}
 			}
 		}
 	}
@@ -125,18 +127,20 @@ func manageDriverLogs(d driver.Driver) {
 func setVolumeGauge(value string) {
 	volume, _ := strconv.Atoi(value)
 	volumeGauge.Percent = volume
-	if value == "" {
-		value = " "
+	volumeGauge.Visible = true
+
+	if volume == 0 {
+		volumeGauge.Visible = false
 	}
 
-	volumeGauge.Label = value
 	render()
 }
 
 func setCurrentlyPlaying(currently string) {
 	format := fmt.Sprintf(fullLineFormatter, currentlyPlayingFormat)
 	if currently == "" {
-		currently = "None"
+		format = "%s"
+		currently = ""
 	}
 	uiPlayingParagraph.Text = fmt.Sprintf(format, currently)
 	render()

pkg/ui/ui.go

@@ -29,20 +29,22 @@ var (
 	uiFooterParagraph  *widgets.Paragraph
 	uiStationsList     *widgets.List
 	uiLoggerList       *widgets.List
-	volumeGauge        *widgets.Gauge
+	volumeGauge        *volume
 	drawables          []tui.Drawable
 )
 
 // Init initialize UI
 func Init(csvStationsList *stations.List, debugFlag bool) error {
-	fullLineFormatter = fmt.Sprintf("%%-%ds", w)
-	debug = debugFlag
-	stationsList = csvStationsList
-
 	if err := tui.Init(); nil != err {
 		return err
 	}
 
+	w, h = tui.TerminalDimensions()
+	fullLineFormatter = fmt.Sprintf("%%-%ds", w)
+
+	debug = debugFlag
+	stationsList = csvStationsList
+
 	uiPlayingParagraph = widgets.NewParagraph()
 	uiPlayingParagraph.Border = false
 	uiPlayingParagraph.TextStyle.Fg = tui.ColorRed
@@ -73,12 +75,16 @@ func Init(csvStationsList *stations.List, debugFlag bool) error {
 	uiStationsList.BorderStyle.Fg = colorGray
 	uiStationsList.WrapText = false
 
-	volumeGauge = widgets.NewGauge()
+	volumeGauge = NewVolume()
 	volumeGauge.Border = false
 	volumeGauge.Percent = 0
-	volumeGauge.Label = " "
 
-	windowResize()
+	windowResize(tui.Event{
+		Payload: tui.Resize{
+			Width:  w,
+			Height: h,
+		},
+	})
 	drawables = []tui.Drawable{
 		uiPlayingParagraph,
 		volumeGauge,
@@ -94,9 +100,13 @@ func Init(csvStationsList *stations.List, debugFlag bool) error {
 }
 
 // Init initialize UI
-func windowResize() {
+func windowResize(e tui.Event) {
+	payload := e.Payload.(tui.Resize)
 	tui.Clear()
-	w, h = tui.TerminalDimensions()
+
+	w = payload.Width
+	h = payload.Height
+	fullLineFormatter = fmt.Sprintf("%%-%ds", w)
 
 	uiPlayingParagraph.SetRect(0, -1, w, 3)
 	uiFooterParagraph.SetRect(0, h-3, w, h)
@@ -140,19 +150,6 @@ func Run(d driver.Driver) {
 	}
 }
 
-func toggleDebug() {
-	debug = !debug
-
-	if debug {
-		drawables = append(drawables, uiLoggerList)
-	} else {
-		drawables = drawables[:len(drawables)-1]
-	}
-
-	windowResize()
-	render()
-}
-
 func render() {
 	tui.Render(drawables...)
 }

pkg/ui/volume.go

@@ -0,0 +1,66 @@
+package ui
+
+import (
+	"image"
+	"strconv"
+
+	tui "github.com/gizak/termui/v3"
+)
+
+type volume struct {
+	tui.Block
+	Percent    int
+	Visible    bool
+	BarColor   tui.Color
+	LabelStyle tui.Style
+	characters []rune
+}
+
+//NewVolume create new volume custom widget
+func NewVolume() *volume {
+	return &volume{
+		Block:      *tui.NewBlock(),
+		BarColor:   tui.Theme.Gauge.Bar,
+		LabelStyle: tui.Theme.Gauge.Label,
+		characters: []rune{
+			'▁', '▁', '▂', '▂', '▃',
+			'▃', '▅', '▅', '▆', '▆',
+			'▇', '▇', '█', '█',
+		},
+	}
+}
+
+func (self *volume) Draw(buf *tui.Buffer) {
+	self.Block.Draw(buf)
+
+	if !self.Visible {
+		return
+	}
+
+	label := strconv.Itoa(self.Percent)
+
+	barXCoordinate := self.Inner.Min.X
+	barYCoordinate := self.Inner.Min.Y + ((self.Inner.Dy() - 1) / 2)
+	barDxCoordinate := self.Inner.Max.X - barXCoordinate - (len(label) + 1)
+
+	// plot bar
+	barWidth := int((float64(self.Percent) / 100) * float64(barDxCoordinate))
+	barStyle := tui.NewStyle(self.BarColor, tui.ColorClear)
+	for i, char := range self.characters {
+		if i > barWidth {
+			break
+		}
+
+		buf.SetCell(tui.NewCell(char, barStyle), image.Pt(barXCoordinate+i, barYCoordinate))
+	}
+
+	// plot label
+	labelXCoordinate := self.Inner.Max.X - len(label)
+	labelYCoordinate := self.Inner.Min.Y + ((self.Inner.Dy() - 1) / 2)
+	if labelYCoordinate < self.Inner.Max.Y {
+		style := self.LabelStyle
+		for i, char := range label {
+			buf.SetCell(tui.NewCell(char, style), image.Pt(labelXCoordinate+i, labelYCoordinate))
+		}
+	}
+}