Merge pull request #103 from balajz/double-key-press-user-notify

Double key press user notify

Author: balajz

internal/app/ui/components/status.go

@@ -7,8 +7,17 @@ import (
 	"charm.land/lipgloss/v2"
 )
 
-// StatusModel manages the status bar and the executing spinner.
+// MessageUpdateMsg is used to update the message in the status bar
+type MessageUpdateMsg struct {
+	Message string
+}
+
+// MessageResetMsg is used to reset the message in the status bar
+type MessageResetMsg struct{}
+
+// StatusModel manages the status bar and the executing spinner
 type StatusModel struct {
+	Message        string
 	Version        string
 	Width          int
 	IssueLink      string
@@ -32,6 +41,10 @@ func (m StatusModel) Update(msg tea.Msg) (StatusModel, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
 		m.Width = msg.Width
+	case MessageUpdateMsg:
+		m.Message = msg.Message
+	case MessageResetMsg:
+		m.Message = ""
 	}
 	return m, cmd
 }
@@ -63,7 +76,14 @@ func (m StatusModel) View() string {
 	}
 	padding := strings.Repeat(" ", paddingWidth)
 
-	statusBar := m.StatusBarStyle.Width(m.Width).Render(name + padding + link)
+	firstLine := m.StatusBarStyle.Faint(true).Render(m.Message)
+	secondLine := m.StatusBarStyle.Render(lipgloss.Sprintf("%s%s%s", name, padding, link))
+
+	statusBar := lipgloss.JoinVertical(
+		lipgloss.Top,
+		firstLine,
+		secondLine,
+	)
 
 	return lipgloss.JoinVertical(
 		lipgloss.Top,
@@ -75,8 +95,7 @@ func (m StatusModel) View() string {
 // StaticHeight returns the height of the footer.
 func (m StatusModel) StaticHeight() int {
 	separator := m.SeparatorStyle.Render(strings.Repeat("─", m.Width))
-	statusBar := m.StatusBarStyle.Width(m.Width).Render("pgxcli " + m.Version)
 
-	// Top separator + Bottom separator + Status bar
-	return lipgloss.Height(separator)*2 + lipgloss.Height(statusBar)
+	// Top separator + Bottom separator + message line + version line
+	return lipgloss.Height(separator)*2 + 2
 }

internal/app/ui/model.go

@@ -182,6 +182,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	case seqTimeoutMsg:
 		if msg.seq == m.pendingSeq {
+			m.statusModel, _ = m.statusModel.Update(components.MessageResetMsg{}) // reset status message
 			m.state = StateInput
 		}
 		return m, nil
@@ -218,6 +219,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.state = StatePendingQuit
 			m.pendingSeq++
 			n := m.pendingSeq
+			m.statusModel, _ = m.statusModel.Update(components.MessageUpdateMsg{Message: "Press Ctrl+C again to quit"})
 			return m, tea.Tick(500*time.Millisecond, func(t time.Time) tea.Msg {
 				return seqTimeoutMsg{seq: n}
 			})
@@ -234,6 +236,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.state = StatePendingClear
 			m.pendingSeq++
 			n := m.pendingSeq
+			m.statusModel, _ = m.statusModel.Update(components.MessageUpdateMsg{Message: "Press ESC again to clear"})
 			return m, tea.Tick(500*time.Millisecond, func(t time.Time) tea.Msg {
 				return seqTimeoutMsg{seq: n}
 			})

internal/app/ui/styles.go

@@ -49,7 +49,6 @@ func DefaultStyles() Styles {
 			Faint(true),
 		StatusBar: lipgloss.NewStyle().
 			Foreground(lipgloss.Color("#C4B5FD")).
-			Background(lipgloss.Color("#2A273F")).
 			Padding(0, 1),
 		ClampNotice: lipgloss.NewStyle().
 			Foreground(lipgloss.Color("#A78BFA")).