saving and sharing xlsx files with embedded images wip

Author: functora

ghcjs/delivery-calculator/package-lock.json

@@ -12,6 +12,7 @@
     "@capacitor/browser": "^6.0.1",
     "@capacitor/clipboard": "^6.0.1",
     "@capacitor/core": "^6.0.0",
+    "@capacitor/filesystem": "^6.0.1",
     "@capacitor/preferences": "^6.0.1",
     "@capacitor/share": "^6.0.1",
     "@capacitor/toast": "^6.0.2",

ghcjs/delivery-calculator/package.json

@@ -4,6 +4,7 @@ module App.Xlsx
 where
 
 import Codec.Xlsx
+import qualified Data.ByteString.Base64.Lazy as B64
 import qualified Data.ByteString.Lazy as BL
 import Functora.Miso.Prelude
 import Lens.Micro
@@ -18,3 +19,32 @@ newXlsx =
       def
         & cellValueAt (1, 2) ?~ CellDouble 42.0
         & cellValueAt (3, 2) ?~ CellText "foo"
+        & #wsDrawing ?~ drawing
+
+drawing :: Drawing
+drawing = Drawing [anchor1]
+  where
+    obj =
+      picture
+        (DrawingElementId 0)
+        FileInfo
+          { fiFilename = "img.jpg",
+            fiContentType = "image/jpg",
+            fiContents = img
+          }
+    anchor1 =
+      Anchor
+        { anchAnchoring =
+            TwoCellAnchor
+              { tcaFrom = unqMarker (1, 0) (1, 0),
+                tcaTo = unqMarker (5, 0) (13, 0),
+                tcaEditAs = EditAsTwoCell
+              },
+          anchObject = obj,
+          anchClientData = def
+        }
+
+img :: BL.ByteString
+img =
+  B64.decodeLenient
+    "/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAP//////////////////////////////////////////////////////////////////////////////////////2wBDAf//////////////////////////////////////////////////////////////////////////////////////wAARCADqATkDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAAAAECA//EACQQAQEBAAIBBAMBAQEBAAAAAAABESExQQISUXFhgZGxocHw/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAH/xAAWEQEBAQAAAAAAAAAAAAAAAAAAEQH/2gAMAwEAAhEDEQA/AMriLyCKgg1gQwCgs4FTMOdutepjQak+FzMSVqgxZdRdPPIIvH5WzzGdBriphtTeAXg2ZjKA1pqKDUGZca3foBek8gFv8Ie3fKdA1qb8s7hoL6eLVt51FsAnql3Ut1M7AWbflLMDkEMX/F6/YjK/pADFQAUNA6alYagKk72m/j9p4Bq2fDDSYKLNXPNLoHE/NT6RYC31cJxZ3yWVM+aBYi/S2ZgiAsnYJx5D21vPmqrm3PTfpQQwyAC8JZvSKDni41ZrMuUVVl+Uz9w9v/1QWrZsZ5nFPHYH+JZyureQSF5M+fJ0CAfwRAVRBQA1DAWVUayoJUWoDpsxntPsueBV4+VxhdyAtv8AjOLGpIDMLbeGvbF4iozJfr/WukAVABAXAQXEAAASzVAZdO2WNordm+emFl7XcQSNZiFtv0C9w90nhJf4mA1u+GcJFwIyAqL/AOovwgGNfSRqdIrNa29M0gKCAojU9PAMjWXpckEJFNFEAAXEUBABYz6rZ0ureQc9vyt9XxDF2QAXtABcQAs0AZywkvluJbyipifas52DcyxjlZweAO0xri/hc+wZOEKIu6nSyeToVZyWXwvCg53gW81QQ7aTNAn5dGZJPs1UXURQAUEMCXQLZE93PRZ5hPTgNMrbIzKCm52LZwCs+2M8w2g3sjPuZAXb4IsMAUACzVUGM4/K+md6vEXUUyM5PDR0IxYe6ramih0VNBrS4xoqN8Q1BFQk3yqyAsioioAAKgDSJL4/jQIn5igLrPqtOuf6oOaxbMoAltUAhhIoJiiggrPu+AaOIxtAX3JbaAIaLwi4t9X4T3fg2AFtqcrUUarP20zUDAmqoE0WRBZPNVUVEAAAAVAC8kvih2DSKxOdBqs7Z0l0gI0mKAC4AuHE7ZtBriM+744QAAAAABAFsveIttBICyaikvy1+r/Cen5rWQHIBQa4rIDRqSl5qDWqziqgAAAATA7BpGdqXb2C2+J/UgAtRQBSQtkBWb6vhLbQAAAAAEBRAAAAAUbm+GZNdPxAP+ql2Tjwx7/wIgZ8iKvBk+CJoCXii9gaqZ/qqihAAAEVABGkBFUwBftNkZ3QW34QAAABFAQAVAAAAAARVkl8gs/43sk1jL45LvHArepk+E9XTG35oLqsmIKmLAEygKg0y1AFQBUXwgAAAoBC34S3UAAABAVAAAAAABAUQAVABdRQa1PcYyit2z58M8C4ouM2NXpOEGeWtNZUatiAIoAKIoCoAoG4C9MW6dgIoAIAAAAAAACKWAgL0CAAAALiANCKioNLgM1CrLihmTafkt1EF3SZ5ZVUW4mnIKvAi5fhEURVDWVQBRAAAAAAAAQFRVyAyulgAqCKlF8IqLsEgC9mGoC+IusqCrv5ZEUVOk1RuJfwSLOOkGFi4XPCoYYrNiKauosBGi9ICstM1UAAAAAAFQ0VcTBAXUGgIqGoKhKAzRRUQUAwxoSrGRpkQA/qiosOL9oJptMRRVZa0VUqSiChE6BqMgCwqKqIogAIAqKCKgKoogg0lBFuIKgAAAKNRlf2gqsftsEtZWoAAqAACKoMqAAeSoqp39kL2AqLOlE8rEBFQARYALhigrNC9gGmooLp4TweEQFFBFAECgIoAu0ifIAqAAA//9k="

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

