diff --git a/lib/screens/log_meal_screen.dart b/lib/screens/log_meal_screen.dart index 784d2aff..a333c96c 100644 --- a/lib/screens/log_meal_screen.dart +++ b/lib/screens/log_meal_screen.dart @@ -63,7 +63,8 @@ class _LogMealScreenState extends State { @override Widget build(BuildContext context) { - final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode).add_Hm(); + final dateFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode); + final dateTimeFormat = DateFormat.yMd(Localizations.localeOf(context).languageCode).add_Hm(); final i18n = AppLocalizations.of(context); final args = ModalRoute.of(context)!.settings.arguments as LogMealArguments; @@ -174,7 +175,7 @@ class _LogMealScreenState extends State { TextButton( child: Text(i18n.save), onPressed: () async { - final loggedDate = dateFormat.parse( + final loggedDate = dateTimeFormat.parse( '${_dateController.text} ${_timeController.text}', ); await Provider.of( diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart index cd33bff3..c3c917a8 100644 --- a/lib/widgets/nutrition/forms.dart +++ b/lib/widgets/nutrition/forms.dart @@ -228,8 +228,9 @@ class IngredientFormState extends State { @override Widget build(BuildContext context) { final languageCode = Localizations.localeOf(context).languageCode; - final dateFormat = DateFormat.yMd(languageCode).add_Hm(); + final dateFormat = DateFormat.yMd(languageCode); final timeFormat = DateFormat.Hm(languageCode); + final dateTimeFormat = DateFormat.yMd(languageCode).add_Hm(); if (_dateController.text.isEmpty) { _dateController.text = dateFormat.format(DateTime.now()); @@ -405,7 +406,7 @@ class IngredientFormState extends State { _form.currentState!.save(); _mealItem.ingredientId = int.parse(_ingredientIdController.text); - final loggedDate = dateFormat.parse( + final loggedDate = dateTimeFormat.parse( '${_dateController.text} ${_timeController.text}', ); widget.onSave(context, _mealItem, loggedDate);