Merge pull request #5 from thetnaingtn/tui-improvement

TUI Improvement

Author: thetnaingtn

forky.go

@@ -15,16 +15,17 @@ var (
 )
 
 type RepositoryWithDetails struct {
-	Owner         string
-	Name          string
-	FullName      string
-	Description   string
-	RepoURL       string
-	DefaultBranch string
-	Parent        string
-	ParentDeleted bool
-	Private       bool
-	BehindBy      int
+	Owner          string
+	Name           string
+	FullName       string
+	Description    string
+	RepoURL        string
+	DefaultBranch  string
+	Parent         string
+	ParentFullName string
+	ParentDeleted  bool
+	Private        bool
+	BehindBy       int
 }
 
 func GetForks(ctx context.Context, client *github.Client) ([]*RepositoryWithDetails, error) {
@@ -103,16 +104,17 @@ func SyncBranchWithUpstreamRepo(client *github.Client, repo *RepositoryWithDetai
 
 func buildDetails(repo *github.Repository, commit *github.CommitsComparison, code int) *RepositoryWithDetails {
 	return &RepositoryWithDetails{
-		Owner:         repo.GetOwner().GetLogin(),
-		Name:          repo.GetName(),
-		FullName:      repo.GetFullName(),
-		Description:   repo.GetDescription(),
-		RepoURL:       repo.GetURL(),
-		DefaultBranch: repo.GetDefaultBranch(),
-		Parent:        repo.GetParent().GetFullName(),
-		ParentDeleted: code == http.StatusNotFound,
-		Private:       repo.GetPrivate(),
-		BehindBy:      commit.GetBehindBy(),
+		Owner:          repo.GetOwner().GetLogin(),
+		Name:           repo.GetName(),
+		FullName:       repo.GetFullName(),
+		Description:    repo.GetDescription(),
+		RepoURL:        repo.GetURL(),
+		DefaultBranch:  repo.GetDefaultBranch(),
+		Parent:         repo.GetParent().GetOwner().GetLogin(),
+		ParentFullName: repo.GetParent().GetFullName(),
+		ParentDeleted:  code == http.StatusNotFound,
+		Private:        repo.GetPrivate(),
+		BehindBy:       commit.GetBehindBy(),
 	}
 }
 

ui/app.go

@@ -17,6 +17,7 @@ type AppModel struct {
 
 func NewAppModel(client *github.Client) AppModel {
 	list := list.New([]list.Item{}, list.NewDefaultDelegate(), 0, 0)
+	list.Styles.Title = listTitleStyle
 	list.Title = "Forky"
 	list.SetSpinner(spinner.MiniDot)
 

ui/item.go

@@ -18,8 +18,8 @@ func (i item) Title() string {
 	var fork string
 	repo := i.repo
 
-	if repo.Parent != "" {
-		fork = fmt.Sprintf(" (fork from %s)", repo.Parent)
+	if repo.ParentFullName != "" {
+		fork = fmt.Sprintf(" (fork from %s)", repo.ParentFullName)
 	}
 
 	titleStr := repo.FullName + fork
@@ -41,7 +41,7 @@ func (i item) Title() string {
 
 func (i item) Description() string {
 	repo := i.repo
-	upstream := fmt.Sprintf("%s:%s", repo.Parent, repo.DefaultBranch)
+	upstream := fmt.Sprintf("%s:%s", repo.ParentFullName, repo.DefaultBranch)
 	base := fmt.Sprintf("%s:%s", repo.FullName, repo.DefaultBranch)
 	var msg string
 
@@ -55,6 +55,7 @@ func (i item) Description() string {
 	}
 
 	if !i.synced {
+		upstream = fmt.Sprintf("%s:%s", repo.Parent, repo.DefaultBranch)
 		msg = fmt.Sprintf("%s is %d commit%s behind %s", base, repo.BehindBy, mayBePlural(repo.BehindBy), upstream)
 	}
 

ui/styles.go

@@ -7,7 +7,10 @@ var (
 		Light: "#e94560",
 		Dark:  "#f05945",
 	}
-	listStyle    = lipgloss.NewStyle().Margin(2)
+
+	listStyle      = lipgloss.NewStyle().Margin(2)
+	listTitleStyle = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("#E36CEE"))
+
 	detailsStyle = lipgloss.NewStyle().PaddingLeft(2)
 
 	errorStyle = lipgloss.NewStyle().Foreground(errorColor)