reorganised code

app/Main.hs

@@ -1,8 +1,8 @@
 module Main where
 
-import Draw (render)
-import State (initial, setTasks)
-import TaskellJSON (exists, readJSON)
+import UI.Render (render)
+import Flow.State (initial, setTasks)
+import Persistence.Taskell (exists, readJSON)
 
 import Data.Bool
 

src/Task.hs → src/Data/Taskell/Task.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 
-module Task where
+module Data.Taskell.Task where
 
 import GHC.Generics
 import Data.Aeson

src/Actions.hs → src/Flow/Actions.hs

@@ -1,8 +1,8 @@
-module Actions (event) where
+module Flow.Actions (event) where
 
-import State
 import Graphics.Vty.Input.Events
-import Keyboard
+import Flow.State
+import Flow.Keyboard
 
 event :: Event -> State -> State
 event e | isChar 'q' e = quit

src/Keyboard.hs → src/Flow/Keyboard.hs

@@ -1,4 +1,4 @@
-module Keyboard (
+module Flow.Keyboard (
     isChar,
     isUp,
     isDown

src/State.hs → src/Flow/State.hs

@@ -1,6 +1,6 @@
-module State where
+module Flow.State where
 
-import Task (Tasks, completed, empty)
+import Data.Taskell.Task (Tasks, completed, empty)
 import Data.Sequence (mapWithIndex) 
 
 data State = State {

src/TaskellJSON.hs → src/Persistence/Taskell.hs

@@ -1,12 +1,12 @@
-module TaskellJSON where
+module Persistence.Taskell where
 
 import System.Directory
 import Data.Aeson
 import Data.Aeson.Encode.Pretty
 import qualified Data.ByteString.Lazy as BS
 
-import CLI (promptYN)
-import Task (Tasks, empty)
+import UI.CLI (promptYN)
+import Data.Taskell.Task (Tasks, empty)
 
 path :: FilePath
 path = "taskell.json"

src/CLI.hs → src/UI/CLI.hs

@@ -1,4 +1,4 @@
-module CLI where
+module UI.CLI where
 
 import System.IO (stdout, hFlush)
 

src/UI/Main.hs

@@ -0,0 +1,12 @@
+module UI.Main where
+
+import Graphics.Vty
+
+attrTitle :: Attr
+attrTitle = defAttr `withForeColor` green
+
+marginBottom :: Image -> Image
+marginBottom = pad 0 0 0 1
+
+-- creates the title element
+title = marginBottom $ string attrTitle "[Taskell]"

src/Draw.hs → src/UI/Render.hs

@@ -1,4 +1,4 @@
-module Draw (
+module UI.Render (
     render
 ) where
 
@@ -7,38 +7,12 @@ import Data.Sequence (mapWithIndex, filter)
 import Data.Foldable (toList)
 import Graphics.Vty
 
-import State
-import Actions
-import Task (Task, Tasks, description, completed, filterCompleted)
-import TaskellJSON (writeJSON)
-
--- styles
-attrTask :: Attr
-attrTask = defAttr `withForeColor` magenta
-
-attrDone :: Attr
-attrDone = defAttr `withStyle` dim 
-
-attrCurrent :: Attr
-attrCurrent = defAttr `withForeColor` blue
-
-attrTitle :: Attr
-attrTitle = defAttr `withForeColor` green
-
-marginBottom :: Image -> Image
-marginBottom = pad 0 0 0 1
-
--- style a task
-bullet :: Int -> Int -> Task -> Image
-bullet cur i t = string style' ("• " ++ s ++ tick)
-    where
-        s = description t
-        tick = if completed t then " ✓" else ""
-        style = if completed t then attrDone else attrTask
-        style' = if cur == i then attrCurrent else style
-
--- creates the title element
-title = marginBottom $ string attrTitle "[Taskell]"
+import Flow.State
+import Flow.Actions
+import Data.Taskell.Task (Task, Tasks, description, completed, filterCompleted)
+import Persistence.Taskell (writeJSON)
+import UI.Task (present)
+import UI.Main (title)
 
 -- filter out completed if option set
 getTasks :: State -> Tasks
@@ -49,7 +23,7 @@ getTasks s = if showCompleted s then ts else filterCompleted ts
 pic :: State -> Picture
 pic state = picForImage $ title <-> imgs
     where
-        bullet' = bullet $ current state
+        bullet' = present $ current state
         imgs = vertCat $ toList $ mapWithIndex bullet' $ getTasks state
 
 -- the draw loop

src/UI/Task.hs

@@ -0,0 +1,23 @@
+module UI.Task where
+
+import Graphics.Vty
+import Data.Taskell.Task
+
+-- styles
+attrTask :: Attr
+attrTask = defAttr `withForeColor` magenta
+
+attrDone :: Attr
+attrDone = defAttr `withStyle` dim 
+
+attrCurrent :: Attr
+attrCurrent = defAttr `withForeColor` blue
+
+-- style a task
+present :: Int -> Int -> Task -> Image
+present cur i t = string style' ("• " ++ s ++ tick)
+    where
+        s = description t
+        tick = if completed t then " ✓" else ""
+        style = if completed t then attrDone else attrTask
+        style' = if cur == i then attrCurrent else style

taskell.cabal

@@ -15,13 +15,17 @@ cabal-version:       >=1.10
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Draw
-                     , Actions
-                     , Keyboard
-                     , Task
-                     , State
-                     , CLI
-                     , TaskellJSON
+                     , src/UI
+                     , src/Data
+  exposed-modules:     Data.Taskell.Task
+                     , Flow.Actions
+                     , Flow.Keyboard
+                     , Flow.State
+                     , Persistence.Taskell
+                     , UI.CLI
+                     , UI.Main
+                     , UI.Render
+                     , UI.Task
   build-depends:       base >= 4.7 && < 5
                      , vty
                      , bytestring