Merge pull request #392 from dweymouth/feat/tracklist-thumbnails

Add tracklist row thumbnails to everything but album page
dweymouth · May 31, 2024 · 3e21a08 · 3e21a08
2 parents 3fb3922 + 84d9372
commit 3e21a08
Show file tree

Hide file tree

Showing 12 changed files with 469 additions and 280 deletions.
diff --git a/backend/config.go b/backend/config.go
@@ -176,11 +176,11 @@ func DefaultConfig(appVersionTag string) *Config {
 			SortOrder: string("Name (A-Z)"),
 		},
 		FavoritesPage: FavoritesPageConfig{
-			TracklistColumns: []string{"Artist", "Album", "Time", "Plays"},
+			TracklistColumns: []string{"Album", "Time", "Plays"},
 			InitialView:      "Albums",
 		},
 		PlaylistPage: PlaylistPageConfig{
-			TracklistColumns: []string{"Artist", "Album", "Time", "Plays"},
+			TracklistColumns: []string{"Album", "Time", "Plays"},
 		},
 		PlaylistsPage: PlaylistsPageConfig{
 			InitialView: "List",
@@ -189,7 +189,7 @@ func DefaultConfig(appVersionTag string) *Config {
 			InitialView: "Play Queue",
 		},
 		TracksPage: TracksPageConfig{
-			TracklistColumns: []string{"Artist", "Album", "Time", "Plays"},
+			TracklistColumns: []string{"Album", "Time", "Plays"},
 		},
 		LocalPlayback: LocalPlaybackConfig{
 			// "auto" is the name to pass to MPV for autoselecting the output device

diff --git a/ui/browsing/albumpage.go b/ui/browsing/albumpage.go
@@ -86,11 +86,11 @@ func newAlbumPage(
 		a.header = NewAlbumPageHeader(a)
 	}
 	a.header.page = a
-	if t := a.pool.Obtain(util.WidgetTypeTracklist); t != nil {
+	if t := a.pool.Obtain(util.WidgetTypeCompactTracklist); t != nil {
 		a.tracklist = t.(*widgets.Tracklist)
 		a.tracklist.Reset()
 	} else {
-		a.tracklist = widgets.NewTracklist(nil)
+		a.tracklist = widgets.NewTracklist(nil, a.im, true)
 	}
 	a.tracklist.SetVisibleColumns(a.cfg.TracklistColumns)
 	a.tracklist.SetSorting(sort)
@@ -122,7 +122,7 @@ func (a *AlbumPage) Save() SavedPage {
 	a.header.page = nil
 	a.pool.Release(util.WidgetTypeAlbumPageHeader, a.header)
 	a.tracklist.Clear()
-	a.pool.Release(util.WidgetTypeTracklist, a.tracklist)
+	a.pool.Release(util.WidgetTypeCompactTracklist, a.tracklist)
 	return &s
 }
 

diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go
@@ -233,7 +233,7 @@ func (a *ArtistPage) showTopTracks() {
 			tl.Reset()
 			tl.SetTracks(ts)
 		} else {
-			tl = widgets.NewTracklist(ts)
+			tl = widgets.NewTracklist(ts, a.im, false)
 		}
 		tl.Options = widgets.TracklistOptions{AutoNumber: true}
 		_, canRate := a.mp.(mediaprovider.SupportsRating)

diff --git a/ui/browsing/favoritespage.go b/ui/browsing/favoritespage.go
@@ -397,7 +397,7 @@ func (a *FavoritesPage) onShowFavoriteSongs() {
 				tracklist.Reset()
 				tracklist.SetTracks(fav.Tracks)
 			} else {
-				tracklist = widgets.NewTracklist(fav.Tracks)
+				tracklist = widgets.NewTracklist(fav.Tracks, a.im, false)
 			}
 			tracklist.Options = widgets.TracklistOptions{AutoNumber: true}
 			_, canRate := a.mp.(mediaprovider.SupportsRating)

diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go
@@ -79,7 +79,7 @@ func newPlaylistPage(
 		a.tracklist = tl.(*widgets.Tracklist)
 		a.tracklist.Reset()
 	} else {
-		a.tracklist = widgets.NewTracklist(nil)
+		a.tracklist = widgets.NewTracklist(nil, a.im, false)
 	}
 	a.tracklist.SetVisibleColumns(conf.TracklistColumns)
 	a.tracklist.SetSorting(trackSort)

diff --git a/ui/browsing/router.go b/ui/browsing/router.go
@@ -54,7 +54,7 @@ func (r Router) CreatePage(rte controller.Route) Page {
 	case controller.Playlists:
 		return NewPlaylistsPage(r.Controller, r.widgetPool, &r.App.Config.PlaylistsPage, r.App.ServerManager.Server)
 	case controller.Tracks:
-		return NewTracksPage(r.Controller, &r.App.Config.TracksPage, r.widgetPool, r.App.ServerManager.Server)
+		return NewTracksPage(r.Controller, &r.App.Config.TracksPage, r.widgetPool, r.App.ServerManager.Server, r.App.ImageManager)
 	}
 	return nil
 }

diff --git a/ui/browsing/trackspage.go b/ui/browsing/trackspage.go
@@ -38,12 +38,13 @@ type tracksPageState struct {
 	contr      *controller.Controller
 	conf       *backend.TracksPageConfig
 	mp         mediaprovider.MediaProvider
+	im         *backend.ImageManager
 	canRate    bool
 	canShare   bool
 }
 
-func NewTracksPage(contr *controller.Controller, conf *backend.TracksPageConfig, pool *util.WidgetPool, mp mediaprovider.MediaProvider) *TracksPage {
-	t := &TracksPage{tracksPageState: tracksPageState{contr: contr, conf: conf, widgetPool: pool, mp: mp}}
+func NewTracksPage(contr *controller.Controller, conf *backend.TracksPageConfig, pool *util.WidgetPool, mp mediaprovider.MediaProvider, im *backend.ImageManager) *TracksPage {
+	t := &TracksPage{tracksPageState: tracksPageState{contr: contr, conf: conf, widgetPool: pool, mp: mp, im: im}}
 	t.ExtendBaseWidget(t)
 
 	t.tracklist = t.obtainTracklist()
@@ -175,7 +176,7 @@ func (t *TracksPage) Save() SavedPage {
 }
 
 func (s *tracksPageState) Restore() Page {
-	t := NewTracksPage(s.contr, s.conf, s.widgetPool, s.mp)
+	t := NewTracksPage(s.contr, s.conf, s.widgetPool, s.mp, s.im)
 	t.searchText = s.searchText
 	if t.searchText != "" {
 		t.searcher.Entry.Text = t.searchText
@@ -194,5 +195,5 @@ func (t *TracksPage) obtainTracklist() *widgets.Tracklist {
 		tracklist.Reset()
 		return tracklist
 	}
-	return widgets.NewTracklist(nil)
+	return widgets.NewTracklist(nil, t.im, false)
 }
diff --git a/ui/util/widgetpool.go b/ui/util/widgetpool.go
@@ -15,6 +15,7 @@ const (
 	WidgetTypeGridView
 	WidgetTypePlaylistPageHeader
 	WidgetTypeTracklist
+	WidgetTypeCompactTracklist
 	WidgetTypeNowPlayingPage
 
 	// keep at bottom

diff --git a/ui/widgets/focuslist.go b/ui/widgets/focuslist.go
@@ -24,6 +24,11 @@ type FocusList struct {
 type FocusListRow interface {
 	fyne.Focusable
 	ItemID() widget.ListItemID
+	SetItemID(widget.ListItemID)
+
+	SetOnTapped(func())
+	SetOnDoubleTapped(func())
+	SetOnFocusNeighbor(func(up bool))
 }
 
 func NewFocusList(len func() int, create func() fyne.CanvasObject, update func(widget.GridWrapItemID, fyne.CanvasObject)) *FocusList {
@@ -101,10 +106,26 @@ type FocusListRowBase struct {
 	selectionRect *canvas.Rectangle
 }
 
+func (l *FocusListRowBase) SetOnTapped(f func()) {
+	l.OnTapped = f
+}
+
+func (l *FocusListRowBase) SetOnDoubleTapped(f func()) {
+	l.OnDoubleTapped = f
+}
+
+func (l *FocusListRowBase) SetOnFocusNeighbor(f func(up bool)) {
+	l.OnFocusNeighbor = f
+}
+
 func (l *FocusListRowBase) ItemID() widget.ListItemID {
 	return l.ListItemID
 }
 
+func (l *FocusListRowBase) SetItemID(id widget.ListItemID) {
+	l.ListItemID = id
+}
+
 func (l *FocusListRowBase) EnsureUnfocused() {
 	if l.Focused {
 		fyne.CurrentApp().Driver().CanvasForObject(l).Unfocus()

diff --git a/ui/widgets/playqueuelist.go b/ui/widgets/playqueuelist.go
@@ -21,7 +21,7 @@ import (
 	"github.com/dweymouth/supersonic/ui/util"
 )
 
-const thumbnailSize = 52
+const playQueueListThumbnailSize = 52
 
 type PlayQueueList struct {
 	widget.BaseWidget
@@ -298,7 +298,7 @@ func NewPlayQueueListRow(playQueueList *PlayQueueList, im *backend.ImageManager,
 		playingIcon:   playingIcon,
 		playQueueList: playQueueList,
 		num:           widget.NewLabel(""),
-		cover:         NewImagePlaceholder(myTheme.TracksIcon, thumbnailSize),
+		cover:         NewImagePlaceholder(myTheme.TracksIcon, playQueueListThumbnailSize),
 		title:         util.NewTruncatingLabel(),
 		artist:        NewMultiHyperlink(),
 		time:          util.NewTrailingAlignLabel(),