feat: restyle

Author: chaindead

internal/tui/model.go

@@ -37,11 +37,7 @@ type model struct {
 }
 
 func NewModel() model {
-	p := progress.New(
-		progress.WithDefaultGradient(),
-		progress.WithWidth(40),
-		progress.WithoutPercentage(),
-	)
+	p := newProgress()
 	s := spinner.New()
 	s.Spinner = spinner.MiniDot
 	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("63"))

internal/tui/styles.go

@@ -3,6 +3,7 @@ package tui
 import (
 	"fmt"
 
+	"github.com/charmbracelet/bubbles/progress"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )
@@ -22,6 +23,14 @@ var (
 	currentPkgNameStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("211"))
 )
 
+func newProgress() progress.Model {
+	return progress.New(
+		progress.WithDefaultGradient(),
+		progress.WithWidth(40),
+		progress.WithoutPercentage(),
+	)
+}
+
 func stepPrint(template string, args ...interface{}) tea.Cmd {
 	line := stepIcon.Render() + " " + fmt.Sprintf(template, args...)
 

internal/tui/update.go

@@ -113,11 +113,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.upgradedSucceeded = nil
 		m.upgradedFailed = nil
 		m.mode = modeUpgrade
-		m.progress = progress.New(
-			progress.WithDefaultGradient(),
-			progress.WithWidth(40),
-			progress.WithoutPercentage(),
-		)
+		m.progress = newProgress()
 
 		cmds := []tea.Cmd{
 			stepPrint("Upgrading %d packages", len(m.upgrading)),

internal/tui/update_list.go

@@ -19,9 +19,10 @@ type listModuleItem struct {
 }
 
 func (i listModuleItem) Title() string {
-	box := "[ ]"
+	box := "◯"
 	if i.Selected {
-		box = "[x]"
+		box = lipgloss.NewStyle().Bold(true).Render("●")
+		box = "●"
 	}
 
 	cat := lipgloss.NewStyle().Foreground(lipgloss.Color("#04B575")).Render(i.Module.UpdateCategory)
@@ -77,15 +78,15 @@ func newListKeyMap() *listKeyMap {
 	return &listKeyMap{
 		toggleItem: key.NewBinding(
 			key.WithKeys(" "),
-			key.WithHelp("space", "toggle item"),
+			key.WithHelp("space", "to select module"),
 		),
 		toggleAll: key.NewBinding(
 			key.WithKeys("a"),
-			key.WithHelp("a", "toggle all"),
+			key.WithHelp("a", "to select all"),
 		),
 		update: key.NewBinding(
 			key.WithKeys("enter", "u"),
-			key.WithHelp("enter", "update selected"),
+			key.WithHelp("enter", "to update selected"),
 		),
 	}
 }
@@ -195,15 +196,8 @@ func (m model) newList() (list.Model, []list.Item) {
 	}
 
 	l := list.New(items, d, 0, 0)
-	l.Title = "Go Modules available to upgrade"
+	l.Title = "Choose modules to upgrade"
 	l.Help = help.New()
-	l.AdditionalShortHelpKeys = func() []key.Binding {
-		return []key.Binding{
-			keys.toggleItem,
-			keys.toggleAll,
-			keys.update,
-		}
-	}
 
 	l.SetStatusBarItemName("package", "packages")
 	l.SetShowTitle(true)