refactor: move duplicate values to constants.go

Signed-off-by: Ayush <mail@ayuch.dev>

Author: bakayu

internal/tui/constants.go

@@ -0,0 +1,70 @@
+package tui
+
+import "time"
+
+const (
+	// --- Layout Ratios ---
+	// leftPanelWidthRatio defines the percentage of the total width for the left column.
+	// rightPanelWidthRatio is "1 - leftPanelWidthRatio".
+	leftPanelWidthRatio = 0.4
+	// helpViewWidthRatio defines the width of the help view relative to the total width.
+	helpViewWidthRatio = 0.5
+	// helpViewHeightRatio defines the height of the help view relative to the total height.
+	helpViewHeightRatio = 0.75
+	// expandedPanelHeightRatio defines the height of a focused panel relative to the total height.
+	expandedPanelHeightRatio = 0.4
+
+	// --- Layout Dimensions ---
+	// collapsedPanelHeight is the fixed height for a panel when it's not in focus.
+	collapsedPanelHeight = 3
+	// borderWidth is the horizontal space taken by left and right borders.
+	borderWidth = 2
+	// titleBarHeight is the vertical space taken by top and bottom borders with titles.
+	titleBarHeight = 2
+	// statusPanelHeight is the fixed height for the status panel.
+	statusPanelHeight = 3
+
+	// --- Help View Styling ---
+	// helpTitleMargin is the left margin for the title in the help view.
+	helpTitleMargin = 9
+	// helpKeyWidth is the fixed width for the keybinding column in the help view.
+	helpKeyWidth = 12
+	// helpDescMargin is the right margin for the keybinding column in the help view.
+	helpDescMargin = 1
+
+	// --- Characters & Symbols ---
+	scrollThumbChar       = "▐"
+	graphNodeChar         = "○"
+	dirExpandedIcon       = "▼ "
+	repoRootNodeName      = "."
+	gitRenameDelimiter    = " -> "
+	initialContentLoading = "Loading..."
+
+	// --- File Watcher ---
+	// fileWatcherPollInterval is the debounce interval for repository file system events.
+	fileWatcherPollInterval = 500 * time.Millisecond
+
+	// --- Git Status Parsing ---
+	// porcelainStatusPrefixLength is the length of the status prefix in `git status --porcelain`.
+	porcelainStatusPrefixLength = 3
+)
+
+// --- Border Characters ---
+const (
+	borderTop         = "─"
+	borderBottom      = "─"
+	borderLeft        = "│"
+	borderRight       = "│"
+	borderTopLeft     = "╭"
+	borderTopRight    = "╮"
+	borderBottomLeft  = "╰"
+	borderBottomRight = "╯"
+)
+
+// --- Tree Characters ---
+const (
+	treeConnector     = ""
+	treeConnectorLast = ""
+	treePrefix        = "    "
+	treePrefixLast    = "   "
+)

internal/tui/filetree.go

