Merge branch 'master' into LarsRefsgaard/data-page-null-safety

cph-cachet · Jul 20, 2023 · c53aa54 · c53aa54
2 parents a5e7a19 + 919ed9c
commit c53aa54
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 133 deletions.
diff --git a/lib/ui/pages/message_details_page.dart b/lib/ui/pages/message_details_page.dart
@@ -20,7 +20,7 @@ class MessageDetailsPage extends StatelessWidget {
           subTitle: 'Unknown message',
           type: MessageType.announcement,
           timestamp: DateTime.now(),
-          image: './assets/images/kids.png');
+          imagePath: './assets/images/kids.png');
     });
 
     return Scaffold(
@@ -44,7 +44,7 @@ class MessageDetailsPage extends StatelessWidget {
               Flexible(
                 child: CustomScrollView(
                   slivers: [
-                    DetailsBanner(message.title!, message.image),
+                    DetailsBanner(message.title!, message.imagePath),
                     SliverToBoxAdapter(
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 30),

diff --git a/lib/ui/pages/study_page.dart b/lib/ui/pages/study_page.dart
@@ -59,7 +59,7 @@ class StudyPageState extends State<StudyPage> {
     timeago.setLocaleMessages('da', timeago.DaMessages());
     timeago.setLocaleMessages('es', timeago.EsMessages());
 
-    Image messageImage = widget.model.getMessageImage(message.image);
+    Image messageImage = widget.model.getMessageImage(message.imagePath);
 
     return Card(
       semanticContainer: true,
@@ -78,7 +78,7 @@ class StudyPageState extends State<StudyPage> {
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Row(children: [
-              message.image != null
+              message.imagePath != null
                   ? Expanded(
                       child: Container(
                       height: 150.0,

diff --git a/lib/view_models/cards/heart_rate_data_model.dart b/lib/view_models/cards/heart_rate_data_model.dart
@@ -28,7 +28,7 @@ class HeartRateCardViewModel extends SerializableViewModel<HourlyHeartRate> {
 
     heartRateEvents?.listen(
       (heartRateDataPoint) {
-        PolarHRSample? heartRate = heartRateDataPoint.data as PolarHRSample;
+        PolarHR? heartRate = heartRateDataPoint.data as PolarHR;
 
         double hr = heartRate.hr.toDouble();
         if (!(hr > 0)) {