Skip to content

Commit

Permalink
ui: update help text
Browse files Browse the repository at this point in the history
  • Loading branch information
dylantientcheu committed Dec 18, 2022
1 parent a9431d3 commit fbf3fd0
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 31 deletions.
28 changes: 7 additions & 21 deletions ui/game.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,6 @@ var baseStyle = lipgloss.NewStyle().
BorderStyle(lipgloss.RoundedBorder()).
BorderForeground(constants.Accent)

type keyMap struct {
Down key.Binding
Up key.Binding
Previous key.Binding
}

func (k keyMap) FullHelp() [][]key.Binding {
return [][]key.Binding{k.ShortHelp()}
}

func (k keyMap) ShortHelp() []key.Binding {
return []key.Binding{k.Down, k.Up, k.Previous}
}

type GameModel struct {
table table.Model
activeGameID string
Expand All @@ -42,6 +28,12 @@ type GameModel struct {
width, height, margin int
}

var gameKM = GameKM{
Down: key.NewBinding(key.WithKeys("down"), key.WithHelp("↓", "highlight next row")),
Up: key.NewBinding(key.WithKeys("up"), key.WithHelp("↑", "highlight previous row")),
Previous: key.NewBinding(key.WithKeys("esc", "q"), key.WithHelp("q/esc", "back to games list")),
}

func (m *GameModel) recalculateTable() {
m.table = m.table.WithTargetWidth(m.width)
}
Expand Down Expand Up @@ -74,14 +66,8 @@ func (m GameModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
func (m GameModel) View() string {
table := m.table.View() + "\n"

keyMap := keyMap{
Down: key.NewBinding(key.WithKeys("down"), key.WithHelp("↓", "highlight next row")),
Up: key.NewBinding(key.WithKeys("up"), key.WithHelp("↑", "highlight previous row")),
Previous: key.NewBinding(key.WithKeys("esc", "q"), key.WithHelp("q/esc", "back to games list")),
}

helpContainer := lipgloss.NewStyle().
SetString(m.help.View(keyMap)).
SetString(m.help.View(gameKM)).
Width(m.width).
Align(lipgloss.Center).
PaddingTop(1).
Expand Down
36 changes: 36 additions & 0 deletions ui/keymaps.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package ui

import (
"github.com/charmbracelet/bubbles/key"
)

// game help keymap
type GameKM struct {
Down key.Binding
Up key.Binding
Previous key.Binding
}

func (k GameKM) FullHelp() [][]key.Binding {
return [][]key.Binding{k.ShortHelp()}
}

func (k GameKM) ShortHelp() []key.Binding {
return []key.Binding{k.Down, k.Up, k.Previous}
}

// standing help keymap
type StandingKM struct {
Down key.Binding
Up key.Binding
Previous key.Binding
NextTab key.Binding
}

func (k StandingKM) FullHelp() [][]key.Binding {
return [][]key.Binding{k.ShortHelp()}
}

func (k StandingKM) ShortHelp() []key.Binding {
return []key.Binding{k.NextTab, k.Down, k.Up, k.Previous}
}
19 changes: 9 additions & 10 deletions ui/standings.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ type StandingsModel struct {
width, height, margin int
}

var standingsKM = StandingKM{
NextTab: key.NewBinding(key.WithKeys("tab"), key.WithHelp("tab", "toggle conference (change tab)")),
Down: key.NewBinding(key.WithKeys("down"), key.WithHelp("↓", "next row")),
Up: key.NewBinding(key.WithKeys("up"), key.WithHelp("↑", "previous row")),
Previous: key.NewBinding(key.WithKeys("esc", "q"), key.WithHelp("q/esc", "quit")),
}

func (m *StandingsModel) recalculateTable() {
m.easternConfTable = m.easternConfTable.WithTargetWidth(m.width - constants.BleedSpaceWidth)
m.westernConfTable = m.westernConfTable.WithTargetWidth(m.width - constants.BleedSpaceWidth)
Expand All @@ -44,9 +51,7 @@ func (m StandingsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.easternConfTable = m.easternConfTable.Focused(false)
m.westernConfTable = m.westernConfTable.Focused(true)
}
case "q", "esc":
return m, tea.Quit
case "ctrl+c":
case "q", "esc", "ctrl+c":
return m, tea.Quit
case "enter":
// TODO: to team view
Expand All @@ -67,14 +72,8 @@ func (m StandingsModel) View() string {
easternTable := m.easternConfTable.View() + "\n"
westernTable := m.westernConfTable.View() + "\n"

keyMap := keyMap{
Down: key.NewBinding(key.WithKeys("down"), key.WithHelp("↓", "highlight next row")),
Up: key.NewBinding(key.WithKeys("up"), key.WithHelp("↑", "highlight previous row")),
Previous: key.NewBinding(key.WithKeys("esc", "q"), key.WithHelp("q/esc", "back to games list")),
}

helpContainer := lipgloss.NewStyle().
SetString(m.help.View(keyMap)).
SetString(m.help.View(standingsKM)).
Width(m.width).
Align(lipgloss.Center).
PaddingTop(1).
Expand Down

0 comments on commit fbf3fd0

Please sign in to comment.