Better system theme detection.

Author: alexballas

go.mod

@@ -3,7 +3,7 @@ module github.com/alexballas/go2tv
 go 1.23.3
 
 require (
-	fyne.io/fyne/v2 v2.5.3
+	fyne.io/fyne/v2 v2.5.2
 	github.com/alexballas/go-ssdp v0.0.3
 	github.com/gdamore/tcell/v2 v2.7.4
 	github.com/h2non/filetype v1.1.3

go.sum

@@ -37,8 +37,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-fyne.io/fyne/v2 v2.5.3 h1:k6LjZx6EzRZhClsuzy6vucLZBstdH2USDGHSGWq8ly8=
-fyne.io/fyne/v2 v2.5.3/go.mod h1:0GOXKqyvNwk3DLmsFu9v0oYM0ZcD1ysGnlHCerKoAmo=
+fyne.io/fyne/v2 v2.5.2 h1:eSyGTmSkv10yAdAeHpDet6u2KkKxOGFc14kQu81We7Q=
+fyne.io/fyne/v2 v2.5.2/go.mod h1:26gqPDvtaxHeyct+C0BBjuGd2zwAJlPkUGSBrb+d7Ug=
 fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
 fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

internal/gui/gui.go

@@ -67,6 +67,7 @@ type FyneScreen struct {
 	currentmfolder       string
 	ffmpegPath           string
 	ffmpegSeek           int
+	systemTheme          fyne.ThemeVariant
 	mediaFormats         []string
 	muError              sync.RWMutex
 	mu                   sync.RWMutex

internal/gui/settings.go

@@ -36,7 +36,9 @@ func settingsWindow(s *FyneScreen) fyne.CanvasObject {
 	themeName := lang.L(fyne.CurrentApp().Preferences().StringWithFallback("Theme", "System Default"))
 	dropdownTheme.PlaceHolder = themeName
 	parseTheme(themeName)
-	go detectSystemThemeChange()
+
+	s.systemTheme = fyne.CurrentApp().Settings().ThemeVariant()
+	go detectSystemThemeChange(s)
 
 	ffmpegText := widget.NewLabel("ffmpeg " + lang.L("Path"))
 	ffmpegTextEntry := widget.NewEntry()
@@ -177,13 +179,9 @@ func parseTheme(t string) {
 			fyne.CurrentApp().Settings().SetTheme(go2tvTheme{"Dark"})
 			fyne.CurrentApp().Preferences().SetString("Theme", "Dark")
 		default:
-			fyne.CurrentApp().Settings().SetTheme(go2tvTheme{"System Default"})
 			fyne.CurrentApp().Preferences().SetString("Theme", "System Default")
 
-			// Wait for the SystemVariant variable to change
-			<-signalSystemVariantChange
-
-			switch systemVariant {
+			switch fyne.CurrentApp().Settings().ThemeVariant() {
 			case theme.VariantDark:
 				fyne.CurrentApp().Settings().SetTheme(go2tvTheme{"Dark"})
 			case theme.VariantLight:
@@ -212,16 +210,17 @@ func parseLanguage(s *FyneScreen) func(string) {
 	}
 }
 
-func detectSystemThemeChange() {
+func detectSystemThemeChange(s *FyneScreen) {
 	tik := time.NewTicker(time.Second)
+
 	for range tik.C {
+		currentSystemTheme := fyne.CurrentApp().Settings().ThemeVariant()
 		themeName := fyne.CurrentApp().Preferences().StringWithFallback("Theme", "System Default")
-		if themeName == "System Default" {
-			fyne.CurrentApp().Settings().SetTheme(go2tvTheme{"System Default"})
-			// Wait for the SystemVariant variable to change
-			<-signalSystemVariantChange
 
-			switch systemVariant {
+		if s.systemTheme != currentSystemTheme && themeName == "System Default" {
+			s.systemTheme = currentSystemTheme
+
+			switch s.systemTheme {
 			case theme.VariantDark:
 				fyne.CurrentApp().Settings().SetTheme(go2tvTheme{"Dark"})
 			case theme.VariantLight:

internal/gui/theme.go

@@ -19,12 +19,6 @@ var (
 
 func (m go2tvTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color {
 	switch m.Theme {
-	case "System Default":
-		systemVariant = variant
-		go func() {
-			signalSystemVariantChange <- struct{}{}
-		}()
-
 	case "Dark":
 		variant = theme.VariantDark
 		switch name {