owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue refactor for favorites page

Browse Source
This commit is contained in:
Drew Weymouth
2023-02-10 18:05:33 -08:00
parent 22e9287608
commit 6b8acc6fa1
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/favoritespage.go
+7 -10
View File
@@ -16,6 +16,7 @@ import (
type FavoritesPage struct {
widget.BaseWidget
pm *backend.PlaybackManager
im *backend.ImageManager
sm *backend.ServerManager
lm *backend.LibraryManager
@@ -26,12 +27,11 @@ type FavoritesPage struct {
searchText string
titleDisp *widget.RichText
container *fyne.Container
OnPlayAlbum func(string, int)
}
func NewFavoritesPage(sm *backend.ServerManager, lm *backend.LibraryManager, im *backend.ImageManager, nav func(Route)) *FavoritesPage {
func NewFavoritesPage(sm *backend.ServerManager, pm *backend.PlaybackManager, lm *backend.LibraryManager, im *backend.ImageManager, nav func(Route)) *FavoritesPage {
a := &FavoritesPage{
pm: pm,
lm: lm,
sm: sm,
im: im,
@@ -66,6 +66,7 @@ func (a *FavoritesPage) createContainer() {
func restoreFavoritesPage(saved *savedFavoritesPage) *FavoritesPage {
a := &FavoritesPage{
pm: saved.pm,
lm: saved.lm,
sm: saved.sm,
im: saved.im,
@@ -88,16 +89,13 @@ func (a *FavoritesPage) Route() Route {
return FavoritesRoute()
}
func (a *FavoritesPage) SetPlayAlbumCallback(cb func(string, int)) {
a.OnPlayAlbum = cb
}
func (a *FavoritesPage) Reload() {
a.grid.Reset(a.lm.StarredIter())
}
func (a *FavoritesPage) Save() SavedPage {
return &savedFavoritesPage{
pm: a.pm,
sm: a.sm,
im: a.im,
lm: a.lm,
@@ -142,9 +140,7 @@ func (a *FavoritesPage) doSearch(query string) {
}
func (a *FavoritesPage) onPlayAlbum(albumID string) {
if a.OnPlayAlbum != nil {
a.OnPlayAlbum(albumID, 0)
}
a.pm.PlayAlbum(albumID, 0)
}
func (a *FavoritesPage) onShowAlbumPage(albumID string) {
@@ -161,6 +157,7 @@ func (a *FavoritesPage) CreateRenderer() fyne.WidgetRenderer {
}
type savedFavoritesPage struct {
pm *backend.PlaybackManager
sm *backend.ServerManager
im *backend.ImageManager
lm *backend.LibraryManager
ui/browsing/router.go
+1 -1
View File
@@ -93,7 +93,7 @@ func (r Router) CreatePage(rte Route) Page {
case Artists:
return NewArtistsGenresPage(false, r.App.ServerManager, r.OpenRoute)
case Favorites:
return NewFavoritesPage(r.App.ServerManager, r.App.LibraryManager, r.App.ImageManager, r.OpenRoute)
return NewFavoritesPage(r.App.ServerManager, r.App.PlaybackManager, r.App.LibraryManager, r.App.ImageManager, r.OpenRoute)
case Genre:
return NewGenrePage(rte.Arg, r.App.LibraryManager, r.App.ImageManager, r.OpenRoute)
case Genres: