Merge pull request #492 from RADAR-base/staging-app

Release 0.6.2-alpha

.travis.yml

@@ -14,8 +14,8 @@ android:
     - tools
     - platform-tools
     - tools
-    - build-tools-27.0.2
-    - android-27
+    - build-tools-28.0.3
+    - android-28
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
@@ -69,7 +69,7 @@ script:
     yarn install;
     ionic cordova build --release android;
     jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $storepass -keystore radar-armt-release-key.keystore $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk alias_name;
-    $ANDROID_HOME/build-tools/27.0.2/zipalign -v 4 $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/radar-armt-app-$APP_VERSION.apk;
+    $ANDROID_HOME/build-tools/28.0.3/zipalign -v 4 $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/radar-armt-app-$APP_VERSION.apk;
     fastlane supply --apk $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/radar-armt-app-$APP_VERSION.apk --track alpha --json_key service-api.json --package_name $PACKAGE_NAME
     ; fi
 #

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="526" id="org.phidatalab.radar_armt" version="0.6.1-alpha"
+<widget android-versionCode="527" id="org.phidatalab.radar_armt" version="0.6.2-alpha"
   xmlns="http://www.w3.org/ns/widgets"
   xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>RADAR Questionnaire</name>
@@ -98,6 +98,8 @@
   <plugin name="phonegap-plugin-barcodescanner" spec="^8.0.1">
     <variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
   </plugin>
-  <plugin name="cordova-plugin-background-mode" spec="^0.7.2" />
-  <engine name="android" spec="^7.1.4" />
+  <plugin name="cordova-plugin-androidx" spec="^1.0.2" />
+  <plugin name="cordova-plugin-androidx-adapter" spec="^1.0.2" />
+  <plugin name="cordova-plugin-background-mode-fixes" spec="^0.7.4" />
+  <engine name="android" spec="^8.0.0" />
 </widget>

package.json

@@ -42,34 +42,36 @@
     "@angular/forms": "^7.2.13",
     "@angular/router": "^7.2.13",
     "@auth0/angular-jwt": "^2.1.0",
-    "@ionic-native/android-permissions": "^5.7.0",
-    "@ionic-native/app-version": "^5.7.0",
-    "@ionic-native/background-mode": "^5.7.0",
-    "@ionic-native/barcode-scanner": "^5.7.0",
-    "@ionic-native/core": "^5.7.0",
-    "@ionic-native/device": "^5.7.0",
-    "@ionic-native/dialogs": "^5.7.0",
-    "@ionic-native/file": "^5.7.0",
-    "@ionic-native/firebase": "^5.7.0",
-    "@ionic-native/globalization": "^5.7.0",
-    "@ionic-native/insomnia": "^5.7.0",
-    "@ionic-native/local-notifications": "^5.7.0",
-    "@ionic-native/mobile-accessibility": "5.7.0",
-    "@ionic-native/splash-screen": "^5.7.0",
-    "@ionic-native/status-bar": "^5.7.0",
-    "@ionic-native/vibration": "^5.7.0",
+    "@ionic-native/android-permissions": "^5.8.0",
+    "@ionic-native/app-version": "^5.8.0",
+    "@ionic-native/background-mode": "^5.8.0",
+    "@ionic-native/barcode-scanner": "^5.8.0",
+    "@ionic-native/core": "^5.8.0",
+    "@ionic-native/device": "^5.8.0",
+    "@ionic-native/dialogs": "^5.8.0",
+    "@ionic-native/file": "^5.8.0",
+    "@ionic-native/firebase": "^5.8.0",
+    "@ionic-native/globalization": "^5.8.0",
+    "@ionic-native/insomnia": "^5.8.0",
+    "@ionic-native/local-notifications": "^5.8.0",
+    "@ionic-native/mobile-accessibility": "5.8.0",
+    "@ionic-native/splash-screen": "^5.8.0",
+    "@ionic-native/status-bar": "^5.8.0",
+    "@ionic-native/vibration": "^5.8.0",
     "@ionic/storage": "^2.2.0",
     "angular-svg-round-progressbar": "^2.0.0",
     "autoprefixer": "^9.6.0",
     "avsc": "^5.4.10",
     "base64-js": "^1.2.1",
-    "cordova-android": "^7.1.4",
+    "cordova-android": "^8.0.0",
     "cordova-android-support-gradle-release": "^3.0.0",
     "cordova-lib": "^9.0.1",
     "cordova-media-with-compression": "^2.1.2",
     "cordova-plugin-android-permissions": "^1.0.0",
+    "cordova-plugin-androidx": "^1.0.2",
+    "cordova-plugin-androidx-adapter": "^1.0.2",
     "cordova-plugin-app-version": "^0.1.9",
-    "cordova-plugin-background-mode": "^0.7.2",
+    "cordova-plugin-background-mode-fixes": "^0.7.4",
     "cordova-plugin-badge": "^0.8.8",
     "cordova-plugin-camera": "^4.0.3",
     "cordova-plugin-device": "^2.0.2",
