From 835660ca1bd3dafade259a82ecf6912a84696dd6 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Fri, 11 Feb 2022 15:13:04 -0500 Subject: [PATCH] fix: change git tui navigation keys A (about) -> R (readme) R (refs) -> B (branches) L (log) -> C (commits) T (tree) -> F (files) --- internal/tui/bubbles/git/about/bubble.go | 2 +- internal/tui/bubbles/git/bubble.go | 18 +++++++++--------- internal/tui/bubbles/git/log/bubble.go | 2 +- internal/tui/bubbles/git/refs/bubble.go | 2 +- internal/tui/bubbles/git/tree/bubble.go | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/tui/bubbles/git/about/bubble.go b/internal/tui/bubbles/git/about/bubble.go index 199f864cf515ef4069c7a9313ab37abdda22fcae..b92135cc9f841348ccc76bac956cc6fc8dc7bb84 100644 --- a/internal/tui/bubbles/git/about/bubble.go +++ b/internal/tui/bubbles/git/about/bubble.go @@ -52,7 +52,7 @@ func (b *Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) { b.readmeViewport.Viewport.SetContent(md) case tea.KeyMsg: switch msg.String() { - case "A": + case "R": b.GotoTop() } } diff --git a/internal/tui/bubbles/git/bubble.go b/internal/tui/bubbles/git/bubble.go index 81a17447bb6b538c1e4337df80d95f618138efff..9e26e4567fcbe1782dae844ce4aabfd6184e6d2b 100644 --- a/internal/tui/bubbles/git/bubble.go +++ b/internal/tui/bubbles/git/bubble.go @@ -65,13 +65,13 @@ func (b *Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case tea.KeyMsg: if b.repo.Name() != "config" { switch msg.String() { - case "r", "R": + case "R": b.state = aboutPage - case "b", "B": + case "B": b.state = refsPage - case "c", "C": + case "C": b.state = logPage - case "f", "F": + case "F": b.state = treePage } } @@ -98,12 +98,12 @@ func (b *Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (b *Bubble) Help() []types.HelpEntry { h := []types.HelpEntry{} - h = append(h, b.boxes[b.state].(types.HelpableBubble).Help()...) + h = append(h, b.boxes[b.state].(types.BubbleHelper).Help()...) if b.repo.Name() != "config" { - h = append(h, types.HelpEntry{"r", "readme"}) - h = append(h, types.HelpEntry{"f", "files"}) - h = append(h, types.HelpEntry{"c", "commits"}) - h = append(h, types.HelpEntry{"b", "branches/tags"}) + h = append(h, types.HelpEntry{"R", "readme"}) + h = append(h, types.HelpEntry{"F", "files"}) + h = append(h, types.HelpEntry{"C", "commits"}) + h = append(h, types.HelpEntry{"B", "branches"}) } return h } diff --git a/internal/tui/bubbles/git/log/bubble.go b/internal/tui/bubbles/git/log/bubble.go index 7d075953a39b646884a0d071e00f4389bd6adbc6..68250f8013925cd1bcfec0dc801e3a26834066d3 100644 --- a/internal/tui/bubbles/git/log/bubble.go +++ b/internal/tui/bubbles/git/log/bubble.go @@ -167,7 +167,7 @@ func (b *Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case tea.KeyMsg: switch msg.String() { - case "L": + case "C": b.state = logState b.list.Select(0) cmds = append(cmds, b.updateItems()) diff --git a/internal/tui/bubbles/git/refs/bubble.go b/internal/tui/bubbles/git/refs/bubble.go index b296bcc224a08ebf8f981aeacdcd238e4a37c399..bb77d6ee65e71cbfb1cf2836a2fff5722d41f255 100644 --- a/internal/tui/bubbles/git/refs/bubble.go +++ b/internal/tui/bubbles/git/refs/bubble.go @@ -155,7 +155,7 @@ func (b *Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case tea.KeyMsg: switch msg.String() { - case "R": + case "B": cmds = append(cmds, b.updateItems()) case "enter", "right", "l": if b.list.Index() >= 0 { diff --git a/internal/tui/bubbles/git/tree/bubble.go b/internal/tui/bubbles/git/tree/bubble.go index f07584b8be565626a5ae5f0732487f00ec78587e..91974f34a83e76e66d60ba77ddf4ab8d23b0d03c 100644 --- a/internal/tui/bubbles/git/tree/bubble.go +++ b/internal/tui/bubbles/git/tree/bubble.go @@ -220,7 +220,7 @@ func (b *Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case tea.KeyMsg: switch msg.String() { - case "T": + case "F": return b, b.reset() case "enter", "right", "l": if b.state == treeState {