@@ -18,23 +18,23 @@ type Node struct {
 
 // BuildTree parses the output of `git status --porcelain` to construct a file tree.
 func BuildTree(gitStatus string) *Node {
-	root := &Node{name: "."}
+	root := &Node{name: repoRootNodeName}
 
 	lines := strings.Split(gitStatus, "\n")
 	if len(lines) == 1 && lines[0] == "" {
 		return root
 	}
 
 	for _, line := range lines {
-		if len(line) < 3 {
+		if len(line) < porcelainStatusPrefixLength {
 			continue
 		}
 		status := line[:2]
-		path := strings.TrimSpace(line[3:])
+		path := strings.TrimSpace(line[porcelainStatusPrefixLength:])
 		isRenamed := false
 
 		if status[0] == 'R' || status[0] == 'C' {
-			parts := strings.Split(path, " -> ")
+			parts := strings.Split(path, gitRenameDelimiter)
 			if len(parts) == 2 {
 				path = parts[1]
 				isRenamed = true
@@ -111,7 +111,7 @@ func (n *Node) compact() {
 	}
 
 	// Do not compact the root node itself.
-	if n.name == "." {
+	if n.name == repoRootNodeName {
 		return
 	}
 
@@ -131,7 +131,7 @@ func (n *Node) renderRecursive(prefix string, theme Theme) []string {
 		newPrefix := prefix + theme.Tree.Prefix
 
 		if len(child.children) > 0 { // It's a directory
-			displayName := "▼ " + child.name
+			displayName := dirExpandedIcon + child.name
 			lines = append(lines, fmt.Sprintf("%s\t\t%s", prefix, displayName))
 			lines = append(lines, child.renderRecursive(newPrefix, theme)...)
 		} else { // It's a file.

internal/tui/model.go

@@ -32,7 +32,7 @@ func initialModel() Model {
 	themeNames := ThemeNames()
 	gc := git.NewGitCommands()
 	repoName, branchName, _ := gc.GetRepoInfo()
-	initialContent := "Loading..."
+	initialContent := initialContentLoading
 
 	// Create a slice to hold all UI panels.
 	panels := make([]panel, totalPanels)

internal/tui/model_test.go

@@ -99,23 +99,23 @@ func TestModel_ConditionalScrollbar(t *testing.T) {
 	t.Run("Scrollbar is hidden when StashPanel is not focused", func(t *testing.T) {
 		tm.focusedPanel = MainPanel
 		rendered := tm.renderPanel("Stash", 30, tm.panelHeights[StashPanel], StashPanel)
-		if strings.Contains(rendered, scrollThumb) {
+		if strings.Contains(rendered, scrollThumbChar) {
 			t.Error("Scrollbar thumb should be hidden but was found")
 		}
 	})
 
 	t.Run("Scrollbar is visible when StashPanel is focused", func(t *testing.T) {
 		tm.focusedPanel = StashPanel
 		rendered := tm.renderPanel("Stash", 30, tm.panelHeights[StashPanel], StashPanel)
-		if !strings.Contains(rendered, scrollThumb) {
+		if !strings.Contains(rendered, scrollThumbChar) {
 			t.Error("Scrollbar thumb should be visible but was not found")
 		}
 	})
 
 	t.Run("Normal panel scrollbar is always visible if scrollable", func(t *testing.T) {
 		tm.focusedPanel = MainPanel // Focus is NOT on CommitsPanel
 		rendered := tm.renderPanel("Commits", 30, tm.panelHeights[CommitsPanel], CommitsPanel)
-		if !strings.Contains(rendered, scrollThumb) {
+		if !strings.Contains(rendered, scrollThumbChar) {
 			t.Error("Scrollbar thumb should be visible but was not found")
 		}
 	})

internal/tui/theme.go

@@ -1,6 +1,10 @@
 package tui
 
-import "github.com/charmbracelet/lipgloss"
+import (
+	"sort"
+
+	"github.com/charmbracelet/lipgloss"
+)
 
 // Palette defines a set of colors for a theme.
 type Palette struct {
@@ -105,6 +109,7 @@ type Theme struct {
 	CommitMerge    lipgloss.Style
 	GraphEdge      lipgloss.Style
 	GraphNode      lipgloss.Style
+	GraphColors    []lipgloss.Style
 	StashName      lipgloss.Style
 	StashMessage   lipgloss.Style
 	ActiveBorder   BorderStyle
@@ -130,11 +135,6 @@ type TreeStyle struct {
 	Connector, ConnectorLast, Prefix, PrefixLast string
 }
 
-const (
-	scrollThumb = "▐"
-	graphNode   = "○"
-)
-
 // Themes holds all the available themes, generated from palettes.
 var Themes = map[string]Theme{}
 
@@ -166,23 +166,35 @@ func NewThemeFromPalette(p Palette) Theme {
 		CommitMerge:    lipgloss.NewStyle().Foreground(lipgloss.Color(p.Magenta)),
 		GraphEdge:      lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightBlack)),
 		GraphNode:      lipgloss.NewStyle().Foreground(lipgloss.Color(p.Green)),
-		StashName:      lipgloss.NewStyle().Foreground(lipgloss.Color(p.Yellow)),
-		StashMessage:   lipgloss.NewStyle().Foreground(lipgloss.Color(p.Fg)),
+		GraphColors: []lipgloss.Style{
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.Green)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.Yellow)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.Blue)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.Magenta)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.Cyan)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightGreen)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightYellow)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightBlue)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightMagenta)),
+			lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightCyan)),
+		},
+		StashName:    lipgloss.NewStyle().Foreground(lipgloss.Color(p.Yellow)),
+		StashMessage: lipgloss.NewStyle().Foreground(lipgloss.Color(p.Fg)),
 		ActiveBorder: BorderStyle{
-			Top: "─", Bottom: "─", Left: "│", Right: "│",
-			TopLeft: "╭", TopRight: "╮", BottomLeft: "╰", BottomRight: "╯",
+			Top: borderTop, Bottom: borderBottom, Left: borderLeft, Right: borderRight,
+			TopLeft: borderTopLeft, TopRight: borderTopRight, BottomLeft: borderBottomLeft, BottomRight: borderBottomRight,
 			Style: lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightCyan)),
 		},
 		InactiveBorder: BorderStyle{
-			Top: "─", Bottom: "─", Left: "│", Right: "│",
-			TopLeft: "╭", TopRight: "╮", BottomLeft: "╰", BottomRight: "╯",
+			Top: borderTop, Bottom: borderBottom, Left: borderLeft, Right: borderRight,
+			TopLeft: borderTopLeft, TopRight: borderTopRight, BottomLeft: borderBottomLeft, BottomRight: borderBottomRight,
 			Style: lipgloss.NewStyle().Foreground(lipgloss.Color(p.BrightBlack)),
 		},
 		Tree: TreeStyle{
-			Connector:     "",
-			ConnectorLast: "",
-			Prefix:        "    ",
-			PrefixLast:    "   ",
+			Connector:     treeConnector,
+			ConnectorLast: treeConnectorLast,
+			Prefix:        treePrefix,
+			PrefixLast:    treePrefixLast,
 		},
 	}
 }
