Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to master #325

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Merge develop to master #325

wants to merge 23 commits into from

Conversation

Panosfunk
Copy link
Collaborator

@Panosfunk Panosfunk commented Oct 4, 2024

2.2.3

  • Fixing login issue with going back to invitations list page
  • Updating changelog.md and pubspec.yaml
  • Bumping version code to 35
  • Fixing build error on ios - tests failing

2.2.2

  • Upgrade to carp_serialization v. 2.0 & carp_mobile_sensing: 1.11
  • Cleanup in pubspec.yaml
  • Upload of informed consent as a input data type
  • Saving participant data on the phone across app restart

2.2.1

  • Created github action script to create a release on pushing a tag on master.
  • Update permissions on Android, fix bug on informed consent upload.
  • Fixed gradle warnings
  • Bumping version to 2.2.0
  • On android, check if user has Google Health Connect installed dialog.

2.1.0

  • fix of switchins studies in the study app

  • refactor of view model

  • improvements to translations (especially the Danish ones)

  • upgrade to fixes in the underlying CAMS (related to Switching studies on the Study App does not fully work #283)

  • improvement to API docs

  • upgrade and refactor of connectivity_plus

  • Aligning iOS "marketing version" with Flutter pubspec version

  • upgrade to latest CAMS packages

  • upgrade to carp_backend 1.7.1

  • Delete gitignored files

  • Bumping version to 2.1.0

Panosfunk and others added 11 commits July 23, 2024 14:13
Github workflow to create a release and include an apk.
… consent (#308)

* fix of #301

* Update carp_backend.dart

* Fix of #306

* update to pubspec to use CAMS ^1.8.0

* Update pubspec.lock

* Update pubspec.lock

---------

Co-authored-by: Aamir Farooq <[email protected]>
* initial commit

* removed warnings about deprecated use of gradle

---------

Co-authored-by: Aamir Farooq <[email protected]>
* Migration needed for new version of CAMS

* Fix test
* Merging recent changes (#319)

* Creates a release on tag creation (#312)

Github workflow to create a release and include an apk.

* On login page init, check if user is authenticated and redirect to Invitations or Home page (#311)

* Update permissions on Android, fix exception while uploading informed consent (#308)

* fix of #301

* Update carp_backend.dart

* Fix of #306

* update to pubspec to use CAMS ^1.8.0

* Update pubspec.lock

* Update pubspec.lock

---------

Co-authored-by: Aamir Farooq <[email protected]>

* Fixed warning about deprecated use of gradle (#310)

* initial commit

* removed warnings about deprecated use of gradle

---------

Co-authored-by: Aamir Farooq <[email protected]>

* Fix an error caused by changes in latest version of CAMS (#315)

* Migration needed for new version of CAMS

* Fix test

* Trigger TestFlight build.

* bumping versions

* bumping versions and updating depricated @UIApplicationMain on AppDelegate.swift to @main.

---------

Co-authored-by: Jakob E. Bardram <[email protected]>
Co-authored-by: Aamir Farooq <[email protected]>

* temporarily removing ACTIVITY_RECOGNITION permission.

* bumping version code to 31

* Reintroducing ACTIVITY_RECOGNITION permission

* bumping version code to 32

* Checking if health connect exists and redirect user to google play store on Health Connect page.

* bumping version to 2.2.1

* removing duplicates from pubspec.lock

* conditional check only for android

* update to EN and DA text

* Update pubspec.lock

* language improvements

---------

Co-authored-by: Jakob E. Bardram <[email protected]>
Co-authored-by: Aamir Farooq <[email protected]>
* Merging recent changes (#319)

* Creates a release on tag creation (#312)

Github workflow to create a release and include an apk.

* On login page init, check if user is authenticated and redirect to Invitations or Home page (#311)

* Update permissions on Android, fix exception while uploading informed consent (#308)

* fix of #301

* Update carp_backend.dart

* Fix of #306

* update to pubspec to use CAMS ^1.8.0

* Update pubspec.lock

* Update pubspec.lock

---------

Co-authored-by: Aamir Farooq <[email protected]>

* Fixed warning about deprecated use of gradle (#310)

* initial commit

* removed warnings about deprecated use of gradle

---------

Co-authored-by: Aamir Farooq <[email protected]>

* Fix an error caused by changes in latest version of CAMS (#315)

* Migration needed for new version of CAMS

* Fix test

* Trigger TestFlight build.

* bumping versions

* bumping versions and updating depricated @UIApplicationMain on AppDelegate.swift to @main.

---------

Co-authored-by: Jakob E. Bardram <[email protected]>
Co-authored-by: Aamir Farooq <[email protected]>

* temporarily removing ACTIVITY_RECOGNITION permission.

* bumping version code to 31

* Reintroducing ACTIVITY_RECOGNITION permission

* bumping version code to 32

* Checking if health connect exists and redirect user to google play store on Health Connect page.

* bumping version to 2.2.1

* removing duplicates from pubspec.lock

* conditional check only for android

* update to EN and DA text

* Update pubspec.lock

* language improvements

* small update to Danish translation

---------

Co-authored-by: Jakob E. Bardram <[email protected]>
Co-authored-by: Aamir Farooq <[email protected]>
@Panosfunk Panosfunk requested a review from bardram October 4, 2024 13:07
bardram and others added 5 commits October 14, 2024 21:53
)

* Merging recent changes (#319)

* Creates a release on tag creation (#312)

Github workflow to create a release and include an apk.

* On login page init, check if user is authenticated and redirect to Invitations or Home page (#311)

* Update permissions on Android, fix exception while uploading informed consent (#308)

* fix of #301

* Update carp_backend.dart

* Fix of #306

* update to pubspec to use CAMS ^1.8.0

* Update pubspec.lock

* Update pubspec.lock

---------

Co-authored-by: Aamir Farooq <[email protected]>

* Fixed warning about deprecated use of gradle (#310)

* initial commit

* removed warnings about deprecated use of gradle

---------

Co-authored-by: Aamir Farooq <[email protected]>

* Fix an error caused by changes in latest version of CAMS (#315)

* Migration needed for new version of CAMS

* Fix test

* Trigger TestFlight build.

* bumping versions

* bumping versions and updating depricated @UIApplicationMain on AppDelegate.swift to @main.

---------

Co-authored-by: Jakob E. Bardram <[email protected]>
Co-authored-by: Aamir Farooq <[email protected]>

* temporarily removing ACTIVITY_RECOGNITION permission.

* bumping version code to 31

* Reintroducing ACTIVITY_RECOGNITION permission

* bumping version code to 32

* Uploading informed consent as participant data + docs update

* Added a Participant object to store participation data locally on the phone

* participant.dart updated

* fix of conflict w. development branch

* misc cleanup

---------

Co-authored-by: Panagiotis Giannoutsos <[email protected]>
Co-authored-by: Aamir Farooq <[email protected]>
@bardram
Copy link
Contributor

bardram commented Oct 20, 2024

2.2.2

  • Upgrade to carp_serialization v. 2.0 & carp_mobile_sensing: 1.11
  • Cleanup in pubspec.yaml
  • Upload of informed consent as a input data type
  • Saving participant data on the phone across app restart

Copy link
Contributor

@bardram bardram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've now looked at it all and updated to the new version of CAMS 1.11 and uploading informed consent as participant data.

@Panosfunk
Copy link
Collaborator Author

Tests are failing with the new changes...

@Panosfunk Panosfunk enabled auto-merge (squash) October 22, 2024 15:15
Copy link
Contributor

@bardram bardram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found a couple of issues (on my Android) phone when using this version. These needs to be fixed before release.... See issue tracker.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants