diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go index 1e4e9dc35..bef06c3d8 100644 --- a/pkg/gui/presentation/branches.go +++ b/pkg/gui/presentation/branches.go @@ -165,7 +165,7 @@ func BranchStatus( ) string { itemOperationStr := ItemOperationToString(itemOperation, tr) if itemOperationStr != "" { - return style.FgCyan.Sprintf("%s %s", itemOperationStr, utils.Loader(now, userConfig.Gui.Spinner)) + return style.FgCyan.Sprintf("%s %s", itemOperationStr, Loader(now, userConfig.Gui.Spinner)) } result := "" diff --git a/pkg/gui/presentation/loader.go b/pkg/gui/presentation/loader.go new file mode 100644 index 000000000..23ab3433e --- /dev/null +++ b/pkg/gui/presentation/loader.go @@ -0,0 +1,14 @@ +package presentation + +import ( + "time" + + "github.com/jesseduffield/lazygit/pkg/config" +) + +// Loader dumps a string to be displayed as a loader +func Loader(now time.Time, config config.SpinnerConfig) string { + milliseconds := now.UnixMilli() + index := milliseconds / int64(config.Rate) % int64(len(config.Frames)) + return config.Frames[index] +} diff --git a/pkg/gui/presentation/remotes.go b/pkg/gui/presentation/remotes.go index 61fc82e02..4cb9e00ab 100644 --- a/pkg/gui/presentation/remotes.go +++ b/pkg/gui/presentation/remotes.go @@ -10,7 +10,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/theme" - "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -49,7 +48,7 @@ func getRemoteDisplayStrings( descriptionStr := style.FgBlue.Sprintf("%d branches", branchCount) itemOperationStr := ItemOperationToString(itemOperation, tr) if itemOperationStr != "" { - descriptionStr += " " + style.FgCyan.Sprint(itemOperationStr+" "+utils.Loader(time.Now(), userConfig.Gui.Spinner)) + descriptionStr += " " + style.FgCyan.Sprint(itemOperationStr+" "+Loader(time.Now(), userConfig.Gui.Spinner)) } res = append(res, textStyle.Sprint(r.Name), descriptionStr) return res diff --git a/pkg/gui/presentation/tags.go b/pkg/gui/presentation/tags.go index 441cd229a..e626c7315 100644 --- a/pkg/gui/presentation/tags.go +++ b/pkg/gui/presentation/tags.go @@ -10,7 +10,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/theme" - "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -47,7 +46,7 @@ func getTagDisplayStrings( descriptionStr := descriptionColor.Sprint(t.Description()) itemOperationStr := ItemOperationToString(itemOperation, tr) if itemOperationStr != "" { - descriptionStr = style.FgCyan.Sprint(itemOperationStr+" "+utils.Loader(time.Now(), userConfig.Gui.Spinner)) + " " + descriptionStr + descriptionStr = style.FgCyan.Sprint(itemOperationStr+" "+Loader(time.Now(), userConfig.Gui.Spinner)) + " " + descriptionStr } res = append(res, textStyle.Sprint(t.Name), descriptionStr) return res diff --git a/pkg/gui/status/status_manager.go b/pkg/gui/status/status_manager.go index 5cee4edc2..40c68fe2d 100644 --- a/pkg/gui/status/status_manager.go +++ b/pkg/gui/status/status_manager.go @@ -5,8 +5,8 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/config" + "github.com/jesseduffield/lazygit/pkg/gui/presentation" "github.com/jesseduffield/lazygit/pkg/gui/types" - "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" "github.com/sasha-s/go-deadlock" ) @@ -75,7 +75,7 @@ func (self *StatusManager) GetStatusString(userConfig *config.UserConfig) (strin } topStatus := self.statuses[0] if topStatus.statusType == "waiting" { - return topStatus.message + " " + utils.Loader(time.Now(), userConfig.Gui.Spinner), topStatus.color + return topStatus.message + " " + presentation.Loader(time.Now(), userConfig.Gui.Spinner), topStatus.color } return topStatus.message, topStatus.color } diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index c7118ff5c..5eecc6e70 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,10 +8,8 @@ import ( "runtime" "strconv" "strings" - "time" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/config" ) // GetProjectRoot returns the path to the root of the project. Only to be used @@ -25,13 +23,6 @@ func GetProjectRoot() string { return strings.Split(dir, "lazygit")[0] + "lazygit" } -// Loader dumps a string to be displayed as a loader -func Loader(now time.Time, config config.SpinnerConfig) string { - milliseconds := now.UnixMilli() - index := milliseconds / int64(config.Rate) % int64(len(config.Frames)) - return config.Frames[index] -} - func SortRange(x int, y int) (int, int) { if x < y { return x, y