@saltcorn/mobile-app 1.6.0-alpha.0 → 1.6.0-alpha.10

package/add_entitlements.rb

@@ -0,0 +1,16 @@
+require 'xcodeproj'
+
+project_path = 'ios/App/App.xcodeproj'
+target_name  = 'App'
+entitlements_relative_path = 'App/App.entitlements'
+
+project = Xcodeproj::Project.open(project_path)
+target = project.targets.find { |t| t.name == target_name }
+abort("Target '#{target_name}' not found") unless target
+
+target.build_configurations.each do |config|
+  config.build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements_relative_path
+end
+
+project.save
+puts "Entitlements configured successfully for target '#{target_name}'"

package/optional_sources/notifications.js

@@ -12,11 +12,12 @@ import { Device } from "@capacitor/device";
 async function notifyTokenApi(config, isSubscribe) {
   console.log("notifyTokenApi subscribe:", isSubscribe);
   const { token, deviceId } = config.pushConfiguration;
+  const platform = Capacitor.getPlatform();
   try {
     const response = await apiCall({
       method: "POST",
       path: `/notifications/mobile-${isSubscribe ? "subscribe" : "remove-subscription"}`,
-      body: { token, deviceId },
+      body: { token, deviceId, platform },
     });
     const data = response.data;
     if (data.success === "ok")
@@ -45,11 +46,12 @@ async function notifyTokenApi(config, isSubscribe) {
 async function syncTokenApi(config, isSubscribe) {
   console.log("syncTokenApi subscribe:", isSubscribe);
   const { token, deviceId } = config.pushConfiguration;
+  const platform = Capacitor.getPlatform();
   try {
     const response = await apiCall({
       method: "POST",
       path: `/sync/push_${isSubscribe ? "subscribe" : "unsubscribe"}`,
-      body: { token, deviceId, synchedTables: config.synchedTables },
+      body: { token, deviceId, synchedTables: config.synchedTables, platform },
     });
     const data = response.data;
     if (data.success === "ok")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.6.0-alpha.0",
+  "version": "1.6.0-alpha.10",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,11 @@
     "i18next-sprintf-postprocessor": "0.2.2",
     "crypto-browserify": "3.12.1",
     "vm-browserify": "1.1.2",
-    "stream-browserify": "3.0.0"
+    "string_decoder": "1.3.0",
+    "buffer": "6.0.3",
+    "events": "3.3.0",
+    "stream-browserify": "3.0.0",
+    "jeep-sqlite": "^2.8.0"
   },
   "devDependencies": {
     "xml2js": "0.6.2",
@@ -30,6 +34,10 @@
     "@babel/preset-env": "^7.26.7",
     "babel-loader": "^9.2.1",
     "webpack": "5.97.1",
-    "webpack-cli": "6.0.1"
+    "webpack-cli": "6.0.1",
+    "typescript": "5.9.2",
+    "kleur": "4.1.5",
+    "@ionic/cli-framework-output": "2.2.8",
+    "@ionic/utils-terminal": "2.3.5"
   }
 }

package/src/helpers/navigation.js

@@ -1,4 +1,4 @@
-/*global saltcorn*/
+/*global saltcorn, Capacitor*/
 import i18next from "i18next";
 
 import { router } from "../routing/index";
@@ -80,7 +80,11 @@ export async function goBack(steps = 1, exitOnFirstPage = false) {
     routingHistory.length === 0 ||
     (exitOnFirstPage && routingHistory.length === 1)
   ) {
-    navigator.app.exitApp();
+    if (Capacitor.getPlatform() === "android") {
+      navigator.app.exitApp();
+    } else if (Capacitor.getPlatform() === "ios") {
+      console.log("iOS app exit not supported");
+    }
   } else if (routingHistory.length <= steps) {
     try {
       if (iframe?.contentWindow?.showLoadSpinner)
@@ -262,9 +266,27 @@ export async function gotoEntryView() {
   }
 }
 
+const iosSwipeBackHandler = () => {
+  const iframe = document.getElementById("content-iframe");
+  let touchStartX = 0;
+  const doc = iframe.contentDocument || iframe.contentWindow.document;
+  doc.addEventListener("pointerdown", (e) => {
+    touchStartX = e.clientX;
+  });
+
+  doc.addEventListener("pointerup", (e) => {
+    const deltaX = e.clientX - touchStartX;
+    if (touchStartX < 20 && deltaX > 100) {
+      saltcorn.mobileApp.navigation.goBack(1, true);
+    }
+  });
+};
+
 export async function replaceIframe(content, isFile = false) {
   const iframe = document.getElementById("content-iframe");
   iframe.srcdoc = content;
+  if (Capacitor.getPlatform() === "ios")
+    iframe.addEventListener("load", iosSwipeBackHandler);
   if (isFile) {
     iframe.setAttribute("is-html-file", true);
     await new Promise((resolve, reject) => {

package/src/init.js

@@ -211,14 +211,10 @@ const showErrorPage = async (error) => {
 const onResume = async () => {
   if (typeof saltcorn === "undefined") return;
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
-  if (mobileConfig?.allowOfflineMode) {
+  if (mobileConfig?.allowOfflineMode && mobileConfig.jwt) {
     const netStatus = await Network.getStatus();
     mobileConfig.networkState = netStatus.connectionType;
-    if (
-      mobileConfig.networkState === "none" &&
-      !mobileConfig.isOfflineMode &&
-      mobileConfig.jwt
-    ) {
+    if (mobileConfig.networkState === "none" && !mobileConfig.isOfflineMode) {
       try {
         await startOfflineMode();
         clearHistory();
@@ -226,6 +222,15 @@ const onResume = async () => {
       } catch (error) {
         await showErrorPage(error);
       }
+    } else if (
+      mobileConfig.networkState !== "none" &&
+      mobileConfig.syncOnAppResume
+    ) {
+      try {
+        await sync(false, false, []);
+      } catch (error) {
+        await showErrorPage(error);
+      }
     }
   }
 };
@@ -362,17 +367,19 @@ const getEntryPoint = (roleId, state, mobileConfig) => {
 // device is ready
 export async function init(mobileConfig) {
   try {
-    if (Capacitor.getPlatform() === "web") {
+    const platform = Capacitor.getPlatform();
+    if (platform === "web") {
       defineCustomElements(window);
       await customElements.whenDefined("jeep-sqlite");
       const jeepSqlite = document.createElement("jeep-sqlite");
       document.body.appendChild(jeepSqlite);
       await jeepSqlite.componentOnReady();
+    } else if (platform === "android") {
+      App.addListener("backButton", async ({ canGoBack }) => {
+        await saltcorn.mobileApp.navigation.goBack(1, true);
+      });
     }
-
-    App.addListener("backButton", async ({ canGoBack }) => {
-      await saltcorn.mobileApp.navigation.goBack(1, true);
-    });
+    // see navigation.js for ios
 
     App.addListener("appUrlOpen", async (event) => {
       try {

package/src/routing/utils.js

@@ -9,6 +9,7 @@ export const getHeaders = () => {
   const versionTag = config.version_tag;
   const stdHeaders = [
     { css: `static_assets/${versionTag}/saltcorn.css` },
+    { css: `static_assets/${versionTag}/saltcorn-mobile.css` },
     { script: `static_assets/${versionTag}/saltcorn-common.js` },
     { script: `static_assets/${versionTag}/dayjs.min.js` },
     { script: `static_assets/${versionTag}/socket.io.min.js` },

package/webpack.config.js

@@ -42,7 +42,9 @@ module.exports = {
       "crypto": require.resolve("crypto-browserify"),
       vm: require.resolve("vm-browserify"),
       stream: require.resolve("stream-browserify"),
-
+      string_decoder: require.resolve("string_decoder/"),
+      buffer: require.resolve("buffer/"),
+      events: require.resolve("events/"),
     }
   },
   target: "web", // Use web target for browser compatibility

package/www/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1"
+      content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover"
     />
     <script src="data/config.js"></script>
     <!-- only set in test mode -->