merged restructure branch

This commit is contained in:
Armin Friedl 2016-08-06 17:52:49 +02:00
parent 573a164246
commit 8a676d6b4f
2 changed files with 17 additions and 17 deletions

View file

@ -1,4 +1,4 @@
{-# LANGUAGE TemplateHaskell #-} -- needed for makeLenses {-# LANGUAGE TemplateHaskell #-}
module Gui (runEditor) where module Gui (runEditor) where
@ -6,25 +6,25 @@ module Gui (runEditor) where
{---- Imports ----} {---- Imports ----}
---- Brick ---- ---- Brick ----
import Brick import Brick
import Brick.Markup (markup) import qualified Brick.Main as BrickMain
import qualified Brick.Main as BrickMain import Brick.Markup (markup)
import qualified Brick.Widgets.Edit as EditWidget import qualified Brick.Widgets.Edit as EditWidget
-- The underlying terminal package Brick is based upon -- The underlying terminal package Brick is based upon
import qualified Graphics.Vty as Vty import qualified Graphics.Vty as Vty
---- Text ---- ---- Text ----
import Data.Text (pack, singleton) import Data.Text (pack, singleton)
import Data.Text.Markup (Markup, (@@)) import Data.Text.Markup (Markup, (@@))
---- Various ---- ---- Various ----
import Lens.Micro ((^.)) import Control.Monad.IO.Class (liftIO)
import Lens.Micro.TH (makeLenses) import Data.List
import Control.Monad.IO.Class (liftIO) import Data.Maybe
import Data.Monoid (mempty, (<>)) import Data.Monoid (mempty, (<>))
import Data.Maybe import Data.Tuple
import Data.List import Lens.Micro ((^.))
import Data.Tuple import Lens.Micro.TH (makeLenses)

View file

@ -1,7 +1,7 @@
module Main where module Main where
import Gui (runEditor) import Gui (runEditor)
import System.Environment (getArgs) import System.Environment (getArgs)
main = do main = do
args <- getArgs args <- getArgs