Test

.github/workflows/create_release_on_tag.yml

@@ -10,15 +10,18 @@ jobs:
     name: Create Release and Upload APK
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@master
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt' # See 'Supported distributions' for available options
           java-version: '17'
 
+      # - name: Set up JDK 17
+      #   uses: actions/setup-java@v4
+      #   with:
+      #     distribution: 'adopt' # See 'Supported distributions' for available options
+      #     java-version: '17'
+
       - name: Cache Flutter
         id: cache-flutter
         uses: actions/cache@v3
@@ -28,6 +31,16 @@ jobs:
             ~/.pub-cache
           key: flutter-${{ hashFiles('**/pubspec.lock') }}
 
+      - name: Cache Gradle
+        id: cache-gradle
+        uses: actions/cache@v3
+        with: 
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper/
+          key: gradle-ubuntu-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+
       - if: ${{ steps.cache-flutter.outputs.cache-hit != 'true' }}
         name: Install Flutter
         run: git clone https://github.com/flutter/flutter.git --depth 1 -b stable $FOLDER

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.2.0
+
+* moving to carp_themes_package instead of research package themes
+* partially transitioning from pods to spm
+* health connect flow update
+* informed consent accepted is now checked via API instead of local settings
+* fixing hasSeenBluetoothInstructions bool logic
+* small UI changes
+
 ## 4.1.1
 
 - small visual fixes

android/app/build.gradle

@@ -5,15 +5,15 @@ plugins {
 }
 
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = project.rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
     localPropertiesFile.withReader('UTF-8') { reader ->
         localProperties.load(reader)
     }
 }
 
 def keyProperties = new Properties()
-def keyPropertiesFile = rootProject.file('key.properties')
+def keyPropertiesFile = project.rootProject.file('key.properties')
 def signingConfigExists = false
 
 if (keyPropertiesFile.exists()) {
@@ -23,15 +23,8 @@ if (keyPropertiesFile.exists()) {
     }
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode') ?: '1'
+def flutterVersionName = localProperties.getProperty('flutter.versionName') ?: '1.0'
 
 android {
     namespace "dk.carp.studies_app"
@@ -88,10 +81,10 @@ android {
                 debugSymbolLevel 'SYMBOL_TABLE'
             }
             if (signingConfigExists) {
-                logger.error('storeFile found, signing with release build.')
+                logger.info('storeFile found, signing with release build.')
                 signingConfig signingConfigs.release
             } else {
-                logger.error('No storeFile found or null. Skipping signing of release build.')
+                logger.info('No storeFile found or null. Skipping signing of release build.')
                 signingConfig signingConfigs.debug
             }
         }

android/app/src/main/AndroidManifest.xml

@@ -212,29 +212,6 @@
         <service android:name="dk.cachet.activity_recognition_flutter.activity.ActivityRecognizedService"
         android:exported="true"/> -->
 
-        <!-- Services for background location handling -->
-        <receiver
-            android:name="rekab.app.background_locator.LocatorBroadcastReceiver"
-            android:enabled="true"
-            android:exported="true" />
-        <receiver
-            android:name="rekab.app.background_locator.BootBroadcastReceiver"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="rekab.app.background_locator.LocatorService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true" />
-        <service
-            android:name="rekab.app.background_locator.IsolateHolderService"
-            android:permission="android.permission.FOREGROUND_SERVICE"
-            android:exported="true" />
-
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

android/build.gradle

@@ -12,8 +12,6 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }
 

assets/lang/da.json

@@ -97,9 +97,9 @@
   "pages.profile.device_role": "Engedsrolle",
   "pages.profile.contact": "Kontakt forsker",
   "pages.profile.privacy": "Fortrolighedspolitik",
-  "pages.profile.study_website": "Studiw Hjemmeside",
+  "pages.profile.study_website": "Hjemmeside for studiet",
   "pages.profile.leave_study": "Forlad studie",
-  "pages.profile.log_out": "Log ud",
+  "pages.profile.log_out": "Forlad studie & Log ud",
   "pages.profile.log_out.confirmation": "Du er ved at forlade dette studie og logge af. Operativsystemet vil åbne en browser for at logge dig ud. Er du sikker?",
   "pages.profile.leave_study.confirmation": "Du er ved at forlade studiet. Du vil ikke længere deltage i dette studie. Er du sikker?",
   "announcements": "Annonceringer",

assets/lang/en.json

@@ -110,9 +110,9 @@
   "pages.profile.device_id": "Device ID",
   "pages.profile.contact": "Contact researcher",
   "pages.profile.privacy": "Privacy policy",
-  "pages.profile.study_website": "Study Website",
+  "pages.profile.study_website": "Study website",
   "pages.profile.leave_study": "Leave study",
-  "pages.profile.log_out": "Log out",
+  "pages.profile.log_out": "Leave study & Log out",
   "pages.profile.log_out.confirmation": "You are about to leave this study and log out. The operating system will open a browser to log you out. Are you sure?",
   "pages.profile.leave_study.confirmation": "You are about to leave the study. You will no longer participate in this study. Are you sure?",
   "announcements": "Announcements",
@@ -244,4 +244,4 @@
   "tasks.participant_data.phone_number.country": "Country code",
   "tasks.participant_data.phone_number.phone_number": "Phone No.",
   "tasks.participant_data.review.title": "Review"
-}
+}

assets/lang/es.json

@@ -58,8 +58,9 @@
     "pages.profile.account_id": "Id Usuario",
     "pages.profile.contact": "Contactar investigador",
     "pages.profile.privacy": "Política de privacidad",
+    "pages.profile.study_website": "Página web del estudio",
     "pages.profile.leave_study": "Abandonar el estudio",
-    "pages.profile.log_out": "Cerrar sesión",
+    "pages.profile.log_out": "Cerrar estudio & sesión",
     "pages.profile.log_out.confirmation": "Estás a punto de cerrar sesión et abandonar el estudio. ¿Estás seguro?",
     "pages.profile.leave_study.confirmation": "Estás a punto de abandonar el estudio. Dejarás de participar en el es estudio. ¿Estás seguro?",
     "announcement": "Anuncio",
@@ -121,4 +122,4 @@
     "pages.devices.connection.step.confirm.title": "está conectado!",
     "pages.devices.connection.step.confirm.1": "El",
     "pages.devices.connection.step.confirm.2": " ha sido connectado satisfactoriamente al estudio y está listo para empezar a detectar."
-}
+}

ios/Podfile

@@ -35,7 +35,7 @@ target 'Runner' do
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   pod 'Movesense', :git => 'https://bitbucket.org/movesense/movesense-mobile-lib/'
-  pod 'PhoneNumberKit', '~> 3.7'
+  # pod 'PhoneNumberKit', '~> 3.7'
 end
 
 post_install do |installer|