summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorKyren223 <Kyren223@proton.me>2025-01-19 18:53:57 +0200
committerKyren223 <Kyren223@proton.me>2025-01-19 18:53:57 +0200
commitabe7eabce9b359c6150d65e291a9fc460196bfba (patch)
treecef2990775a7a4c2e1a3c590e5e8eafa4cdac0b3 /internal
parent0a5ed18ac8576b0f9d2d6fae87267a400feb2475 (diff)
Added frequency name at the top of chat (might flip the bg/fg later)
Diffstat (limited to 'internal')
-rw-r--r--internal/client/ui/auth/auth.go2
-rw-r--r--internal/client/ui/core/chat/chat.go28
-rw-r--r--internal/client/ui/ui.go4
3 files changed, 28 insertions, 6 deletions
diff --git a/internal/client/ui/auth/auth.go b/internal/client/ui/auth/auth.go
index 4b69735..1405fa2 100644
--- a/internal/client/ui/auth/auth.go
+++ b/internal/client/ui/auth/auth.go
@@ -77,7 +77,7 @@ ___] | |__] | \| | | \|`)
focusedRememberChecked = focusedStyle.Render(blurredRememberChecked)
focusedRememberUnchecked = focusedStyle.Render(blurredRememberUnchecked)
- centerStyle = lipgloss.NewStyle().Width(authWidth).AlignHorizontal(0.5)
+ centerStyle = lipgloss.NewStyle().Width(authWidth).AlignHorizontal(lipgloss.Center)
)
func init() {
diff --git a/internal/client/ui/core/chat/chat.go b/internal/client/ui/core/chat/chat.go
index 1895c0d..80ccacc 100644
--- a/internal/client/ui/core/chat/chat.go
+++ b/internal/client/ui/core/chat/chat.go
@@ -71,6 +71,11 @@ var (
SetString("\n(edited)").String()
WidthWithoutVi = PaddingCount*2 + lipgloss.Width(LeftCorner) + lipgloss.Width(RightCorner)
+
+ FrequencyNameStyle = lipgloss.NewStyle().
+ Background(colors.BackgroundDim).
+ AlignHorizontal(lipgloss.Center).
+ Border(lipgloss.ThickBorder(), false, false, true)
)
const (
@@ -142,9 +147,13 @@ func (m Model) Init() tea.Cmd {
}
func (m *Model) Prerender() {
+ frequencyName := m.renderFrequencyName()
+ frequencyHeight := lipgloss.Height(frequencyName)
+
messagebox := m.renderMessageBox()
- messagesHeight := ui.Height - lipgloss.Height(messagebox)
- messagesHeight -= 1 // For the extra \n at the end
+ messageBoxHeight := lipgloss.Height(messagebox)
+
+ messagesHeight := ui.Height - messageBoxHeight - frequencyHeight
// if m.messagesCache == nil || messagesHeight != m.messagesHeight {
// // Re-render
@@ -154,7 +163,7 @@ func (m *Model) Prerender() {
m.messagesCache = &messages
m.messagesHeight = messagesHeight
- m.prerender = *m.messagesCache + messagebox
+ m.prerender = frequencyName + *m.messagesCache + messagebox
}
func (m Model) View() string {
@@ -870,3 +879,16 @@ func (m *Model) editMessage() tea.Cmd {
func (m *Model) SetWidth(width int) {
m.width = width
}
+
+func (m *Model) renderFrequencyName() string {
+ networkId := state.NetworkId(m.networkIndex)
+ if m.frequencyIndex == -1 || networkId == nil {
+ return ""
+ }
+
+ frequency := state.State.Frequencies[*networkId][m.frequencyIndex]
+ color := lipgloss.Color(frequency.HexColor)
+
+ return FrequencyNameStyle.Width(m.width).Foreground(color).
+ Render(frequency.Name) + "\n"
+}
diff --git a/internal/client/ui/ui.go b/internal/client/ui/ui.go
index b60efac..4ff8d27 100644
--- a/internal/client/ui/ui.go
+++ b/internal/client/ui/ui.go
@@ -18,8 +18,8 @@ import (
const (
DEBUG = true
- MinWidth = 85
- Center = 0.499
+ MinWidth = 85
+ Center lipgloss.Position = 0.499
)
var (