-
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #95 from jorgerojas26/status-bar
Help modal with keybindings
- Loading branch information
Showing
8 changed files
with
231 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package components | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/gdamore/tcell/v2" | ||
| "github.com/jorgerojas26/lazysql/app" | ||
| "github.com/jorgerojas26/lazysql/commands" | ||
| "github.com/jorgerojas26/lazysql/keymap" | ||
| "github.com/rivo/tview" | ||
| ) | ||
|
|
||
| type HelpModal struct { | ||
| tview.Primitive | ||
| } | ||
|
|
||
| func NewHelpModal() *HelpModal { | ||
| // Returns a new primitive which puts the provided primitive in the center and | ||
| // sets its size to the given width and height. | ||
| modal := func(p tview.Primitive, width, height int) tview.Primitive { | ||
| return tview.NewFlex(). | ||
| AddItem(nil, 0, 1, false). | ||
| AddItem(tview.NewFlex().SetDirection(tview.FlexRow). | ||
| AddItem(nil, 0, 1, false). | ||
| AddItem(p, height, 1, true). | ||
| AddItem(nil, 0, 1, false), width, 1, true). | ||
| AddItem(nil, 0, 1, false) | ||
| } | ||
|
|
||
| table := tview.NewTable() | ||
|
|
||
| // table.SetBorders(true) | ||
| table.SetBorder(true) | ||
| table.SetBorderColor(tview.Styles.PrimaryTextColor) | ||
| table.SetTitle(" Keybindings ") | ||
| table.SetSelectable(true, false) | ||
| table.SetSelectedStyle(tcell.StyleDefault.Background(tview.Styles.SecondaryTextColor).Foreground(tview.Styles.ContrastSecondaryTextColor)) | ||
|
|
||
| keymapGroups := make(map[string]keymap.Map, len(app.Keymaps.Groups)+1) | ||
|
|
||
| keymapGroups["global"] = app.Keymaps.Global | ||
|
|
||
| for name, group := range app.Keymaps.Groups { | ||
| keymapGroups[name] = group | ||
| } | ||
|
|
||
| mostLengthyKey := "" | ||
|
|
||
| for groupName := range keymapGroups { | ||
| for _, key := range keymapGroups[groupName] { | ||
| if len(key.Key.String()) > len(mostLengthyKey) { | ||
| mostLengthyKey = key.Key.String() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for groupName, keys := range keymapGroups { | ||
| rowCount := table.GetRowCount() | ||
| groupNameCell := tview.NewTableCell(strings.ToUpper(groupName)) | ||
| groupNameCell.SetTextColor(tview.Styles.TertiaryTextColor) | ||
| groupNameCell.SetSelectable(rowCount == 0) | ||
|
|
||
| table.SetCell(rowCount, 0, tview.NewTableCell("").SetSelectable(false)) | ||
| table.SetCell(rowCount+1, 0, groupNameCell) | ||
| table.SetCell(rowCount+2, 0, tview.NewTableCell("").SetSelectable(false)) | ||
|
|
||
| for i, key := range keys { | ||
| keyText := key.Key.String() | ||
|
|
||
| if len(keyText) < len(mostLengthyKey) { | ||
| keyText = strings.Repeat(" ", len(mostLengthyKey)-len(keyText)) + keyText | ||
| } | ||
| table.SetCell(rowCount+3+i, 0, tview.NewTableCell(keyText).SetAlign(tview.AlignRight).SetTextColor(tview.Styles.SecondaryTextColor)) | ||
| table.SetCell(rowCount+3+i, 1, tview.NewTableCell(key.Description).SetAlign(tview.AlignLeft).SetExpansion(1)) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| table.Select(3, 0) | ||
|
|
||
| table.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { | ||
| command := app.Keymaps.Group("global").Resolve(event) | ||
| if command == commands.Quit { | ||
| App.Stop() | ||
| } else if command == commands.HelpPopup { | ||
| MainPages.RemovePage(HelpPageName) | ||
| } | ||
| return event | ||
| }) | ||
|
|
||
| r := &HelpModal{modal(table, 0, 30)} | ||
|
|
||
| return r | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package components | ||
|
|
||
| import ( | ||
| "github.com/rivo/tview" | ||
|
|
||
| "github.com/jorgerojas26/lazysql/app" | ||
| "github.com/jorgerojas26/lazysql/keymap" | ||
| ) | ||
|
|
||
| type HelpStatus struct { | ||
| *tview.TextView | ||
| } | ||
|
|
||
| func NewHelpStatus() HelpStatus { | ||
|
|
||
| status := HelpStatus{tview.NewTextView().SetTextColor(tview.Styles.TertiaryTextColor)} | ||
|
|
||
| status.SetStatusOnTree() | ||
|
|
||
| return status | ||
| } | ||
|
|
||
| func (status *HelpStatus) UpdateText(binds []keymap.Bind) { | ||
|
|
||
| newtext := "" | ||
|
|
||
| for i, key := range binds { | ||
|
|
||
| newtext += key.Cmd.String() | ||
|
|
||
| newtext += ": " | ||
|
|
||
| newtext += key.Key.String() | ||
|
|
||
| islast := i == len(binds)-1 | ||
|
|
||
| if !islast { | ||
| newtext += " | " | ||
| } | ||
|
|
||
| } | ||
|
|
||
| status.SetText(newtext) | ||
| } | ||
|
|
||
| func (status *HelpStatus) SetStatusOnTree() { | ||
| status.UpdateText(app.Keymaps.Global) | ||
| } | ||
| func (status *HelpStatus) SetStatusOnEditorView() { | ||
| status.UpdateText(app.Keymaps.Group("editor")) | ||
| } | ||
| func (status *HelpStatus) SetStatusOnTableView() { | ||
| status.UpdateText(app.Keymaps.Group("table")) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.