@@ -9,6 +9,13 @@ platforms:
         target: manifest/application/activity
         attrs:
           android:label: "@string/app_name"
+      - file: AndroidManifest.xml
+        target: manifest
+        merge: |
+          <manifest>
+            <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+          </manifest>
     gradle:
       - file: variables.gradle
         target:

ghcjs/delivery-calculator/trapeze.yaml

@@ -1,4 +1,5 @@
 import { defineCustomElements } from "@ionic/pwa-elements/loader";
+import { Filesystem, Directory } from "@capacitor/filesystem";
 import { WebviewPrint } from "capacitor-webview-print";
 import { Preferences } from "@capacitor/preferences";
 import { Clipboard } from "@capacitor/clipboard";
@@ -65,16 +66,34 @@ export async function selectBarcode() {
   return ScanResult;
 }
 
-export async function saveFile(name, mime, bytes) {
-  return saveAs(new Blob([Uint8Array.from(bytes)], { type: mime }), name);
+export async function saveFile(name, mime, bs) {
+  const u8a = Uint8Array.from(bs);
+  if (Capacitor.isNativePlatform()) {
+    const b64 = btoa(String.fromCharCode.apply(null, u8a));
+    const { uri } = await Filesystem.writeFile({
+      path: name,
+      data: b64,
+      directory: Directory.Documents,
+    });
+    return uri;
+  } else {
+    const blob = new Blob([u8a, { type: mime }]);
+    await saveAs(blob, name);
+    return null;
+  }
 }
 
-export function newUint8Array(buf, off, len) {
-  return new Uint8Array(buf, off, len);
+export async function shareFiles(files) {
+  if (Capacitor.isNativePlatform()) {
+    const { value } = await Share.share({ files: files });
+    return value;
+  } else {
+    return null;
+  }
 }
 
-export function emptyUint8Array() {
-  return new Uint8Array(0);
+export function isNativePlatform() {
+  return Capacitor.isNativePlatform();
 }
 
 defineCustomElements(window);

ghcjs/miso-widgets/js/main.js

@@ -12,6 +12,7 @@
     "@capacitor/browser": "^6.0.1",
     "@capacitor/clipboard": "^6.0.1",
     "@capacitor/core": "^6.0.0",
+    "@capacitor/filesystem": "^6.0.1",
     "@capacitor/ios": "^6.0.0",
     "@capacitor/preferences": "^6.0.1",
     "@capacitor/share": "^6.0.1",

ghcjs/miso-widgets/js/main.min.js

@@ -119,7 +119,7 @@ insertStorage key raw = do
 
 selectStorage :: (FromJSON a) => Unicode -> (Maybe a -> JSM ()) -> JSM ()
 selectStorage key after =
-  genericPromise "selectStorage" (Just key) $ \case
+  genericPromise @[Unicode] @Unicode "selectStorage" [key] $ \case
     Nothing ->
       after Nothing
     Just str ->
@@ -134,31 +134,36 @@ selectStorage key after =
 
 selectBarcode :: (Maybe Unicode -> JSM ()) -> JSM ()
 selectBarcode after =
-  genericPromise "selectBarcode" Nothing $ after . fmap strip
+  genericPromise @[Unicode] @Unicode "selectBarcode" mempty
+    $ after
+    . fmap strip
 
 selectClipboard :: (Maybe Unicode -> JSM ()) -> JSM ()
 selectClipboard after =
-  genericPromise "selectClipboard" Nothing $ after . fmap strip
+  genericPromise @[Unicode] @Unicode "selectClipboard" mempty
+    $ after
+    . fmap strip
 
 genericPromise ::
+  forall args res.
+  ( JS.MakeArgs args,
+    JS.FromJSVal res
+  ) =>
   Unicode ->
-  Maybe Unicode ->
-  (Maybe Unicode -> JSM ()) ->
+  args ->
+  (Maybe res -> JSM ()) ->
   JSM ()
-genericPromise fun marg after = do
+genericPromise fun argv after = do
   success <- JS.function $ \_ _ ->
     handleAny (\e -> consoleLog e >> after Nothing) . \case
       [val] -> do
         valExist <- ghcjsPure $ JS.isTruthy val
         if not valExist
           then after Nothing
           else do
-            raw <-
-              JS.fromJSVal @Unicode val
-            res <-
-              maybe (throwString @String "Failure, bad type!") pure raw
-            after
-              $ Just res
+            mres <- JS.fromJSVal @res val
+            res <- maybe (throwString @String "Failure, bad result!") pure mres
+            after $ Just res
       _ ->
         throwString @String "Failure, bad argv!"
   failure <-
@@ -167,13 +172,8 @@ genericPromise fun marg after = do
       consoleLog @Unicode $ "Failure, " <> inspect msg <> "!"
       after Nothing
   pkg <- getPkg
-  prom <-
-    case marg of
-      Nothing -> pkg ^. JS.js0 fun
-      Just arg -> pkg ^. JS.js1 fun arg
-  void
-    $ prom
-    ^. JS.js2 @Unicode "then" success failure
+  prom <- pkg ^. JS.jsf fun argv
+  void $ prom ^. JS.js2 @Unicode "then" success failure
 
 printCurrentPage :: Unicode -> JSM ()
 printCurrentPage name = do
@@ -182,11 +182,12 @@ printCurrentPage name = do
 
 saveFile :: forall a. (From a [Word8]) => Unicode -> Unicode -> a -> JSM ()
 saveFile name mime bs = do
-  pkg <- getPkg
-  void
-    $ pkg
-    ^. JS.js3
-      ("saveFile" :: Unicode)
-      name
-      mime
-      (from @a @[Word8] bs)
+  argv <-
+    sequence
+      [ JS.toJSVal name,
+        JS.toJSVal mime,
+        JS.toJSVal $ from @a @[Word8] bs
+      ]
+  genericPromise @[JS.JSVal] @Unicode "saveFile" argv $ \case
+    Nothing -> pure ()
+    Just str -> popupText str

ghcjs/miso-widgets/package-lock.json

@@ -448,6 +448,7 @@ data FileData = FileData
     fdRelType :: Text,
     fdContents :: L.ByteString
   }
+  deriving (Eq, Ord, Show, Generic)
 
 type ReferencedFileData = (RefId, FileData)