@saltcorn/mobile-app 1.1.0-beta.20 → 1.1.0-beta.22

package/build_scripts/modify_gradle_cfg.js

@@ -4,22 +4,35 @@ const { readFileSync, writeFileSync } = require("fs");
 console.log("Writing gradle config");
 console.log("args", process.argv);
 
+const hasKeyStoreFile = process.argv.some((arg) =>
+  arg.includes("keyStoreFile")
+);
 const args = process.argv.slice(2);
-const keyStoreFile = args[0].split("=")[1];
-const keyStoreAlias = args[1].split("=")[1];
-const keyStorePassword = args[2].split("=")[1];
+const appVersion = args[0].split("=")[1];
+const keyStoreFile = hasKeyStoreFile ? args[1].split("=")[1] : null;
+const keyStoreAlias = hasKeyStoreFile ? args[2].split("=")[1] : null;
+const keyStorePassword = hasKeyStoreFile ? args[3].split("=")[1] : null;
 
 const gradleFile = join(__dirname, "..", "android", "app", "build.gradle");
 const gradleContent = readFileSync(gradleFile, "utf8");
-const newGradleContent = gradleContent
-  .replace(
-    /release\s*{/,
-    `release { 
+
+// generate versionCode from appVersion
+const parts = appVersion.split(".");
+const versionCode =
+  parseInt(parts[0]) * 1000000 + parseInt(parts[1]) * 1000 + parseInt(parts[2]);
+let newGradleContent = gradleContent
+  .replace(/versionName "1.0"/, `versionName "${appVersion}"`)
+  .replace(/versionCode 1/, `versionCode ${versionCode}`);
+if (hasKeyStoreFile) {
+  newGradleContent = gradleContent
+    .replace(
+      /release\s*{/,
+      `release { 
             signingConfig signingConfigs.release`
-  )
-  .replace(
-    /buildTypes\s*{/,
-    `
+    )
+    .replace(
+      /buildTypes\s*{/,
+      `
       signingConfigs {
           release {
               keyAlias '${keyStoreAlias}'
@@ -29,6 +42,7 @@ const newGradleContent = gradleContent
           }
         }
     buildTypes {`
-  );
+    );
+}
 console.log("newGradleContent", newGradleContent);
 writeFileSync(gradleFile, newGradleContent, "utf8");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.1.0-beta.20",
+  "version": "1.1.0-beta.22",
   "description": "Apache Cordova application with @saltcorn/markup",
   "main": "index.js",
   "scripts": {

package/src/helpers/common.js

@@ -3,6 +3,9 @@
 import { apiCall } from "./api";
 import { Camera, CameraResultType } from "@capacitor/camera";
 import { Geolocation } from "@capacitor/geolocation";
+import { ScreenOrientation } from "@capacitor/screen-orientation";
+
+const orientationChangeListeners = new Set();
 
 export function clearAlerts() {
   const iframe = document.getElementById("content-iframe");
@@ -173,3 +176,14 @@ export async function getGeolocation(successCb, errorCb) {
     return null;
   }
 }
+
+export function registerScreenOrientationListener(name, listener) {
+  if (!orientationChangeListeners.has(name)) {
+    orientationChangeListeners.add(name, listener);
+    ScreenOrientation.addListener("screenOrientationChange", listener);
+  } else console.warn(`Listener with name ${name} already registered.`);
+}
+
+export async function getScreenOrientation() {
+  return await ScreenOrientation.orientation();
+}

package/src/helpers/navigation.js

@@ -43,6 +43,23 @@ export function addQueryParam(key, value) {
   }
 }
 
+export function setAnchor(anchor) {
+  if (routingHistory.length === 0)
+    throw new Error("No current route to set anchor");
+  else {
+    const current = routingHistory[routingHistory.length - 1];
+    current.anchor = anchor;
+  }
+}
+
+export function getAnchor() {
+  if (routingHistory.length === 0) return undefined;
+  else {
+    const current = routingHistory[routingHistory.length - 1];
+    return current.anchor;
+  }
+}
+
 export function addRoute(routeEntry) {
   routingHistory.push(routeEntry);
 }

package/src/routing/routes/error.js

@@ -2,5 +2,5 @@ import { MobileRequest } from "../mocks/request";
 import { wrapContents } from "../utils";
 
 export const getErrorView = async (context) => {
-  return wrapContents("", "Error", context, new MobileRequest());
+  return await wrapContents("", "Error", context, new MobileRequest());
 };

package/src/routing/routes/page.js

@@ -108,6 +108,6 @@ export const getPage = async (context) => {
     return { content, title: "title", replaceIframe: true, isFile: true };
   } else {
     const title = "title"; // TODO
-    return wrapContents(contents, title, context, req);
+    return await wrapContents(contents, title, context, req);
   }
 };

package/src/routing/routes/sync.js

