using capacitor browser plugin

Author: functora

ghcjs/currency-converter/default.nix

@@ -88,6 +88,8 @@ in rec {
         ${./static}/web.js -o $out/web.js --compress --mangle --source-map
       ${functora-pkgs.terser}/bin/terser \
         ${./static}/web2.js -o $out/web2.js --compress --mangle --source-map
+      ${functora-pkgs.terser}/bin/terser \
+        ${./static}/web3.js -o $out/web3.js --compress --mangle --source-map
       ${functora-pkgs.terser}/bin/terser \
         ${./static}/main.js -o $out/main.js --compress --mangle --source-map
       ${functora-pkgs.html-minifier}/bin/html-minifier \

ghcjs/currency-converter/package-lock.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@capacitor/android": "^6.0.0",
+    "@capacitor/browser": "^6.0.1",
     "@capacitor/core": "^6.0.0",
     "@capacitor/ios": "^6.0.0",
     "@capacitor/preferences": "^6.0.1",

ghcjs/currency-converter/package.json

@@ -18,6 +18,7 @@ module App.Misc
     newAssetAction,
     newFieldPairAction,
     newPaymentMethodAction,
+    openBrowserPageAction,
   )
 where
 
@@ -27,6 +28,7 @@ import Functora.Miso.Prelude
 import Functora.Money hiding (Text)
 import qualified Language.Javascript.JSaddle as JS
 import qualified Material.Snackbar as Snackbar
+import qualified Text.URI as URI
 import qualified Prelude
 
 getConverterAmountOptic ::
@@ -244,3 +246,9 @@ newPaymentMethodAction optic =
       . ChanItem 0
       $ (textPopupPure @MisoString "Added payment!")
       . (& cloneTraversal optic %~ (<> [item]))
+
+openBrowserPageAction :: URI -> Action
+openBrowserPageAction uri =
+  PushUpdate $ do
+    void $ JS.global ^. JS.js1 @MisoString "openBrowserPage" (URI.render uri)
+    pure $ ChanItem 0 id

ghcjs/currency-converter/src/App/Misc.hs

@@ -12,6 +12,7 @@ import qualified App.Widgets.Qr as Qr
 import qualified App.Widgets.SwapAmounts as SwapAmounts
 import Functora.Miso.Prelude
 import Functora.Money hiding (Text)
+import qualified Functora.Prelude as Prelude
 import qualified Material.Button as Button
 import qualified Material.LayoutGrid as LayoutGrid
 import qualified Material.Snackbar as Snackbar
@@ -180,6 +181,7 @@ ratesWidget st =
         . #currencyOutput
         . #currencyInfoCode
         . #unCurrencyCode
+        . to toMisoString
     bottom = st ^. #modelState . #stDoc . #stDocBottomMoney
     bottomAmt = bottom ^. #moneyAmount . #fieldOutput
     bottomCur =
@@ -188,6 +190,7 @@ ratesWidget st =
         . #currencyOutput
         . #currencyInfoCode
         . #unCurrencyCode
+        . to toMisoString
     bottomPerTop =
       if topAmt == 0
         then 0
@@ -236,12 +239,49 @@ tosWidget =
         [ ("text-align", "center")
         ]
     ]
