From aae165b5a1ab9a6406ee38de3392752ff3e1fd14 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Fri, 3 Jun 2022 12:11:51 -0400 Subject: [PATCH] fix(ui): show "no description" when a repo doesn't have one --- ui/pages/repo/repo.go | 12 ++++++++---- ui/pages/selection/item.go | 9 ++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ui/pages/repo/repo.go b/ui/pages/repo/repo.go index 8fca562d6315d986ba2e03cc5dda6b32947f45fa..de402e03f14620bc5921240bd0ecca577e7e5e61 100644 --- a/ui/pages/repo/repo.go +++ b/ui/pages/repo/repo.go @@ -262,23 +262,27 @@ func (r *Repo) headerView() string { } cfg := r.cfg name := r.common.Styles.RepoHeaderName.Render(r.selectedRepo.Name()) + desc := r.selectedRepo.Description() + if desc == "" { + desc = "No description" + } + desc = r.common.Styles.RepoHeaderDesc.Render(desc) url := git.RepoURL(cfg.Host, cfg.Port, r.selectedRepo.Repo()) // TODO move this into a style. url = lipgloss.NewStyle(). MarginLeft(1). Foreground(lipgloss.Color("168")). - Width(r.common.Width - lipgloss.Width(name) - 1). + Width(r.common.Width - lipgloss.Width(desc) - 1). Align(lipgloss.Right). Render(url) - desc := r.common.Styles.RepoHeaderDesc.Render(r.selectedRepo.Description()) style := r.common.Styles.RepoHeader.Copy().Width(r.common.Width) return style.Render( lipgloss.JoinVertical(lipgloss.Top, + name, lipgloss.JoinHorizontal(lipgloss.Left, - name, + desc, url, ), - desc, ), ) } diff --git a/ui/pages/selection/item.go b/ui/pages/selection/item.go index 0c0b910f0f6021fe858173fa34a42b566a1fdb1f..98ecdc043c9c3889c98fbd347064cf3019fdbe61 100644 --- a/ui/pages/selection/item.go +++ b/ui/pages/selection/item.go @@ -147,10 +147,13 @@ func (d ItemDelegate) Render(w io.Writer, m list.Model, index int, listItem list } title = titleStyle.Render(title) desc := i.Description() + descStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("243")) + if desc == "" { + desc = "No description" + descStyle = descStyle.Faint(true) + } desc = common.TruncateString(desc, m.Width()-itemStyle.GetHorizontalFrameSize()) - desc = lipgloss.NewStyle(). - Faint(true). - Render(desc) + desc = descStyle.Render(desc) s.WriteString(lipgloss.JoinHorizontal(lipgloss.Bottom, title, updated)) s.WriteString("\n")