b41596da06e198a9c499881d6f73e72c61caa0c3

Author
Christian Rocha <christian@rocha.is>
Committer
Ayman Bagabas <ayman.bagabas@gmail.com>
Date

Message

chore: tidy up ref browser style names

Diff

 1diff --git a/ui/pages/repo/refsitem.go b/ui/pages/repo/refsitem.go
 2index eb07f7044293e045ade31f822be75f7d7c28db54..cfae1a3d4aaf12e3293d20f818269d9b1f99a29e 100644
 3--- a/ui/pages/repo/refsitem.go
 4+++ b/ui/pages/repo/refsitem.go
 5@@ -98,13 +98,13 @@ func (d RefItemDelegate) Render(w io.Writer, m list.Model, index int, listItem l
 6 	isActive := index == m.Index()
 7 
 8 	if isTag && isActive {
 9-		st = s.ItemTagActive
10+		st = s.Active.ItemTag
11 	} else if isTag {
12-		st = s.ItemTagInactive
13+		st = s.Normal.ItemTag
14 	} else if isActive {
15-		st = s.ItemActive
16+		st = s.Active.Item
17 	} else {
18-		st = s.ItemInactive
19+		st = s.Normal.Item
20 	}
21 
22 	if isActive {
23@@ -118,7 +118,7 @@ func (d RefItemDelegate) Render(w io.Writer, m list.Model, index int, listItem l
24 	refMaxWidth := m.Width() -
25 		s.ItemSelector.GetMarginLeft() -
26 		s.ItemSelector.GetWidth() -
27-		s.ItemInactive.GetMarginLeft()
28+		s.Normal.Item.GetMarginLeft()
29 	ref = common.TruncateString(ref, refMaxWidth)
30 	ref = st.Render(ref)
31 	fmt.Fprint(w, selector, ref)
32diff --git a/ui/styles/styles.go b/ui/styles/styles.go
33index f14ec339e88b6512ac9b5a3ce35a8b0ca156a035..d52621e20d27e286bb171ca5929b3cb04276767a 100644
34--- a/ui/styles/styles.go
35+++ b/ui/styles/styles.go
36@@ -75,13 +75,17 @@ type Styles struct {
37 	}
38 
39 	Ref struct {
40-		ItemSelector    lipgloss.Style
41-		ItemActive      lipgloss.Style
42-		ItemInactive    lipgloss.Style
43-		ItemBranch      lipgloss.Style
44-		ItemTagInactive lipgloss.Style
45-		ItemTagActive   lipgloss.Style
46-		Paginator       lipgloss.Style
47+		Normal struct {
48+			Item    lipgloss.Style
49+			ItemTag lipgloss.Style
50+		}
51+		Active struct {
52+			Item    lipgloss.Style
53+			ItemTag lipgloss.Style
54+		}
55+		ItemSelector lipgloss.Style
56+		ItemBranch   lipgloss.Style
57+		Paginator    lipgloss.Style
58 	}
59 
60 	Tree struct {
61@@ -292,25 +296,25 @@ func DefaultStyles() *Styles {
62 		Margin(0).
63 		Align(lipgloss.Center)
64 
65-	s.Ref.ItemInactive = lipgloss.NewStyle()
66+	s.Ref.Normal.Item = lipgloss.NewStyle()
67 
68 	s.Ref.ItemSelector = lipgloss.NewStyle().
69 		Foreground(selectorColor).
70 		SetString("> ")
71 
72-	s.Ref.ItemActive = s.Ref.ItemActive.Copy().
73+	s.Ref.Active.Item = lipgloss.NewStyle().
74 		Foreground(highlightColorDim)
75 
76 	s.Ref.ItemBranch = lipgloss.NewStyle()
77 
78-	s.Ref.ItemTagInactive = lipgloss.NewStyle().
79+	s.Ref.Normal.ItemTag = lipgloss.NewStyle().
80 		Foreground(lipgloss.Color("185"))
81 
82-	s.Ref.ItemTagActive = lipgloss.NewStyle().
83+	s.Ref.Active.ItemTag = lipgloss.NewStyle().
84 		Bold(true).
85 		Foreground(highlightColor)
86 
87-	s.Ref.ItemActive = lipgloss.NewStyle().
88+	s.Ref.Active.Item = lipgloss.NewStyle().
89 		Bold(true).
90 		Foreground(highlightColor)
91