diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart index 2b5783a..85fa617 100644 --- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart +++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart @@ -687,7 +687,7 @@ class DiaryEditBloc extends Bloc { SendModeration event, Emitter emit) async { if (state is DiaryEditLoadedState) { var currentState = state as DiaryEditLoadedState; - + print("sad"); final response = await _sendModerationData( event.name, event.energyOn100gr, @@ -730,7 +730,7 @@ class DiaryEditBloc extends Bloc { return response; } else { throw Exception( - 'Failed to upload image. Status code: ${response.statusCode}'); + 'Failed to send a product for moderation ${response.statusCode}'); } } diff --git a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart index 4cd9b80..fbee790 100644 --- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart +++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart @@ -517,11 +517,11 @@ class DiaryEditScreen extends StatelessWidget { ), actions: [ TextButton( - onPressed: () => popDialog, + onPressed: popDialog(context), child: Text('Отмена'), ), TextButton( - onPressed: () => triggerModeration( + onPressed: triggerModeration( context, name, energyOn100gr, @@ -537,7 +537,7 @@ class DiaryEditScreen extends StatelessWidget { ); } - Function triggerModeration( + triggerModeration( BuildContext context, String name, String energyOn100gr, @@ -789,6 +789,53 @@ class DiaryEditScreen extends StatelessWidget { ), ), SizedBox(height: 2.v), + Padding( + padding: EdgeInsets.only( + left: 10.h, + right: 2.h, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Калорий", + style: theme.textTheme.bodySmall, + ), + Padding( + padding: EdgeInsets.only( + left: 25.h, + bottom: 11.v, + ), + child: Text( + "Белков", + style: theme.textTheme.bodySmall, + ), + ), + Padding( + padding: EdgeInsets.only( + left: 19.h, + bottom: 11.v, + ), + child: Text( + "Жиров", + style: theme.textTheme.bodySmall, + ), + ), + Padding( + padding: EdgeInsets.only( + left: 14.h, + bottom: 11.v, + ), + child: Text( + "Углеводов", + style: theme.textTheme.bodySmall, + ), + ), + ], + ), + ), + SizedBox(height: 2.v), Padding( padding: EdgeInsets.only( left: 10.h,