use ilovetui colors & styles

internal/ui/findings/model.go

@@ -11,7 +11,7 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"charm.land/glamour/v2"
 	"charm.land/lipgloss/v2"
-	"github.com/anotherhadi/spilltea/internal/config"
+	ilovetui "github.com/anotherhadi/ilovetui"
 	"github.com/anotherhadi/spilltea/internal/db"
 	"github.com/anotherhadi/spilltea/internal/keys"
 	"github.com/anotherhadi/spilltea/internal/style"
@@ -78,7 +78,7 @@ func (m *Model) recalcSizes() {
 
 	listH, bodyH := style.SplitH(m.height, m.renderStatusBar(), 0.35)
 
-	listVH := style.PanelContentH(listH) - 1 // -1 for the pager dots row
+	listVH := ilovetui.ContentHeight(listH) - 1 // -1 for the pager dots row
 	if listVH < 0 {
 		listVH = 0
 	}
@@ -89,7 +89,7 @@ func (m *Model) recalcSizes() {
 		m.pager.PerPage = 1
 	}
 
-	bodyVH := style.PanelContentH(bodyH)
+	bodyVH := ilovetui.ContentHeight(bodyH)
 	m.bodyViewport.SetWidth(inner)
 	m.bodyViewport.SetHeight(bodyVH)
 
@@ -148,7 +148,7 @@ func (m *Model) refreshBodyScroll(reset bool) {
 
 func (m *Model) renderMarkdownCached(src string, width int) string {
 	if src == "" {
-		return style.S.Faint.Render(util.CenterLines("(ㆆ _ ㆆ)", "no description"))
+		return ilovetui.S.Faint.Render(util.CenterLines("(ㆆ _ ㆆ)", "no description"))
 	}
 	tmpl, err := template.New("").Parse(src)
 	if err != nil {
@@ -164,7 +164,7 @@ func (m *Model) renderMarkdownCached(src string, width int) string {
 	// Rebuild renderer if width changed or not yet built.
 	if m.renderer == nil || m.rendererWidth != width {
 		r, err := glamour.NewTermRenderer(
-			glamour.WithStyles(style.GlamourStyleConfig(config.Global)),
+			glamour.WithStyles(ilovetui.GlamourStyleConfig()),
 			glamour.WithWordWrap(width),
 		)
 		if err == nil {

internal/ui/findings/view.go

@@ -6,6 +6,7 @@ import (
 
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
+	ilovetui "github.com/anotherhadi/ilovetui"
 	"github.com/anotherhadi/spilltea/internal/icons"
 	"github.com/anotherhadi/spilltea/internal/style"
 	"github.com/anotherhadi/spilltea/internal/util"
@@ -27,34 +28,31 @@ func (m Model) View() tea.View {
 }
 
 func (m *Model) renderListPanel(w, h int) string {
-	s := style.S
 	var dots string
 	if len(m.findings) > 0 {
-		dots = s.Faint.Render(m.pager.View())
+		dots = ilovetui.S.Faint.Render(m.pager.View())
 	}
 	inner := lipgloss.JoinVertical(lipgloss.Left,
 		m.listViewport.View(),
 		lipgloss.PlaceHorizontal(m.listViewport.Width(), lipgloss.Center, dots),
 	)
-	return style.RenderWithTitle(s.PanelFocused, icons.I.Findings+"Findings", inner, w, h)
+	return ilovetui.RenderWithTitle(ilovetui.S.PanelFocused, icons.I.Findings+"Findings", inner, w, h)
 }
 
 func (m *Model) renderBodyPanel(h int) string {
-	s := style.S
 	title := "Description"
 	if len(m.findings) > 0 {
 		title = m.findings[m.cursor].Title
 	}
-	return style.RenderWithTitle(s.Panel, title, style.ViewportView(&m.bodyViewport), m.width, h)
+	return ilovetui.RenderWithTitle(ilovetui.S.Panel, title, style.ViewportView(&m.bodyViewport), m.width, h)
 }
 
 func (m *Model) renderList() string {
-	s := style.S
 	if len(m.findings) == 0 {
 		return lipgloss.Place(
 			m.listViewport.Width(), m.listViewport.Height(),
 			lipgloss.Center, lipgloss.Center,
-			s.Faint.Render(util.CenterLines("(҂◡_◡) ᕤ", "no findings")),
+			ilovetui.S.Faint.Render(util.CenterLines("(҂◡_◡) ᕤ", "no findings")),
 		)
 	}
 
@@ -76,18 +74,18 @@ func (m *Model) renderList() string {
 			titleW = 0
 		}
 
-		pluginStr := s.Faint.Width(8).Render(util.Truncate(f.PluginName, 8))
+		pluginStr := ilovetui.S.Faint.Width(8).Render(util.Truncate(f.PluginName, 8))
 
 		var line string
 		if selected {
-			bg := lipgloss.NewStyle().Background(s.Selection)
+			bg := lipgloss.NewStyle().Background(ilovetui.S.Selection)
 			line = lipgloss.JoinHorizontal(lipgloss.Top,
-				bg.Bold(true).Foreground(s.Primary).Width(2).Render(">"),
-				sevStyle.Background(s.Selection).Width(8).Render(f.Severity),
+				bg.Bold(true).Foreground(ilovetui.S.Primary).Width(2).Render(">"),
+				sevStyle.Background(ilovetui.S.Selection).Width(8).Render(f.Severity),
 				bg.Width(1).Render(""),
-				bg.Foreground(s.Subtle).Width(8).Render(util.Truncate(f.PluginName, 8)),
+				bg.Foreground(ilovetui.S.Subtle).Width(8).Render(util.Truncate(f.PluginName, 8)),
 				bg.Width(1).Render(""),
-				bg.Foreground(s.Subtle).Width(10).Render(ts),
+				bg.Foreground(ilovetui.S.Subtle).Width(10).Render(ts),
 				bg.Width(1).Render(""),
 				bg.Bold(true).Width(titleW).Render(f.Title),
 			)
@@ -98,9 +96,9 @@ func (m *Model) renderList() string {
 				" ",
 				pluginStr,
 				" ",
-				s.Faint.Width(10).Render(ts),
+				ilovetui.S.Faint.Width(10).Render(ts),
 				" ",
-				s.Bold.Render(f.Title),
+				ilovetui.S.Bold.Render(f.Title),
 			)
 		}
 		sb.WriteString(fmt.Sprintf("%s\n", line))