diff options
Diffstat (limited to 'internal/client/ui/core')
| -rw-r--r-- | internal/client/ui/core/core.go | 2 | ||||
| -rw-r--r-- | internal/client/ui/core/networklist/networklist.go | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/internal/client/ui/core/core.go b/internal/client/ui/core/core.go index 2122fd0..160df87 100644 --- a/internal/client/ui/core/core.go +++ b/internal/client/ui/core/core.go @@ -171,6 +171,8 @@ func (m Model) View() string { popup = m.banViewPopup.View() } else if m.signalAddPopup != nil { popup = m.signalAddPopup.View() + } else { + assert.Never("missing handling of a popup!") } x := (ui.Width - lipgloss.Width(popup)) / 2 diff --git a/internal/client/ui/core/networklist/networklist.go b/internal/client/ui/core/networklist/networklist.go index 16afda1..69d7c76 100644 --- a/internal/client/ui/core/networklist/networklist.go +++ b/internal/client/ui/core/networklist/networklist.go @@ -75,6 +75,13 @@ func (m Model) View() string { networks = networks[m.base:upper] for i, networkId := range networks { network := state.State.Networks[networkId] + fg := lipgloss.Color(network.FgHexColor) + bg := lipgloss.Color(network.BgHexColor) + + if colors.IsDarkened() { + fg = colors.DarkenColor(fg, colors.DarkeningFactor) + bg = colors.DarkenColor(bg, colors.DarkeningFactor) + } pings, ok := 0, false frequencies := state.State.Frequencies[networkId] @@ -86,17 +93,9 @@ func (m Model) View() string { var icon lipgloss.Style if ok && pings != 0 { - icon = ui.IconStyleNotif(network.Icon, - lipgloss.Color(network.FgHexColor), - lipgloss.Color(network.BgHexColor), - colors.BackgroundDimmer, pings, - ) + icon = ui.IconStyleNotif(network.Icon, fg, bg, colors.BackgroundDimmer, pings) } else { - icon = ui.IconStyle(network.Icon, - lipgloss.Color(network.FgHexColor), - lipgloss.Color(network.BgHexColor), - colors.BackgroundDimmer, - ) + icon = ui.IconStyle(network.Icon, fg, bg, colors.BackgroundDimmer) } if m.index == m.base+i { |