wip: switching from ncurses to brick

src/Mtlstats/Control/EditGoalie.hs

@@ -23,10 +23,11 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 module Mtlstats.Control.EditGoalie (editGoalieC) where
 
-import Control.Monad.Trans.State (gets, modify)
+import Brick.Types (Widget)
+import Brick.Widgets.Core (str, vBox)
+import Control.Monad.State.Class (gets, modify)
 import Data.Maybe (fromMaybe)
 import Lens.Micro ((^.), (.~), (%~))
-import UI.NCurses as C
 
 import Mtlstats.Actions
 import Mtlstats.Handlers
@@ -90,33 +91,19 @@ lifetimeMenuC _ = menuControllerWith header editGoalieLtMenu
 deleteC :: Action () -> Controller
 deleteC _ = Controller
 
-  { drawController = \s -> do
-
-    C.drawString $ let
-
-      hdr = fromMaybe [] $ do
-        gid    <- s^.progMode.editGoalieStateL.egsSelectedGoalie
-        goalie <- nth gid $ s^.database.dbGoalies
-        Just $ "Goalie: " ++ goalieDetails goalie ++ "\n\n"
-
-      in hdr ++ "Are you sure you want to delete this goalie? (Y/N)"
-
-    return C.CursorInvisible
-
-  , handleController = \e -> do
-
-    case ynHandler e of
-
-      Just True -> do
-        gets (^.progMode.editGoalieStateL.egsSelectedGoalie) >>= mapM_
-          (\gid -> modify $ database.dbGoalies %~ dropNth gid)
-        modify edit
-
-      Just False -> modify $ progMode.editGoalieStateL.egsMode .~ EGMenu
-      Nothing    -> return ()
-
-    return True
-
+  { drawController = \s -> let
+    hdr = fromMaybe "" $ do
+      gid    <- s^.progMode.editGoalieStateL.egsSelectedGoalie
+      goalie <- nth gid $ s^.database.dbGoalies
+      Just $ "Goalie: " ++ goalieDetails goalie ++ "\n\n"
+    in str $ hdr ++ "Are you sure you want to delete this goalie? (Y/N)"
+  , handleController = \e -> case ynHandler e of
+    Just True -> do
+      gets (^.progMode.editGoalieStateL.egsSelectedGoalie) >>= mapM_
+        (\gid -> modify $ database.dbGoalies %~ dropNth gid)
+      modify edit
+    Just False -> modify $ progMode.editGoalieStateL.egsMode .~ EGMenu
+    Nothing    -> return ()
   }
 
 ytdGamesC :: Bool -> Action () -> Controller
@@ -173,8 +160,11 @@ ltLossesC = curry $ promptController .
 ltTiesC :: Action () -> Controller
 ltTiesC = promptController . editGoalieLtTiesPrompt
 
-header :: ProgState -> C.Update ()
-header s = C.drawString $ fromMaybe "" $ do
-  gid <- s^.progMode.editGoalieStateL.egsSelectedGoalie
-  g   <- nth gid $ s^.database.dbGoalies
-  Just $ goalieDetails g ++ "\n"
+header :: ProgState -> Widget () -> Widget ()
+header s w = vBox
+  [ str $ fromMaybe "" $ do
+    gid <- s^.progMode.editGoalieStateL.egsSelectedGoalie
+    g   <- nth gid $ s^.database.dbGoalies
+    Just $ goalieDetails g
+  , w
+  ]