Merge pull request #1024 from e-mission/aria_and_fall_2023_rewrite

Label screen accessibility + custom labels + more profile migrations + upgrade to android 23

bin/gen_release_app_zip.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+PROJECT=$1
+VERSION=$2
+
+pushd platforms/ios/build/emulator
+zip -o ../../../../$PROJECT-build-$VERSION.app.zip -r NREL\ OpenPATH.app
+popd

bin/sign_and_align_keys.sh

@@ -10,7 +10,7 @@ fi
 
 # Sign and release the L+ version
 # Make sure the highest supported version has the biggest version code
-npx cordova build android --release -- --minSdkVersion=22
+npm run build-prod-android
 # cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.aab platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk
 jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/bundle/release/app-release.aab androidproductionkey
 cp platforms/android/app/build/outputs/bundle/release/app-release.aab $1-build-$2.aab

config.cordovabuild.xml

@@ -13,7 +13,6 @@
     <preference name="webviewbounce" value="false" />
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
-    <preference name="android-minSdkVersion" value="22" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="emSensorDataCollectionProtocolApprovalDate" value="2016-07-14" />
     <preference name="GradlePluginGoogleServicesEnabled" value="true" />
@@ -48,8 +47,6 @@
     </platform>
     <platform name="android">
         <hook src="hooks/before_build/android/android_copy_locales.js" type="before_build" />
-        <preference name="android-minSdkVersion" value="23" />
-        <preference name="android-targetSdkVersion" value="32" />
         <preference name="AndroidLaunchMode" value="singleInstance"/>
         <preference name="AndroidXEnabled" value="true" />
         <preference name="GradlePluginKotlinEnabled" value="true" />

package.cordovabuild.json

@@ -11,7 +11,10 @@
     "build": "npx webpack --config webpack.prod.js && npx cordova build",
     "build-dev": "npx webpack --config webpack.dev.js && npx cordova build",
     "build-dev-android": "npx webpack --config webpack.dev.js && npx cordova build android",
-    "build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios"
+    "build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios",
+    "build-prod-android": "npx webpack --config webpack.prod.js && npx cordova build android",
+    "build-prod-ios": "npx webpack --config webpack.prod.js && npx cordova build ios",
+    "build-prod-android-release": "npx webpack --config webpack.prod.js && npx cordova build android --release"
   },
   "devDependencies": {
     "@babel/core": "^7.21.3",
@@ -115,22 +118,22 @@
     "chart.js": "^4.3.0",
     "chartjs-adapter-luxon": "^1.3.1",
     "chartjs-plugin-annotation": "^3.0.1",
-    "cordova-android": "11.0.0",
+    "cordova-android": "12.0.0",
     "cordova-ios": "6.2.0",
     "cordova-plugin-advanced-http": "3.3.1",
     "cordova-plugin-androidx-adapter": "1.1.3",
     "cordova-plugin-app-version": "0.1.14",
     "cordova-plugin-customurlscheme": "5.0.2",
     "cordova-plugin-device": "2.1.0",
-    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.8",
+    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.9",
     "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2",
     "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6",
     "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2",
     "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.3",
     "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.6",
     "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.6",
     "cordova-plugin-email-composer": "git+https://github.com/katzer/cordova-plugin-email-composer.git#0.10.1",
-    "cordova-plugin-file": "7.0.0",
+    "cordova-plugin-file": "8.0.0",
     "cordova-plugin-inappbrowser": "5.0.0",
     "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-ionic-webview": "5.0.0",
@@ -165,7 +168,7 @@
     "react-native-safe-area-context": "^4.6.3",
     "react-native-screens": "^3.22.0",
     "react-native-vector-icons": "^9.2.0",
-    "react-native-web": "^0.18.10",
+    "react-native-web": "^0.19.7",
     "react-native-web-webview": "^1.0.2",
     "react-qr-code": "^2.0.11",
     "shelljs": "^0.8.5"

package.serve.json

@@ -87,7 +87,7 @@
     "react-native-safe-area-context": "^4.6.3",
     "react-native-screens": "^3.22.0",
     "react-native-vector-icons": "^9.2.0",
-    "react-native-web": "^0.18.10",
+    "react-native-web": "^0.19.7",
     "react-native-web-webview": "^1.0.2",
     "react-qr-code": "^2.0.11",
     "shelljs": "^0.8.5"

www/css/style.css

@@ -2,6 +2,16 @@
 /* if we don't contain them here, they will leak into the rest of the app */
 .enketo-plugin {
   @import 'enketo-core/src/sass/formhub/formhub.scss';
+  flex: 1;
+  .question.non-select {
+    display: inline-block;
+  }
+  .question input[name*="_date"],
+  .question input[name*="_time"] {
+    width: calc(40vw - 10px);
+    margin-right: 5px;
+    display: flex;
+  }
 }
 
 .enketo-plugin .form-header {
@@ -1471,16 +1481,3 @@ svg {
   width: 3ch;
   left: calc(8px + 2.5ch);
 }
-
-.enketo-plugin .question.inline-datetime > input[name*="_date"],
-.enketo-plugin .question.inline-datetime > input[name*="_time"] {
-  display: flex;
-  width: auto;
-  min-width: 65%;
-  max-width: 85%;
-}
-
-.enketo-plugin .question.inline-datetime {
-  display: inline-grid;
-  width: 50%;
-}