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

translate sort order strings

Browse Source
This commit is contained in:
Drew Weymouth
2024-07-21 16:23:47 -07:00
parent 53f29e08c4
commit 4afedda04e
11 changed files with 123 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/albumspage.go
+12 -8
View File
@@ -8,6 +8,7 @@ import (
"fyne.io/fyne/v2/widget"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/controller"
myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
@@ -50,22 +51,25 @@ func (a *albumsPageAdapter) PlaceholderResource() fyne.Resource { return myTheme
func (a *albumsPageAdapter) Route() controller.Route { return controller.AlbumsRoute() }
func (a *albumsPageAdapter) SortOrders() ([]string, string) {
func (a *albumsPageAdapter) SortOrders() ([]string, int) {
orders := a.mp.AlbumSortOrders()
sortOrder := a.cfg.SortOrder
if !slices.Contains(orders, sortOrder) {
sortOrder = string(orders[0])
sortOrder := slices.Index(orders, a.cfg.SortOrder)
if sortOrder < 0 {
sortOrder = 0
}
return orders, sortOrder
translatedOrders := sharedutil.MapSlice(orders, func(s string) string { return lang.L(s) })
return translatedOrders, sortOrder
}
func (a *albumsPageAdapter) SaveSortOrder(order string) {
a.cfg.SortOrder = order
func (a *albumsPageAdapter) SaveSortOrder(orderIdx int) {
a.cfg.SortOrder = a.mp.AlbumSortOrders()[orderIdx]
}
func (a *albumsPageAdapter) ActionButton() *widget.Button { return nil }
func (a *albumsPageAdapter) Iter(sortOrder string, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
func (a *albumsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
sortOrder := a.mp.AlbumSortOrders()[sortOrderIdx]
return widgets.NewGridViewAlbumIterator(a.mp.IterateAlbums(sortOrder, filter))
}
ui/browsing/artistspage.go
+12 -8
View File
@@ -8,6 +8,7 @@ import (
"fyne.io/fyne/v2/widget"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/controller"
myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
@@ -46,22 +47,25 @@ func (a *artistsPageAdapter) PlaceholderResource() fyne.Resource { return myThem
func (a *artistsPageAdapter) Route() controller.Route { return controller.ArtistsRoute() }
func (a *artistsPageAdapter) SortOrders() ([]string, string) {
func (a *artistsPageAdapter) SortOrders() ([]string, int) {
orders := a.mp.ArtistSortOrders()
sortOrder := a.cfg.SortOrder
if !slices.Contains(orders, sortOrder) {
sortOrder = string(orders[0])
sortOrder := slices.Index(orders, a.cfg.SortOrder)
if sortOrder < 0 {
sortOrder = 0
}
return orders, sortOrder
translatedOrders := sharedutil.MapSlice(orders, func(s string) string { return lang.L(s) })
return translatedOrders, sortOrder
}
func (a *artistsPageAdapter) SaveSortOrder(order string) {
a.cfg.SortOrder = order
func (a *artistsPageAdapter) SaveSortOrder(orderIdx int) {
a.cfg.SortOrder = a.mp.ArtistSortOrders()[orderIdx]
}
func (a *artistsPageAdapter) ActionButton() *widget.Button { return nil }
func (a *artistsPageAdapter) Iter(sortOrder string, filter mediaprovider.ArtistFilter) widgets.GridViewIterator {
func (a *artistsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.ArtistFilter) widgets.GridViewIterator {
sortOrder := a.mp.ArtistSortOrders()[sortOrderIdx]
return widgets.NewGridViewArtistIterator(a.mp.IterateArtists(sortOrder, filter))
}
ui/browsing/genrepage.go
+2 -2
View File
@@ -62,8 +62,8 @@ func (g *genrePageAdapter) ActionButton() *widget.Button {
return widget.NewButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, fn)
}
func (a *genrePageAdapter) Iter(sortOrder string, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
return widgets.NewGridViewAlbumIterator(a.mp.IterateAlbums(sortOrder, filter))
func (a *genrePageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
return widgets.NewGridViewAlbumIterator(a.mp.IterateAlbums("", filter))
}
func (a *genrePageAdapter) SearchIter(query string, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
ui/browsing/gridviewpage.go
+21 -16
View File
@@ -62,7 +62,7 @@ type GridViewPageAdapter[M, F any] interface {
// Returns the iterator for the given sortOrder and filter.
// (Non-media pages can ignore the filter argument)
Iter(sortOrder string, filter mediaprovider.MediaFilter[M, F]) widgets.GridViewIterator
Iter(sortOrderIdx int, filter mediaprovider.MediaFilter[M, F]) widgets.GridViewIterator
// Returns the iterator for the given search query and filter.
SearchIter(query string, filter mediaprovider.MediaFilter[M, F]) widgets.GridViewIterator
@@ -77,11 +77,12 @@ type GridViewPageAdapter[M, F any] interface {
}
type SortableGridViewPageAdapter interface {
// Returns the list of sort orders and the initially selected sort order
SortOrders() ([]string, string)
// Returns the list of sort orders
// and the index of the initially selected sort order
SortOrders() ([]string, int)
// Saves the given sort order setting.
SaveSortOrder(string)
// Saves the given sort order setting, the selected index is passed.
SaveSortOrder(int)
}
type sortOrderSelect struct {
@@ -121,7 +122,7 @@ func NewGridViewPage[M, F any](
gp.createTitleAndSort()
_, canShare := mp.(mediaprovider.SupportsSharing)
iter := adapter.Iter(gp.getSortOrder(), gp.getFilter())
iter := adapter.Iter(gp.getSortOrderIdx(), gp.getFilter())
if g := pool.Obtain(util.WidgetTypeGridView); g != nil {
gp.grid = g.(*widgets.GridView)
gp.grid.Placeholder = adapter.PlaceholderResource()
@@ -144,7 +145,7 @@ func (g *GridViewPage[M, F]) createTitleAndSort() {
if s, ok := g.adapter.(SortableGridViewPageAdapter); ok {
sorts, selected := s.SortOrders()
g.sortOrder = NewSortOrderSelect(sorts, g.onSortOrderChanged)
g.sortOrder.Selected = selected
g.sortOrder.SetSelectedIndex(selected)
}
}
@@ -180,7 +181,7 @@ func (g *GridViewPage[M, F]) Reload() {
if g.searchText != "" {
g.doSearch(g.searchText)
} else {
g.grid.Reset(g.adapter.Iter(g.getSortOrder(), g.getFilter()))
g.grid.Reset(g.adapter.Iter(g.getSortOrderIdx(), g.getFilter()))
}
}
@@ -223,20 +224,24 @@ func (g *GridViewPage[M, F]) doSearch(query string) {
g.grid.Reset(g.adapter.SearchIter(query, g.getFilter()))
}
func (g *GridViewPage[M, F]) onSortOrderChanged(order string) {
g.adapter.(SortableGridViewPageAdapter).SaveSortOrder(g.getSortOrder())
g.grid.Reset(g.adapter.Iter(g.getSortOrder(), g.getFilter()))
func (g *GridViewPage[M, F]) onSortOrderChanged(_ string) {
if g.grid == nil {
return // callback from initializing
}
g.adapter.(SortableGridViewPageAdapter).SaveSortOrder(g.getSortOrderIdx())
g.grid.Reset(g.adapter.Iter(g.getSortOrderIdx(), g.getFilter()))
}
func (g *GridViewPage[M, F]) getFilter() mediaprovider.MediaFilter[M, F] {
return g.filter
}
func (g *GridViewPage[M, F]) getSortOrder() string {
func (g *GridViewPage[M, F]) getSortOrderIdx() int {
if g.sortOrder != nil {
return g.sortOrder.Selected
return g.sortOrder.SelectedIndex()
}
return ""
return 0
}
func (g *GridViewPage[M, F]) CreateRenderer() fyne.WidgetRenderer {
@@ -250,7 +255,7 @@ type savedGridViewPage[M, F any] struct {
searchText string
filter mediaprovider.MediaFilter[M, F]
pool *util.WidgetPool
sortOrder string
sortOrderIdx int
gridState *widgets.GridViewState
searchGridState *widgets.GridViewState
}
@@ -263,7 +268,7 @@ func (g *GridViewPage[M, F]) Save() SavedPage {
im: g.im,
searchText: g.searchText,
filter: g.filter,
sortOrder: g.getSortOrder(),
sortOrderIdx: g.getSortOrderIdx(),
gridState: g.gridState,
searchGridState: g.searchGridState,
}