@@ -4,7 +4,7 @@ import { MobileRequest } from "../mocks/request";
 import { wrapContents } from "../utils";
 
 // get/sync/sync_settings
-export const getSyncSettingsView = (context) => {
+export const getSyncSettingsView = async (context) => {
   const state = saltcorn.data.state.getState();
   const { isOfflineMode } = state.mobileConfig;
   const content = saltcorn.markup.div(
@@ -98,11 +98,16 @@ export const getSyncSettingsView = (context) => {
     ),
     saltcorn.markup.hr()
   );
-  return wrapContents(content, "Sync Settings", context, new MobileRequest());
+  return await wrapContents(
+    content,
+    "Sync Settings",
+    context,
+    new MobileRequest()
+  );
 };
 
 // get/sync/ask_upload_not_ended
-export const getAskUploadNotEnded = (context) => {
+export const getAskUploadNotEnded = async (context) => {
   const content = saltcorn.markup.div(
     saltcorn.markup.div(
       { class: "mb-3 h6" },
@@ -126,11 +131,11 @@ export const getAskUploadNotEnded = (context) => {
       "Upload anyway"
     )
   );
-  return wrapContents(content, "Warning", context, new MobileRequest());
+  return await wrapContents(content, "Warning", context, new MobileRequest());
 };
 
 // get/sync/ask_delete_offline_data
-export const getAskDeleteOfflineData = (context) => {
+export const getAskDeleteOfflineData = async (context) => {
   const content = saltcorn.markup.div(
     saltcorn.markup.div(
       { class: "mb-3 h6" },
@@ -154,5 +159,5 @@ export const getAskDeleteOfflineData = (context) => {
       "Delete"
     )
   );
-  return wrapContents(content, "Warning", context, new MobileRequest());
+  return await wrapContents(content, "Warning", context, new MobileRequest());
 };

package/src/routing/routes/view.js

@@ -53,7 +53,7 @@ export const postView = async (context) => {
   if (mobileCfg.isOfflineMode) await setHasOfflineData(true);
   const wrapped = res.getWrapHtml();
   if (wrapped) {
-    return wrapContents(
+    return await wrapContents(
       wrapped,
       res.getWrapViewName() || "viewname",
       context,
@@ -100,7 +100,7 @@ export const postViewRoute = async (context) => {
   if (isOfflineMode) await setHasOfflineData(true);
   const wrapped = res.getWrapHtml();
   if (wrapped)
-    return wrapContents(
+    return await wrapContents(
       wrapped,
       res.getWrapViewName() || "viewname",
       context,
@@ -156,7 +156,7 @@ export const getView = async (context) => {
   }
   const wrapped = res.getWrapHtml();
   if (wrapped)
-    return wrapContents(
+    return await wrapContents(
       wrapped,
       res.getWrapViewName() || "viewname",
       context,
@@ -181,6 +181,6 @@ export const getView = async (context) => {
           )
         : contents0;
 
-    return wrapContents(contents, viewname, context, req);
+    return await wrapContents(contents, viewname, context, req);
   }
 };

package/src/routing/utils.js

@@ -1,6 +1,7 @@
 /*global saltcorn */
 
 import { getOfflineMsg } from "../helpers/offline_mode";
+import { getScreenOrientation } from "../helpers/common";
 
 export const getHeaders = () => {
   const state = saltcorn.data.state.getState();
@@ -131,7 +132,8 @@ const prepareAlerts = (context, req) => {
   return [...(context.alerts || []), ...req.flashMessages()];
 };
 
-export const wrapContents = (contents, title, context, req) => {
+export const wrapContents = async (contents, title, context, req) => {
+  const orientation = await getScreenOrientation();
   const state = saltcorn.data.state.getState();
   const body = {
     above: [
@@ -159,6 +161,7 @@ export const wrapContents = (contents, title, context, req) => {
         },
         bodyClass: "",
         currentUrl: "",
+        orientation: orientation?.type,
       })
     : layout().renderBody({
         title: title,

package/www/js/iframe_view_utils.js

@@ -28,7 +28,10 @@ async function execLink(url, linkSrc) {
     try {
       if (document.getElementById("scspinner")) return;
       showLoadSpinner();
-      if (url.startsWith("javascript:")) eval(url.substring(11));
+      if (url.startsWith("#")) {
+        const anchor = url.substring(1);
+        parent.saltcorn.mobileApp.navigation.setAnchor(anchor);
+      } else if (url.startsWith("javascript:")) eval(url.substring(11));
       else {
         const { path, query } =
           parent.saltcorn.mobileApp.navigation.splitPathQuery(url);
@@ -40,6 +43,8 @@ async function execLink(url, linkSrc) {
           query
         );
       }
+    } catch (error) {
+      parent.saltcorn.mobileApp.common.errorAlert(error);
     } finally {
       removeLoadSpinner();
     }