Fixed helper to be showed at home and finder

grrlopes · Aug 13, 2023 · a9a4176 · a9a4176
1 parent 4dfdbb9
commit a9a4176
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 24 deletions.
diff --git a/entity/cmdmodel.go b/entity/cmdmodel.go
@@ -29,6 +29,7 @@ type CmdModel struct {
 	Finder             textinput.Model
 	FinderFilter       string
 	Store              []Commands
-	Keys               helper.Keymap
+	HomeKeys           helper.Keymap
+	FinderKeys         helper.Keymap
 	Help               help.Model
 }
diff --git a/helper/keymaps.go b/helper/keymaps.go
@@ -3,25 +3,30 @@ package helper
 import "github.com/charmbracelet/bubbles/key"
 
 type Keymap struct {
-	Sync   key.Binding
-	Enter  key.Binding
-	Finder key.Binding
-	Back   key.Binding
-	Quit   key.Binding
+	Sync     key.Binding
+	Enter    key.Binding
+	Finder   key.Binding
+	Back     key.Binding
+	Quit     key.Binding
+	PageNext key.Binding
+	PagePrev key.Binding
 }
 
 func (k Keymap) ShortHelp() []key.Binding {
-	return []key.Binding{k.Quit, k.Back, k.Enter, k.Sync, k.Finder}
+	return []key.Binding{
+		k.Quit, k.Back, k.Enter, k.Sync,
+		k.Finder, k.PagePrev, k.PageNext,
+	}
 }
 
 func (k Keymap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		{k.Back, k.Enter, k.Quit},
-		{k.Sync, k.Finder},
+		{k.Sync, k.Finder, k.PageNext, k.PagePrev},
 	}
 }
 
-var HotKeys = Keymap{
+var HotKeysHome = Keymap{
 	Sync: key.NewBinding(
 		key.WithKeys("s"),
 		key.WithHelp("s", "sync"),
@@ -34,12 +39,26 @@ var HotKeys = Keymap{
 		key.WithKeys("f"),
 		key.WithHelp("f", "finder"),
 	),
-	Back: key.NewBinding(
-		key.WithKeys("esc"),
-		key.WithHelp("esc", "back"),
-	),
 	Quit: key.NewBinding(
 		key.WithKeys("ctrl+c", "q"),
 		key.WithHelp("ctrl+c/q", "quit"),
 	),
+	PageNext: key.NewBinding(
+		key.WithKeys("ctrl+d", "Next"),
+		key.WithHelp("ctrl+d", "Next Page"),
+	),
+	PagePrev: key.NewBinding(
+		key.WithKeys("ctrl+s", "Prev"),
+		key.WithHelp("ctrl+s", "Prev Page"),
+	),
+}
+
+var HotKeysFinder = Keymap{
+	Enter: HotKeysHome.Enter,
+	Quit: key.NewBinding(
+		key.WithKeys("ctrl+c", "q"),
+		key.WithHelp("ctrl+c", "quit"),
+	),
+	PageNext: HotKeysHome.PageNext,
+	PagePrev: HotKeysHome.PagePrev,
 }
diff --git a/ui/home.go b/ui/home.go
@@ -46,6 +46,8 @@ func NewHome(m *entity.CmdModel) *ModelHome {
 	ftotal := usecaseHistoryTotal.Execute()
 	p := paginator.New()
 	p.SetTotalPages(count)
+	p.KeyMap.NextPage = helper.HotKeysHome.PageNext
+	p.KeyMap.PrevPage = helper.HotKeysHome.PagePrev
 	pro := progress.New(progress.WithDefaultGradient())
 	txt := textinput.New()
 	txt.Placeholder = "type..."
@@ -67,7 +69,8 @@ func NewHome(m *entity.CmdModel) *ModelHome {
 			ProgressSync:     pro,
 			Ftotal:           ftotal,
 			Finder:           txt,
-			Keys:             helper.HotKeys,
+			HomeKeys:         helper.HotKeysHome,
+			FinderKeys:       helper.HotKeysFinder,
 			Help:             h,
 		},
 	}
@@ -188,14 +191,14 @@ func (m ModelHome) View() string {
 			m.home.Finder.View() +
 			content.Render(m.home.Viewport.View()) + "\n" +
 			m.FooterView() + "\n" +
-			m.paginationView()
-
+			m.paginationView() + "\n" +
+			HelperStyle.Render(m.finderKeysView())
 	}
 	return view.Render(m.HeaderView()) + "\n" +
 		content.Render(m.home.Viewport.View()) + "\n" +
 		m.FooterView() + "\n" +
 		m.paginationView() + "\n" +
-		m.mappingView()
+		HelperStyle.Render(m.homeKeysView())
 }
 
 func (m *ModelHome) GetSelected() string {
@@ -250,6 +253,10 @@ func (m *ModelHome) paginationView() string {
 	return b.String()
 }
 
-func (m ModelHome) mappingView() string {
-	return m.home.Help.View(m.home.Keys)
+func (m ModelHome) homeKeysView() string {
+	return m.home.Help.View(m.home.HomeKeys)
+}
+
+func (m ModelHome) finderKeysView() string {
+	return m.home.Help.View(m.home.FinderKeys)
 }
diff --git a/ui/styles.go b/ui/styles.go
@@ -24,6 +24,11 @@ var (
 		return b
 	}()
 
+	HelperStyle = func() lipgloss.Style {
+		b := view.PaddingTop(1)
+		return b
+	}()
+
 	DialogBoxStyle = lipgloss.NewStyle().
 			Border(lipgloss.RoundedBorder()).
 			BorderForeground(lipgloss.Color("#b7cbbf")).
@@ -41,11 +46,11 @@ var (
 			MarginRight(2)
 
 	ButtonDisableStyle = lipgloss.NewStyle().
-			Foreground(lipgloss.Color("#FFFFFF")).
-			Background(lipgloss.Color("#7a0609")).
-			Padding(0, 3).
-			MarginTop(1).
-			MarginRight(2)
+				Foreground(lipgloss.Color("#FFFFFF")).
+				Background(lipgloss.Color("#7a0609")).
+				Padding(0, 3).
+				MarginTop(1).
+				MarginRight(2)
 
 	ActiveButtonStyle = ButtonStyle.Copy().
 				Foreground(lipgloss.Color("#FFFFFF")).