src/Password/App/Draw.hs

@@ -22,33 +22,25 @@ License along with this program.  If not, see
 
 -}
 
-{-# LANGUAGE OverloadedStrings #-}
-
 module Password.App.Draw (drawFunc) where
 
-import Brick (Widget, emptyWidget, txt, vBox)
+import Brick (Widget, txt, vBox)
-import Brick.Forms (Form, formState, renderForm)
+import Brick.Forms (renderForm)
-import Data.Text (Text)
 import Lens.Micro ((^.))
 
 import Password.App.Types
 
 -- | Renders the application view
 drawFunc :: AppState -> [Widget ResName]
-drawFunc s = maybe [emptyWidget] drawPassForm $ s^.passForm
+drawFunc s = case s^.appMode of
+  InitMode is -> drawPassForm is
 
-drawPassForm :: Form (Text, Text) () ResName -> [Widget ResName]
+drawPassForm :: InitState -> [Widget ResName]
-drawPassForm f =
+drawPassForm is =
   [ vBox
-    [ renderForm f
+    [ renderForm $ is^.setPassForm
-    , txt $ pfText $ formState f
+    , txt $ is^.spfError
     ]
   ]
 
-pfText :: (Text, Text) -> Text
-pfText (pass, conf)
-  | pass == ""   = "Password cannot be blank."
-  | pass /= conf = "Passwords do not match."
-  | otherwise    = ""
-
 --jl

src/Password/App/Event.hs

@@ -43,7 +43,7 @@ import Control.Monad.IO.Class (liftIO)
 import Control.Monad.State.Class (gets, put)
 import Data.Aeson (decodeFileStrict)
 import Graphics.Vty.Input.Events (Event (EvKey))
-import Lens.Micro (each, (^.))
+import Lens.Micro ((^.))
 import Lens.Micro.Mtl (zoom)
 import System.EasyFile
   ( createDirectoryIfMissing
@@ -77,9 +77,9 @@ loadDatabase = zoom database $ liftIO
   ) >>= mapM_ put
 
 fallbackHandler :: BrickEvent ResName () -> EventM ResName AppState ()
-fallbackHandler e = gets (^.passForm) >>= \case
+fallbackHandler e = gets (^.appMode) >>= \case
-  Just _  -> zoom (passForm.each) $ handleFormEvent e
+  InitMode _ -> zoom (appMode.initState.setPassForm) $
-  Nothing -> return ()
+    handleFormEvent e
 
 getKeyDispatcher
   :: AppState

src/Password/App/Types.hs

@@ -27,13 +27,19 @@ License along with this program.  If not, see
 module Password.App.Types (
   -- * Types
   AppState (..),
+  AppMode (..),
+  InitState (..),
   ResName (..),
   -- * Lenses
   -- ** AppState
   randGen,
   database,
-  mainPass,
+  appMode,
-  passForm,
+  -- ** AppMode
+  initState,
+  -- ** InitState
+  setPassForm,
+  spfError,
   -- * Constructors
   mkInitialState,
   ) where
@@ -54,13 +60,23 @@ data AppState = AppState
   -- ^ The random number generator
   , _database :: PWDatabase
   -- ^ The password database
-  , _mainPass :: String
+  , _appMode :: AppMode
-  -- ^ The main password
+  -- ^ The current operating mode
-  , _passForm :: Maybe PassForm
   }
 
--- | A password form (with confirmation)
+-- | The applicaiton's mode
-type PassForm = Form (Text, Text) () ResName
+newtype AppMode = InitMode
+  { _initState :: InitState
+  -- ^ Initialization state
+  }
+
+-- | Application initialization state
+data InitState = InitState
+  { _setPassForm :: Form (Text, Text) () ResName
+  -- ^ password form
+  , _spfError :: Text
+  -- ^ error message
+  }
 
 -- | Resource identifier
 data ResName
@@ -68,22 +84,28 @@ data ResName
   | ConfField
   deriving (Eq, Ord, Show)
 
-makeLenses ''AppState
+concat <$> mapM makeLenses
+  [ ''AppState
+  , ''AppMode
+  , ''InitState
+  ]
 
 -- | Builds an initial state
 mkInitialState :: MonadIO m => m AppState
 mkInitialState = AppState
   <$> initStdGen
   <*> return newPWDatabase
-  <*> return ""
+  <*> return (InitMode newInitState)
-  <*> return (Just newPassForm)
 
--- | Constructs a blank password form
+-- | New `InitState` value
-newPassForm :: PassForm
+newInitState :: InitState
-newPassForm = newForm
+newInitState = InitState
-  [ (txt "Master password: " <+>) @@= editPasswordField _1 PassField
+  ( newForm
-  , (txt "Confirm password: " <+>) @@= editPasswordField _2 ConfField
+    [ (txt "Master password: " <+>) @@= editPasswordField _1 PassField
-  ]
+    , (txt "Confirm password: " <+>) @@= editPasswordField _2 ConfField
-  ("", "")
+    ]
+    ("", "")
+  )
+  ""
 
 --jl