Skip to content

Commit

Permalink
Merge pull request #677 from hpi-studyu/dev
Browse files Browse the repository at this point in the history
Release: August 2024
  • Loading branch information
johannesvedder authored Aug 12, 2024
2 parents 317ab49 + 7a6b916 commit 7c1fe6f
Show file tree
Hide file tree
Showing 46 changed files with 805 additions and 486 deletions.
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.22.3"
"flutter": "3.24.0"
}
2 changes: 1 addition & 1 deletion .github/workflows/all_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: melos format

- name: Run analyze
run: melos analyze
run: melos analyze --fatal-infos

- name: Commit changes if any
uses: stefanzweifel/git-auto-commit-action@v5
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
jobs:
drive_web:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Await potential publishing on Pub.dev
uses: johannesvedder/await-workflow@v1
Expand Down
57 changes: 57 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,63 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2024-08-12

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`studyu_app` - `v2.7.9`](#studyu_app---v279)
- [`studyu_core` - `v4.4.6`](#studyu_core---v446)
- [`studyu_designer_v2` - `v1.9.0`](#studyu_designer_v2---v190)
- [`studyu_flutter_common` - `v1.8.7`](#studyu_flutter_common---v187)

---

#### `studyu_app` - `v2.7.9`

- **FIX**: upgrade deps.

#### `studyu_core` - `v4.4.6`

- **FIX**: upgrade deps.

#### `studyu_designer_v2` - `v1.9.0`

- **FIX**: legend spacing.
- **FIX**: legend overflow.
- **FIX**: translation.
- **FIX**: overflow issues.
- **FIX**: participant info max intervention and survey count.
- **FIX**: intervention and observation wrong number in table.
- **FIX**: sort arrow.
- **FIX**: remove bar chart if no participant.
- **FIX**: translation.
- **FIX**: tooltip message.
- **FIX**: remove min visibility.
- **FIX**: style consistency for the close button, update style, and add translation.
- **FIX**: add close button to launch success dialog (public study).
- **FIX**: translation consistency.
- **FIX**: remove add participant action button from publish success dialog for public studies.
- **FIX**: reset invite codes if study gets published as public.
- **FIX**: check for unique invite codes in designer.
- **FIX**: upgrade deps.
- **FIX**: enable atLeastOneTask for intervention again".
- **FIX**: auto-save new study to prevent exception on intervention screen.
- **FEAT**: fix translations.
- **FEAT**: disable invite code creation for public studies.

#### `studyu_flutter_common` - `v1.8.7`

- **FIX**: upgrade deps.


## 2024-07-24

### Changes
Expand Down
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ Languages & Frameworks -> Flutter -> Flutter SDK path and set the path to the F
(`<path to the studyu repository>/.fvm/flutter_sdk`). For VS Code, have a look at
the [FVM documentation](https://fvm.app/documentation/guides/vscode).

Using FVM with melos requires setting the `MELOS_SDK_PATH` environment variable to the path of the
FVM Flutter SDK. This can be done by running `export MELOS_SDK_PATH=.fvm/flutter_sdk` in the
terminal. This is needed to ensure that melos uses the correct Flutter SDK version.

## Database and Backend

We are using a self-hosted instance of [Supabase](https://supabase.com/) as a
Expand Down
4 changes: 4 additions & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.7.9

- **FIX**: upgrade deps.

## 2.7.8

- **FIX**: safety check.
Expand Down
22 changes: 11 additions & 11 deletions app/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.957.0)
aws-sdk-core (3.201.2)
aws-partitions (1.962.0)
aws-sdk-core (3.201.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-s3 (1.157.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand Down Expand Up @@ -60,15 +60,15 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.221.1)
fastlane (2.222.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -126,7 +126,7 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.0)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
Expand Down Expand Up @@ -164,14 +164,14 @@ GEM
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.0)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.9)
rexml (3.3.4)
strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
Expand All @@ -197,13 +197,13 @@ GEM
uber (0.1.0)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.2, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand Down
10 changes: 5 additions & 5 deletions app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ PODS:
- record_darwin (1.0.0):
- Flutter
- FlutterMacOS
- Sentry/HybridSDK (8.30.1)
- sentry_flutter (8.4.0):
- Sentry/HybridSDK (8.32.0)
- sentry_flutter (8.6.0):
- Flutter
- FlutterMacOS
- Sentry/HybridSDK (= 8.30.1)
- Sentry/HybridSDK (= 8.32.0)
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
Expand Down Expand Up @@ -129,8 +129,8 @@ SPEC CHECKSUMS:
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
record_darwin: df0a677188e5fed18472550298e675f19ddaffbe
Sentry: 514a3ea653886e9a48c6287d8b7bf05ec24bf3be
sentry_flutter: edc037f7af0dc1512d6c33a5c2c7c838bd0d6806
Sentry: 96ae1dcdf01a644bc3a3b1dc279cecaf48a833fb
sentry_flutter: 090351ce1ff5f96a4b33ef9455b7e3b28185387d
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
Expand Down
2 changes: 1 addition & 1 deletion app/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Flutter
import UIKit
import flutter_local_notifications

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
3 changes: 2 additions & 1 deletion app/lib/screens/app_onboarding/loading_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class _LoadingScreenState extends State<LoadingScreen> {
}
} catch (exception) {
debugPrint(
"Could not login and retrieve the study subject: $exception");
"Could not login and retrieve the study subject: $exception",
);
if (exception is SocketException) {
subject = await Cache.loadSubject();
StudyULogger.info("Offline mode with cached subject: $subject");
Expand Down
53 changes: 28 additions & 25 deletions app/lib/util/notifications.dart
Original file line number Diff line number Diff line change
Expand Up @@ -126,31 +126,34 @@ class StudyNotifications {
void _configureDidReceiveLocalNotificationSubject() {
didReceiveLocalNotificationStream.stream
.listen((ReceivedNotification receivedNotification) async {
await showDialog(
context: context,
builder: (BuildContext context) => CupertinoAlertDialog(
title: receivedNotification.title != null
? Text(receivedNotification.title!)
: null,
content: receivedNotification.body != null
? Text(receivedNotification.body!)
: null,
actions: <Widget>[
CupertinoDialogAction(
isDefaultAction: true,
onPressed: () async {
Navigator.of(context, rootNavigator: true).pop();
await Navigator.of(context).push(
MaterialPageRoute<void>(
builder: (BuildContext context) => const DashboardScreen(),
),
);
},
child: const Text('Ok'),
),
],
),
);
if (context.mounted) {
await showDialog(
context: context,
builder: (BuildContext context) => CupertinoAlertDialog(
title: receivedNotification.title != null
? Text(receivedNotification.title!)
: null,
content: receivedNotification.body != null
? Text(receivedNotification.body!)
: null,
actions: <Widget>[
CupertinoDialogAction(
isDefaultAction: true,
onPressed: () async {
Navigator.of(context, rootNavigator: true).pop();
await Navigator.of(context).push(
MaterialPageRoute<void>(
builder: (BuildContext context) =>
const DashboardScreen(),
),
);
},
child: const Text('Ok'),
),
],
),
);
}
});
}

Expand Down
Loading

0 comments on commit 7c1fe6f

Please sign in to comment.