Merge pull request #759 from RADAR-base/release-0.7.1-alpha

Release 0.7.1-alpha
RADAR-base · Oct 3, 2019 · f59cf82 · f59cf82
2 parents 109234e + 05aa67e
commit f59cf82
Show file tree

Hide file tree

Showing 202 changed files with 4,862 additions and 1,508 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,14 @@ android:
     - build-tools-28.0.3
     - android-28
     - extra
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - dpkg
+      - google-chrome-stable
+      - xvfb
 cache:
   yarn: true
   directories:
@@ -38,6 +46,7 @@ before_script:
 script:
   - cordova prepare
   - yarn install
+  - xvfb-run -a yarn test
   - if [[ $TRAVIS_BRANCH != $TRAVIS_TAG ]]; then fastlane android build_debug ; fi
   - if [[ $TRAVIS_BRANCH == $TRAVIS_TAG ]]; then fastlane android deploy keystore_path:$KEYSTORE_PATH keystore_password:$storepass keystore_alias:$KEYSTORE_ALIAS package_name:$PACKAGE_NAME_ANDROID track:$PLAYSTORE_TRACK json_key:$PLAYSTORE_SERVICE_KEY ; fi
 #

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at admin@radar-cns.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected] or radar-[email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,7 +64,6 @@ GEM
       xcodeproj (>= 1.8.1, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-cordova (2.2.1)
     fastlane-plugin-ionic (0.1.0)
     gh_inspector (1.1.3)
     google-api-client (0.23.9)
@@ -156,7 +155,6 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
-  fastlane-plugin-cordova
   fastlane-plugin-ionic
 
 BUNDLED WITH

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![BCH compliance](https://bettercodehub.com/edge/badge/RADAR-base/RADAR-Questionnaire?branch=master)](https://bettercodehub.com/)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/03ec17f46bf147278bc71242a769af88)](https://www.codacy.com/app/yatharthranjan89/RADAR-Questionnaire?utm_source=github.com&utm_medium=referral&utm_content=RADAR-base/RADAR-Questionnaire&utm_campaign=Badge_Grade)
 
-Hybrid mobile application to actively capture data for the RADAR-CNS Platform.
+Hybrid mobile application to actively capture data for the RADAR-Base Platform.
 
 ## Note
 
@@ -71,14 +71,15 @@ $ ionic cordova emulate android
 Certain values can be overriden using Firebase Remote Config. Specifically, the following variables are supported:
 
 | Parameter                 | Description                                                      | Default value                                                                                                    |
-|---------------------------|------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------|
+| ------------------------- | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
 | `oauth_client_id`         | Client ID to connect to the ManagementPortal with                | `aRMT`                                                                                                           |
 | `oauth_client_secret`     | Client secret to connect to the ManagementPortal with            | Value set in `secret.ts`                                                                                         |
 | `oauth_refresh_seconds`   | After how many seconds to refresh the OAuth token                | `1800` (=30 minutes)                                                                                             |
 | `protocol_base_url`       | Base URL where the protocol definitions are located.             | <https://api.github.com/repos/RADAR-base/RADAR-aRMT-protocols/contents>                                          |
 | `protocol_branch`         | Github branch where the protocol definitions should be read from | `master`                                                                                                         |
 | `protocol_path`           | Path inside a project name that should be read for a protocol    | `protocol.json`                                                                                                  |
 | `kafka_specification_url` | URL of the Kafka topic specification                             | <https://api.github.com/repos/RADAR-base/radar-schemas/contents/specifications/active/aRMT_1.4.3.yml?ref=master> |
+| `platform_instance`       | Title of RADAR Base / platform instance                          | `RADAR-CNS`                                                                                                      |
 
 ## Other Config Options
 

diff --git a/angular.json b/angular.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "/",
+  "projects": {
+    "radar-questionnaire": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "architect": {
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "browsers": "ChromeDebugging",
+            "tsConfig": "src/tsconfig.spec.json"
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "radar-questionnaire"
+}
diff --git a/config.xml b/config.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="534" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radararmt" version="0.7.0-alpha">
+<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">
     <name>RADAR Questionnaire</name>
     <description>An application that collects active data for research.</description>
-    <author email="info@radar-cns.org" href="http://radar-cns.org/">RADAR-CNS</author>
+    <author email="radar-[email protected]" href="http://radar-base.org/">RADAR-Base</author>
     <content src="index.html" />
     <access origin="*" />
     <access origin="*" subdomains="true" />
@@ -26,6 +26,7 @@
         <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
         <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
         <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+        <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" />
         <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
         <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
         <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
@@ -38,6 +39,16 @@
         <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
         <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
         <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
+        <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
+        <resource-file src="resources/android/notification/drawable-ldpi-icon.png" target="app/src/main/res/drawable-ldpi/ic_silhouette.png" />
+        <resource-file src="resources/android/notification/drawable-mdpi-icon.png" target="app/src/main/res/drawable-mdpi/ic_silhouette.png" />
+        <resource-file src="resources/android/notification/drawable-hdpi-icon.png" target="app/src/main/res/drawable-hdpi/ic_silhouette.png" />
+        <resource-file src="resources/android/notification/drawable-xhdpi-icon.png" target="app/src/main/res/drawable-xhdpi/ic_silhouette.png" />
+        <resource-file src="resources/android/notification/drawable-xxhdpi-icon.png" target="app/src/main/res/drawable-xxhdpi/ic_silhouette.png" />
+        <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" />
+        </config-file>
     </platform>
     <platform name="ios">
         <edit-config file="*-Info.plist" mode="merge" target="NSCameraUsageDescription">
@@ -61,7 +72,30 @@
         <icon height="58" src="resources/ios/icon/[email protected]" width="58" />
         <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
         <icon height="100" src="resources/ios/icon/[email protected]" width="100" />
-        <splash src="resources/ios/splash/Default@2x~universal~anyany.png" />
+        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+        <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+        <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
+        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+        <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
+        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+        <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
+        <icon height="40" src="resources/ios/icon/[email protected]" width="40" />
+        <icon height="60" src="resources/ios/icon/[email protected]" width="60" />
+        <icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
+        <icon height="58" src="resources/ios/icon/[email protected]" width="58" />
+        <icon height="87" src="resources/ios/icon/[email protected]" width="87" />
+        <icon height="48" src="resources/ios/icon/[email protected]" width="48" />
+        <icon height="55" src="resources/ios/icon/[email protected]" width="55" />
+        <icon height="88" src="resources/ios/icon/[email protected]" width="88" />
+        <icon height="172" src="resources/ios/icon/[email protected]" width="172" />
+        <icon height="196" src="resources/ios/icon/[email protected]" width="196" />
+        <icon height="120" src="resources/ios/icon/[email protected]" width="120" />
+        <icon height="167" src="resources/ios/icon/[email protected]" width="167" />
+        <icon height="87" src="resources/ios/icon/[email protected]" width="87" />
     </platform>
     <preference name="SplashScreen" value="screen" />
     <preference name="SplashScreenBackgroundColor" value="0xff6d9aa5" />
@@ -83,7 +117,7 @@
     <plugin name="cordova-plugin-splashscreen" spec="^5.0.3" />
     <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
-    <plugin name="cordova-sqlite-storage" spec="^3.2.1" />
+    <plugin name="cordova-sqlite-storage" spec="^3.3.0" />
     <plugin name="cordova-plugin-dialogs" spec="^2.0.2" />
     <plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
     <plugin name="cordova-plugin-vibration" spec="^3.1.1" />
@@ -107,6 +141,7 @@
     <plugin name="cordova-plugin-androidx-adapter" spec="^1.1.0" />
     <plugin name="cordova-plugin-background-mode-fixes" spec="^0.7.4" />
     <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.4" />
-    <engine name="android" spec="^8.0.0" />
-    <engine name="ios" spec="^5.0.0" />
+    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
+    <engine name="ios" spec="5.0.1" />
+    <engine name="android" spec="^8.1.0" />
 </widget>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -4,7 +4,6 @@ platform :android do
   lane :build_debug do
     ionic(
       platform: 'android',
-      prod: true,
       release: false
     )
   end
@@ -13,7 +12,6 @@ platform :android do
   lane :deploy do |options|
     ionic(
       platform: 'android',
-      prod: true,
       release: true,
       keystore_path: options[:keystore_path],
       keystore_password: options[:keystore_password],

diff --git a/karma.conf.js b/karma.conf.js
@@ -0,0 +1,51 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
+module.exports = function(config) {
+  config.set({
+    basePath: '../',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-browserstack-launcher'),
+      require('karma-chrome-launcher'),
+      require('karma-coverage-istanbul-reporter'),
+      require('karma-jasmine-html-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+      require('karma-scss-preprocessor'),
+      require('karma-spec-reporter')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, 'coverage'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
+    specReporter: {
+      showSpecTiming: true
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    singleRun: false,
+    browsers: ['Chrome'],
+    customLaunchers: {
+      ChromeDebugging: {
+        base: 'Chrome',
+        flags: ['--remote-debugging-port=9333']
+      },
+      ChromeNoSandbox: {
+        base: 'Chrome',
+        flags: ['--no-sandbox']
+      }
+    },
+    browserDisconnectTimeout: 20000,
+    browserDisconnectTolerance: 1,
+    browserNoActivityTimeout: 240000,
+    captureTimeout: 240000
+  })
+}