refactor 2: use generic model for grid view

ui/browsing/albumspage.go

@@ -72,7 +72,7 @@ func NewAlbumsPage(cfg *backend.AlbumsPageConfig, contr *controller.Controller,
 	}
 	a.sortOrder.Selected = cfg.SortOrder
 	iter := lm.AlbumsIter(backend.AlbumSortOrder(a.sortOrder.Selected))
-	a.grid = widgets.NewAlbumGrid(iter, im, false /*showYear*/)
+	a.grid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), im)
 	a.grid.OnPlay = a.onPlayAlbum
 	a.grid.OnShowSecondaryPage = a.onShowArtistPage
 	a.grid.OnShowItemPage = a.onShowAlbumPage
@@ -180,7 +180,7 @@ func (a *AlbumsPage) Save() SavedPage {
 
 func (a *AlbumsPage) doSearch(query string) {
 	if a.searchGrid == nil {
-		a.searchGrid = widgets.NewAlbumGrid(a.lm.SearchIter(query), a.im, false /*showYear*/)
+		a.searchGrid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(a.lm.SearchIter(query)), a.im)
 		a.searchGrid.OnPlay = a.onPlayAlbum
 		a.searchGrid.OnShowItemPage = a.onShowAlbumPage
 		a.searchGrid.OnShowSecondaryPage = a.onShowArtistPage

ui/browsing/artistpage.go

@@ -2,6 +2,7 @@ package browsing
 
 import (
 	"log"
+	"strconv"
 	"strings"
 	"supersonic/backend"
 	"supersonic/res"
@@ -172,7 +173,15 @@ func (a *ArtistPage) showAlbumGrid() {
 			a.activeView = 0 // if page still loading, will show discography view first
 			return
 		}
-		a.albumGrid = widgets.NewFixedAlbumGrid(a.artistInfo.Album, a.im, true /*showYear*/)
+		model := sharedutil.MapSlice(a.artistInfo.Album, func(al *subsonic.AlbumID3) widgets.GridViewItemModel {
+			return widgets.GridViewItemModel{
+				Name:       al.Name,
+				ID:         al.ID,
+				CoverArtID: al.CoverArt,
+				Secondary:  strconv.Itoa(al.Year),
+			}
+		})
+		a.albumGrid = widgets.NewFixedGridView(model, a.im)
 		a.albumGrid.OnPlay = a.onPlayAlbum
 		a.albumGrid.OnShowItemPage = a.onShowAlbumPage
 	}

ui/browsing/favoritespage.go

@@ -53,7 +53,7 @@ func NewFavoritesPage(cfg *backend.FavoritesPageConfig, contr *controller.Contro
 	}
 	a.ExtendBaseWidget(a)
 	a.createHeader(0, "")
-	a.grid = widgets.NewAlbumGrid(a.lm.StarredIter(), a.im, false)
+	a.grid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(lm.StarredIter()), a.im)
 	a.connectGridActions()
 	if cfg.InitialView == "Artists" {
 		a.toggleBtns.SetActivatedButton(1)
@@ -220,7 +220,7 @@ func (a *FavoritesPage) doSearchAlbums(query string) {
 		return al.Starred.After(time.Time{})
 	})
 	if a.searchGrid == nil {
-		a.searchGrid = widgets.NewAlbumGrid(iter, a.im, false /*showYear*/)
+		a.searchGrid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), a.im)
 		a.searchGrid.OnPlay = a.onPlayAlbum
 		a.searchGrid.OnShowItemPage = a.onShowAlbumPage
 		a.searchGrid.OnShowSecondaryPage = a.onShowArtistPage

ui/browsing/genrepage.go

@@ -52,7 +52,7 @@ func NewGenrePage(genre string, contr *controller.Controller, pm *backend.Playba
 	}
 	g.playRandom = widget.NewButtonWithIcon("Play random", res.ResShuffleInvertSvg, g.playRandomSongs)
 	iter := g.lm.GenreIter(g.genre)
-	g.grid = widgets.NewAlbumGrid(iter, g.im, false)
+	g.grid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), g.im)
 	g.grid.OnPlay = g.onPlayAlbum
 	g.grid.OnShowSecondaryPage = g.onShowArtistPage
 	g.grid.OnShowItemPage = g.onShowAlbumPage
@@ -176,7 +176,7 @@ func (g *GenrePage) doSearch(query string) {
 		return al.Genre == g.genre
 	})
 	if g.searchGrid == nil {
-		g.searchGrid = widgets.NewAlbumGrid(iter, g.im, false /*showYear*/)
+		g.searchGrid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), g.im)
 		g.searchGrid.OnPlay = g.onPlayAlbum
 		g.searchGrid.OnShowItemPage = g.onShowAlbumPage
 		g.searchGrid.OnShowSecondaryPage = g.onShowArtistPage