use proptController and promptControllerWith in goalie input controller

src/Mtlstats/Control/GoalieInput.hs

@@ -39,35 +39,16 @@ goalieInput gs
   | otherwise                       = goalsAllowedC
 
 selectGoalieC :: Controller
-selectGoalieC = Controller
+selectGoalieC = promptController selectGameGoaliePrompt
-  { drawController   = drawPrompt selectGameGoaliePrompt
-  , handleController = \e -> do
-    promptHandler selectGameGoaliePrompt e
-    return True
-  }
 
 minsPlayedC :: Controller
-minsPlayedC = Controller
+minsPlayedC = promptControllerWith header goalieMinsPlayedPrompt
-  { drawController = \s -> do
-    C.drawString $ header s
-    drawPrompt goalieMinsPlayedPrompt s
-  , handleController = \e -> do
-    promptHandler goalieMinsPlayedPrompt e
-    return True
-  }
 
 goalsAllowedC :: Controller
-goalsAllowedC = Controller
+goalsAllowedC = promptControllerWith header goalsAllowedPrompt
-  { drawController = \s -> do
-    C.drawString $ header s
-    drawPrompt goalsAllowedPrompt s
-  , handleController = \e -> do
-    promptHandler goalsAllowedPrompt e
-    return True
-  }
 
-header :: ProgState -> String
+header :: ProgState -> C.Update ()
-header s = unlines
+header s = C.drawString $ unlines
   [ "*** GAME " ++ padNum 2 (s^.database.dbGames) ++ " ***"
   , fromMaybe "" $ do
     n <- s^.progMode.gameStateL.gameSelectedGoalie