Merge pull request #1849 from RADAR-base/release-3.3.2-alpha

Sync release with dev
RADAR-base · Jan 8, 2025 · 6a26c24 · 6a26c24
2 parents 3373650 + 48df1a1
commit 6a26c24
Show file tree

Hide file tree

Showing 30 changed files with 2,891 additions and 27,738 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,16 +37,14 @@ jobs:
           key: ${{ runner.os }}-gradle
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: temurin
+          java-version: '17'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
-      - name: Fix Android directories
-        run: rm -R /usr/local/lib/android/sdk/build-tools/31.0.0/ && rm -R /usr/local/lib/android/sdk/build-tools/32.0.0/ && rm -R /usr/local/lib/android/sdk/build-tools/33.0.0/ && rm -R /usr/local/lib/android/sdk/build-tools/33.0.1/
-
       - name: Copy aRMT secrets
         run: 'echo "$SECRET" > src/assets/data/secret.ts'
         shell: bash
@@ -78,7 +76,7 @@ jobs:
           node-version: '16'
 
       - name: Install app dependencies
-        run: npm install --legacy-peer-deps
+        run: npm install --force
 
       - name: Run unit tests
         run: npm run test

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,16 +41,14 @@ jobs:
           key: ${{ runner.os }}-gradle
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: temurin
+          java-version: '17'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
 
-      - name: Fix Android directories
-        run: rm -R /usr/local/lib/android/sdk/build-tools/31.0.0/ && rm -R /usr/local/lib/android/sdk/build-tools/32.0.0/
-
       - name: Setup Node
         uses: actions/setup-node@v2
         with:

diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 ## RADAR-Questionnaire
 