@@ -193,5 +205,6 @@ func ThemeNames() []string {
 	for name := range Palettes {
 		names = append(names, name)
 	}
+	sort.Strings(names)
 	return names
 }

internal/tui/tui.go

@@ -73,7 +73,7 @@ func (a *App) watchGitDir() {
 		}
 	}
 
-	ticker := time.NewTicker(500 * time.Millisecond)
+	ticker := time.NewTicker(fileWatcherPollInterval)
 	defer ticker.Stop()
 	var needsUpdate bool
 

internal/tui/update.go

@@ -194,7 +194,7 @@ func (m Model) fetchPanelContent(panel Panel) tea.Cmd {
 				}
 			}
 		case MainPanel, SecondaryPanel:
-			content = "Loading..."
+			content = initialContentLoading
 		}
 
 		if err != nil {
@@ -209,8 +209,8 @@ func (m Model) handleWindowSizeMsg(msg tea.WindowSizeMsg) (Model, tea.Cmd) {
 	m.width = msg.Width
 	m.height = msg.Height
 	m.help.Width = msg.Width
-	m.helpViewport.Width = int(float64(m.width) * 0.5)
-	m.helpViewport.Height = int(float64(m.height) * 0.75)
+	m.helpViewport.Width = int(float64(m.width) * helpViewWidthRatio)
+	m.helpViewport.Height = int(float64(m.height) * helpViewHeightRatio)
 
 	m = m.recalculateLayout()
 	return m, nil
@@ -376,26 +376,25 @@ func (m Model) recalculateLayout() Model {
 
 	contentHeight := m.height - 1 // Account for help bar
 	m.panelHeights = make([]int, totalPanels)
-	expandedHeight := int(float64(contentHeight) * 0.4)
-	collapsedHeight := 3
+	expandedHeight := int(float64(contentHeight) * expandedPanelHeightRatio)
 
 	// Right Column Layout
 	if m.focusedPanel == SecondaryPanel {
 		m.panelHeights[SecondaryPanel] = expandedHeight
 		m.panelHeights[MainPanel] = contentHeight - expandedHeight
 	} else {
-		m.panelHeights[SecondaryPanel] = collapsedHeight
-		m.panelHeights[MainPanel] = contentHeight - collapsedHeight
+		m.panelHeights[SecondaryPanel] = collapsedPanelHeight
+		m.panelHeights[MainPanel] = contentHeight - collapsedPanelHeight
 	}
 
 	// Left Column Layout
-	m.panelHeights[StatusPanel] = 3
+	m.panelHeights[StatusPanel] = statusPanelHeight
 	remainingHeight := contentHeight - m.panelHeights[StatusPanel]
 
 	if m.focusedPanel == StashPanel {
 		m.panelHeights[StashPanel] = expandedHeight
 	} else {
-		m.panelHeights[StashPanel] = collapsedHeight
+		m.panelHeights[StashPanel] = collapsedPanelHeight
 	}
 
 	flexiblePanels := []Panel{FilesPanel, BranchesPanel, CommitsPanel}
@@ -437,18 +436,15 @@ func (m Model) recalculateLayout() Model {
 
 // updateViewportSizes applies the calculated dimensions from the model to the viewports.
 func (m Model) updateViewportSizes() Model {
-	horizontalBorderWidth := 2
-	titleBarHeight := 2
-
-	rightSectionWidth := m.width - int(float64(m.width)*0.3)
-	rightContentWidth := rightSectionWidth - horizontalBorderWidth
+	leftSectionWidth := int(float64(m.width) * leftPanelWidthRatio)
+	rightSectionWidth := m.width - leftSectionWidth
+	rightContentWidth := rightSectionWidth - borderWidth
 	m.panels[MainPanel].viewport.Width = rightContentWidth
 	m.panels[MainPanel].viewport.Height = m.panelHeights[MainPanel] - titleBarHeight
 	m.panels[SecondaryPanel].viewport.Width = rightContentWidth
 	m.panels[SecondaryPanel].viewport.Height = m.panelHeights[SecondaryPanel] - titleBarHeight
 
-	leftSectionWidth := int(float64(m.width) * 0.3)
-	leftContentWidth := leftSectionWidth - horizontalBorderWidth
+	leftContentWidth := leftSectionWidth - borderWidth
 	leftPanels := []Panel{StatusPanel, FilesPanel, BranchesPanel, CommitsPanel, StashPanel}
 	for _, panel := range leftPanels {
 		m.panels[panel].viewport.Width = leftContentWidth