misha/eatvio_app
2
1
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

Merge branch 'main' of ssh://10.55.5.123:222/misha/eatvio_app into issue-911

Browse Source
This commit is contained in:
misha
2026-02-27 13:14:47 +03:00
parent 8b1d08b2aa cdc5936d3c
commit c6cdb5bf01
10 changed files with 137 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/routing/other_routes.dart
View File

@@ -159,9 +159,9 @@ class OtherRoutes {
path: CreateDietScreen.path,
name: CreateDietScreen.name,
builder: (context, state) {
final data = state.extra as Map<String, dynamic>;
final diet = data['diet'] as Diet?;
final isEditing = data['isEditing'] as bool?;
final data = state.extra as Map<String, dynamic>?;
final diet = data?['diet'] as Diet?;
final isEditing = data?['isEditing'] as bool?;
return CreateDietScreen(diet: diet, isEditing: isEditing);
},
),
@@ -172,7 +172,7 @@ class OtherRoutes {
final data = state.extra as Map<String, dynamic>;
final diet = data['diet'] as Diet;
final isImageInBase64 = data['isImageInBase64'] as bool;
return DietPreviewScreen(diet: diet, isImageInBase64: isImageInBase64,);
return DietPreviewScreen(diet: diet, isImageInBase64: isImageInBase64);
},
),
GoRoute(path: RouteConstants.createPlanScreen, name: 'createPlanScreen', builder: (context, state) => const CreatePlanScreen()),

2
lib/core/widgets/info_row.dart
View File

@@ -58,7 +58,7 @@ class InfoRow extends StatelessWidget {
children: [
SvgPicture.asset('assets/icons/calories.svg', width: 13.3, height: 13.3),
const SizedBox(width: 4),
Text('${recipe?.calories.toStringAsFixed(0) ?? '0'} ккал', style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
Text('${(recipe?.calories ?? 0).toStringAsFixed(0)} ккал', style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
],
),
const SizedBox(width: 12),