-![Travis CI](https://travis-ci.org/RADAR-base/RADAR-Questionnaire.svg?branch=master)
-[![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)
+![Build Status](https://img.shields.io/github/actions/workflow/status/RADAR-base/radar-questionnaire/main.yml) [![Known Vulnerabilities](https://snyk.io//test/github/RADAR-base/RADAR-questionnaire/badge.svg?targetFile=package.json)](https://snyk.io//test/github/RADAR-base/RADAR-questionnaire?targetFile=package.json)
 
 A hybrid mobile application to actively capture data for the RADAR-Base Platform.
 
@@ -151,6 +149,9 @@ Certain values can be overriden using Firebase Remote Config. Specifically, the
 | `skippable_questionnaire_types` | String list of question/question input types where the next button is enabled by default, allowing the question to be skippable.                                                                          | `audio`                                                                                                          |
 | `show_task_calendar_name`       | The task calendar by default shows the task timestamp instead of the task name. This allows showing of the task name instead of the timestamp.                                                            | `false`                                                                                                          |
 | `show_task_progress_count`      | In the questionnaire page, by default, only the task progress bar is shown. This config will enable the showing of the "question number / total questions" count.                                         | `false`                                                                                                          |
+| `audio_sampling_rate`           | The sampling rate (in Hz) for audio recording. Determines the number of audio samples captured per second.                                                                                                | `16000`                                                                                                          |
+| `audio_bit_rate`                | The bit rate (in bits per second) for audio recording. Higher values result in better audio quality and larger files.                                                                                     | `16384`                                                                                                          |
+| `audio_encoder`                 | The audio encoder used for recording. Defines the codec used to encode the audio data (e.g., AAC, AMR_NB, AMR_WB, VORBIS).                                                                                | `AAC`                                                                                                            |
 
 #### Conditions
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.phidatalab.radar_armt"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 586
-        versionName "3.3.0-alpha"
+        versionCode 590
+        versionName "3.3.2-alpha"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">RADAR Questionnaire</string>
+    <string name="app_name">RADAR Active RMT</string>
     <string name="title_activity_main">RADAR Active RMT</string>
     <string name="package_name">org.phidatalab.radar_armt</string>
     <string name="custom_url_scheme">org.phidatalab.radar_armt</string>

diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -8,9 +8,6 @@ const config: CapacitorConfig = {
     androidScheme: 'https'
   },
   loggingBehavior: 'none',
-  ios: {
-    scheme: 'RADAR Questionnaire'
-  },
   plugins: {
     SplashScreen: {
       launchAutoHide: true,

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2DCC4441ECB6AE53462C7302 /* Pods_RADAR_Active_RMT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FBB3316FEBE50D0F3BCBA4C /* Pods_RADAR_Active_RMT.framework */; };
 		2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
 		4C4FF1572BEBFDF000B0D335 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C4FF1562BEBFDF000B0D335 /* GoogleService-Info.plist */; };
 		50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
@@ -15,24 +16,25 @@
 		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
-		704135CD8D02B14F5F414200 /* Pods_RADAR_Questionnaire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64300C0E7C8CE638425A12D0 /* Pods_RADAR_Questionnaire.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		0066ED161F09C0B9FCA0716A /* Pods-RADAR Active RMT.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RADAR Active RMT.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RADAR Active RMT/Pods-RADAR Active RMT.debug.xcconfig"; sourceTree = "<group>"; };
 		2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
+		3FBB3316FEBE50D0F3BCBA4C /* Pods_RADAR_Active_RMT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RADAR_Active_RMT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C4FF1562BEBFDF000B0D335 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../GoogleService-Info.plist"; sourceTree = "<group>"; };
 		4C4FF1592BEC015000B0D335 /* RADAR Questionnaire.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RADAR Questionnaire.entitlements"; sourceTree = "<group>"; };
 		50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
-		504EC3041FED79650016851F /* RADAR Questionnaire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RADAR Questionnaire.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		504EC3041FED79650016851F /* RADAR Active RMT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RADAR Active RMT.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
-		64300C0E7C8CE638425A12D0 /* Pods_RADAR_Questionnaire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RADAR_Questionnaire.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		76D0CE0D220067B194EAA22C /* Pods-RADAR Questionnaire.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RADAR Questionnaire.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RADAR Questionnaire/Pods-RADAR Questionnaire.debug.xcconfig"; sourceTree = "<group>"; };
 		84676E1D2BB11F957E52E167 /* Pods-RADAR Questionnaire.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RADAR Questionnaire.release.xcconfig"; path = "Pods/Target Support Files/Pods-RADAR Questionnaire/Pods-RADAR Questionnaire.release.xcconfig"; sourceTree = "<group>"; };
+		A4424794DED16B074B2B4CA9 /* Pods-RADAR Active RMT.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RADAR Active RMT.release.xcconfig"; path = "Pods/Target Support Files/Pods-RADAR Active RMT/Pods-RADAR Active RMT.release.xcconfig"; sourceTree = "<group>"; };
 		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
 		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -42,7 +44,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				704135CD8D02B14F5F414200 /* Pods_RADAR_Questionnaire.framework in Frameworks */,
+				2DCC4441ECB6AE53462C7302 /* Pods_RADAR_Active_RMT.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -52,7 +54,7 @@
 		27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				64300C0E7C8CE638425A12D0 /* Pods_RADAR_Questionnaire.framework */,
+				3FBB3316FEBE50D0F3BCBA4C /* Pods_RADAR_Active_RMT.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -71,7 +73,7 @@
 		504EC3051FED79650016851F /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				504EC3041FED79650016851F /* RADAR Questionnaire.app */,
+				504EC3041FED79650016851F /* RADAR Active RMT.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -99,16 +101,18 @@
 				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
 				76D0CE0D220067B194EAA22C /* Pods-RADAR Questionnaire.debug.xcconfig */,
 				84676E1D2BB11F957E52E167 /* Pods-RADAR Questionnaire.release.xcconfig */,
+				0066ED161F09C0B9FCA0716A /* Pods-RADAR Active RMT.debug.xcconfig */,
+				A4424794DED16B074B2B4CA9 /* Pods-RADAR Active RMT.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		504EC3031FED79650016851F /* RADAR Questionnaire */ = {
+		504EC3031FED79650016851F /* RADAR Active RMT */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "RADAR Questionnaire" */;
+			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "RADAR Active RMT" */;
 			buildPhases = (
 				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
 				504EC3001FED79650016851F /* Sources */,
@@ -120,9 +124,9 @@
 			);
 			dependencies = (
 			);
-			name = "RADAR Questionnaire";
+			name = "RADAR Active RMT";
 			productName = App;
-			productReference = 504EC3041FED79650016851F /* RADAR Questionnaire.app */;
+			productReference = 504EC3041FED79650016851F /* RADAR Active RMT.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -154,7 +158,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				504EC3031FED79650016851F /* RADAR Questionnaire */,
+				504EC3031FED79650016851F /* RADAR Active RMT */,
 			);
 		};
 /* End PBXProject section */
@@ -188,7 +192,7 @@
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RADAR Questionnaire-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-RADAR Active RMT-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -207,7 +211,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RADAR Questionnaire/Pods-RADAR Questionnaire-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RADAR Active RMT/Pods-RADAR Active RMT-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -352,7 +356,7 @@
 		};
 		504EC3171FED79650016851F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 76D0CE0D220067B194EAA22C /* Pods-RADAR Questionnaire.debug.xcconfig */;
+			baseConfigurationReference = 0066ED161F09C0B9FCA0716A /* Pods-RADAR Active RMT.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "RADAR Questionnaire.entitlements";
@@ -362,7 +366,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.phidatalab.radar-armt";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -374,7 +378,7 @@
 		};
 		504EC3181FED79650016851F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 84676E1D2BB11F957E52E167 /* Pods-RADAR Questionnaire.release.xcconfig */;
+			baseConfigurationReference = A4424794DED16B074B2B4CA9 /* Pods-RADAR Active RMT.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "RADAR Questionnaire.entitlements";
@@ -384,7 +388,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.phidatalab.radar-armt";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -405,7 +409,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "RADAR Questionnaire" */ = {
+		504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "RADAR Active RMT" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				504EC3171FED79650016851F /* Debug */,

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -21,9 +21,18 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.3.2</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>org.phidatalab.radar-armt</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
   <key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -38,9 +47,9 @@
 	<key>NSCameraUsageDescription</key>
 	<string>Need camera access for scanning QR codes</string>
 	<key>NSHealthShareUsageDescription</key>
-	<string>Read Health Data</string>
+	<string>Provide access to your health data to the study</string>
 	<key>NSHealthUpdateUsageDescription</key>
-	<string>Read Health Data</string>
+	<string>Provide access to your health data to the study</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Need microphone access for uploading audio</string>
 	<key>UIBackgroundModes</key>

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -34,7 +34,7 @@ def capacitor_pods
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 
-target 'RADAR Questionnaire' do
+target 'RADAR Active RMT' do
   capacitor_pods
   # Add your Pods here
   pod 'Firebase/Messaging'

diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -47,7 +47,7 @@ PODS:
     - Capacitor
   - CapacitorTextZoom (5.0.7):
     - Capacitor
-  - CapacitorVoiceRecorder (5.0.0):
+  - CapacitorVoiceRecorder (6.0.3):
     - Capacitor
   - CordovaPlugins (5.7.0):
     - CapacitorCordova
@@ -324,7 +324,7 @@ SPEC CHECKSUMS:
   CapacitorSplashScreen: dd3de3f3644710fa2a697cfb91ec262eece4d242
   CapacitorStatusBar: f390fbb49b82ffb754ea4b3cf71dc8b048baf3e7
   CapacitorTextZoom: 69814a62b1d0f23a899cca06ea9838c38de187ff
-  CapacitorVoiceRecorder: 872ea857b497ce2c71afe3e4eb5de0a74290c0db
+  CapacitorVoiceRecorder: d44c1da901cc3918eb9c92c24834d8dc90f071f4
   CordovaPlugins: a707edf6d79ba00bd300f341fe9e1ada032d211f
   Firebase: 4453b799f72f625384dc23f412d3be92b0e3b2a0
   FirebaseABTesting: 40774deef367dcc7b736b6c26dd59ce0fab42f41
@@ -350,6 +350,6 @@ SPEC CHECKSUMS:
   PerfoodCapacitorHealthkit: 88f6e78b319072c4d0aec439b2fcc14d3f05d311
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
 
-PODFILE CHECKSUM: 4eeca94f0e0d84a74c743aa0b5dac0b22e8137d4
+PODFILE CHECKSUM: 819ee8abeaebf087881ec781995944baa241d26f
 
 COCOAPODS: 1.16.2