Rename Brick.Core to Brick.Types

brick.cabal

@@ -23,7 +23,7 @@ library
     Brick.Widgets.Edit
     Brick.Widgets.List
     Brick.AttrMap
-    Brick.Core
+    Brick.Types
     Brick.Focus
     Brick.Main
     Brick.Markup

programs/EditDemo.hs

@@ -6,7 +6,7 @@ import Data.Monoid
 import Graphics.Vty hiding (translate)
 
 import Brick.Main
-import Brick.Core
+import Brick.Types
 import Brick.Widgets.Core
 import Brick.Widgets.Center
 import Brick.Widgets.Edit

programs/LayerDemo.hs

@@ -7,7 +7,7 @@ import Control.Monad (void)
 import Data.Default
 import Graphics.Vty
 
-import Brick.Core
+import Brick.Types
 import Brick.Main
 import Brick.Widgets.Core
 import Brick.Widgets.Border

programs/ListDemo.hs

@@ -7,7 +7,7 @@ import Data.Monoid
 import Graphics.Vty
 
 import Brick.Main
-import Brick.Core
+import Brick.Types
 import Brick.Widgets.Core
 import Brick.Widgets.Border
 import Brick.Widgets.List

programs/Main.hs

@@ -9,7 +9,7 @@ import Graphics.Vty hiding (translate)
 import qualified Data.Text as T
 
 import Brick.Main
-import Brick.Core
+import Brick.Types
 import Brick.Widgets.Core
 import Brick.Widgets.Center
 import Brick.Widgets.Border

programs/Rogue.hs

@@ -13,7 +13,7 @@ import Control.Monad
 import System.Random
 
 import Brick.Main
-import Brick.Core
+import Brick.Types
 import Brick.AttrMap
 import Brick.Widgets.Core
 import Brick.Widgets.Border

src/Brick/Focus.hs

@@ -17,7 +17,7 @@ where
 import Control.Lens ((^.))
 import Data.Maybe (listToMaybe)
 
-import Brick.Core (Name(..), CursorLocation(..), cursorLocationName)
+import Brick.Types
 
 -- | A focus ring containing a sequence of widget names to focus and a
 -- currently-focused widget name.

src/Brick/Main.hs

@@ -49,7 +49,7 @@ import Graphics.Vty
 
 import Brick.Widgets.Core (Widget)
 import Brick.Widgets.Internal (renderFinal, RenderState(..), ScrollRequest(..), Direction(..))
-import Brick.Core (row, column, CursorLocation(..), Name(..))
+import Brick.Types (row, column, CursorLocation(..), Name(..))
 import Brick.AttrMap
 
 -- | The type of actions to take in an event handler.

src/Brick/Types.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-module Brick.Core
+module Brick.Types
   ( Location(Location)
   , TerminalLocation(..)
   , CursorLocation(..)

src/Brick/Util.hs

@@ -12,7 +12,7 @@ import Control.Lens ((&), (%~))
 import Data.Monoid ((<>))
 import Graphics.Vty
 
-import Brick.Core (Location(..), CursorLocation(..), cursorLocation)
+import Brick.Types (Location(..), CursorLocation(..), cursorLocation)
 
 for :: [a] -> (a -> b) -> [b]
 for = flip map

src/Brick/Widgets/Center.hs

@@ -12,8 +12,8 @@ where
 import Control.Lens ((^.), (&), (.~), to)
 import Graphics.Vty (imageWidth, imageHeight, horizCat, charFill, vertCat)
 
+import Brick.Types
 import Brick.Widgets.Core
-import Brick.Core
 
 hCenter :: Widget -> Widget
 hCenter = hCenterWith Nothing

src/Brick/Widgets/Edit.hs

@@ -15,7 +15,7 @@ import Control.Lens
 import Data.Monoid ((<>))
 import Graphics.Vty (Event(..), Key(..), Modifier(..))
 
-import Brick.Core (Name, Location(..), HandleEvent(..), suffixLenses)
+import Brick.Types
 import Brick.Widgets.Core
 import Brick.Util (clamp)
 import Brick.AttrMap

src/Brick/Widgets/Internal.hs

@@ -83,7 +83,7 @@ import Control.Lens (Lens')
 import Data.String (IsString(..))
 import qualified Graphics.Vty as V
 
-import Brick.Core
+import Brick.Types
 import Brick.Widgets.Border.Style
 import Brick.Util (clOffset, for)
 import Brick.AttrMap

src/Brick/Widgets/List.hs

@@ -29,7 +29,7 @@ import Data.Monoid ((<>))
 import Data.Maybe (fromMaybe)
 import Graphics.Vty (Event(..), Key(..))
 
-import Brick.Core (HandleEvent(..), Name, suffixLenses)
+import Brick.Types
 import Brick.Merge (maintainSel)
 import Brick.Widgets.Core
 import Brick.Util (clamp, for)