Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: PrevStep/NextStep to move through steps with only 2 keys. #16

Merged
merged 4 commits into from
Aug 12, 2024
Merged

feat: PrevStep/NextStep to move through steps with only 2 keys. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
627ce03
feat: PrevStep/NextStep to move through steps with only 2 keys. Valid…
ajboni Aug 11, 2024
3305ce5
Update filesystem/keymap.go
xaviergodart Aug 12, 2024
58c3ac6
Update filesystem/keymap.go
xaviergodart Aug 12, 2024
ba1d3f4
Remove support navigation for patterns.
ajboni Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions filesystem/keymap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ type KeyMap struct {
RemoveTrack string `json:"remove_track"`
AddStep string `json:"add_step"`
RemoveStep string `json:"remove_step"`
PreviousStep string `json:"previous_step"`
NextStep string `json:"next_step"`
PageUp string `json:"page_up"`
PageDown string `json:"page_down"`
TempoUp string `json:"tempo_up"`
Expand Down Expand Up @@ -40,6 +42,8 @@ func NewDefaultAzertyKeyMap() KeyMap {
RemoveTrack: ")",
AddStep: "+",
RemoveStep: "°",
PreviousStep: ",",
NextStep: ";",
PageUp: "p",
PageDown: "m",
TempoUp: "shift+up",
Expand Down Expand Up @@ -69,6 +73,8 @@ func NewDefaultAzertyMacKeyMap() KeyMap {
RemoveTrack: ")",
AddStep: "_",
RemoveStep: "°",
PreviousStep: ",",
NextStep: ";",
PageUp: "p",
PageDown: "m",
TempoUp: "shift+up",
Expand Down Expand Up @@ -97,6 +103,8 @@ func NewDefaultQwertyKeyMap() KeyMap {
RemoveTrack: "-",
AddStep: "+",
RemoveStep: "_",
PreviousStep: ",",
NextStep: ".",
PageUp: "p",
PageDown: ";",
TempoUp: "shift+up",
Expand Down Expand Up @@ -126,6 +134,8 @@ func NewDefaultQwertyMacKeyMap() KeyMap {
RemoveTrack: "-",
AddStep: "+",
RemoveStep: "_",
PreviousStep: ",",
NextStep: ".",
PageUp: "p",
PageDown: ";",
TempoUp: "shift+up",
Expand Down
13 changes: 12 additions & 1 deletion ui/keymap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ type keyMap struct {
AddStep key.Binding
RemoveStep key.Binding

NextStep key.Binding
PreviousStep key.Binding

StepIndex map[string]int
Step key.Binding

Expand Down Expand Up @@ -61,7 +64,7 @@ func (k keyMap) ShortHelp() []key.Binding {
// key.Map interface.
func (k keyMap) FullHelp() [][]key.Binding {
return [][]key.Binding{
{k.Play, k.ParamMode, k.PatternMode, k.AddTrack, k.RemoveTrack, k.AddStep, k.RemoveStep, k.TempoUp, k.TempoDown},
{k.Play, k.ParamMode, k.PatternMode, k.AddTrack, k.RemoveTrack, k.AddStep, k.RemoveStep, k.PreviousStep, k.NextStep, k.TempoUp, k.TempoDown},
{k.Step, k.StepToggle, k.Track, k.TrackToggle, k.PageUp, k.PageDown, k.AddParam, k.RemoveParam},
{k.Validate, k.Up, k.Down, k.Left, k.Right, k.Help, k.Quit},
}
Expand Down Expand Up @@ -98,6 +101,14 @@ func newKeyMap(keys filesystem.KeyMap) keyMap {
key.WithKeys(keys.RemoveStep),
key.WithHelp(keys.RemoveStep, "remove step"),
),
PreviousStep: key.NewBinding(
key.WithKeys(keys.PreviousStep),
key.WithHelp(keys.PreviousStep, "select previous step"),
),
NextStep: key.NewBinding(
key.WithKeys(keys.NextStep),
key.WithHelp(keys.NextStep, "select next step"),
),
StepIndex: map[string]int{},
Step: key.NewBinding(
key.WithKeys(keys.Steps[:]...),
Expand Down
36 changes: 36 additions & 0 deletions ui/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,39 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.seq.RemoveStep(m.activeTrack)
return m, nil

case key.Matches(msg, m.keymap.PreviousStep):
if m.mode == stepMode || m.mode == trackMode {
newIndex := m.activeStep - 1
if newIndex < 0 {
newIndex = len(m.getActiveTrack().Steps()) - 1
}

m.activeStep = newIndex
// Paginate if needed
m.activeTrackPage = (newIndex / stepsPerPage)

m.mode = stepMode
m.stepModeTimer = 0
m.updateParams()
}
ajboni marked this conversation as resolved.
Show resolved Hide resolved
return m, nil

case key.Matches(msg, m.keymap.NextStep):
if m.mode == stepMode || m.mode == trackMode {
newIndex := m.activeStep + 1
if newIndex > len(m.getActiveTrack().Steps())-1 {
newIndex = 0
}
m.activeStep = newIndex
// Paginate if needed
m.activeTrackPage = (newIndex / stepsPerPage)

m.mode = stepMode
m.stepModeTimer = 0
m.updateParams()
}
ajboni marked this conversation as resolved.
Show resolved Hide resolved
return m, nil

case key.Matches(msg, m.keymap.Step):
number := m.keymap.StepIndex[msg.String()]
if m.mode == patternMode {
Expand Down Expand Up @@ -273,6 +306,9 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.mode = trackMode
m.updateParams()
}
if m.mode == stepMode {
m.seq.ToggleStep(m.activeTrack, m.activeStep)
}
return m, nil

case key.Matches(msg, m.keymap.Left):
Expand Down
Loading