another big refactor to make code more manageable
This commit is contained in:
+33
-4
@@ -1,11 +1,14 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"supersonic/player"
|
||||
"supersonic/backend"
|
||||
"supersonic/ui/widgets"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/layout"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/dweymouth/go-subsonic"
|
||||
)
|
||||
|
||||
type MainWindow struct {
|
||||
@@ -14,17 +17,43 @@ type MainWindow struct {
|
||||
BottomPanel *BottomPanel
|
||||
}
|
||||
|
||||
func NewMainWindow(app fyne.App, appName string, p *player.Player) MainWindow {
|
||||
func NewMainWindow(fyneApp fyne.App, appName string, app *backend.App) MainWindow {
|
||||
m := MainWindow{
|
||||
Window: app.NewWindow(appName),
|
||||
BottomPanel: NewBottomPanel(p),
|
||||
Window: fyneApp.NewWindow(appName),
|
||||
BottomPanel: NewBottomPanel(app.Player),
|
||||
}
|
||||
m.BottomPanel.SetPlaybackManager(app.PlaybackManager)
|
||||
m.BottomPanel.ImageManager = app.ImageManager
|
||||
c := container.NewBorder(nil, m.BottomPanel, nil, nil, &layout.Spacer{})
|
||||
m.Window.SetContent(c)
|
||||
m.Window.Resize(fyne.NewSize(1000, 800))
|
||||
app.PlaybackManager.OnSongChange(func(song *subsonic.Child) {
|
||||
if song == nil {
|
||||
m.Window.SetTitle(appName)
|
||||
return
|
||||
}
|
||||
m.Window.SetTitle(song.Title)
|
||||
})
|
||||
app.ServerManager.OnServerConnected(func() {
|
||||
ag := NewAlbumGrid(app.LibraryManager.RecentlyAddedIter(), app.ImageManager.GetAlbumThumbnail)
|
||||
ag.OnPlayAlbum = func(albumID string) {
|
||||
_ = app.PlaybackManager.PlayAlbum(albumID)
|
||||
}
|
||||
m.Window.SetContent(container.NewBorder(nil, m.BottomPanel, nil, nil, ag))
|
||||
})
|
||||
return m
|
||||
}
|
||||
|
||||
func (m *MainWindow) PromptForFirstServer(cb func(string, string, string, string)) {
|
||||
d := widgets.NewAddServerForm("Connect to Server")
|
||||
pop := widget.NewModalPopUp(d, m.Canvas())
|
||||
d.OnSubmit = func() {
|
||||
pop.Hide()
|
||||
cb(d.Nickname, d.Host, d.Username, d.Password)
|
||||
}
|
||||
pop.Show()
|
||||
}
|
||||
|
||||
func (m *MainWindow) Show() {
|
||||
m.Window.Show()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user