@@ -87,6 +87,7 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
87
87
88
88
void loadEvents () async {
89
89
final numberFormat = NumberFormat .decimalPattern (Localizations .localeOf (context).toString ());
90
+ final i18n = AppLocalizations .of (context);
90
91
91
92
// Process weight entries
92
93
final weightProvider = context.read <BodyWeightProvider >();
@@ -98,7 +99,7 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
98
99
}
99
100
100
101
// Add events to lists
101
- _events[date]! .add (Event (EventType .weight, '${numberFormat .format (entry .weight )} kg' ));
102
+ _events[date]? .add (Event (EventType .weight, '${numberFormat .format (entry .weight )} kg' ));
102
103
}
103
104
104
105
// Process measurements
@@ -111,7 +112,7 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
111
112
_events[date] = [];
112
113
}
113
114
114
- _events[date]! .add (Event (
115
+ _events[date]? .add (Event (
115
116
EventType .measurement,
116
117
'${category .name }: ${numberFormat .format (entry .value )} ${category .unit }' ,
117
118
));
@@ -130,9 +131,9 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
130
131
time = '(${timeToString (session .timeStart )} - ${timeToString (session .timeEnd )})' ;
131
132
132
133
// Add events to lists
133
- _events[date]! .add (Event (
134
+ _events[date]? .add (Event (
134
135
EventType .session,
135
- '${AppLocalizations . of ( context ) .impression }: ${session .impressionAsString } $time ' ,
136
+ '${i18n .impression }: ${session .impressionAsString } $time ' ,
136
137
));
137
138
}
138
139
});
@@ -148,15 +149,15 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
148
149
}
149
150
150
151
// Add events to lists
151
- _events[date]! .add (Event (
152
+ _events[date]? .add (Event (
152
153
EventType .caloriesDiary,
153
- AppLocalizations . of (context) .kcalValue (entry.value.energy.toStringAsFixed (0 )),
154
+ i18n .kcalValue (entry.value.energy.toStringAsFixed (0 )),
154
155
));
155
156
}
156
157
}
157
158
158
159
// Add initial selected day to events list
159
- _selectedEvents.value = _getEventsForDay (_selectedDay! );
160
+ _selectedEvents.value = _selectedDay != null ? _getEventsForDay (_selectedDay! ) : [] ;
160
161
}
161
162
162
163
@override
0 commit comments