git.iko.soy/crush
on main help sign in
chore: rename default theme + infer default theme name (#570)
31dc01eChristian Rocha
internal/tui/styles/crush.go → internal/tui/styles/charmtone.gorenamed+2−2
compare with main
unifiedsplit
@@ -5,9 +5,9 @@ import (
5 "github.com/charmbracelet/x/exp/charmtone"
5 "github.com/charmbracelet/x/exp/charmtone"
6)
6)
7
7
8−func NewCrushTheme() *Theme {
8+func NewCharmtoneTheme() *Theme {
9 t := &Theme{
9 t := &Theme{
10− Name: "crush",
10+ Name: "charmtone",
11 IsDark: true,
11 IsDark: true,
12
12
13 Primary: charmtone.Charple,
13 Primary: charmtone.Charple,
internal/tui/styles/theme.go+6−6
@@ -491,26 +491,26 @@ func SetDefaultManager(m *Manager) {
491
491
492func DefaultManager() *Manager {
492func DefaultManager() *Manager {
493 if defaultManager == nil {
493 if defaultManager == nil {
494− defaultManager = NewManager("crush")
494+ defaultManager = NewManager()
495 }
495 }
496 return defaultManager
496 return defaultManager
497}
497}
498
498
499func CurrentTheme() *Theme {
499func CurrentTheme() *Theme {
500 if defaultManager == nil {
500 if defaultManager == nil {
501− defaultManager = NewManager("crush")
501+ defaultManager = NewManager()
502 }
502 }
503 return defaultManager.Current()
503 return defaultManager.Current()
504}
504}
505
505
506−func NewManager(defaultTheme string) *Manager {
506+func NewManager() *Manager {
507 m := &Manager{
507 m := &Manager{
508 themes: make(map[string]*Theme),
508 themes: make(map[string]*Theme),
509 }
509 }
510
510
511+ t := NewCharmtoneTheme() // default theme
511− m.Register(NewCrushTheme())
512+ m.Register(t)
512−
513− m.current = m.themes[defaultTheme]
513+ m.current = m.themes[t.Name]
514
514
515 return m
515 return m
516}
516}