CHANGELOG.md

@@ -14,7 +14,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Transaction list
 - Balance display
 - Account selector
-- Menu for new addresses, accounts, wallets
 
 
 ## [0.5.3.0-beta]

src/Zenith/GUI.hs

@@ -40,28 +40,16 @@ import Zenith.Utils (displayAmount, showAddress)
 data AppEvent
   = AppInit
   | ShowMsg !T.Text
-  | ShowError !T.Text
   | CloseMsg
   | WalletClicked
   | AccountClicked
-  | MenuClicked
-  | NewClicked
-  | NewAddress
-  | NewAccount
-  | NewWallet
   | SetPool !ZcashPool
   | SwitchQr !(Maybe QrCode)
   | SwitchAddr !Int
   | SwitchAcc !Int
-  | SwitchWal !Int
   | CopyAddr !(Maybe (Entity WalletAddress))
   | LoadTxs ![Entity UserTx]
   | LoadAddrs ![Entity WalletAddress]
-  | LoadAccs ![Entity ZcashAccount]
-  | ConfirmCancel
-  | SaveAddress
-  | SaveAccount
-  | SaveWallet
   deriving (Eq, Show)
 
 data AppModel = AppModel
@@ -82,15 +70,6 @@ data AppModel = AppModel
   , _selPool :: !ZcashPool
   , _qrCodeWidget :: !(Maybe QrCode)
   , _accPopup :: !Bool
-  , _walPopup :: !Bool
-  , _menuPopup :: !Bool
-  , _newPopup :: !Bool
-  , _mainInput :: !T.Text
-  , _confirmTitle :: !(Maybe T.Text)
-  , _confirmAccept :: !T.Text
-  , _confirmCancel :: !T.Text
-  , _confirmEvent :: !AppEvent
-  , _inError :: !Bool
   } deriving (Eq, Show)
 
 makeLenses ''AppModel
@@ -123,11 +102,7 @@ buildUI wenv model = widgetTree
         then Nothing
         else Just ((model ^. addresses) !! (model ^. selAddr))
     widgetTree =
-      zstack
+      zstack [mainWindow, msgOverlay `nodeVisible` isJust (model ^. msg)]
-        [ mainWindow
-        , confirmOverlay `nodeVisible` isJust (model ^. confirmTitle)
-        , msgOverlay `nodeVisible` isJust (model ^. msg)
-        ]
     mainWindow =
       vstack
         [ windowHeader
@@ -140,21 +115,9 @@ buildUI wenv model = widgetTree
         ]
     windowHeader =
       hstack
