refactor(webkit): use ColorSchemeResolver in ContentInjector for dynamic dark mode

commit: 25530676611e9afabecd84b34e2df6610e7a4e28
author: bnema · 9mo ago · 2025-12-29 20:51 UTC
parent: 34930dd
signature: GPG Unverified2B82207D370127A0 The key is unknown

1 file · +12 -16

M internal/infrastructure/webkit/injector.go +12 -16


@@ -5,6 +5,7 @@ import (
5	5		"fmt"
6	6		"strings"
7	7
	8	+	"github.com/bnema/dumber/internal/application/port"
8	9		"github.com/bnema/dumber/internal/logging"
9	10		"github.com/bnema/puregotk-webkit/webkit"
10	11		)

@@ -118,16 +119,16 @@ var internalPageAllowList = []string{"dumb://*"}
118	119		// External pages receive dark mode preference via libadwaita's StyleManager.
119	120		// Implements port.ContentInjector interface.
120	121		type ContentInjector struct {
121		-	prefersDark bool
122		-	themeCSSVars string // CSS custom property declarations for WebUI
123		-	findCSS string // CSS for find-in-page highlight styling
	122	+	colorResolver port.ColorSchemeResolver
	123	+	themeCSSVars string // CSS custom property declarations for WebUI
	124	+	findCSS string // CSS for find-in-page highlight styling
124	125		}
125	126
126	127		// NewContentInjector creates a new injector instance.
127		-	// The prefersDark parameter should come from ThemeManager.PrefersDark().
128		-	func NewContentInjector(prefersDark bool) *ContentInjector {
	128	+	// The resolver is used to dynamically determine dark mode preference.
	129	+	func NewContentInjector(resolver port.ColorSchemeResolver) *ContentInjector {
129	130		return &ContentInjector{
130		-	prefersDark: prefersDark,
	131	+	colorResolver: resolver,
131	132		}
132	133		}
133	134

@@ -149,15 +150,9 @@ func (ci *ContentInjector) InjectFindHighlightCSS(ctx context.Context, css strin
149	150		return nil
150	151		}
151	152
152		-	// PrefersDark returns the current dark mode preference.
	153	+	// PrefersDark returns the current dark mode preference from the resolver.
153	154		func (ci *ContentInjector) PrefersDark() bool {
154		-	return ci.prefersDark
155		-	}
156		-
157		-	// SetPrefersDark updates the dark mode preference.
158		-	// Call this when theme changes at runtime.
159		-	func (ci *ContentInjector) SetPrefersDark(prefersDark bool) {
160		-	ci.prefersDark = prefersDark
	155	+	return ci.colorResolver.Resolve().PrefersDark
161	156		}
162	157
163	158		// InjectScripts adds scripts to the given content manager.

@@ -186,7 +181,8 @@ func (ci ContentInjector) InjectScripts(ctx context.Context, ucm webkit.UserCo
186	181		}
187	182
188	183		// 1. Inject GTK dark mode preference for internal pages only
189		-	darkModePrefScript := fmt.Sprintf("window.__dumber_gtk_prefers_dark=%t;", ci.prefersDark)
	184	+	prefersDark := ci.PrefersDark()
	185	+	darkModePrefScript := fmt.Sprintf("window.__dumber_gtk_prefers_dark=%t;", prefersDark)
190	186		addScript(
191	187		webkit.NewUserScript(
192	188		darkModePrefScript,

@@ -263,5 +259,5 @@ func (ci ContentInjector) InjectScripts(ctx context.Context, ucm webkit.UserCo
263	259		}
264	260		}
265	261
266		-	log.Debug().Bool("prefers_dark", ci.prefersDark).Msg("scripts injected")
	262	+	log.Debug().Bool("prefers_dark", prefersDark).Msg("scripts injected")
267	263		}

 	"fmt"
 	"strings"
+	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/logging"
 	"github.com/bnema/puregotk-webkit/webkit"
 )
 // External pages receive dark mode preference via libadwaita's StyleManager.
 // Implements port.ContentInjector interface.
 type ContentInjector struct {
-	prefersDark  bool
+	colorResolver port.ColorSchemeResolver
-	themeCSSVars string // CSS custom property declarations for WebUI
+	themeCSSVars  string // CSS custom property declarations for WebUI
-	findCSS      string // CSS for find-in-page highlight styling
+	findCSS       string // CSS for find-in-page highlight styling
 }
 // NewContentInjector creates a new injector instance.
-// The prefersDark parameter should come from ThemeManager.PrefersDark().
+// The resolver is used to dynamically determine dark mode preference.
-func NewContentInjector(prefersDark bool) *ContentInjector {
+func NewContentInjector(resolver port.ColorSchemeResolver) *ContentInjector {
 	return &ContentInjector{
-		prefersDark: prefersDark,
+		colorResolver: resolver,
 	}
 }
 	return nil
 }
-// PrefersDark returns the current dark mode preference.
+// PrefersDark returns the current dark mode preference from the resolver.
 func (ci *ContentInjector) PrefersDark() bool {
-	return ci.prefersDark
+	return ci.colorResolver.Resolve().PrefersDark
-}
-// SetPrefersDark updates the dark mode preference.
-// Call this when theme changes at runtime.
-func (ci *ContentInjector) SetPrefersDark(prefersDark bool) {
-	ci.prefersDark = prefersDark
 }
 // InjectScripts adds scripts to the given content manager.
 	}
 	// 1. Inject GTK dark mode preference for internal pages only
-	darkModePrefScript := fmt.Sprintf("window.__dumber_gtk_prefers_dark=%t;", ci.prefersDark)
+	prefersDark := ci.PrefersDark()
+	darkModePrefScript := fmt.Sprintf("window.__dumber_gtk_prefers_dark=%t;", prefersDark)
 	addScript(
 		webkit.NewUserScript(
 			darkModePrefScript,
 		}
 	}
-	log.Debug().Bool("prefers_dark", ci.prefersDark).Msg("scripts injected")
+	log.Debug().Bool("prefers_dark", prefersDark).Msg("scripts injected")
 }