@@ -86,7 +88,7 @@
     "cordova-plugin-whitelist": "^1.3.3",
     "cordova-sqlite-storage": "^3.2.0",
     "cordova-support-android-plugin": "^1.0.1",
-    "core-js": "^3.1.3",
+    "core-js": "^3.1.4",
     "ionic-angular": "^3.9.6",
     "ionic-plugin-keyboard": "^2.2.1",
     "ionicons": "^4.5.8",
@@ -110,7 +112,7 @@
     "@angular/platform-browser-dynamic": "^7.2.13",
     "@angular/platform-server": "^7.2.13",
     "@ionic/app-scripts": "^3.2.4",
-    "@types/node": "^12.0.5",
+    "@types/node": "^12.0.8",
     "codelyzer": "^5.1.0",
     "eslint": "^5.7.0",
     "eslint-scope": "^4.0.0",
@@ -124,19 +126,19 @@
     "postcss-cli": "^6.1.2",
     "postcss-scss": "^2.0.0",
     "postcss-sorting": "^5.0.0",
-    "prettier": "^1.17.1",
+    "prettier": "^1.18.2",
     "reflect-metadata": "^0.1.13",
     "rxjs-compat": "^6.5.2",
     "rxjs-tslint": "0.1.5",
     "stylefmt": "^6.0.3",
-    "stylelint": "^10.0.1",
+    "stylelint": "^10.1.0",
     "stylelint-config-standard": "^18.3.0",
     "tslint": "^5.17.0",
     "tslint-angular": "^3.0.2",
     "tslint-config-prettier": "^1.15.0",
     "tslint-config-standard": "^8.0.1",
     "typescript": ">=3.1.1 <3.3",
-    "webpack": "^4.33.0",
+    "webpack": "^4.34.0",
     "webpack-sources": "^1.3.0"
   },
   "cordova": {
@@ -167,7 +169,8 @@
       "cordova-media-with-compression": {},
       "cordova-plugin-file": {},
       "cordova-plugin-insomnia": {},
-      "cordova-plugin-firebase-with-upstream-messaging": {}
+      "cordova-plugin-firebase-with-upstream-messaging": {},
+      "cordova-plugin-background-mode-fixes": {}
     }
   },
   "ionic_enable_lint": false

src/app/pages/questions/components/question/audio-input/audio-input.component.ts

@@ -31,9 +31,9 @@ export class AudioInputComponent implements OnDestroy, OnInit {
   currentlyShown: boolean
 
   recordAttempts = 0
+  buttonTransitionDelay = 1000
   buttonShown = true
   buttonDisabled = false
-  buttonTransitionDelay = 1000
   resumeListener: Subscription
   pauseListener: Subscription
   audioData: string
@@ -51,9 +51,9 @@ export class AudioInputComponent implements OnDestroy, OnInit {
   }
 
   ngOnInit() {
-    this.resumeListener = this.platform.resume.subscribe(() =>
-      this.showTaskInterruptedAlert()
-    )
+    this.resumeListener = this.platform.resume.subscribe(() => {
+      if (this.currentlyShown) this.showTaskInterruptedAlert()
+    })
     // NOTE: Stop audio recording when application is on pause / backbutton is pressed
     this.pauseListener = this.platform.pause.subscribe(() =>
       this.stopAndGetRecording()

src/app/pages/questions/components/question/info-screen/info-screen.component.html

@@ -2,7 +2,7 @@
   class="info-card"
   [class.info-card-sm]="hasFieldLabel"
 >
-  <ion-content>
+  <ion-content (ionScroll)="onScroll($event)">
     <div *ngIf="isThincItReminder">
       <img
         src="assets/imgs/thincIt_app_icon.png"

src/app/pages/questions/components/question/info-screen/info-screen.component.scss

@@ -39,7 +39,7 @@ info-screen {
   }
 
   .info-content {
-    margin-bottom: 64%;
+    margin-bottom: 48%;
   }
 
   .icon-thincIt {

src/app/pages/questions/components/question/info-screen/info-screen.component.ts

@@ -47,15 +47,25 @@ export class InfoScreenComponent implements OnInit {
       })
     })
 
-    // NOTE: Save timestamp (epoch) and activate the next button
-    const epoch: number = new Date().getTime()
-    this.valueChange.emit(epoch)
-    this.showScrollButton = this.sections.length > 1
+    if (this.sections.length > 1) this.showScrollButton = true
+    else this.emitTimestamp()
   }
 
   scrollDown() {
     const dimensions = this.content.getContentDimensions()
-    const position = dimensions.scrollTop + dimensions.contentHeight / 2
+    const position = dimensions.scrollTop + dimensions.contentHeight
     this.content.scrollTo(0, position, 1000)
   }
+
+  onScroll(event) {
+    if (event.scrollTop >= event.scrollHeight - event.contentHeight) {
+      this.emitTimestamp()
+      this.showScrollButton = false
+    } else this.showScrollButton = true
+  }
+
+  emitTimestamp() {
+    // NOTE: Save timestamp (epoch) and activate the next button
+    this.valueChange.emit(new Date().getTime())
+  }
 }