first commit
This commit is contained in:
Drew Weymouth
@@ -0,0 +1,93 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"image"
|
||||
"log"
|
||||
|
||||
"gomuse/ui/layout"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/dweymouth/go-subsonic"
|
||||
)
|
||||
|
||||
var _ fyne.Widget = (*AlbumCard)(nil)
|
||||
|
||||
var _ fyne.Tappable = (*TappableImage)(nil)
|
||||
|
||||
type TappableImage struct {
|
||||
im *canvas.Image
|
||||
|
||||
onTapped func()
|
||||
}
|
||||
|
||||
func (t *TappableImage) Tapped(*fyne.PointEvent) {
|
||||
log.Println("tapped!")
|
||||
t.onTapped()
|
||||
}
|
||||
|
||||
func (t *TappableImage) SetImage(im image.Image) {
|
||||
t.im.Image = im
|
||||
t.im.Refresh()
|
||||
}
|
||||
|
||||
type AlbumCard struct {
|
||||
widget.BaseWidget
|
||||
|
||||
albumID string
|
||||
title *widget.Label
|
||||
artist *widget.Label
|
||||
Cover *TappableImage
|
||||
container *fyne.Container
|
||||
|
||||
OnTapped func()
|
||||
}
|
||||
|
||||
func NewAlbumCard() *AlbumCard {
|
||||
a := &AlbumCard{
|
||||
title: widget.NewLabel(""),
|
||||
artist: widget.NewLabel(""),
|
||||
Cover: &TappableImage{
|
||||
im: &canvas.Image{},
|
||||
},
|
||||
}
|
||||
a.ExtendBaseWidget(a)
|
||||
a.title.Wrapping = fyne.TextTruncate
|
||||
a.artist.Wrapping = fyne.TextTruncate
|
||||
a.title.TextStyle = fyne.TextStyle{Bold: true}
|
||||
a.Cover.im.SetMinSize(fyne.NewSize(225, 225))
|
||||
a.Cover.im.FillMode = canvas.ImageFillContain
|
||||
|
||||
a.createContainer()
|
||||
return a
|
||||
}
|
||||
|
||||
func (a *AlbumCard) createContainer() {
|
||||
titleArtist := container.New(&layout.VboxCustomPadding{ExtraPad: -16}, a.title, a.artist)
|
||||
c := container.New(&layout.VboxCustomPadding{ExtraPad: -5}, a.Cover.im, titleArtist)
|
||||
pad := &layout.CenterPadLayout{PadLeftRight: 20, PadTopBottom: 10}
|
||||
a.container = container.New(pad, c)
|
||||
}
|
||||
|
||||
func (a *AlbumCard) Update(al *subsonic.AlbumID3) {
|
||||
a.title.SetText(al.Name)
|
||||
a.artist.SetText(al.Artist)
|
||||
a.albumID = al.ID
|
||||
}
|
||||
|
||||
func (a *AlbumCard) AlbumID() string {
|
||||
return a.albumID
|
||||
}
|
||||
|
||||
func (a *AlbumCard) CreateRenderer() fyne.WidgetRenderer {
|
||||
return widget.NewSimpleRenderer(a.container)
|
||||
//return widget.NewSimpleRenderer(container.New(&layout.VboxCustomPadding{-10}, a.Cover.im, a.title, a.artist))
|
||||
}
|
||||
|
||||
func (a *AlbumCard) Tapped(*fyne.PointEvent) {
|
||||
if a.OnTapped != nil {
|
||||
a.OnTapped()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"gomuse/backend"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/dweymouth/go-subsonic"
|
||||
)
|
||||
|
||||
type AlbumGrid struct {
|
||||
widget.BaseWidget
|
||||
|
||||
grid *widget.GridWrapList
|
||||
albums []*subsonic.AlbumID3
|
||||
iter backend.AlbumIterator
|
||||
fetching bool
|
||||
done bool
|
||||
}
|
||||
|
||||
var _ fyne.Widget = (*AlbumGrid)(nil)
|
||||
|
||||
func NewAlbumGrid(iter backend.AlbumIterator, pm *backend.PlaybackManager, im *backend.ImageManager) *AlbumGrid {
|
||||
ag := &AlbumGrid{
|
||||
iter: iter,
|
||||
}
|
||||
ag.ExtendBaseWidget(ag)
|
||||
|
||||
g := widget.NewGridWrapList(
|
||||
func() int {
|
||||
return len(ag.albums)
|
||||
},
|
||||
// create func
|
||||
func() fyne.CanvasObject {
|
||||
ac := NewAlbumCard()
|
||||
ac.OnTapped = func() {
|
||||
pm.PlayAlbum(ac.AlbumID())
|
||||
}
|
||||
return ac
|
||||
},
|
||||
// update func
|
||||
func(itemID int, obj fyne.CanvasObject) {
|
||||
ac := obj.(*AlbumCard)
|
||||
ac.Update(ag.albums[itemID])
|
||||
// TODO: set image to a placeholder before spinning off async fetch
|
||||
go func() {
|
||||
i, err := im.GetAlbumThumbnail(ag.albums[itemID].ID)
|
||||
if err == nil {
|
||||
ac.Cover.SetImage(i)
|
||||
ac.Refresh()
|
||||
}
|
||||
}()
|
||||
|
||||
// TODO: remove magic number 10
|
||||
if !ag.done && !ag.fetching && itemID > len(ag.albums)-10 {
|
||||
ag.fetchMoreAlbums(10)
|
||||
}
|
||||
},
|
||||
)
|
||||
ag.grid = g
|
||||
|
||||
// fetch initial albums
|
||||
ag.fetchMoreAlbums(36)
|
||||
return ag
|
||||
}
|
||||
|
||||
func (a *AlbumGrid) fetchMoreAlbums(count int) {
|
||||
i := 0
|
||||
a.fetching = true
|
||||
a.iter.NextN(count, func(al *subsonic.AlbumID3) {
|
||||
if al == nil {
|
||||
a.done = true
|
||||
return
|
||||
}
|
||||
a.albums = append(a.albums, al)
|
||||
i++
|
||||
if i == count {
|
||||
a.fetching = false
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (a *AlbumGrid) CreateRenderer() fyne.WidgetRenderer {
|
||||
return widget.NewSimpleRenderer(a.grid)
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"gomuse/backend"
|
||||
"gomuse/player"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/layout"
|
||||
"fyne.io/fyne/v2/theme"
|
||||
"github.com/dweymouth/go-subsonic"
|
||||
)
|
||||
|
||||
type bottomPanelLayout struct {
|
||||
left, middle, right fyne.CanvasObject
|
||||
middleWidth float32
|
||||
hbox fyne.Layout
|
||||
}
|
||||
|
||||
func newBottomPanelLayout(midWidth float32, left, middle, right fyne.CanvasObject) *bottomPanelLayout {
|
||||
return &bottomPanelLayout{
|
||||
left: left,
|
||||
middle: middle,
|
||||
right: right,
|
||||
middleWidth: midWidth,
|
||||
hbox: layout.NewHBoxLayout(),
|
||||
}
|
||||
}
|
||||
|
||||
func (b *bottomPanelLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
||||
hboxSize := b.hbox.MinSize(objects)
|
||||
return fyne.Size{
|
||||
Height: hboxSize.Height,
|
||||
Width: hboxSize.Width + fyne.Max(0, b.middleWidth-b.middle.MinSize().Width),
|
||||
}
|
||||
}
|
||||
|
||||
func (b *bottomPanelLayout) Layout(_ []fyne.CanvasObject, size fyne.Size) {
|
||||
midW := fyne.Max(b.middleWidth, b.middle.MinSize().Width)
|
||||
lrW := (size.Width - midW) / 2
|
||||
b.left.Resize(fyne.NewSize(lrW, size.Height))
|
||||
b.left.Move(fyne.NewPos(0, 0))
|
||||
b.middle.Resize(fyne.NewSize(midW, size.Height))
|
||||
b.middle.Move(fyne.NewPos(lrW+theme.Padding(), 0))
|
||||
if b.right != nil {
|
||||
b.right.Resize(fyne.NewSize(lrW, size.Height))
|
||||
b.right.Move(fyne.NewPos(lrW+theme.Padding()*2, 0))
|
||||
}
|
||||
}
|
||||
|
||||
func NewBottomPanel(p *player.Player, pm *backend.PlaybackManager, im *backend.ImageManager) fyne.CanvasObject {
|
||||
n := NewNowPlayingCard()
|
||||
c := NewPlayerControls(p, pm)
|
||||
|
||||
pm.OnSongChange(func(song *subsonic.Child) {
|
||||
if song == nil {
|
||||
n.Update("", "", "", nil)
|
||||
} else {
|
||||
im, _ := im.GetAlbumThumbnail(song.AlbumID)
|
||||
n.Update(song.Title, song.Artist, song.Album, im)
|
||||
}
|
||||
})
|
||||
|
||||
return container.New(newBottomPanelLayout(500, n, c, nil), n, c)
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package layout
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2"
|
||||
)
|
||||
|
||||
var _ fyne.Layout = (*CenterPadLayout)(nil)
|
||||
|
||||
type CenterPadLayout struct {
|
||||
PadLeftRight float32
|
||||
PadTopBottom float32
|
||||
}
|
||||
|
||||
// only supports one object
|
||||
func (c *CenterPadLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
||||
if len(objects) == 0 {
|
||||
return fyne.NewSize(0, 0)
|
||||
}
|
||||
return fyne.Size{
|
||||
Width: objects[0].MinSize().Width + c.PadLeftRight*2,
|
||||
Height: objects[0].MinSize().Height + c.PadTopBottom*2,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *CenterPadLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
|
||||
if len(objects) == 0 {
|
||||
return
|
||||
}
|
||||
objSize := objects[0].MinSize()
|
||||
xOffs := (size.Width - objSize.Width) / 2
|
||||
yOffs := (size.Height - objSize.Height) / 2
|
||||
for _, child := range objects {
|
||||
if !child.Visible() {
|
||||
continue
|
||||
}
|
||||
child.Move(fyne.NewPos(xOffs, yOffs))
|
||||
child.Resize(child.MinSize())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package layout
|
||||
|
||||
import (
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/theme"
|
||||
)
|
||||
|
||||
var _ fyne.Layout = (*VboxCustomPadding)(nil)
|
||||
|
||||
type VboxCustomPadding struct {
|
||||
ExtraPad float32
|
||||
}
|
||||
|
||||
func (v *VboxCustomPadding) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
||||
minSize := fyne.NewSize(0, 0)
|
||||
for _, child := range objects {
|
||||
if !child.Visible() {
|
||||
continue
|
||||
}
|
||||
|
||||
minSize.Width = fyne.Max(child.MinSize().Width, minSize.Width)
|
||||
minSize.Height += child.MinSize().Height
|
||||
}
|
||||
minSize.Height += (theme.Padding() + v.ExtraPad) * float32(len(objects)-1)
|
||||
return minSize
|
||||
}
|
||||
|
||||
func (v *VboxCustomPadding) Layout(objects []fyne.CanvasObject, size fyne.Size) {
|
||||
total := float32(0)
|
||||
for _, child := range objects {
|
||||
if !child.Visible() {
|
||||
continue
|
||||
}
|
||||
total += child.MinSize().Height
|
||||
}
|
||||
|
||||
x, y := float32(0), float32(0)
|
||||
|
||||
extra := float32(0)
|
||||
for _, child := range objects {
|
||||
if !child.Visible() {
|
||||
continue
|
||||
}
|
||||
height := child.MinSize().Height
|
||||
child.Move(fyne.NewPos(x, y+extra))
|
||||
y += height
|
||||
child.Resize(fyne.NewSize(size.Width, height))
|
||||
extra += (theme.Padding() + v.ExtraPad)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"image"
|
||||
|
||||
"gomuse/ui/layout"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/canvas"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
)
|
||||
|
||||
type NowPlayingCard struct {
|
||||
widget.BaseWidget
|
||||
|
||||
trackName *widget.Label
|
||||
artistName *widget.Label
|
||||
albumName *widget.Label
|
||||
cover *canvas.Image
|
||||
|
||||
c fyne.CanvasObject
|
||||
}
|
||||
|
||||
func NewNowPlayingCard() *NowPlayingCard {
|
||||
n := &NowPlayingCard{
|
||||
trackName: widget.NewLabel(""),
|
||||
artistName: widget.NewLabel(""),
|
||||
albumName: widget.NewLabel(""),
|
||||
cover: &canvas.Image{},
|
||||
}
|
||||
n.ExtendBaseWidget(n)
|
||||
n.trackName.Wrapping = fyne.TextTruncate
|
||||
n.trackName.TextStyle = fyne.TextStyle{Bold: true}
|
||||
n.artistName.Wrapping = fyne.TextTruncate
|
||||
n.albumName.Wrapping = fyne.TextTruncate
|
||||
n.cover.SetMinSize(fyne.NewSize(100, 100))
|
||||
n.cover.FillMode = canvas.ImageFillContain
|
||||
|
||||
n.c = container.NewBorder(nil, nil, n.cover, nil, container.New(&layout.VboxCustomPadding{-10}, n.trackName, n.artistName, n.albumName))
|
||||
return n
|
||||
}
|
||||
|
||||
func (n *NowPlayingCard) CreateRenderer() fyne.WidgetRenderer {
|
||||
return widget.NewSimpleRenderer(n.c)
|
||||
}
|
||||
|
||||
func (n *NowPlayingCard) Update(track, artist, album string, cover image.Image) {
|
||||
n.trackName.Text = track
|
||||
n.artistName.Text = artist
|
||||
n.albumName.Text = album
|
||||
n.cover.Image = cover
|
||||
n.c.Refresh()
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"gomuse/backend"
|
||||
"gomuse/player"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/layout"
|
||||
"fyne.io/fyne/v2/theme"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
)
|
||||
|
||||
// TrackPosSlider is a custom slider that doesn't trigger
|
||||
// the seek action until drag end.
|
||||
type TrackPosSlider struct {
|
||||
widget.Slider
|
||||
|
||||
OnDragEnd func(float64)
|
||||
|
||||
isDragging bool
|
||||
lastDraggedValue float64
|
||||
}
|
||||
|
||||
func NewTrackPosSlider() *TrackPosSlider {
|
||||
slider := &TrackPosSlider{
|
||||
Slider: widget.Slider{
|
||||
Value: 0,
|
||||
Min: 0,
|
||||
Max: 1,
|
||||
Step: 0.002,
|
||||
Orientation: widget.Horizontal,
|
||||
},
|
||||
}
|
||||
slider.ExtendBaseWidget(slider)
|
||||
return slider
|
||||
}
|
||||
|
||||
func (t *TrackPosSlider) DragEnd() {
|
||||
t.isDragging = false
|
||||
t.Slider.DragEnd()
|
||||
if t.OnDragEnd != nil {
|
||||
t.OnDragEnd(t.lastDraggedValue)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TrackPosSlider) Dragged(e *fyne.DragEvent) {
|
||||
t.isDragging = true
|
||||
t.Slider.Dragged(e)
|
||||
t.lastDraggedValue = t.Value
|
||||
}
|
||||
|
||||
func (t *TrackPosSlider) IsDragging() bool {
|
||||
return t.isDragging
|
||||
}
|
||||
|
||||
// NewPlayerControls sets up the seek bar, and transport buttons, and returns the encompassing Container.
|
||||
func NewPlayerControls(p *player.Player, pm *backend.PlaybackManager) *fyne.Container {
|
||||
slider := NewTrackPosSlider()
|
||||
curTimeLabel := widget.NewLabel("0:00")
|
||||
totalTimeLabel := widget.NewLabel("0:00")
|
||||
|
||||
c := container.NewBorder(nil, nil, curTimeLabel, totalTimeLabel, slider)
|
||||
|
||||
slider.OnDragEnd = func(f float64) {
|
||||
p.Seek(fmt.Sprintf("%d", int(f*100)), player.SeekAbsolutePercent)
|
||||
}
|
||||
|
||||
prev := widget.NewButtonWithIcon("", theme.MediaSkipPreviousIcon(), func() {
|
||||
p.SeekBackOrPrevious()
|
||||
})
|
||||
next := widget.NewButtonWithIcon("", theme.MediaSkipNextIcon(), func() {
|
||||
p.SeekNext()
|
||||
})
|
||||
playpause := widget.NewButtonWithIcon("", theme.MediaPlayIcon(), func() {
|
||||
p.PlayPause()
|
||||
})
|
||||
|
||||
p.OnPaused(func() {
|
||||
playpause.SetIcon(theme.MediaPlayIcon())
|
||||
})
|
||||
p.OnPlaying(func() {
|
||||
playpause.SetIcon(theme.MediaPauseIcon())
|
||||
})
|
||||
p.OnStopped(func() {
|
||||
playpause.SetIcon(theme.MediaPlayIcon())
|
||||
})
|
||||
|
||||
buttons := container.NewHBox(prev, playpause, next)
|
||||
b := container.New(layout.NewCenterLayout(), buttons)
|
||||
content := container.NewVBox(c, b)
|
||||
|
||||
pm.OnPlayTimeUpdate(func(curTime float64, totalTime float64) {
|
||||
if !pm.IsSeeking() {
|
||||
v := 0.0
|
||||
if totalTime > 0 {
|
||||
v = curTime / totalTime
|
||||
}
|
||||
ct := SecondsToTimeString(curTime)
|
||||
updated := false
|
||||
if ct != curTimeLabel.Text {
|
||||
curTimeLabel.SetText(ct)
|
||||
updated = true
|
||||
}
|
||||
tt := SecondsToTimeString(totalTime)
|
||||
if tt != totalTimeLabel.Text {
|
||||
totalTimeLabel.SetText(tt)
|
||||
updated = true
|
||||
}
|
||||
if !slider.IsDragging() {
|
||||
if totalTime < 210 || updated {
|
||||
// if current track is long, we only need to redraw the slider
|
||||
// when the time label updates, to reduce screen redraws.
|
||||
slider.SetValue(v)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return content
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package ui
|
||||
|
||||
import "fmt"
|
||||
|
||||
func SecondsToTimeString(s float64) string {
|
||||
if s < 0 {
|
||||
s = 0
|
||||
}
|
||||
min := int(s / 60)
|
||||
sec := int(s - float64(min*60))
|
||||
|
||||
return fmt.Sprintf("%2d:%02d", min, sec)
|
||||
}
|
||||
Reference in New Issue
Block a user