fix: auto theme detection not working

Author: ErikKalkoken

internal/app/ui/theme.go

@@ -35,12 +35,26 @@ var themeColors = map[fyne.ThemeColorName][]color.Color{
 	},
 }
 
-type myTheme struct {
-	mode settings.ColorTheme
+// customTheme represents a custom Fyne theme.
+// It adds colors to the default theme
+// and allows setting a fixed theme variant.
+type customTheme struct {
+	defaultTheme fyne.Theme
+	mode         settings.ColorTheme
 }
 
-func (ct myTheme) Color(c fyne.ThemeColorName, v fyne.ThemeVariant) color.Color {
-	switch ct.mode {
+// newCustomTheme returns a new custom theme.
+// Must be called after the app has started.
+func newCustomTheme(mode settings.ColorTheme) *customTheme {
+	th := &customTheme{
+		defaultTheme: fyne.CurrentApp().Settings().Theme(),
+		mode:         mode,
+	}
+	return th
+}
+
+func (th customTheme) Color(c fyne.ThemeColorName, v fyne.ThemeVariant) color.Color {
+	switch th.mode {
 	case settings.Dark:
 		v = theme.VariantDark
 	case settings.Light:
@@ -50,18 +64,18 @@ func (ct myTheme) Color(c fyne.ThemeColorName, v fyne.ThemeVariant) color.Color
 	case colorNameInfo, colorNameCreative, colorNameSystem, colorNameAttention:
 		return themeColors[c][v]
 	default:
-		return theme.DefaultTheme().Color(c, v)
+		return th.defaultTheme.Color(c, v)
 	}
 }
 
-func (myTheme) Font(style fyne.TextStyle) fyne.Resource {
-	return theme.DefaultTheme().Font(style)
+func (th customTheme) Font(style fyne.TextStyle) fyne.Resource {
+	return th.defaultTheme.Font(style)
 }
 
-func (myTheme) Icon(n fyne.ThemeIconName) fyne.Resource {
-	return theme.DefaultTheme().Icon(n)
+func (th customTheme) Icon(n fyne.ThemeIconName) fyne.Resource {
+	return th.defaultTheme.Icon(n)
 }
 
-func (myTheme) Size(s fyne.ThemeSizeName) float32 {
-	return theme.DefaultTheme().Size(s)
+func (th customTheme) Size(s fyne.ThemeSizeName) float32 {
+	return th.defaultTheme.Size(s)
 }

internal/app/ui/ui.go

@@ -420,7 +420,6 @@ func NewBaseUI(arg BaseUIParams) *baseUI {
 	u.training = newTraining(u)
 	u.wealth = newWealth(u)
 
-	u.setColorTheme(u.settings.ColorTheme())
 	u.MainWindow().SetMaster()
 
 	// SetOnStarted is called on initial start,
@@ -462,6 +461,7 @@ func (u *baseUI) Start() bool {
 		return false
 	}
 	// First app start
+	u.setColorTheme(u.settings.ColorTheme())
 	if u.isOffline {
 		slog.Info("App started in offline mode")
 	} else {
@@ -912,7 +912,7 @@ func (u *baseUI) updateStatus() {
 }
 
 func (u *baseUI) setColorTheme(s settings.ColorTheme) {
-	u.app.Settings().SetTheme(myTheme{s})
+	u.app.Settings().SetTheme(newCustomTheme(s))
 }
 
 func (u *baseUI) updateMailIndicator() {

internal/app/ui/wealth.go

@@ -58,10 +58,12 @@ func newWealth(u *baseUI) *wealth {
 	color := theme.ColorNameForeground
 	a.assetDetail.SetTitleStyle(size, color)
 	a.assetDetail.HideLegend()
+	a.assetDetail.SetYAxisLabel("B ISK")
 	a.assetSplit.SetTitleStyle(size, color)
 	a.walletSplit.SetTitleStyle(size, color)
 	a.walletDetail.SetTitleStyle(size, color)
 	a.walletDetail.HideLegend()
+	a.walletDetail.SetYAxisLabel("B ISK")
 	a.totalSplit.SetTitleStyle(size, color)
 	a.characterSplit.SetTitleStyle(size, color)