@@ -3,38 +3,30 @@ package ui
33import (
44 "time"
55
6- "github.com/charmbracelet/bubbles/progress"
7-
86 "github.com/charmbracelet/bubbles/spinner"
97 tea "github.com/charmbracelet/bubbletea"
108 "github.com/charmbracelet/lipgloss"
119)
1210
1311var (
1412 SingleTaskLayoutStyle = lipgloss .NewStyle ().
15- Padding (1 , 0 , 1 , 2 )
13+ Padding (0 , 0 , 1 , 2 )
1614
17- SingleTaskBorderStyle = lipgloss .NewStyle ().
18- Border (lipgloss .RoundedBorder ()).
19- BorderForeground (lipgloss .Color ("#37B9FF" )).
20- Width (55 ).
21- Padding (0 , 1 , 1 , 2 )
15+ SingleTaskMsgLayout = lipgloss .NewStyle ().
16+ Padding (1 , 0 , 1 , 0 )
2217
2318 SingleTaskSuccessStyle = lipgloss .NewStyle ().
2419 Bold (true ).
25- Background (lipgloss .Color ("#25A065" )).
26- Padding (1 , 0 , 0 , 0 )
20+ Foreground (lipgloss .Color ("#2AFFA3" ))
2721
2822 SingleTaskFailedStyle = SingleTaskSuccessStyle .Copy ().
2923 Background (lipgloss .Color ("#EE6FF8" ))
3024
31- SingleTaskWaitingStyle = lipgloss .NewStyle ().
32- Bold (true ).
33- Foreground (lipgloss .Color ("#37B9FF" )).
34- Padding (0 , 0 , 0 , 0 )
25+ SingleTaskWaitingStyle = SingleTaskSuccessStyle .Copy ().
26+ Foreground (lipgloss .Color ("#37B9FF" ))
3527
3628 SingleTaskSpinner = spinner.Model {
37- Style : lipgloss .NewStyle ().Foreground (lipgloss .Color ("#EE6FF8" )). Padding ( 1 , 0 , 0 , 0 ) ,
29+ Style : lipgloss .NewStyle ().Foreground (lipgloss .Color ("#EE6FF8" )),
3830 Spinner : spinner.Spinner {
3931 Frames : []string {
4032 "[∙∙∙]" ,
4840)
4941
5042type SingleTaskModel struct {
51- Task Task
52- Width int
53-
54- Spinner spinner.Model
55- Progress progress.Model
43+ Task Task
44+ Spinner spinner.Model
5645
5746 TaskDelay time.Duration
5847 LayoutStyle lipgloss.Style
@@ -71,7 +60,6 @@ func NewSingleTaskModel(task Task) SingleTaskModel {
7160 Spinner : SingleTaskSpinner ,
7261 TaskDelay : time .Second ,
7362 LayoutStyle : SingleTaskLayoutStyle ,
74- BorderStyle : SingleTaskBorderStyle ,
7563 SuccessStyle : SingleTaskSuccessStyle ,
7664 FailedStyle : SingleTaskFailedStyle ,
7765 RunningStyle : SingleTaskWaitingStyle ,
@@ -112,5 +100,5 @@ func (m SingleTaskModel) View() string {
112100 view = m .Spinner .View () + " " + m .RunningStyle .Render (m .Task .Title )
113101 }
114102
115- return m .LayoutStyle .Render (m .BorderStyle .Render (view ))
103+ return m .LayoutStyle .Render (m .BorderStyle .Render (SingleTaskMsgLayout . Render ( view ) ))
116104}
0 commit comments