Skip to content

refactor(ui): use colors instead of text for PR state #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renato0307 merged 1 commit into from
Feb 1, 2026
Merged

refactor(ui): use colors instead of text for PR state #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/theme/colors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const (
const (
ColorAdditions Color = "2" // Green
ColorDeletions Color = "1" // Red
ColorPRLabel Color = "3" // Yellow - same as idle icon
ColorPRClosed Color = "241" // Gray - closed PR
ColorPRLabel Color = "3" // Yellow - open PR
ColorPRMerged Color = "141" // Light purple - merged PR
)

Expand Down
3 changes: 3 additions & 0 deletions internal/theme/styles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ var (
DeletionsStyle = lipgloss.NewStyle().
Foreground(ColorDeletions)

PRClosedStyle = lipgloss.NewStyle().
Foreground(ColorPRClosed)

PRLabelStyle = lipgloss.NewStyle().
Foreground(ColorPRLabel)

Expand Down
25 changes: 15 additions & 10 deletions internal/ui/session_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type SessionItem struct {
HasShellSession bool // Track if shell session exists
IsFlagged bool
LastUpdated time.Time
PRState string // PR state: OPEN, MERGED, CLOSED
Session *ports.TmuxSession
State string
Status *string // Implementation status
Expand Down Expand Up @@ -202,12 +203,17 @@ func (d SessionDelegate) Render(w io.Writer, m list.Model, index int, listItem l
}
parts[i] = strings.Join(words, " ")
} else if strings.HasPrefix(part, "PR #") {
// Style "PR" - purple if merged, yellow otherwise
if strings.Contains(part, "(merged)") {
parts[i] = theme.PRMergedStyle.Render("PR") + theme.BranchStyle.Render(part[2:])
} else {
parts[i] = theme.PRLabelStyle.Render("PR") + theme.BranchStyle.Render(part[2:])
// Style "PR" based on state: yellow=open, purple=merged, gray=closed
var prStyle lipgloss.Style
switch item.PRState {
case "MERGED":
prStyle = theme.PRMergedStyle
case "CLOSED":
prStyle = theme.PRClosedStyle
default:
prStyle = theme.PRLabelStyle
}
parts[i] = prStyle.Render("PR") + theme.BranchStyle.Render(part[2:])
} else {
// Apply gray color to non-stat parts (branch name, ahead/behind, etc)
parts[i] = theme.BranchStyle.Render(part)
Expand Down Expand Up @@ -790,14 +796,12 @@ func buildListItems(sessionState *domain.SessionCollection, sessionService *serv
}

// Add PR number if available (between branch and git stats)
// State is stored in SessionItem.PRState for color-coding in Render
var prState string
if info.PRInfo != nil && info.PRInfo.Number > 0 {
prStr := fmt.Sprintf("PR #%d", info.PRInfo.Number)
if info.PRInfo.State == "CLOSED" {
prStr += " (closed)"
} else if info.PRInfo.State == "MERGED" {
prStr += " (merged)"
}
gitRef += " · " + prStr
prState = info.PRInfo.State
}

// Append git stats if available
Expand Down Expand Up @@ -828,6 +832,7 @@ func buildListItems(sessionState *domain.SessionCollection, sessionService *serv
HasShellSession: hasShell,
IsFlagged: info.IsFlagged,
LastUpdated: info.LastUpdated,
PRState: prState,
Session: session,
State: string(info.State),
Status: info.Status,
Expand Down