switch GridView to icon placeholder

ui/widgets/imageplaceholder.go

@@ -2,48 +2,50 @@ package widgets
 
 import (
 	"image"
-	"image/color"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
+	myTheme "github.com/dweymouth/supersonic/ui/theme"
 )
 
 // A widget that can display an image or else
 // a placeholder with a rectangular border frame
 // and an icon positioned in the center of the frame.
 type ImagePlaceholder struct {
+	ScaleMode canvas.ImageScale
+
 	widget.BaseWidget
-	container *fyne.Container
+	content   *fyne.Container
+	imageDisp *TappableImage
 	image     image.Image
+	iconImage *canvas.Image
+	border    *myTheme.ThemedRectangle
 	minSize   float32
 
 	OnTapped func()
 }
 
 func NewImagePlaceholder(centerIcon fyne.Resource, minSize float32) *ImagePlaceholder {
-	m := &ImagePlaceholder{minSize: minSize}
-	m.ExtendBaseWidget(m)
-	img := canvas.NewImageFromResource(centerIcon)
-	img.FillMode = canvas.ImageFillContain
-	img.SetMinSize(fyne.NewSize(minSize/4, minSize/4))
-	rect := canvas.NewRectangle(theme.BackgroundColor())
-	rect.StrokeColor = color.Black
-	rect.StrokeWidth = 3
-	rect.SetMinSize(fyne.NewSize(minSize, minSize))
-	m.container = container.NewMax(
-		rect,
-		container.NewCenter(img),
+	i := &ImagePlaceholder{minSize: minSize}
+	i.ExtendBaseWidget(i)
+	i.iconImage = canvas.NewImageFromResource(centerIcon)
+	i.iconImage.FillMode = canvas.ImageFillContain
+	i.iconImage.SetMinSize(fyne.NewSize(minSize/4, minSize/4))
+	i.imageDisp = NewTappableImage(i.onTapped)
+	i.imageDisp.FillMode = canvas.ImageFillContain
+	i.imageDisp.Hidden = true
+	i.border = myTheme.NewThemedRectangle(theme.ColorNameBackground)
+	i.border.BorderColorName = theme.ColorNameForeground
+	i.border.BorderWidth = 3
+	i.content = container.NewMax(
+		i.border,
+		container.NewCenter(i.iconImage),
+		i.imageDisp,
 	)
-	return m
-}
-
-type CanvasImage interface {
-	fyne.CanvasObject
-
-	SetMinSize(fyne.Size)
+	return i
 }
 
 func (i *ImagePlaceholder) HaveImage() bool {
@@ -51,22 +53,13 @@ func (i *ImagePlaceholder) HaveImage() bool {
 }
 
 func (i *ImagePlaceholder) SetImage(img image.Image, tappable bool) {
-	var cIm CanvasImage
 	i.image = img
-	if tappable {
-		cImg := NewTappableImage(i.onTapped)
-		cImg.Image.Image = img
-		cImg.FillMode = canvas.ImageFillContain
-		cIm = cImg
-	} else {
-		cImg := canvas.NewImageFromImage(img)
-		cImg.FillMode = canvas.ImageFillContain
-		cIm = cImg
+	if img != nil {
+		i.imageDisp.DisableTapping = !tappable
+		i.imageDisp.Image.Image = img
 	}
-	cIm.SetMinSize(fyne.NewSize(i.minSize, i.minSize))
-	i.container.RemoveAll()
-	i.container.Add(cIm)
-	i.container.Refresh()
+
+	i.Refresh()
 }
 
 func (i *ImagePlaceholder) Image() image.Image {
@@ -79,6 +72,18 @@ func (i *ImagePlaceholder) onTapped() {
 	}
 }
 
-func (i *ImagePlaceholder) CreateRenderer() fyne.WidgetRenderer {
-	return widget.NewSimpleRenderer(i.container)
+func (i *ImagePlaceholder) MinSize() fyne.Size {
+	return fyne.NewSize(i.minSize, i.minSize)
+}
+
+func (i *ImagePlaceholder) Refresh() {
+	i.border.Hidden = i.HaveImage()
+	i.iconImage.Hidden = i.HaveImage()
+	i.imageDisp.Hidden = !i.HaveImage()
+	i.imageDisp.ScaleMode = i.ScaleMode
+	i.BaseWidget.Refresh()
+}
+
+func (i *ImagePlaceholder) CreateRenderer() fyne.WidgetRenderer {
+	return widget.NewSimpleRenderer(i.content)
 }