[fix] add default colors if bg/fg detection fails

Author: robinovitch61

internal/app.go

@@ -33,6 +33,7 @@ type Model struct {
 	allClusterNamespaces []model.ClusterNamespaces
 	width, height        int
 	initialized          bool
+	stylesLoaded         bool
 	gotFirstContainers   bool
 	seenFirstContainer   bool
 	toast                toast.Model
@@ -69,6 +70,7 @@ func InitialModel(c Config) Model {
 func (m Model) Init() (tea.Model, tea.Cmd) {
 	return m, tea.Batch(
 		tea.Tick(constants.BatchUpdateLogsInterval, func(t time.Time) tea.Msg { return message.BatchUpdateLogsMsg{} }),
+		tea.Tick(constants.CheckStylesLoadedDuration, func(t time.Time) tea.Msg { return message.CheckStylesLoadedMsg{} }),
 		tea.RequestForegroundColor,
 		tea.RequestBackgroundColor,
 	)
@@ -83,11 +85,13 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	// handle these regardless of m.err
 	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		if key.Matches(msg, m.keyMap.Quit) {
+			return m, m.cleanupCmd()
+		}
+
 	case message.CleanupCompleteMsg:
 		return m, tea.Quit
-
-	case tea.KeyMsg:
-		return m.handleKeyMsg(msg)
 	}
 
 	if m.err != nil {
@@ -98,6 +102,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case message.ErrMsg:
 		m.err = msg.Err
+		return m, nil
 
 	case tea.BackgroundColorMsg:
 		m.termStyleData.SetBackground(msg)
@@ -113,6 +118,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 		return m, nil
 
+	case message.CheckStylesLoadedMsg:
+		if !m.stylesLoaded {
+			m.setStyles(style.DefaultStyles)
+		}
+		return m, nil
+
 	// WindowSizeMsg arrives once on startup, then again every time the window is resized
 	case tea.WindowSizeMsg:
 		m.width, m.height = msg.Width, msg.Height
@@ -128,6 +139,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.syncDimensions()
 		return m, tea.Batch(cmds...)
 
+	case tea.KeyMsg:
+		return m.handleKeyMsg(msg)
+
 	case message.AttemptUpdateSinceTimeMsg:
 		m, cmd = m.attemptUpdateSinceTime()
 		cmds = append(cmds, cmd)
@@ -397,10 +411,6 @@ func (m Model) handleKeyMsg(msg tea.KeyMsg) (Model, tea.Cmd) {
 	var cmd tea.Cmd
 	var cmds []tea.Cmd
 
-	if key.Matches(msg, m.keyMap.Quit) {
-		return m, m.cleanupCmd()
-	}
-
 	if !m.initialized {
 		return m, nil
 	}
@@ -1086,6 +1096,7 @@ func (m *Model) setFullscreen(fullscreen bool) {
 
 func (m *Model) setStyles(styles style.Styles) {
 	m.styles = styles
+	m.stylesLoaded = true
 	m.pages[page.EntitiesPageType] = m.pages[page.EntitiesPageType].WithStyles(styles)
 	m.pages[page.LogsPageType] = m.pages[page.LogsPageType].WithStyles(styles)
 	m.pages[page.SingleLogPageType] = m.pages[page.SingleLogPageType].WithStyles(styles)

internal/constants/constants.go

@@ -20,6 +20,9 @@ var GetNextContainerDeltasDuration = 300 * time.Millisecond
 // the newly acquired logs from all the containers. In between updates, it accumulates logs from received messages
 var BatchUpdateLogsInterval = 200 * time.Millisecond
 
+// CheckStylesLoaded controls how long to wait before checking if terminal foreground/background colors have been detected
+var CheckStylesLoadedDuration = 200 * time.Millisecond
+
 // AttemptUpdateSinceTimeInterval controls the cadence at which a "since time" update is attempted
 var AttemptUpdateSinceTimeInterval = 500 * time.Millisecond
 

internal/message/message.go

@@ -8,6 +8,8 @@ type CleanupCompleteMsg struct{}
 
 type BatchUpdateLogsMsg struct{}
 
+type CheckStylesLoadedMsg struct{}
+
 type StartMaintainEntitySelectionMsg struct{}
 
 type AttemptUpdateSinceTimeMsg struct{}

internal/style/style.go

@@ -8,6 +8,12 @@ import (
 	"image/color"
 )
 
+var (
+	blue  = lipgloss.Color("6")
+	lilac = lipgloss.Color("189")
+	green = lipgloss.Color("46")
+)
+
 type TermStyleData struct {
 	ForegroundDetected bool
 	Foreground         color.Color
@@ -52,6 +58,21 @@ type Styles struct {
 	RightBorder      lipgloss.Style
 }
 
+var DefaultStyles = Styles{
+	Unset:            lipgloss.NewStyle(),
+	Alt:              lipgloss.NewStyle().Foreground(lipgloss.Color("#ffffff")),
+	Bold:             lipgloss.NewStyle().Bold(true),
+	Inverse:          lipgloss.NewStyle().Foreground(lipgloss.Color("#000000")).Background(lipgloss.Color("#ffffff")),
+	BoldUnderline:    lipgloss.NewStyle().Bold(true).Underline(true),
+	InverseUnderline: lipgloss.NewStyle().Foreground(lipgloss.Color("#000000")).Background(lipgloss.Color("#ffffff")).Underline(true),
+	AltInverse:       lipgloss.NewStyle().Foreground(lipgloss.Color("#141414")).Background(lipgloss.Color("#cbcbcb")),
+	Underline:        lipgloss.NewStyle().Underline(true),
+	Blue:             lipgloss.NewStyle().Background(blue).Foreground(lipgloss.Color("#000000")),
+	Lilac:            lipgloss.NewStyle().Background(lilac).Foreground(lipgloss.Color("#000000")),
+	Green:            lipgloss.NewStyle().Background(green).Foreground(lipgloss.Color("#000000")),
+	RightBorder:      lipgloss.NewStyle().Border(lipgloss.ThickBorder(), false, true, false, false).BorderForeground(lilac),
+}
+
 func NewStyles(data TermStyleData) Styles {
 	if !data.IsComplete() {
 		panic(fmt.Errorf("NewStyles called with incomplete TermStyleData"))
@@ -64,8 +85,6 @@ func NewStyles(data TermStyleData) Styles {
 	fgLightDark := lipgloss.LightDark(data.ForegroundIsDark)
 	bgLightDark := lipgloss.LightDark(data.BackgroundIsDark)
 
-	lilac := lipgloss.Color("189")
-
 	return Styles{
 		Unset: lipgloss.NewStyle().Foreground(data.Foreground).Background(data.Background),
 
@@ -85,11 +104,11 @@ func NewStyles(data TermStyleData) Styles {
 
 		Underline: lipgloss.NewStyle().Underline(true),
 
-		Blue: lipgloss.NewStyle().Background(lipgloss.Color("6")).Foreground(lipgloss.Color("#000000")),
+		Blue: lipgloss.NewStyle().Background(blue).Foreground(lipgloss.Color("#000000")),
 
 		Lilac: lipgloss.NewStyle().Background(lilac).Foreground(lipgloss.Color("#000000")),
 
-		Green: lipgloss.NewStyle().Background(lipgloss.Color("46")).Foreground(lipgloss.Color("#000000")),
+		Green: lipgloss.NewStyle().Background(green).Foreground(lipgloss.Color("#000000")),
 
 		RightBorder: lipgloss.NewStyle().Border(lipgloss.ThickBorder(), false, true, false, false).BorderForeground(lilac),
 	}