more light theme work: themed icon button, colors adj

ui/widgets/favoritebutton.go

@@ -2,6 +2,7 @@ package widgets
 
 import (
 	"supersonic/res"
+	"supersonic/ui/theme"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/widget"
@@ -31,10 +32,12 @@ func (f *FavoriteButton) Tapped(e *fyne.PointEvent) {
 }
 
 func (f *FavoriteButton) Refresh() {
+	var iconName fyne.ThemeIconName
 	if f.IsFavorited {
-		f.Icon = res.ResHeartFilledInvertPng
+		iconName = theme.IconNameFavorite
 	} else {
-		f.Icon = res.ResHeartOutlineInvertPng
+		iconName = theme.IconNameNotFavorite
 	}
+	f.Icon = fyne.CurrentApp().Settings().Theme().Icon(iconName)
 	f.Button.Refresh()
 }

ui/widgets/listheader.go

@@ -5,7 +5,6 @@ import (
 	"supersonic/ui/layouts"
 
 	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
@@ -42,7 +41,7 @@ func NewListHeader(cols []ListColumn, layout *layouts.ColumnsLayout) *ListHeader
 	for i, _ := range l.columnVisible {
 		l.columnVisible[i] = true
 	}
-	l.container = container.NewMax(canvas.NewRectangle(theme.BackgroundColor()), l.columnsContainer)
+	l.container = container.NewMax(NewThemedRectangle(theme.ColorNameBackground), l.columnsContainer)
 	l.ExtendBaseWidget(l)
 	l.buildColumns()
 	return l

ui/widgets/themed.go

@@ -0,0 +1,63 @@
+package widgets
+
+import (
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/canvas"
+	"fyne.io/fyne/v2/widget"
+)
+
+type ThemedIconButton struct {
+	widget.Button
+
+	IconName fyne.ThemeIconName
+}
+
+func NewThemedIconButton(iconName fyne.ThemeIconName, text string, action func()) *ThemedIconButton {
+	b := &ThemedIconButton{
+		IconName: iconName,
+		Button: widget.Button{
+			Text:     text,
+			OnTapped: action,
+		},
+	}
+	b.updateIcon()
+	b.ExtendBaseWidget(b)
+	return b
+}
+
+func (b *ThemedIconButton) updateIcon() {
+	b.Icon = fyne.CurrentApp().Settings().Theme().Icon(b.IconName)
+}
+
+func (b *ThemedIconButton) Refresh() {
+	b.updateIcon()
+	b.Button.Refresh()
+}
+
+type ThemedRectangle struct {
+	widget.BaseWidget
+
+	rect *canvas.Rectangle
+
+	ColorName fyne.ThemeColorName
+}
+
+func NewThemedRectangle(colorName fyne.ThemeColorName) *ThemedRectangle {
+	t := &ThemedRectangle{
+		ColorName: colorName,
+		rect: canvas.NewRectangle(fyne.CurrentApp().Settings().Theme().Color(colorName,
+			fyne.CurrentApp().Settings().ThemeVariant())),
+	}
+	t.ExtendBaseWidget(t)
+	return t
+}
+
+func (t *ThemedRectangle) Refresh() {
+	t.rect.FillColor = fyne.CurrentApp().Settings().Theme().Color(t.ColorName,
+		fyne.CurrentApp().Settings().ThemeVariant())
+	t.BaseWidget.Refresh()
+}
+
+func (t *ThemedRectangle) CreateRenderer() fyne.WidgetRenderer {
+	return widget.NewSimpleRenderer(t.rect)
+}