Merge branch 'master' into LarsRefsgaard/message-images-fix

cph-cachet · Jul 19, 2023 · 71c6b12 · 71c6b12
2 parents c38dd3f + 338112f
commit 71c6b12
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 32 deletions.
diff --git a/lib/ui/pages/informed_consent_page.dart b/lib/ui/pages/informed_consent_page.dart
@@ -19,30 +19,6 @@ class InformedConsentState extends State<InformedConsentPage> {
     }
   }
 
-  void cancelCallback(RPTaskResult? result) async {
-    info("$runtimeType - Informed Consent canceled");
-
-    await showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (BuildContext context) {
-        RPLocalizations locale = RPLocalizations.of(context)!;
-
-        return AlertDialog(
-          title: Text(locale.translate("pages.ic.need_accept")),
-          actions: <Widget>[
-            TextButton(
-              child: Text(locale.translate("pages.ic.go_to_ic")),
-              onPressed: () {
-                context.go('/consent');
-              },
-            )
-          ],
-        );
-      },
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     RPLocalizations localization = RPLocalizations.of(context)!;
@@ -64,7 +40,6 @@ class InformedConsentState extends State<InformedConsentPage> {
               return RPUITask(
                 task: snapshot.data!,
                 onSubmit: resultCallback,
-                onCancel: cancelCallback,
               );
             }
           }

diff --git a/lib/view_models/cards/heart_rate_data_model.dart b/lib/view_models/cards/heart_rate_data_model.dart
@@ -105,12 +105,18 @@ class HourlyHeartRate extends DataModel {
 
     currentHeartRate = heartRate;
     if (hourlyHeartRate.containsKey(hour)) {
-      hourlyHeartRate.update(
-        hour,
-        (value) => value
-          ..min = value.min != null ? min(value.min!, heartRate) : heartRate
-          ..max = value.max != null ? max(value.max!, heartRate) : heartRate,
-      );
+      hourlyHeartRate.update(hour, (value) {
+        double? minVal = value.min, maxVal = value.max;
+        if (minVal != null && maxVal != null) {
+          return value
+            ..min = min(minVal, heartRate)
+            ..max = max(maxVal, heartRate);
+        } else {
+          return value
+            ..min = heartRate
+            ..max = heartRate;
+        }
+      });
     } else {
       hourlyHeartRate[hour] = HeartRateMinMaxPrHour(heartRate, heartRate);
     }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 1.1.0
 
 environment:
-  sdk: ">=2.17.0 <4.0.0"
+  sdk: ">=2.19.0 <4.0.0"
   flutter: ">=3.0.0"
 
 dependencies: