Refactor: move update logic back to base type
This commit is contained in:
@@ -1,12 +1,9 @@
|
||||
package dialogs
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/theme"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/dweymouth/supersonic/backend/mediaprovider"
|
||||
"github.com/dweymouth/supersonic/ui/util"
|
||||
)
|
||||
@@ -26,7 +23,6 @@ func NewQuickSearch(mp mediaprovider.MediaProvider, im util.ImageFetcher) *Quick
|
||||
im,
|
||||
"Quick Search",
|
||||
q.onSearched,
|
||||
q.onUpdateSearchResult,
|
||||
nil,
|
||||
)
|
||||
q.SearchDialog = sd
|
||||
@@ -45,53 +41,6 @@ func (q *QuickSearch) onSearched(query string) []*mediaprovider.SearchResult {
|
||||
return results
|
||||
}
|
||||
|
||||
func (q *QuickSearch) onUpdateSearchResult(sr *searchResult, result *mediaprovider.SearchResult) {
|
||||
|
||||
maybePluralize := func(s string, size int) string {
|
||||
if size != 1 {
|
||||
return s + "s"
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
var secondaryText string
|
||||
switch result.Type {
|
||||
case mediaprovider.ContentTypeAlbum:
|
||||
secondaryText = result.ArtistName
|
||||
case mediaprovider.ContentTypeArtist:
|
||||
secondaryText = fmt.Sprintf("%d %s", result.Size, maybePluralize("album", result.Size))
|
||||
case mediaprovider.ContentTypeTrack:
|
||||
secondaryText = result.ArtistName
|
||||
case mediaprovider.ContentTypePlaylist:
|
||||
secondaryText = fmt.Sprintf("%d %s", result.Size, maybePluralize("track", result.Size))
|
||||
case mediaprovider.ContentTypeGenre:
|
||||
if result.Size > 0 {
|
||||
secondaryText = fmt.Sprintf("%d %s", result.Size, maybePluralize("album", result.Size))
|
||||
} else {
|
||||
secondaryText = ""
|
||||
}
|
||||
}
|
||||
sr.secondary.Segments = []widget.RichTextSegment{
|
||||
&widget.TextSegment{
|
||||
Text: result.Type.String(),
|
||||
Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, TextStyle: fyne.TextStyle{Bold: true}, Inline: true},
|
||||
},
|
||||
}
|
||||
if secondaryText != "" {
|
||||
sr.secondary.Segments = append(sr.secondary.Segments,
|
||||
&widget.TextSegment{
|
||||
Text: " · ",
|
||||
Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, Inline: true},
|
||||
},
|
||||
&widget.TextSegment{
|
||||
Text: secondaryText,
|
||||
Style: widget.RichTextStyle{SizeName: theme.SizeNameCaptionText, Inline: true},
|
||||
},
|
||||
)
|
||||
}
|
||||
sr.secondary.Refresh()
|
||||
}
|
||||
|
||||
func (q *QuickSearch) SetOnDismiss(onDismiss func()) {
|
||||
q.SearchDialog.OnDismiss = onDismiss
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user