Introduce 'g' keybinding to go to the top of the list

This keybinding is the opposite of 'G' which goes to the end of the list. Closes: #59
felixonmars · Jan 20, 2020 · 7551f2a · 7551f2a
1 parent 11eba52
commit 7551f2a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/src/Events/Actions/Normal.hs b/src/Events/Actions/Normal.hs
@@ -33,6 +33,7 @@ events
     , (A.Left, left)
     , (A.Right, right)
     , (A.Bottom, bottom)
+    , (A.Top, top)
     -- new tasks
     , (A.New, (startCreate =<<) . (newItem =<<) . store)
     , (A.NewAbove, (startCreate =<<) . (above =<<) . store)

diff --git a/src/Events/Actions/Types.hs b/src/Events/Actions/Types.hs
@@ -17,6 +17,7 @@ data ActionType
     | Left
     | Right
     | Bottom
+    | Top
     | New
     | NewAbove
     | NewBelow
@@ -56,6 +57,7 @@ read "next"       = Next
 read "left"       = Left
 read "right"      = Right
 read "bottom"     = Bottom
+read "top"        = Top
 read "new"        = New
 read "newAbove"   = NewAbove
 read "newBelow"   = NewBelow

diff --git a/src/Events/State.hs b/src/Events/State.hs
@@ -24,6 +24,7 @@ module Events.State
     , above
     , below
     , bottom
+    , top
     , previous
     , duplicate
     , next
@@ -206,6 +207,12 @@ bottom = pure . selectLast
 selectLast :: InternalStateful
 selectLast state = setIndex state (countCurrent state - 1)
 
+top :: Stateful
+top = pure . selectFirst
+
+selectFirst :: InternalStateful
+selectFirst state = setIndex state (0)
+
 removeBlank :: Stateful
 removeBlank state = do
     currentTask <- getCurrentTask state

diff --git a/src/IO/Keyboard.hs b/src/IO/Keyboard.hs
@@ -50,7 +50,8 @@ defaultBindings =
     , (BChar 'j', A.Next)
     , (BChar 'h', A.Left)
     , (BChar 'l', A.Right)
-    , (BChar 'g', A.Bottom)
+    , (BChar 'G', A.Bottom)
+    , (BChar 'g', A.Top)
     , (BChar 'a', A.New)
     , (BChar 'O', A.NewAbove)
     , (BChar 'o', A.NewBelow)

diff --git a/src/UI/Draw/Modal/Help.hs b/src/UI/Draw/Modal/Help.hs
@@ -24,6 +24,7 @@ descriptions =
     , ([A.Due], "Show tasks with due dates")
     , ([A.Previous, A.Next, A.Left, A.Right], "Move down / up / left / right")
     , ([A.Bottom], "Go to bottom of list")
+    , ([A.Top], "Go to top of list")
     , ([A.New], "Add a task")
     , ([A.NewAbove, A.NewBelow], "Add a task above / below")
     , ([A.Duplicate], "Duplicate a task")

diff --git a/templates/bindings.ini b/templates/bindings.ini
@@ -12,6 +12,7 @@ next = j
 left = h
 right = l
 bottom = G
+top = g
 
 # new tasks
 new = a

diff --git a/test/IO/Keyboard/TypesTest.hs b/test/IO/Keyboard/TypesTest.hs
@@ -29,7 +29,8 @@ notFullResult =
     , (BChar 'j', A.Next)
     , (BChar 'h', A.Left)
     , (BChar 'l', A.Right)
-    , (BChar 'g', A.Bottom)
+    , (BChar 'G', A.Bottom)
+    , (BChar 'g', A.Top)
     , (BChar 'a', A.New)
     , (BChar 'O', A.NewAbove)
     , (BChar 'o', A.NewBelow)