From c473c3ad2321d40458f7bb73b7879094d4ea0075 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Fri, 23 Feb 2024 09:06:58 -0800
Subject: [PATCH] some tweaks, still WIP

---
 ui/browsing/fullscreenpage.go     | 10 ++++++++--
 ui/browsing/router.go             |  2 +-
 ui/widgets/largenowplayingcard.go |  8 ++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ui/browsing/fullscreenpage.go b/ui/browsing/fullscreenpage.go
index 668647e..d30d7c6 100644
--- a/ui/browsing/fullscreenpage.go
+++ b/ui/browsing/fullscreenpage.go
@@ -10,6 +10,7 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/widget"
 )
 
@@ -28,12 +29,14 @@ type fullscreenPageState struct {
 	contr   *controller.Controller
 	pool    *util.WidgetPool
 	pm      *backend.PlaybackManager
+	im      *backend.ImageManager
 	canRate bool
 }
 
 func NewFullscreenPage(
 	contr *controller.Controller,
 	pool *util.WidgetPool,
+	im *backend.ImageManager,
 	pm *backend.PlaybackManager,
 	canRate bool,
 ) *FullscreenPage {
@@ -49,7 +52,10 @@ func NewFullscreenPage(
 }
 
 func (a *FullscreenPage) CreateRenderer() fyne.WidgetRenderer {
-	container := container.NewPadded()
+	container := container.NewGridWithColumns(2,
+		a.card,
+		layout.NewSpacer(),
+	)
 	return widget.NewSimpleRenderer(container)
 }
 
@@ -74,5 +80,5 @@ func (a *FullscreenPage) Reload() {
 }
 
 func (s *fullscreenPageState) Restore() Page {
-	return NewFullscreenPage(s.contr, s.pool, s.pm, s.canRate)
+	return NewFullscreenPage(s.contr, s.pool, s.im, s.pm, s.canRate)
 }
diff --git a/ui/browsing/router.go b/ui/browsing/router.go
index 0a2a188..f515a16 100644
--- a/ui/browsing/router.go
+++ b/ui/browsing/router.go
@@ -43,7 +43,7 @@ func (r Router) CreatePage(rte controller.Route) Page {
 	case controller.Favorites:
 		return NewFavoritesPage(&r.App.Config.FavoritesPage, r.widgetPool, r.Controller, r.App.ServerManager.Server, r.App.PlaybackManager, r.App.ImageManager)
 	case controller.Fullscreen:
-		return NewFullscreenPage(r.Controller, r.widgetPool, r.App.PlaybackManager, canRate)
+		return NewFullscreenPage(r.Controller, r.widgetPool, r.App.ImageManager, r.App.PlaybackManager, canRate)
 	case controller.Genre:
 		return NewGenrePage(rte.Arg, r.widgetPool, r.Controller, r.App.PlaybackManager, r.App.ServerManager.Server, r.App.ImageManager)
 	case controller.Genres:
diff --git a/ui/widgets/largenowplayingcard.go b/ui/widgets/largenowplayingcard.go
index 3edf36e..fda8d89 100644
--- a/ui/widgets/largenowplayingcard.go
+++ b/ui/widgets/largenowplayingcard.go
@@ -50,11 +50,6 @@ func NewLargeNowPlayingCard() *LargeNowPlayingCard {
 	return n
 }
 
-func (n *LargeNowPlayingCard) MinSize() fyne.Size {
-	// prop up height for when cover image is hidden
-	return fyne.NewSize(n.BaseWidget.MinSize().Width, 85)
-}
-
 func (n *LargeNowPlayingCard) onAlbumNameTapped() {
 	if n.OnAlbumNameTapped != nil {
 		n.OnAlbumNameTapped()
@@ -97,7 +92,8 @@ func (n *LargeNowPlayingCard) CreateRenderer() fyne.WidgetRenderer {
 		n.albumName,
 		n.artistName,
 	)
-	c := container.NewBorder(nil, vbox, nil, nil, n.cover)
+	c := container.NewCenter(
+		container.NewBorder(nil, vbox, nil, nil, n.cover))
 	return widget.NewSimpleRenderer(c)
 }