-        [ vstack
-            [ box_
-                [onClick MenuClicked, alignMiddle]
-                (remixIcon remixMenuFill `styleBasic`
-                 [textSize 16, textColor white]) `styleBasic`
-              [cursorHand, height 25, padding 3] `styleHover`
-              [bgColor btnHiLite]
-            , popup menuPopup menuBox
-            ]
-        , vstack
         [ box_ [onClick WalletClicked, alignMiddle] walletButton `styleBasic`
           [cursorHand, height 25, padding 3] `styleHover`
           [bgColor btnHiLite]
-            , popup walPopup walListPopup
-            ]
         , vstack
             [ box_ [onClick AccountClicked, alignMiddle] accountButton `styleBasic`
               [cursorHand, height 25, padding 3] `styleHover`
@@ -167,47 +130,6 @@ buildUI wenv model = widgetTree
           (model ^. network == TestNet)
         ] `styleBasic`
       [bgColor btnColor]
-    menuBox =
-      box_
-        [alignMiddle]
-        (vstack
-           [ box_
-               [alignLeft]
-               (vstack
-                  [ box_
-                      [alignLeft, onClick NewClicked]
-                      (hstack
-                         [ label "New"
-                         , filler
-                         , widgetIf (not $ model ^. newPopup) $
-                           remixIcon remixMenuUnfoldFill
-                         , widgetIf (model ^. newPopup) $
-                           remixIcon remixMenuFoldFill
-                         ])
-                  , widgetIf (model ^. newPopup) $ animSlideIn newBox
-                  ]) `styleBasic`
-             [bgColor white, borderB 1 gray, padding 3]
-           , box_ [alignLeft] (label "Backup Wallet") `styleBasic`
-             [bgColor white, borderB 1 gray, padding 3]
-           ]) `styleBasic`
-      [bgColor btnColor, padding 3]
-    newBox =
-      box_
-        [alignMiddle]
-        (vstack
-           [ box_
-               [alignLeft, onClick NewAddress]
-               (hstack [label "Address", filler]) `styleBasic`
-             [bgColor white, borderB 1 gray, padding 3]
-           , box_
-               [alignLeft, onClick NewAccount]
-               (hstack [label "Account", filler]) `styleBasic`
-             [bgColor white, borderB 1 gray, padding 3]
-           , box_
-               [alignLeft, onClick NewWallet]
-               (hstack [label "Wallet", filler]) `styleBasic`
-             [bgColor white, borderB 1 gray, padding 3]
-           ])
     walletButton =
       hstack
         [ label "Wallet: " `styleBasic` [textFont "Bold", textColor white]
@@ -215,21 +137,6 @@ buildUI wenv model = widgetTree
           [textFont "Regular", textColor white]
         , remixIcon remixArrowRightWideLine `styleBasic` [textColor white]
         ]
-    walListPopup =
-      box_ [alignMiddle] dispWalList `styleBasic` [bgColor btnColor, padding 3]
-    dispWalList = vstack (zipWith walRow [0 ..] (model ^. wallets))
-    walRow :: Int -> Entity ZcashWallet -> WidgetNode AppModel AppEvent
-    walRow idx wal =
-      box_
-        [onClick $ SwitchWal idx, alignCenter]
-        (label (zcashWalletName (entityVal wal))) `styleBasic`
-      [ padding 1
-      , borderB 1 gray
-      , bgColor white
-      , width 80
-      , styleIf (model ^. selWallet == idx) (borderL 2 btnHiLite)
-      , styleIf (model ^. selWallet == idx) (borderR 2 btnHiLite)
-      ]
     accountButton =
       hstack
         [ label "Account: " `styleBasic` [textFont "Bold", textColor white]
@@ -248,7 +155,6 @@ buildUI wenv model = widgetTree
       [ padding 1
       , borderB 1 gray
       , bgColor white
-      , width 80
       , styleIf (model ^. selAcc == idx) (borderL 2 btnHiLite)
       , styleIf (model ^. selAcc == idx) (borderR 2 btnHiLite)
       ]
@@ -448,23 +354,7 @@ buildUI wenv model = widgetTree
         ]
     msgOverlay =
       alert CloseMsg $
-      hstack
+      hstack [filler, label $ fromMaybe "" (model ^. msg), filler]
-        [ filler
-        , image_ "./assets/1F616_color.png" [fitHeight] `styleBasic`
-          [height 44, width 44] `nodeVisible`
-          (model ^. inError)
-        , label $ fromMaybe "" (model ^. msg)
-        , filler
-        ]
-    confirmOverlay =
-      confirm_
-        (model ^. confirmEvent)
-        ConfirmCancel
-        [ titleCaption $ fromMaybe "" $ model ^. confirmTitle
-        , acceptCaption $ model ^. confirmAccept
-        , cancelCaption $ model ^. confirmCancel
-        ]
-        (hstack [label "Name:", filler, textField_ mainInput [maxLength 25]])
 
 generateQRCodes :: Config -> IO ()
 generateQRCodes config = do
@@ -543,62 +433,9 @@ handleEvent ::
 handleEvent wenv node model evt =
   case evt of
     AppInit -> []
-    ShowMsg t -> [Model $ model & msg ?~ t & menuPopup .~ False]
+    ShowMsg t -> [Model $ model & msg ?~ t]
-    ShowError t ->
+    WalletClicked -> [Model $ model & msg ?~ "You clicked Wallet!"]
-      [Model $ model & msg ?~ t & menuPopup .~ False & inError .~ True]
-    WalletClicked -> [Model $ model & walPopup .~ True]
     AccountClicked -> [Model $ model & accPopup .~ True]
-    MenuClicked -> [Model $ model & menuPopup .~ True]
-    NewClicked -> [Model $ model & newPopup .~ not (model ^. newPopup)]
-    NewAddress ->
-      [ Model $
-        model & confirmTitle ?~ "New Address" & confirmAccept .~ "Create" &
-        confirmCancel .~
-        "Cancel" &
-        confirmEvent .~
-        SaveAddress &
-        menuPopup .~
-        False
-      ]
-    NewAccount ->
-      [ Model $
-        model & confirmTitle ?~ "New Account" & confirmAccept .~ "Create" &
-        confirmCancel .~
-        "Cancel" &
-        confirmEvent .~
-        SaveAccount &
-        menuPopup .~
-        False
-      ]
-    NewWallet ->
-      [ Model $
-        model & confirmTitle ?~ "New Wallet" & confirmAccept .~ "Create" &
-        confirmCancel .~
-        "Cancel" &
-        confirmEvent .~
-        SaveWallet &
-        menuPopup .~
-        False
-      ]
-    ConfirmCancel -> [Model $ model & confirmTitle .~ Nothing & mainInput .~ ""]
-    SaveAddress ->
-      [ if T.length (model ^. mainInput) > 1
-          then Event $ ShowMsg $ "You saved address: " <> model ^. mainInput
-          else Event $ ShowError "Invalid input"
-      , Event ConfirmCancel
-      ]
-    SaveAccount ->
-      [ if T.length (model ^. mainInput) > 1
-          then Event $ ShowMsg $ "You saved account: " <> model ^. mainInput
-          else Event $ ShowError "Invalid input"
-      , Event ConfirmCancel
-      ]
-    SaveWallet ->
-      [ if T.length (model ^. mainInput) > 1
-          then Event $ ShowMsg $ "You saved wallet: " <> model ^. mainInput
-          else Event $ ShowError "Invalid input"
-      , Event ConfirmCancel
-      ]
     SetPool p ->
       [ Model $ model & selPool .~ p
       , Task $
@@ -626,15 +463,6 @@ handleEvent wenv node model evt =
             Just acc -> runNoLoggingT $ getAddresses dbPool $ entityKey acc
       , Event $ SetPool Orchard
       ]
-    SwitchWal i ->
-      [ Model $ model & selWallet .~ i & selAcc .~ 0 & selAddr .~ 0
-      , Task $
-        LoadAccs <$> do
-          dbPool <- runNoLoggingT $ initPool $ c_dbPath $ model ^. configuration
-          case selectWallet i of
-            Nothing -> return []
-            Just wal -> runNoLoggingT $ getAccounts dbPool $ entityKey wal
-      ]
     CopyAddr a ->
       [ setClipboardData $
         ClipboardText $
@@ -656,17 +484,12 @@ handleEvent wenv node model evt =
       ]
     LoadTxs t -> [Model $ model & transactions .~ t]
     LoadAddrs a -> [Model $ model & addresses .~ a, Event $ SetPool Orchard]
-    LoadAccs a -> [Model $ model & accounts .~ a, Event $ SwitchAcc 0]
+    CloseMsg -> [Model $ model & msg .~ Nothing]
-    CloseMsg -> [Model $ model & msg .~ Nothing & inError .~ False]
   where
     currentWallet =
       if null (model ^. wallets)
         then Nothing
         else Just ((model ^. wallets) !! (model ^. selWallet))
-    selectWallet i =
-      if null (model ^. wallets)
-        then Nothing
-        else Just ((model ^. wallets) !! i)
     currentAccount =
       if null (model ^. accounts)
         then Nothing
@@ -733,15 +556,6 @@ runZenithGUI config = do
                   Orchard
                   qr
                   False
-                  False
-                  False
-                  False
-                  ""
-                  Nothing
-                  ""
-                  ""
-                  SaveAddress
-                  False
           startApp model handleEvent buildUI params
     Left e -> do
       initDb dbFilePath
@@ -766,15 +580,6 @@ runZenithGUI config = do
               Orchard
               Nothing
               False
-              False
-              False
-              False
-              ""
-              Nothing
-              ""
-              ""
-              SaveAddress
-              False
       startApp model handleEvent buildUI params
   where
     params =

src/Zenith/GUI/Theme.hs

@@ -4,7 +4,6 @@ module Zenith.GUI.Theme
   ( zenithTheme
   ) where
 
-import Data.Default
 import Lens.Micro ((&), (+~), (.~), (?~), (^.), at, set)
 import Monomer
 import Monomer.Core.Themes.BaseTheme
@@ -13,72 +12,49 @@ import Monomer.Graphics (rgbHex, transparent)
 import Monomer.Graphics.ColorTable
 import qualified Monomer.Lens as L
 
-baseTextStyle :: TextStyle
-baseTextStyle = def & L.fontSize ?~ FontSize 10 & L.fontColor ?~ black
-
-hiliteTextStyle :: TextStyle
-hiliteTextStyle = def & L.fontSize ?~ FontSize 10 & L.fontColor ?~ white
-
 zenithTheme :: Theme
 zenithTheme =
-  baseTheme zgoThemeColors & L.basic . L.labelStyle . L.text ?~ baseTextStyle &
+  baseTheme zgoThemeColors & L.basic . L.labelStyle . L.text ?~
+  TextStyle
+    Nothing
+    (Just . FontSize $ 10)
+    Nothing
+    Nothing
+    (Just black)
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing &
   L.hover .
   L.tooltipStyle . L.text ?~
-  baseTextStyle &
+  TextStyle
+    Nothing
+    (Just . FontSize $ 10)
+    Nothing
+    Nothing
+    (Just black)
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing
+    Nothing &
   L.hover .
   L.labelStyle . L.text ?~
-  baseTextStyle &
+  TextStyle
-  L.basic .
+    Nothing
-  L.dialogTitleStyle . L.text ?~
+    (Just . FontSize $ 10)
-  (baseTextStyle & L.fontSize ?~ FontSize 12 & L.font ?~ "Bold") &
+    Nothing
-  L.hover .
+    Nothing
-  L.dialogTitleStyle . L.text ?~
+    (Just black)
-  (baseTextStyle & L.fontSize ?~ FontSize 12 & L.font ?~ "Bold") &
+    Nothing
-  L.basic .
+    Nothing
-  L.btnStyle . L.text ?~
+    Nothing
-  baseTextStyle &
+    Nothing
-  L.hover .
+    Nothing
-  L.btnStyle . L.text ?~
+    Nothing
-  baseTextStyle &
-  L.focus .
-  L.btnStyle . L.text ?~
-  baseTextStyle &
-  L.focusHover .
-  L.btnStyle . L.text ?~
-  baseTextStyle &
-  L.active .
-  L.btnStyle . L.text ?~
-  baseTextStyle &
-  L.basic .
-  L.btnMainStyle . L.text ?~
-  hiliteTextStyle &
-  L.hover .
-  L.btnMainStyle . L.text ?~
-  hiliteTextStyle &
-  L.focus .
-  L.btnMainStyle . L.text ?~
-  hiliteTextStyle &
-  L.focusHover .
-  L.btnMainStyle . L.text ?~
-  hiliteTextStyle &
-  L.active .
-  L.btnMainStyle . L.text ?~
-  hiliteTextStyle &
-  L.basic .
-  L.textFieldStyle . L.text ?~
-  baseTextStyle &
-  L.hover .
-  L.textFieldStyle . L.text ?~
-  baseTextStyle &
-  L.focus .
-  L.textFieldStyle . L.text ?~
-  baseTextStyle &
-  L.active .
-  L.textFieldStyle . L.text ?~
-  baseTextStyle &
-  L.focusHover .
-  L.textFieldStyle . L.text ?~
-  baseTextStyle
 
 zenithThemeColors :: BaseThemeColors
 zenithThemeColors =
@@ -94,10 +70,10 @@ zenithThemeColors =
     , btnText = gray02
     , btnTextDisabled = gray01
     , btnMainFocusBorder = blue08
-    , btnMainBgBasic = btnColor
+    , btnMainBgBasic = blue05b
-    , btnMainBgHover = btnHiLite
+    , btnMainBgHover = blue06
-    , btnMainBgFocus = btnColor
+    , btnMainBgFocus = blue05c
-    , btnMainBgActive = btnHiLite
+    , btnMainBgActive = blue05
     , btnMainBgDisabled = blue04
     , btnMainText = white
     , btnMainTextDisabled = gray08
@@ -173,10 +149,10 @@ zgoThemeColors =
     , btnText = gray02
     , btnTextDisabled = gray02
     , btnMainFocusBorder = blue09
-    , btnMainBgBasic = btnColor
+    , btnMainBgBasic = blue05b
-    , btnMainBgHover = btnHiLite
+    , btnMainBgHover = blue06
-    , btnMainBgFocus = btnColor
+    , btnMainBgFocus = blue05c
-    , btnMainBgActive = btnHiLite
+    , btnMainBgActive = blue05
     , btnMainBgDisabled = blue04
     , btnMainText = white
     , btnMainTextDisabled = white
@@ -241,10 +217,6 @@ zgoThemeColors =
 
 --black = rgbHex "#000000"
 {-white = rgbHex "#FFFFFF"-}
-btnColor = rgbHex "#ff5722" --rgbHex "#1818B2"
-
-btnHiLite = rgbHex "#207DE8"
-
 blue01 = rgbHex "#002159"
 
 blue02 = rgbHex "#01337D"

zenith.cabal

@@ -46,7 +46,6 @@ library
     , base64-bytestring
     , brick
     , bytestring
-    , data-default
     , esqueleto
     , resource-pool
     , binary