better fav

Author: functora

ghcjs/currency-converter/src/App/Widgets/Fav.hs

@@ -9,6 +9,7 @@ import qualified App.Widgets.Cell as Cell
 import qualified App.Widgets.Field as Field
 import App.Widgets.Templates
 import qualified Data.Map as Map
+import qualified Data.Text as T
 import Functora.Miso.Prelude
 import qualified Material.Button as Button
 import qualified Material.Dialog as Dialog
@@ -39,7 +40,14 @@ fav st =
                           )
                           ( Field.defOpts
                               & #optsPlaceholder
-                              .~ ("Name - " <> makeFavName st)
+                              .~ ( let name = makeFavName st
+                                    in "Name"
+                                        <> ( if name == mempty
+                                              then mempty
+                                              else " - "
+                                           )
+                                        <> name
+                                 )
                           ),
                        Cell.smallCell
                         $ Button.raised
@@ -94,7 +102,11 @@ fav st =
               makeFavName nextSt
          in nextSt
               & ( Misc.textPopupPure
-                    $ "Saved "
+                    $ "Saved"
+                    <> ( if nextFavName == mempty
+                          then mempty
+                          else " "
+                       )
                     <> nextFavName
                     <> "!"
                 )
@@ -117,31 +129,16 @@ fav st =
 
 makeFavName :: Model -> MisoString
 makeFavName st =
-  preFavName
-    <> ( if preFavName == mempty
-          then mempty
-          else " "
-       )
-    <> getCode #stDocTopMoney
-    <> "/"
-    <> getCode #stDocBottomMoney
+  toMisoString
+    . T.toUpper
+    $ fromMisoString preFavName
   where
     preFavName =
       st
         ^. #modelState
         . #stDoc
         . #stDocPreFavName
         . #fieldOutput
-    getCode optic =
-      st
-        ^. #modelState
-        . #stDoc
-        . cloneLens optic
-        . #moneyCurrency
-        . #currencyOutput
-        . #currencyInfoCode
-        . #unCurrencyCode
-        . to toMisoString
 
 favItems :: Model -> [View Action]
 favItems st =

ghcjs/currency-converter/src/App/Widgets/Menu.hs

@@ -60,16 +60,16 @@ menu st =
                   $ IconButton.iconButton
                     ( IconButton.config
                         & IconButton.setOnClick
-                          ( pureUpdate 0
-                              $ (& #modelFav .~ Opened)
-                              . ( &
-                                    #modelState
-                                      . #stDoc
-                                      . #stDocPreFavName
-                                      . #fieldInput
-                                      . #uniqueValue
-                                      .~ mempty
-                                )
+                          ( pureUpdate 0 $ \next ->
+                              next
+                                & #modelFav
+                                .~ Opened
+                                & #modelState
+                                . #stDoc
+                                . #stDocPreFavName
+                                . #fieldInput
+                                . #uniqueValue
+                                .~ defFavName next
                           )
                         & IconButton.setAttributes
                           [ TopAppBar.actionItem,
@@ -150,6 +150,7 @@ menu st =
                         Cell.smallCell
                           $ Button.raised
                             ( Button.config
+                                & Button.setDisabled disabled
                                 & Button.setOnClick
                                   ( Misc.newFieldPairAction
                                       $ #modelState
@@ -169,6 +170,7 @@ menu st =
                          in Cell.mediumCell
                               $ Select.outlined
                                 ( Select.config
+                                    & Select.setDisabled disabled
                                     & Select.setLabel
                                       ( Just "Exchange rate"
                                       )
@@ -211,6 +213,8 @@ menu st =
                             ( #modelState . #stPre
                             )
                             ( Field.defOpts
+                                & #optsDisabled
+                                .~ disabled
                                 & #optsPlaceholder
                                 .~ ( "Preview - "
                                       <> ( st
@@ -240,16 +244,22 @@ menu st =
                                 . #stIkm
                             )
                             ( Field.defOpts
+                                & #optsDisabled
+                                .~ disabled
                                 & #optsFilledOrOutlined
                                 .~ Outlined
                             )
                       ]
-                    <> FieldPairs.fieldPairs
-                      st
-                      ( #modelState
-                          . #stDoc
-                          . #stDocFieldPairs
-                      )
+                    <> ( if disabled
+                          then mempty
+                          else
+                            FieldPairs.fieldPairs
+                              st
+                              ( #modelState
+                                  . #stDoc
+                                  . #stDocFieldPairs
+                              )
+                       )
                     <> [ Cell.bigCell
                           $ Button.raised
                             ( Button.config
@@ -273,6 +283,8 @@ menu st =
         . (& #modelState . #stScreen .~ next)
     sc =
       st ^. #modelState . #stScreen
+    disabled =
+      isJust $ st ^. #modelState . #stCpt
     navItemLeft x =
       div_
         [ TopAppBar.title,
@@ -293,3 +305,21 @@ menu st =
         ]
         [ x
         ]
+
+defFavName :: Model -> MisoString
+defFavName st =
+  if isJust (st ^. #modelState . #stCpt)
+    || (st ^. #modelState . #stIkm . #fieldOutput /= mempty)
+    then mempty
+    else getCode #stDocTopMoney <> "/" <> getCode #stDocBottomMoney
+  where
+    getCode optic =
+      st
+        ^. #modelState
+        . #stDoc
+        . cloneLens optic
+        . #moneyCurrency
+        . #currencyOutput
+        . #currencyInfoCode
+        . #unCurrencyCode
+        . to toMisoString