add album shuffle mode to Genre page

ui/browsing/albumspage.go

@@ -5,7 +5,6 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/lang"
-	"fyne.io/fyne/v2/widget"
 	"github.com/dweymouth/supersonic/backend"
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
 	"github.com/dweymouth/supersonic/ui/controller"
@@ -64,7 +63,7 @@ func (a *albumsPageAdapter) SaveSortOrder(orderIdx int) {
 	a.cfg.SortOrder = a.mp.AlbumSortOrders()[orderIdx]
 }
 
-func (a *albumsPageAdapter) ActionButton() *widget.Button { return nil }
+func (a *albumsPageAdapter) ActionButton() fyne.CanvasObject { return nil }
 
 func (a *albumsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
 	sortOrder := a.mp.AlbumSortOrders()[sortOrderIdx]

ui/browsing/artistspage.go

@@ -5,7 +5,6 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/lang"
-	"fyne.io/fyne/v2/widget"
 	"github.com/dweymouth/supersonic/backend"
 	"github.com/dweymouth/supersonic/backend/mediaprovider"
 	"github.com/dweymouth/supersonic/ui/controller"
@@ -60,7 +59,7 @@ func (a *artistsPageAdapter) SaveSortOrder(orderIdx int) {
 	a.cfg.SortOrder = a.mp.ArtistSortOrders()[orderIdx]
 }
 
-func (a *artistsPageAdapter) ActionButton() *widget.Button { return nil }
+func (a *artistsPageAdapter) ActionButton() fyne.CanvasObject { return nil }
 
 func (a *artistsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.ArtistFilter) widgets.GridViewIterator {
 	sortOrder := a.mp.ArtistSortOrders()[sortOrderIdx]

ui/browsing/genrepage.go

@@ -12,7 +12,6 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/lang"
-	"fyne.io/fyne/v2/widget"
 )
 
 type genrePageAdapter struct {
@@ -59,19 +58,47 @@ func (g *genrePageAdapter) Route() controller.Route {
 	return controller.GenreRoute(g.genre)
 }
 
-func (g *genrePageAdapter) ActionButton() *widget.Button {
+func (g *genrePageAdapter) ActionButton() fyne.CanvasObject {
 	fn := func() {
 		go func() {
-			err := g.pm.PlayRandomSongs(g.genre)
+			var err error
+			if g.cfg.ShuffleMode == "Albums" {
+				err = g.pm.PlayRandomAlbums(g.genre)
+			} else {
+				err = g.pm.PlayRandomSongs(g.genre)
+			}
 			if err != nil {
-				log.Println("error playing random tracks: %v", err)
+				log.Printf("error playing random tracks: %v", err)
 				fyne.Do(func() {
 					g.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play random tracks"))
 				})
 			}
 		}()
 	}
-	return widget.NewButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, fn)
+
+	var tracks, albums *fyne.MenuItem
+
+	setShuffleMode := func(isAlbums bool) {
+		if isAlbums {
+			g.cfg.ShuffleMode = "Albums"
+		} else {
+			g.cfg.ShuffleMode = "Tracks"
+		}
+		albums.Checked = isAlbums
+		tracks.Checked = !isAlbums
+	}
+
+	tracks = fyne.NewMenuItem(lang.L("Tracks"), func() { setShuffleMode(false) })
+	tracks.Icon = myTheme.TracksIcon
+	albums = fyne.NewMenuItem(lang.L("Albums"), func() { setShuffleMode(true) })
+	albums.Icon = myTheme.AlbumIcon
+
+	isAlbums := g.cfg.ShuffleMode == "Albums"
+	albums.Checked = isAlbums
+	tracks.Checked = !isAlbums
+
+	menu := fyne.NewMenu("", tracks, albums)
+	return widgets.NewOptionButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, menu, fn)
 }
 
 func (a *genrePageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {

ui/browsing/gridviewpage.go

@@ -58,7 +58,7 @@ type GridViewPageAdapter[M, F any] interface {
 	Route() controller.Route
 
 	// Returns the ActionButton for this page, if any
-	ActionButton() *widget.Button
+	ActionButton() fyne.CanvasObject
 
 	// Returns the iterator for the given sortOrder and filter.
 	// (Non-media pages can ignore the filter argument)