Add "OK" modal

grancalavera · Jan 11, 2019 · 3773f42 · 3773f42
1 parent 3436b7c
commit 3773f42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lib/Labyrinth/Store/Event/Setup.hs b/lib/Labyrinth/Store/Event/Setup.hs
@@ -21,7 +21,7 @@ import           Labyrinth.UI.Screen.Setup      ( submitPlayer
                                                 , firstPlayer
                                                 )
 import           Labyrinth.UI.Widget            ( playerAttr )
-import           Labyrinth.UI.Modal             ( mkModal )
+import           Labyrinth.UI.Modal             ( mkOkModal )
 import qualified Labyrinth.Game.Configuration  as Conf
 import           Labyrinth.Game.Configuration   ( PlayOrder(..) )
 
@@ -47,14 +47,12 @@ play :: RegistrationEventHandler e
 play s store _ = if hasEnoughPlayers s then start else continue store
  where
   start = maybe (continue store) promptToStart (firstPlayer s)
-  promptToStart p = showModal store $ mkModal
+  promptToStart p = showModal store $ mkOkModal
     "start"
     (txt "The next player is " <+> playerAttr
       p
       (padLeft (Pad 1) $ padRight (Pad 1) $ txt $ p ^. Conf.name)
     )
-    (0, [("OK", True)])
-    halt
     halt
 
 processInput :: RegistrationEventHandler e

diff --git a/lib/Labyrinth/Store/Internal.hs b/lib/Labyrinth/Store/Internal.hs
@@ -11,7 +11,7 @@ module Labyrinth.Store.Internal
   )
 where
 
-import Data.Maybe (listToMaybe)
+import           Data.Maybe                     ( listToMaybe )
 import           Brick
 import           Lens.Micro.TH                  ( makeLenses )
 import           Lens.Micro                     ( (&)
@@ -46,8 +46,8 @@ showModal store m = continue $ store & modal %~ (m :)
 
 hideModal :: Store e -> EventM Name (Next (Store e))
 hideModal store = continue $ store & modal %~ \case
-  [] -> []
-  (_:ms) -> ms
+  []       -> []
+  (_ : ms) -> ms
 
 nextModal :: Store e -> Maybe (Modal Store e)
-nextModal = listToMaybe . (^.modal)
+nextModal = listToMaybe . (^. modal)
diff --git a/lib/Labyrinth/UI/Modal.hs b/lib/Labyrinth/UI/Modal.hs
@@ -7,6 +7,7 @@ module Labyrinth.UI.Modal
   , onTrue
   , onFalse
   , mkModal
+  , mkOkModal
   )
 where
 
@@ -57,3 +58,6 @@ mkModal desc body options onT onF = Modal
   , _onFalse     = onF
   , _description = desc
   }
+
+mkOkModal :: String -> Widget Name -> ModalCallback s e -> Modal s e
+mkOkModal desc body onOk = mkModal desc body (0, [("OK", True)]) onOk onOk