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

reuse grid for searching in genre page

Browse Source
This commit is contained in:
Drew Weymouth
2023-07-09 13:18:05 -07:00
parent 1c771b0832
commit be41bdc72c
1 changed files with 52 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/genrepage.go
+52 -57
View File
@@ -19,19 +19,20 @@ import (
type GenrePage struct { type GenrePage struct {
widget.BaseWidget widget.BaseWidget
genre string genre string
contr *controller.Controller contr *controller.Controller
im *backend.ImageManager im *backend.ImageManager
pm *backend.PlaybackManager pm *backend.PlaybackManager
mp mediaprovider.MediaProvider mp mediaprovider.MediaProvider
grid *widgets.GridView grid *widgets.GridView
searchGrid *widgets.GridView gridState *widgets.GridViewState
searcher *widgets.SearchEntry searchGridState *widgets.GridViewState
searchText string searcher *widgets.SearchEntry
filter mediaprovider.AlbumFilter searchText string
filterBtn *widgets.AlbumFilterButton filter mediaprovider.AlbumFilter
titleDisp *widget.RichText filterBtn *widgets.AlbumFilterButton
playRandom *widget.Button titleDisp *widget.RichText
playRandom *widget.Button
container *fyne.Container container *fyne.Container
} }
@@ -56,7 +57,7 @@ func NewGenrePage(genre string, contr *controller.Controller, pm *backend.Playba
g.grid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), g.im, myTheme.AlbumIcon) g.grid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), g.im, myTheme.AlbumIcon)
g.contr.ConnectAlbumGridActions(g.grid) g.contr.ConnectAlbumGridActions(g.grid)
g.createSearchAndFilter() g.createSearchAndFilter()
g.createContainer(false) g.createContainer()
return g return g
} }
@@ -71,29 +72,27 @@ func (g *GenrePage) createSearchAndFilter() {
g.filterBtn.OnChanged = g.Reload g.filterBtn.OnChanged = g.Reload
} }
func (g *GenrePage) createContainer(searchGrid bool) { func (g *GenrePage) createContainer() {
searchVbox := container.NewVBox(layout.NewSpacer(), g.searcher, layout.NewSpacer()) searchVbox := container.NewVBox(layout.NewSpacer(), g.searcher, layout.NewSpacer())
gr := g.grid
if searchGrid {
gr = g.searchGrid
}
playRandomVbox := container.NewVBox(layout.NewSpacer(), g.playRandom, layout.NewSpacer()) playRandomVbox := container.NewVBox(layout.NewSpacer(), g.playRandom, layout.NewSpacer())
g.container = container.NewBorder( g.container = container.NewBorder(
container.NewHBox(util.NewHSpace(6), container.NewHBox(util.NewHSpace(6),
g.titleDisp, playRandomVbox, layout.NewSpacer(), container.NewCenter(g.filterBtn), searchVbox, util.NewHSpace(15)), g.titleDisp, playRandomVbox, layout.NewSpacer(), container.NewCenter(g.filterBtn), searchVbox, util.NewHSpace(15)),
nil, nil, nil, gr, nil, nil, nil, g.grid,
) )
} }
func restoreGenrePage(saved *savedGenrePage) *GenrePage { func restoreGenrePage(saved *savedGenrePage) *GenrePage {
g := &GenrePage{ g := &GenrePage{
genre: saved.genre, genre: saved.genre,
contr: saved.contr, contr: saved.contr,
pm: saved.pm, pm: saved.pm,
mp: saved.mp, mp: saved.mp,
im: saved.im, im: saved.im,
searchText: saved.searchText, gridState: saved.gridState,
filter: saved.filter, searchGridState: saved.searchGridState,
searchText: saved.searchText,
filter: saved.filter,
} }
g.ExtendBaseWidget(g) g.ExtendBaseWidget(g)
@@ -102,12 +101,13 @@ func restoreGenrePage(saved *savedGenrePage) *GenrePage {
SizeName: theme.SizeNameHeadingText, SizeName: theme.SizeNameHeadingText,
} }
g.playRandom = widget.NewButtonWithIcon(" Play random", myTheme.ShuffleIcon, g.playRandomSongs) g.playRandom = widget.NewButtonWithIcon(" Play random", myTheme.ShuffleIcon, g.playRandomSongs)
g.grid = widgets.NewGridViewFromState(saved.gridState)
g.createSearchAndFilter()
if g.searchText != "" { if g.searchText != "" {
g.searchGrid = widgets.NewGridViewFromState(saved.searchGridState) g.grid = widgets.NewGridViewFromState(saved.searchGridState)
} else {
g.grid = widgets.NewGridViewFromState(saved.gridState)
} }
g.createContainer(saved.searchText != "") g.createSearchAndFilter()
g.createContainer()
return g return g
} }
@@ -131,17 +131,20 @@ func (g *GenrePage) Reload() {
func (g *GenrePage) Save() SavedPage { func (g *GenrePage) Save() SavedPage {
sg := &savedGenrePage{ sg := &savedGenrePage{
genre: g.genre, genre: g.genre,
filter: g.filter, filter: g.filter,
searchText: g.searchText, searchText: g.searchText,
contr: g.contr, contr: g.contr,
pm: g.pm, pm: g.pm,
mp: g.mp, mp: g.mp,
im: g.im, im: g.im,
gridState: g.grid.SaveToState(), gridState: g.gridState,
searchGridState: g.searchGridState,
} }
if g.searchGrid != nil { if g.searchText != "" {
sg.searchGridState = g.searchGrid.SaveToState() sg.searchGridState = g.grid.SaveToState()
} else {
sg.gridState = g.grid.SaveToState()
} }
return sg return sg
} }
@@ -153,28 +156,20 @@ func (g *GenrePage) SearchWidget() fyne.Focusable {
} }
func (g *GenrePage) OnSearched(query string) { func (g *GenrePage) OnSearched(query string) {
g.searchText = query
if query == "" { if query == "" {
g.container.Objects[0] = g.grid g.grid.ResetFromState(g.gridState)
if g.searchGrid != nil { } else {
g.searchGrid.Clear() g.doSearch(query)
}
g.Refresh()
return
} }
g.doSearch(query) g.searchText = query
} }
func (g *GenrePage) doSearch(query string) { func (g *GenrePage) doSearch(query string) {
iter := g.mp.SearchAlbums(query, g.filter) if g.searchText == "" {
if g.searchGrid == nil { g.gridState = g.grid.SaveToState()
g.searchGrid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), g.im, myTheme.AlbumIcon)
g.contr.ConnectAlbumGridActions(g.searchGrid)
} else {
g.searchGrid.Reset(widgets.NewGridViewAlbumIterator(iter))
} }
g.container.Objects[0] = g.searchGrid iter := g.mp.SearchAlbums(query, g.filter)
g.Refresh() g.grid.Reset(widgets.NewGridViewAlbumIterator(iter))
} }
func (g *GenrePage) playRandomSongs() { func (g *GenrePage) playRandomSongs() {