wip

Author: functora

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          delivery-calculator
-version:       0.1.0.15
+version:       0.1.0.16
 synopsis:      Delivery Calculator
 category:      Web
 build-type:    Simple

ghcjs/delivery-calculator/src/App/Types.hs

@@ -13,12 +13,8 @@ module App.Types
     newFieldPairId,
     newTotal,
     inspectExchangeRate,
-    Screen (..),
-    isQrCode,
-    unQrCode,
     unShareUri,
     stUri,
-    setScreenAction,
     emitter,
     icon,
     vsn,
@@ -100,7 +96,6 @@ data St f = St
     stMerchantEmail :: Field Unicode f,
     stMerchantFeePercent :: Field DynamicField f,
     stOnlineOrOffline :: OnlineOrOffline,
-    stScreen :: Screen,
     stEnableTheme :: Bool,
     stTheme :: Theme
   }
@@ -140,7 +135,6 @@ newSt = do
         stMerchantEmail = email,
         stMerchantFeePercent = fee & #fieldType .~ FieldTypePercent,
         stOnlineOrOffline = Online,
-        stScreen = Main,
         stEnableTheme = True,
         stTheme = Theme.Matcha
       }
@@ -412,23 +406,6 @@ foldFieldPair :: Rational -> FieldPair DynamicField f -> Rational
 foldFieldPair acc =
   foldField acc . fieldPairValue
 
-data Screen
-  = Main
-  | Donate
-  | QrCode Screen
-  deriving stock (Eq, Ord, Show, Data, Generic)
-  deriving (Binary) via GenericType Screen
-
-isQrCode :: Screen -> Bool
-isQrCode = \case
-  QrCode {} -> True
-  _ -> False
-
-unQrCode :: Screen -> Screen
-unQrCode = \case
-  QrCode sc -> unQrCode sc
-  sc -> sc
-
 stUri :: (MonadThrow m) => Model -> m URI
 stUri st = do
   uri <- mkURI $ from @Unicode @Prelude.Text baseUri
@@ -498,18 +475,6 @@ baseUri =
   "https://functora.github.io/apps/delivery-calculator/" <> vsn <> "/index.html"
 #endif
 
-setScreenPure :: Screen -> Update Model
-setScreenPure sc =
-  PureUpdate
-    $ (& #modelMenu .~ Closed)
-    . (& #modelAppLinks .~ Closed)
-    . (& #modelState . #stScreen .~ sc)
-
-setScreenAction :: Screen -> Action
-setScreenAction =
-  PushUpdate
-    . setScreenPure
-
 emitter :: (MonadIO m) => Model -> Update Model -> m ()
 emitter st updater = do
   sink <- readMVar $ modelSink st

ghcjs/delivery-calculator/src/App/Widgets/Main.hs

@@ -59,55 +59,7 @@ mainWidget st =
        )
 
 screenWidget :: Model -> [View Action]
-screenWidget st@Model {modelState = St {stScreen = QrCode sc}} =
-  [ Flex.flexCol
-      main_
-      ( <>
-          [ style_ [("align-items", "center")]
-          ]
-      )
-      $ fmap
-        ( appendAttrs
-            [ style_
-                [ ("display", "flex"),
-                  ("align-items", "center"),
-                  ("flex-direction", "column")
-                ]
-            ]
-        )
-        ( FieldPairs.fieldPairsViewer
-            FieldPairs.defOpts
-            FieldPairs.Args
-              { FieldPairs.argsModel = st,
-                FieldPairs.argsOptic = #modelUriViewer,
-                FieldPairs.argsAction = PushUpdate,
-                FieldPairs.argsEmitter = emitter st
-              }
-        )
-      <> [ button_
-            [ onClick . setScreenAction $ unQrCode sc
-            ]
-            [ icon Icon.IconOpen,
-              text " Delivery Calculator"
-            ]
-         ]
-  ]
-screenWidget st@Model {modelState = St {stScreen = Donate}} =
-  FieldPairs.fieldPairsViewer
-    FieldPairs.defOpts
-    FieldPairs.Args
-      { FieldPairs.argsModel = st,
-        FieldPairs.argsOptic = #modelDonateViewer,
-        FieldPairs.argsAction = PushUpdate,
-        FieldPairs.argsEmitter = emitter st
-      }
-    <> [ button_
-          [ onClick $ setScreenAction Main
-          ]
-          [ text "Open"
-          ]
-       ]
-screenWidget st@Model {modelState = St {stScreen = Main}} =
+screenWidget st =
   ( if null assets
       then mempty
       else buttons

ghcjs/delivery-calculator/src/App/Widgets/Templates.hs

@@ -55,10 +55,13 @@ newDonateViewer = do
       qr xmrMtd
     ]
   where
-    qr :: FieldPair a b -> FieldPair a b
-    qr = noTrunc . (#fieldPairValue . #fieldType .~ FieldTypeQrCode)
     noTrunc :: FieldPair a b -> FieldPair a b
     noTrunc = #fieldPairValue . #fieldOpts . #fieldOptsTruncateLimit .~ Nothing
+    qr :: FieldPair a b -> FieldPair a b
+    qr =
+      noTrunc
+        . (#fieldPairValue . #fieldType .~ FieldTypeQrCode)
+        . (#fieldPairValue . #fieldOpts . #fieldOptsAllowCopy .~ True)
 
 exampleBtcAddress :: Unicode
 exampleBtcAddress = "bc1qa3qk8d4mxl6qkpvahl5xvg6c5k33kmuwvt9v8q"

ghcjs/delivery-calculator/src/Main.hs

@@ -193,12 +193,11 @@ updateModel (EvalUpdate f) st = do
         uri <- stUri next
         Jsm.insertStorage ("current-" <> vsn) uri
         syncUri uri
-        nextUri <- stUri $ next & #modelState . #stScreen %~ unQrCode
         uriViewer <-
           newFieldPair mempty
             . DynamicFieldText
             . from @String @Unicode
-            $ URI.renderStr nextUri
+            $ URI.renderStr uri
         pure
           . LinkUpdate
           $ #modelUriViewer

ghcjs/delivery-calculator/trapeze.yaml

@@ -1,8 +1,8 @@
 platforms:
   android:
     appName: Delivery Calculator
-    versionCode: 15
-    versionName: 0.1.0.15
+    versionCode: 16
+    versionName: 0.1.0.16
     packageName: com.functora.delivery_calculator
     manifest:
       - file: AndroidManifest.xml