Merge pull request #1855 from RADAR-base/release-3.3.4-alpha

Release 3.3.5-alpha

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

README.md

@@ -269,7 +269,7 @@ $ANDROID_HOME/build-tools/27.0.2/zipalign -v 4 <your-project-path>/platforms/and
 
 ## Questionnaire Input Types
 
-The questionnaire input types supported are `audio`, `checkbox`, `descriptive`, `info-screen`, `matrix-radio`, `radio`, `range-info`, `range-input`, `slider`, `text`, `date`, `time`, and `timed-test`.
+The questionnaire input types supported are `audio`, `checkbox`, `descriptive`, `info-screen`, `matrix-radio`, `radio`, `range-info`, `range-input`, `slider`, `text`, `date`, `time`, `healthkit`, and `timed-test`.
 
 ### Descriptive Input Type
 
@@ -297,17 +297,30 @@ Here is the output:
 
 <img src="/.github/etc/descriptive-2.png" width="200px"><img src="/.github/etc/descriptive-1.png" width="200px">
 
-## Common Errors
+## Healthkit Input Type
 
-Here are some common errors you might find during installation.
+Please see `/src/app/shared/models/health.ts` for a list of supported data types. In order to add support for new data types, follow the steps below:
 
-### Error: cordova-custom-config
+### Add the New Data Type to `HealthkitDataType`
 
-When you are running `ionic cordova run ios`, you might encounter the problem, we solved this problem by refering this [issue](https://github.com/dpa99c/cordova-custom-config/issues/144) with `cordova-custom-config`.
+Open the `health.ts` file and add the new data type to the `HealthkitDataType` enum. Use a descriptive key and a string value that matches the Healthkit data type.
 
-We enter the following command at the root directory.
-
-```
-cd plugins/cordova-custom-config
-npm install
+```typescript
+export enum HealthkitDataType {
+  ...
+  VO2_MAX = 'vo2Max',
+}
 ```
+
+### Add a New Permission to HealthkitPermission
+Add the corresponding permission to the `HealthkitPermission` enum. The permission should match the new data type.
+
+### Map the Data Type to Its Permission
+Update the `HealthkitPermissionMap` object to link the new `HealthkitDataType` to its `HealthkitPermission`.
+
+### Add the Kafka Topic to HealthkitTopic
+Add the corresponding topic to the `HealthkitTopic` enum. The topic should be a descriptive string representing the data type's usage in your system.
+
+### Add to the Appropriate Data Type Sets (if applicable)
+Depending on the data type (e.g., numeric or string), add the new data type to the relevant set: `HealthkitFloatDataTypes` or `HealthkitStringDataTypes`.
+

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "org.phidatalab.radar_armt"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 593
-        versionName "3.3.4-alpha"
+        versionCode 595
+        versionName "3.3.5-alpha"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
         android:hardwareAccelerated="true">
 
         <meta-data

angular.json

@@ -32,7 +32,6 @@
               }
             ],
             "styles": ["src/theme/variables.scss", "src/global.scss"],
-            "scripts": [],
             "vendorChunk": true,
             "extractLicenses": false,
             "buildOptimizer": false,

capacitor.config.ts

@@ -5,7 +5,8 @@ const config: CapacitorConfig = {
   appName: 'RADAR Active RMT',
   webDir: 'www',
   server: {
-    androidScheme: 'https'
+    androidScheme: 'https',
+    "cleartext": true
   },
   loggingBehavior: 'none',
   plugins: {
@@ -26,6 +27,9 @@ const config: CapacitorConfig = {
     },
     FirebaseMessaging: {
       presentationOptions: ['badge', 'sound', 'alert']
+    },
+    CapacitorHttp: {
+      enabled: true
     }
   },
   cordova: {

ios/App/App.xcodeproj/project.pbxproj

@@ -379,7 +379,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.3.4;
+				MARKETING_VERSION = 3.3.5;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.phidatalab.radar-armt";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -401,7 +401,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.3.4;
+				MARKETING_VERSION = 3.3.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.phidatalab.radar-armt";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

ios/App/App/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.4</string>
+	<string>3.3.5</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>