-    [ Miso.text "\169 2024 Functora. All rights reserved. ",
+    [ Miso.text "\169 2024 ",
+      browserLink "https://functora.github.io/" "Functora",
+      Miso.text ". All rights reserved. ",
       Miso.text "By continuing to use this software, you agree to the ",
-      a_ [href_ "license.html"] [Miso.text "Terms of Service"],
+      a_
+        [ href_ "license.html"
+        ]
+        [ Miso.text "Terms of Service"
+        ],
       Miso.text " and ",
-      a_ [href_ "privacy.html"] [Miso.text "Privacy Policy"],
-      Miso.text
-        ". This software is 100% organic and AI-free. It is built and tested exclusively by humans. ",
-      Miso.text $ "Version " <> vsn <> "."
+      a_
+        [ href_ "privacy.html"
+        ]
+        [ Miso.text "Privacy Policy"
+        ],
+      Miso.text ". To install the ",
+      browserLink
+        "https://play.google.com/apps/testing/com.functora.currency_converter"
+        "Android app",
+      Miso.text ", either join the ",
+      browserLink
+        "https://groups.google.com/g/currency-converter"
+        "testing group",
+      Miso.text " or download the ",
+      browserLink
+        ( "https://github.com/functora/functora.github.io/releases/download/currency-converter-v"
+            <> fromMisoString vsn
+            <> "/currency-converter-v"
+            <> fromMisoString vsn
+            <> ".apk"
+        )
+        "APK file",
+      Miso.text $ ". Version " <> vsn <> "."
+    ]
+
+browserLink :: Prelude.Text -> MisoString -> View Action
+browserLink uri txt =
+  a_
+    [ href_ "#!",
+      onClick
+        . Misc.openBrowserPageAction
+        . either impureThrow id
+        $ URI.mkURI uri
+    ]
+    [ Miso.text txt
     ]

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

@@ -91,6 +91,7 @@ runApp app = do
         ("static" : _) -> staticApp (defaultWebAppSettings ".") req
         ("web.js" : _) -> staticApp (defaultWebAppSettings "static") req
         ("web2.js" : _) -> staticApp (defaultWebAppSettings "static") req
+        ("web3.js" : _) -> staticApp (defaultWebAppSettings "static") req
         ("main.js" : _) -> staticApp (defaultWebAppSettings "static") req
         ("site.webmanifest" : _) -> staticApp (defaultWebAppSettings "static") req
         _ -> JS.jsaddleAppWithJs (JS.jsaddleJs False <> js) req

ghcjs/currency-converter/src/Main.hs

@@ -10,6 +10,10 @@ body {
   justify-content: center;
 }
 
+a {
+  color: inherit;
+}
+
 textarea {
   resize: vertical;
   pointer-events: auto;

ghcjs/currency-converter/static/app.css

@@ -1,5 +1,6 @@
 import { WebviewPrint } from "capacitor-webview-print";
 import { Preferences } from "@capacitor/preferences";
+import { Browser } from "@capacitor/browser";
 
 async function printCurrentPage(name) {
   await WebviewPrint.print({ name: name });
@@ -14,6 +15,15 @@ async function insertStorage(key, value) {
   await Preferences.set({ key: key, value: value });
 }
 
+async function openBrowserPage(url) {
+  try {
+    await Browser.open({ url: url });
+  } catch (e) {
+    window.open(url, "_blank").focus();
+  }
+}
+
 globalThis.printCurrentPage = printCurrentPage;
 globalThis.selectStorage = selectStorage;
 globalThis.insertStorage = insertStorage;
+globalThis.openBrowserPage = openBrowserPage;

ghcjs/currency-converter/static/cap.js

@@ -579,6 +579,9 @@ const WebviewPrint = registerPlugin("WebviewPrint", {
 const Preferences = registerPlugin("Preferences", {
   web: () => __vitePreload(() => import("./web2.js"), true ? [] : void 0).then((m) => new m.PreferencesWeb())
 });
+const Browser = registerPlugin("Browser", {
+  web: () => __vitePreload(() => import("./web3.js"), true ? [] : void 0).then((m) => new m.BrowserWeb())
+});
 async function printCurrentPage(name) {
   await WebviewPrint.print({ name });
 }
@@ -589,9 +592,17 @@ async function selectStorage(key) {
 async function insertStorage(key, value) {
   await Preferences.set({ key, value });
 }
+async function openBrowserPage(url) {
+  try {
+    await Browser.open({ url });
+  } catch (e) {
+    window.open(url, "_blank").focus();
+  }
+}
 globalThis.printCurrentPage = printCurrentPage;
 globalThis.selectStorage = selectStorage;
 globalThis.insertStorage = insertStorage;
+globalThis.openBrowserPage = openBrowserPage;
 export {
   WebPlugin as W
 };

ghcjs/currency-converter/static/main.js

@@ -0,0 +1,26 @@
+import { W as WebPlugin } from "./main.js";
+class BrowserWeb extends WebPlugin {
+  constructor() {
+    super();
+    this._lastWindow = null;
+  }
+  async open(options) {
+    this._lastWindow = window.open(options.url, options.windowName || "_blank");
+  }
+  async close() {
+    return new Promise((resolve, reject) => {
+      if (this._lastWindow != null) {
+        this._lastWindow.close();
+        this._lastWindow = null;
+        resolve();
+      } else {
+        reject("No active window to close!");
+      }
+    });
+  }
+}
+const Browser = new BrowserWeb();
+export {
+  Browser,
+  BrowserWeb
+};