style(tui): polish panel labels

Author: nsumbadze

pkg/gui/keybindings_test.go

@@ -6,6 +6,29 @@ import (
 	"github.com/jesseduffield/gocui"
 )
 
+func TestOptionsMapToString(t *testing.T) {
+	gui := &Gui{}
+
+	actual := gui.optionsMapToString(map[string]string{
+		"j/k": "navigate",
+		"?":   "menu",
+	})
+	expected := "[?] menu  •  [j/k] navigate"
+
+	if actual != expected {
+		t.Fatalf("optionsMapToString() = %q, want %q", actual, expected)
+	}
+}
+
+func TestFormatPanelTitle(t *testing.T) {
+	actual := formatPanelTitle(2, "Packages")
+	expected := "2 Packages"
+
+	if actual != expected {
+		t.Fatalf("formatPanelTitle() = %q, want %q", actual, expected)
+	}
+}
+
 func TestGetKeyDisplay(t *testing.T) {
 	testCases := []struct {
 		name     string

pkg/gui/layout.go

@@ -236,7 +236,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		v.Title = gui.Tr.SLocalize("StatusTitle")
+		v.Title = formatPanelTitle(1, gui.Tr.SLocalize("StatusTitle"))
 		v.FgColor = textColor
 	}
 
@@ -246,7 +246,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 		packagesView.Highlight = true
-		packagesView.Title = gui.Tr.SLocalize("PackagesTitle")
+		packagesView.Title = formatPanelTitle(2, gui.Tr.SLocalize("PackagesTitle"))
 		packagesView.ContainsList = true
 	}
 
@@ -255,7 +255,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		depsView.Title = gui.Tr.SLocalize("DepsTitle")
+		depsView.Title = formatPanelTitle(3, gui.Tr.SLocalize("DepsTitle"))
 		depsView.FgColor = textColor
 		depsView.ContainsList = true
 	}
@@ -265,7 +265,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		scriptsView.Title = gui.Tr.SLocalize("ScriptsTitle")
+		scriptsView.Title = formatPanelTitle(4, gui.Tr.SLocalize("ScriptsTitle"))
 		scriptsView.FgColor = textColor
 		scriptsView.ContainsList = true
 	}
@@ -275,7 +275,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		tarballsView.Title = gui.Tr.SLocalize("TarballsTitle")
+		tarballsView.Title = formatPanelTitle(5, gui.Tr.SLocalize("TarballsTitle"))
 		tarballsView.FgColor = textColor
 		tarballsView.ContainsList = true
 	}

pkg/gui/view_helpers.go

@@ -200,10 +200,14 @@ func (gui *Gui) renderString(viewName, s string) {
 func (gui *Gui) optionsMapToString(optionsMap map[string]string) string {
 	optionsArray := make([]string, 0)
 	for key, description := range optionsMap {
-		optionsArray = append(optionsArray, key+": "+description)
+		optionsArray = append(optionsArray, fmt.Sprintf("[%s] %s", key, description))
 	}
 	sort.Strings(optionsArray)
-	return strings.Join(optionsArray, ", ")
+	return strings.Join(optionsArray, "  •  ")
+}
+
+func formatPanelTitle(number int, title string) string {
+	return fmt.Sprintf("%d %s", number, title)
 }
 
 func (gui *Gui) renderOptionsMap(optionsMap map[string]string) error {
@@ -328,12 +332,17 @@ func (gui *Gui) renderPanelOptions() error {
 }
 
 func (gui *Gui) renderGlobalOptions() error {
+	jumpRange := "1-4"
+	if gui.showTarballsView() {
+		jumpRange = "1-5"
+	}
+
 	return gui.renderOptionsMap(map[string]string{
 		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")):                                                                                 gui.Tr.SLocalize("scroll"),
 		fmt.Sprintf("%s %s %s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock"), gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"),
 		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")):                                                                                                 gui.Tr.SLocalize("close"),
 		gui.getKeyDisplay("universal.optionMenu"): gui.Tr.SLocalize("menu"),
-		"1-4": gui.Tr.SLocalize("jump"),
+		jumpRange: gui.Tr.SLocalize("jump"),
 	})
 }