Skip to content

Commit 092f09b

Browse files
committed
feat(ui): add single task support
add single task support Signed-off-by: mritd <[email protected]>
1 parent 1f05491 commit 092f09b

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

ui/multi_task.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222

2323
MultiTaskMsgSuccessStyle = lipgloss.NewStyle().
2424
Bold(true).
25-
Foreground(lipgloss.Color("#25A065"))
25+
Foreground(lipgloss.Color("#2AFFA3"))
2626

2727
MultiTaskMsgFailedStyle = MultiTaskMsgSuccessStyle.Copy().
2828
Foreground(lipgloss.Color("#EE6FF8"))

ui/single_task.go

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,30 @@ package ui
33
import (
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

1311
var (
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
"[∙∙∙]",
@@ -48,11 +40,8 @@ var (
4840
)
4941

5042
type 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
}

ui_selector.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package main
22

33
import (
44
"fmt"
5+
"io"
6+
57
"github.com/charmbracelet/bubbles/help"
68
"github.com/charmbracelet/bubbles/list"
79
tea "github.com/charmbracelet/bubbletea"
810
"github.com/charmbracelet/lipgloss"
9-
"io"
1011
)
1112

1213
var (

0 commit comments

Comments
 (0)