Merge pull request #765 from RADAR-base/release-0.7.1.1-alpha

Release 0.7.1.1 alpha
RADAR-base · Oct 4, 2019 · af04414 · af04414
2 parents f59cf82 + f8e21ff
commit af04414
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="536" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" version="0.7.1-alpha" xmlns:android="http://schemas.android.com/apk/res/android">
+<widget android-versionCode="537" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" version="0.7.1.1-alpha" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>RADAR Questionnaire</name>
     <description>An application that collects active data for research.</description>
     <author email="radar-base@kcl.ac.uk" href="http://radar-base.org/">RADAR-Base</author>
@@ -48,6 +48,8 @@
         <resource-file src="resources/android/notification/drawable-xxxhdpi-icon.png" target="app/src/main/res/drawable-xxxhdpi/ic_silhouette.png" />
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_silhouette" />
+            <activity android:clearTaskOnLaunch="true" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false" android:name="com.google.zxing.client.android.CaptureActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:windowSoftInputMode="stateAlwaysHidden" />
+            <activity android:label="Share" android:name="com.google.zxing.client.android.encode.EncodeActivity" />
         </config-file>
     </platform>
     <platform name="ios">
@@ -123,10 +125,6 @@
     <plugin name="cordova-plugin-vibration" spec="^3.1.1" />
     <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
     <plugin name="cordova-plugin-camera" spec="^4.0.3" />
-    <plugin name="phonegap-plugin-barcodescanner" spec="^8.0.1">
-        <variable name="CAMERA_USAGE_DESCRIPTION" value="27.+" />
-        <variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
-    </plugin>
     <plugin name="cordova-plugin-local-notification" spec="^0.9.0-beta.3" />
     <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
     <plugin name="phonegap-plugin-mobile-accessibility" spec="^1.0.5" />
@@ -135,6 +133,7 @@
     <plugin name="cordova-plugin-insomnia" spec="^4.3.0" />
     <plugin name="cordova-plugin-firebase-with-upstream-messaging" spec="2.1.1" />
     <plugin name="phonegap-plugin-barcodescanner" spec="^8.1.0">
+        <variable name="CAMERA_USAGE_DESCRIPTION" value="27.+" />
         <variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
     </plugin>
     <plugin name="cordova-plugin-androidx" spec="^1.0.2" />

diff --git a/package.json b/package.json
@@ -92,6 +92,7 @@
         "cordova-plugin-insomnia": "^4.3.0",
         "cordova-plugin-ionic-keyboard": "^2.2.0",
         "cordova-plugin-local-notification": "^0.9.0-beta.3",
+        "cordova-plugin-network-information": "git+https://github.com/apache/cordova-plugin-network-information.git",
         "cordova-plugin-splashscreen": "^5.0.3",
         "cordova-plugin-statusbar": "^2.4.3",
         "cordova-plugin-vibration": "^3.1.1",
@@ -185,7 +186,9 @@
             "cordova-plugin-android-permissions": {},
             "cordova-plugin-vibration": {},
             "cordova-plugin-globalization": {},
-            "cordova-plugin-camera": {},
+            "cordova-plugin-camera": {
+                "ANDROID_SUPPORT_V4_VERSION": "27.+"
+            },
             "phonegap-plugin-barcodescanner": {
                 "CAMERA_USAGE_DESCRIPTION": "27.+",
                 "ANDROID_SUPPORT_V4_VERSION": "27.+"

diff --git a/src/app/pages/questions/containers/questions-page.component.spec.ts b/src/app/pages/questions/containers/questions-page.component.spec.ts
@@ -40,4 +40,8 @@ export class QuestionsServiceMock {
   getQuestionnairePayload() {
     return Promise.resolve({})
   }
+
+  getTime() {
+    return 0
+  }
 }
diff --git a/src/app/pages/questions/containers/questions-page.component.ts b/src/app/pages/questions/containers/questions-page.component.ts
@@ -19,7 +19,7 @@ export class QuestionsPageComponent implements OnInit {
   @ViewChild(Slides)
   slides: Slides
 
-  startTime = Date.now()
+  startTime: number
   currentQuestionId = 0
   nextQuestionId: number
   questionOrder = [0]
@@ -54,6 +54,7 @@ export class QuestionsPageComponent implements OnInit {
 
   ngOnInit() {
     this.task = this.navParams.data
+    this.startTime = this.questionsService.getTime()
     const data = this.questionsService.getQuestionnairePayload(this.task)
     return data.then(res => {
       this.questionTitle = res.title

diff --git a/yarn.lock b/yarn.lock
@@ -3117,6 +3117,10 @@ cordova-plugin-local-notification@^0.9.0-beta.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-beta.3.tgz#f63d49b90ea9cdf1a5de53e7eb478a09bb236f93"
   integrity sha512-L3Z1velxrkm9nHFcvLnMgBPZjKFt6hwM6hn1lA+JFwIR26Yw6UF72z+/lRMBclAcOxBIDYCqeaLgvezmajjuEg==
 
+"cordova-plugin-network-information@git+https://github.com/apache/cordova-plugin-network-information.git":
+  version "2.0.3-dev"
+  resolved "git+https://github.com/apache/cordova-plugin-network-information.git#97a4967a2e0f0324db4a6d789477ec5f761f2770"
+
 cordova-plugin-splashscreen@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.3.tgz#02820472771c3e10b43ceedd54b0a1e4674efa6d"