show full size cover when clicking thumbnail in now playing display

dweymouth · Apr 30, 2023 · 7819416 · 7819416
1 parent b7a93e1
commit 7819416
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/ui/bottompanel.go b/ui/bottompanel.go
@@ -3,6 +3,7 @@ package ui
 import (
 	"fmt"
 	"image"
+	"log"
 	"supersonic/backend"
 	"supersonic/player"
 	"supersonic/ui/controller"
@@ -25,12 +26,14 @@ type BottomPanel struct {
 	NowPlaying  *widgets.NowPlayingCard
 	Controls    *widgets.PlayerControls
 	AuxControls *widgets.AuxControls
-	container   *fyne.Container
+
+	coverArtID string
+	container  *fyne.Container
 }
 
 var _ fyne.Widget = (*BottomPanel)(nil)
 
-func NewBottomPanel(p *player.Player, nav func(controller.Route)) *BottomPanel {
+func NewBottomPanel(p *player.Player, contr *controller.Controller) *BottomPanel {
 	bp := &BottomPanel{}
 	bp.ExtendBaseWidget(bp)
 	p.OnPaused(func() {
@@ -44,11 +47,19 @@ func NewBottomPanel(p *player.Player, nav func(controller.Route)) *BottomPanel {
 	})
 
 	bp.NowPlaying = widgets.NewNowPlayingCard()
+	bp.NowPlaying.OnShowCoverImage = func() {
+		im, err := bp.ImageManager.GetFullSizeCoverArt(bp.coverArtID)
+		if err != nil {
+			log.Printf("error getting full size cover image: %s", err.Error())
+		} else {
+			contr.ShowPopUpImage(im)
+		}
+	}
 	bp.NowPlaying.OnAlbumNameTapped(func() {
-		nav(controller.AlbumRoute(bp.playbackManager.NowPlaying().AlbumID))
+		contr.NavigateTo(controller.AlbumRoute(bp.playbackManager.NowPlaying().AlbumID))
 	})
 	bp.NowPlaying.OnArtistNameTapped(func() {
-		nav(controller.ArtistRoute(bp.playbackManager.NowPlaying().ArtistID))
+		contr.NavigateTo(controller.ArtistRoute(bp.playbackManager.NowPlaying().ArtistID))
 	})
 	bp.Controls = widgets.NewPlayerControls()
 	bp.Controls.OnPlayPause(func() {
@@ -86,8 +97,9 @@ func (bp *BottomPanel) SetPlaybackManager(pm *backend.PlaybackManager) {
 
 func (bp *BottomPanel) onSongChange(song *subsonic.Child, _ *subsonic.Child) {
 	if song == nil {
-		bp.NowPlaying.Update("", "", "", nil)
+		bp.NowPlaying.Update("", "", false, "", nil)
 	} else {
+		bp.coverArtID = song.CoverArt
 		var im image.Image
 		if bp.ImageManager != nil {
 			// set image to expire not long after the length of the song
@@ -97,7 +109,7 @@ func (bp *BottomPanel) onSongChange(song *subsonic.Child, _ *subsonic.Child) {
 			imgTTLSec := song.Duration + 30
 			im, _ = bp.ImageManager.GetCoverThumbnailWithTTL(song.CoverArt, time.Duration(imgTTLSec)*time.Second)
 		}
-		bp.NowPlaying.Update(song.Title, song.Artist, song.Album, im)
+		bp.NowPlaying.Update(song.Title, song.Artist, song.ArtistID != "", song.Album, im)
 	}
 }
 

diff --git a/ui/mainwindow.go b/ui/mainwindow.go
@@ -67,7 +67,7 @@ func NewMainWindow(fyneApp fyne.App, appName, appVersion string, app *backend.Ap
 	m.Controller.ReloadFunc = m.BrowsingPane.Reload
 	m.Controller.CurPageFunc = m.BrowsingPane.CurPage
 
-	m.BottomPanel = NewBottomPanel(app.Player, m.Router.NavigateTo)
+	m.BottomPanel = NewBottomPanel(app.Player, m.Controller)
 	m.BottomPanel.SetPlaybackManager(app.PlaybackManager)
 	m.BottomPanel.ImageManager = app.ImageManager
 	m.container = container.NewBorder(nil, m.BottomPanel, nil, nil, m.BrowsingPane)

diff --git a/ui/widgets/nowplayingcard.go b/ui/widgets/nowplayingcard.go
@@ -18,7 +18,9 @@ type NowPlayingCard struct {
 	trackName  *widget.Label
 	artistName *CustomHyperlink
 	albumName  *CustomHyperlink
-	cover      *canvas.Image
+	cover      *TappableImage
+
+	OnShowCoverImage func()
 
 	c fyne.CanvasObject
 }
@@ -28,9 +30,9 @@ func NewNowPlayingCard() *NowPlayingCard {
 		trackName:  widget.NewLabel(""),
 		artistName: NewCustomHyperlink(),
 		albumName:  NewCustomHyperlink(),
-		cover:      &canvas.Image{},
 	}
 	n.ExtendBaseWidget(n)
+	n.cover = NewTappableImage(n.onShowCoverImage)
 	n.artistName.Hidden = true
 	n.albumName.Hidden = true
 	n.trackName.Wrapping = fyne.TextTruncate
@@ -46,17 +48,24 @@ func NewNowPlayingCard() *NowPlayingCard {
 	return n
 }
 
+func (n *NowPlayingCard) onShowCoverImage() {
+	if n.OnShowCoverImage != nil {
+		n.OnShowCoverImage()
+	}
+}
+
 func (n *NowPlayingCard) CreateRenderer() fyne.WidgetRenderer {
 	return widget.NewSimpleRenderer(n.c)
 }
 
-func (n *NowPlayingCard) Update(track, artist, album string, cover image.Image) {
+func (n *NowPlayingCard) Update(track, artist string, artistNavigable bool, album string, cover image.Image) {
 	n.trackName.Text = track
 	n.artistName.SetText(artist)
 	n.artistName.Hidden = artist == ""
+	n.artistName.Disabled = !artistNavigable
 	n.albumName.SetText(album)
 	n.albumName.Hidden = album == ""
-	n.cover.Image = cover
+	n.cover.Image.Image = cover
 	n.c.Refresh()
 }