feat(chat): add trailing comma rules

lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart

@@ -29,15 +29,15 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
     on<AddPortionEvent>(_addPortion); //пользователь нажимает "Добавить продукт"
     on<RemovePortionEvent>(_removePortion);
     on<RemoveImageEvent>(
-        _removeImage); // пользователь нажимает на крестик около продукта
+        _removeImage,); // пользователь нажимает на крестик около продукта
     on<UploadImages>(_uploadImages); //пользователь нажимает "Добавить фото"
     on<AddComment>(_addComment); //пользователь нажимает "Добавить комментарий"
     on<ProductInput>(
-        _inputProduct); //пользователь нажимает "Добавить комментарий"
+        _inputProduct,); //пользователь нажимает "Добавить комментарий"
     on<FinishDay>(_finishDay); //пользователь нажимает "Добавить комментарий"
     on<SendModeration>(_sendModeration);
     on<RefreshEvent>(
-        reloadScreen); //пользователь нажимает "Добавить комментарий"
+        reloadScreen,); //пользователь нажимает "Добавить комментарий"
     on<ClearInput>(_clearInput);
   }
 
@@ -89,7 +89,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
                 recommendedChartValues: currentState.recommendedChartValues,
                 consumedChartValues: currentState.consumedChartValues,
                 autocompleteList: currentState.autocompleteList,
-                diaryEditModelObj: currentState.diaryEditModelObj));
+                diaryEditModelObj: currentState.diaryEditModelObj,),);
           } else {
             // Если текущее состояние - начальное, создаем новое загруженное состояние
             final List<SelectionPopupModel> meals =
@@ -97,7 +97,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
             emit(DiaryEditLoadedState(
                 currentMeal: meals[0],
                 portionController: SelectionPopupModel(
-                    id: 0, title: "порций", isSelected: true),
+                    id: 0, title: "порций", isSelected: true,),
                 wakeupExpanded: true,
                 moodExpanded: true,
                 moderationExpanded: false,
@@ -125,7 +125,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
                 diaryDate: diaryDate,
                 autocompleteList: [],
                 diaryEditModelObj: state.diaryEditModelObj
-                    ?.copyWith(mealList: meals, portionList: fillPortions())));
+                    ?.copyWith(mealList: meals, portionList: fillPortions()),),);
           }
         }
       } catch (e) {
@@ -177,10 +177,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   fetchChartValues(
-      String token, int diaryID, Emitter<DiaryEditState> emit) async {
+      String token, int diaryID, Emitter<DiaryEditState> emit,) async {
     final responseChart = await http.get(
       Uri.parse(
-          dotenv.env['SERVER_ROOT']! + '/diary/$diaryID/dailyNutritionData/'),
+          dotenv.env['SERVER_ROOT']! + '/diary/$diaryID/dailyNutritionData/',),
       headers: {
         'Content-Type': 'application/json',
         'Authorization': 'Bearer $token',
@@ -250,7 +250,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
             final String diaryDate = diary['date'] ?? DateTime.now().toString();
             final responseChart = await http.get(
               Uri.parse(dotenv.env['SERVER_ROOT']! +
-                  '/diary/$diaryId/dailyNutritionData/'),
+                  '/diary/$diaryId/dailyNutritionData/',),
               headers: {
                 'Content-Type': 'application/json',
                 'Authorization': 'Bearer $token',
@@ -258,7 +258,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
             );
             if (responseChart.statusCode == 200) {
               final recommendedChartValues = jsonDecode(
-                  responseChart.body)['dailyNutritionRecommendation'];
+                  responseChart.body,)['dailyNutritionRecommendation'];
               final consumedChartValues =
                   jsonDecode(responseChart.body)['dailyNutritionIntake'];
               final List<SelectionPopupModel> meals =
@@ -266,10 +266,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
               try {
                 await Future(() => emit(DiaryEditLoadedState(
                       diaryEditModelObj: state.diaryEditModelObj?.copyWith(
-                          mealList: meals, portionList: fillPortions()),
+                          mealList: meals, portionList: fillPortions(),),
                       currentMeal: meals[0],
                       portionController: SelectionPopupModel(
-                          id: 0, title: "порций", isSelected: true),
+                          id: 0, title: "порций", isSelected: true,),
                       wakeupExpanded: true,
                       moodExpanded: true,
                       moderationExpanded: false,
@@ -301,7 +301,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
                       diaryDate: diaryDate,
                       isLoading: false,
                       autocompleteList: [],
-                    )));
+                    ),),);
 
                 print("Updated");
               } catch (e) {
@@ -312,11 +312,11 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
             }
           } else {
             emit(DiaryEditErrorState(
-                'Ошибка при декодировании данных дневника'));
+                'Ошибка при декодировании данных дневника',),);
           }
         } else {
           emit(
-              DiaryEditErrorState('Некоторые необходимые данные отсутствуют.'));
+              DiaryEditErrorState('Некоторые необходимые данные отсутствуют.'),);
         }
       } else {
         emit(DiaryEditErrorState('Ошибка сервера: ${response.statusCode}'));
@@ -327,7 +327,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   Future<void> _changeSatiety(
-      ChangeSatiety event, Emitter<DiaryEditState> emit) async {
+      ChangeSatiety event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       var updatedState =
@@ -338,7 +338,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           currentState.token,
           event.selectedElement,
           currentState.currentMeal?.id,
-          currentState.diaryId);
+          currentState.diaryId,);
 
       if (response.statusCode == 200) {
         updatedState.selectedSatiety = event.selectedElement;
@@ -364,12 +364,12 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           'Authorization': 'Bearer $token',
         },
         body: json.encode(credentials),
-        encoding: utf8);
+        encoding: utf8,);
     return response;
   }
 
   Future<void> _changeMood(
-      ChangeMood event, Emitter<DiaryEditState> emit) async {
+      ChangeMood event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       var updatedState =
@@ -380,11 +380,11 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           currentState.token,
           event.selectedElement,
           currentState.currentMeal?.id,
-          currentState.diaryId);
+          currentState.diaryId,);
 
       if (response.statusCode == 200) {
         print(
-            'Mood change success! meal_id: ${currentState.currentMeal?.id}, mood: ${event.selectedElement}');
+            'Mood change success! meal_id: ${currentState.currentMeal?.id}, mood: ${event.selectedElement}',);
         updatedState.selectedMood = event.selectedElement;
         emit(updatedState); // Передаем обновленное состояние в emit
       }
@@ -409,17 +409,17 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           'Authorization': 'Bearer $token',
         },
         body: json.encode(credentials),
-        encoding: utf8);
+        encoding: utf8,);
 
     return response;
   }
 
   FutureOr<void> _changeWakeup(
-      WakeupEvent event, Emitter<DiaryEditState> emit) async {
+      WakeupEvent event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       var response = await sendWakeupData(
-          currentState.token, event.selectedTime, currentState.diaryId);
+          currentState.token, event.selectedTime, currentState.diaryId,);
       if (response.statusCode == 200) {
         await reloadScreen(event, emit);
         var updatedState =
@@ -432,11 +432,11 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   FutureOr<void> _changeRetire(
-      RetireEvent event, Emitter<DiaryEditState> emit) async {
+      RetireEvent event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       var response = await sendRetireData(
-          currentState.token, event.selectedTime, currentState.diaryId);
+          currentState.token, event.selectedTime, currentState.diaryId,);
       if (response.statusCode == 200) {
         await reloadScreen(event, emit);
         var updatedState =
@@ -467,13 +467,13 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           'Authorization': 'Bearer $token',
         },
         body: json.encode(credentials),
-        encoding: utf8);
+        encoding: utf8,);
 
     return response;
   }
 
   Future<http.Response> sendRetireData(
-      String? token, TimeOfDay retire, int diaryID) async {
+      String? token, TimeOfDay retire, int diaryID,) async {
     String url = dotenv.env['SERVER_ROOT']! + '/diary/$diaryID/retire/fill';
     final formatter = DateFormat('HH:mm');
     final retireString =
@@ -488,13 +488,13 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           'Authorization': 'Bearer $token',
         },
         body: json.encode(credentials),
-        encoding: utf8);
+        encoding: utf8,);
 
     return response;
   }
 
   FutureOr<void> _changeMealTime(
-      ChangeMealTime event, Emitter<DiaryEditState> emit) async {
+      ChangeMealTime event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       var updatedState = currentState.copyWith(mealTimeController: event.time);
@@ -522,18 +522,18 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           'Authorization': 'Bearer $token',
         },
         body: json.encode(credentials),
-        encoding: utf8);
+        encoding: utf8,);
 
     return response;
   }
 
   FutureOr<void> _changeMeal(
-      ChangeMeal event, Emitter<DiaryEditState> emit) async {
+      ChangeMeal event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       final meal = currentState.meals?.firstWhere(
           (meal) => meal['id'] == event.value.id,
-          orElse: () => null);
+          orElse: () => null,);
       int? id = event.value.id;
       print(meal['photos']);
       DiaryEditLoadedState updatedState = currentState.copyWith(
@@ -542,7 +542,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           photos: meal['photos'],
           mealTimeController: toTime(meal['time'] ?? "1$id:00"),
           selectedMood: meal['mood'],
-          selectedSatiety: meal['satiety']);
+          selectedSatiety: meal['satiety'],);
       print(updatedState.photos);
       emit(updatedState);
     }
@@ -550,7 +550,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
 
   
   FutureOr<void> _clearInput(
-      ClearInput event, Emitter<DiaryEditState> emit) {
+      ClearInput event, Emitter<DiaryEditState> emit,) {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       DiaryEditLoadedState updatedState = currentState.copyWith(
@@ -560,7 +560,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   FutureOr<void> _changePortion(
-      ChangePortion event, Emitter<DiaryEditState> emit) {
+      ChangePortion event, Emitter<DiaryEditState> emit,) {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       DiaryEditLoadedState updatedState = currentState.copyWith(
@@ -571,7 +571,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   FutureOr<void> _toggleMood(
-      ToggleMoodExpandedEvent event, Emitter<DiaryEditState> emit) {
+      ToggleMoodExpandedEvent event, Emitter<DiaryEditState> emit,) {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
 
@@ -581,7 +581,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   FutureOr<void> _toggleWakeup(
-      ToggleWakeupExpandedEvent event, Emitter<DiaryEditState> emit) {
+      ToggleWakeupExpandedEvent event, Emitter<DiaryEditState> emit,) {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
 
@@ -591,7 +591,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   FutureOr<void> _addPortion(
-      AddPortionEvent event, Emitter<DiaryEditState> emit) async {
+      AddPortionEvent event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
 
@@ -609,13 +609,13 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
         await reloadScreen(event, emit);
       } else {
         print(
-            'Failed to add portion. Status Code: ${response.statusCode} ${response.body}');
+            'Failed to add portion. Status Code: ${response.statusCode} ${response.body}',);
       }
     }
   }
 
   FutureOr<http.Response> sendPortionData(String? token, String? name,
-      String portion, int? quantity, int? mealID, int diaryID) async {
+      String portion, int? quantity, int? mealID, int diaryID,) async {
     String url =
         '${dotenv.env['SERVER_ROOT']!}/diary/$diaryID/meal/$mealID/portions/create';
 
@@ -639,14 +639,14 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   Future<void> _inputProduct(
-      ProductInput event, Emitter<DiaryEditState> emit) async {
+      ProductInput event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       String? token = currentState.token;
 
       final Map<String, dynamic> credentials = {'name': event.input};
       final uri = Uri.parse(
-          '${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/filter?${Uri(queryParameters: credentials).query}');
+          '${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/filter?${Uri(queryParameters: credentials).query}',);
 
       final response = await http.get(
         uri,
@@ -679,7 +679,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   Future<void> _removePortion(
-      RemovePortionEvent event, Emitter<DiaryEditState> emit) async {
+      RemovePortionEvent event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
 
@@ -697,13 +697,13 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
         await reloadScreen(event, emit);
       } else {
         print(
-            'Failed to add portion. Status Code: ${response.statusCode} ${response.body}');
+            'Failed to add portion. Status Code: ${response.statusCode} ${response.body}',);
       }
     }
   }
 
   Future<http.Response> sendRemovePortion(
-      String? token, int? portionID, int? mealID, int diaryID) async {
+      String? token, int? portionID, int? mealID, int diaryID,) async {
     String url =
         '${dotenv.env['SERVER_ROOT']!}/diary/$diaryID/meal/$mealID/portions/$portionID/delete';
 
@@ -720,7 +720,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   FutureOr<void> _removeImage(
-      RemoveImageEvent event, Emitter<DiaryEditState> emit) async {
+      RemoveImageEvent event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
 
@@ -736,13 +736,13 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
         await reloadScreen(event, emit);
       } else {
         print(
-            'Failed to remove photo. Status Code: ${response.statusCode} ${response.body}');
+            'Failed to remove photo. Status Code: ${response.statusCode} ${response.body}',);
       }
     }
   }
 
   Future<http.Response> sendRemovePhoto(String? token, String? path,
-      String? photoID, int? mealID, int diaryID) async {
+      String? photoID, int? mealID, int diaryID,) async {
     String url =
         '${dotenv.env['SERVER_ROOT']!}/diary/$diaryID/meal/$mealID/photo/delete';
     final Map<String, dynamic> credentials = {
@@ -781,7 +781,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   Future<http.Response> sendFinishDay(String? token, int diaryID,
-      TimeOfDay? wakeup, TimeOfDay? retire, String? comment) async {
+      TimeOfDay? wakeup, TimeOfDay? retire, String? comment,) async {
     final formatter = DateFormat('HH:mm');
     final wakeupString =
         formatter.format(DateTime(2022, 1, 1, wakeup!.hour, wakeup.minute));
@@ -810,19 +810,19 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   Future<void> _uploadImages(
-      UploadImages event, Emitter<DiaryEditState> emit) async {
+      UploadImages event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
 
       emit(currentState.copyWith(isLoading: true));
       await uploadImageToServer(event.image.path, currentState.diaryId,
-          currentState.currentMeal!.id!, currentState.token);
+          currentState.currentMeal!.id!, currentState.token,);
       await reloadScreen(event, emit);
     }
   }
 
   Future<String> uploadImageToServer(
-      String imagePath, int diaryID, int mealId, String? token) async {
+      String imagePath, int diaryID, int mealId, String? token,) async {
     String url =
         '${dotenv.env['SERVER_ROOT']!}/diary/$diaryID/meal/$mealId/photo/upload';
 
@@ -841,12 +841,12 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
       return imageUrl;
     } else {
       throw Exception(
-          'Failed to upload image. Status code: ${streamedResponse.statusCode}}');
+          'Failed to upload image. Status code: ${streamedResponse.statusCode}}',);
     }
   }
 
   FutureOr<void> _sendModeration(
-      SendModeration event, Emitter<DiaryEditState> emit) async {
+      SendModeration event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       final response = await _sendModerationData(
@@ -871,9 +871,9 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
       String proteins_on_100gr,
       String fats_on_100gr,
       String carbohydrates_on_100gr,
-      String? token) async {
+      String? token,) async {
     final Uri url = Uri.parse(
-        '${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/sendToModeration');
+        '${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/sendToModeration',);
     final Uri serverURL = Uri.parse('${dotenv.env['SERVER_ROOT']!}');
     String host = serverURL.host;
     final Map<String, String> credentials = {
@@ -901,12 +901,12 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
       return response;
     } else {
       throw Exception(
-          'Failed to send a product for moderation ${response.statusCode}');
+          'Failed to send a product for moderation ${response.statusCode}',);
     }
   }
 
   FutureOr<void> _addComment(
-      AddComment event, Emitter<DiaryEditState> emit) async {
+      AddComment event, Emitter<DiaryEditState> emit,) async {
     if (state is DiaryEditLoadedState) {
       var currentState = state as DiaryEditLoadedState;
       var updatedState = currentState.copyWith(
@@ -915,7 +915,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
 
       // Отправляем данные по HTTP маршруту и ждем ответ
       var response = await sendCommentData(
-          currentState.token, event.comment, currentState.diaryId);
+          currentState.token, event.comment, currentState.diaryId,);
 
       if (response.statusCode == 200) {
         emit(updatedState); // Передаем обновленное состояние в emit
@@ -924,7 +924,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
   }
 
   Future<http.Response> sendCommentData(
-      String? token, String comment, int diaryID) async {
+      String? token, String comment, int diaryID,) async {
     String url = dotenv.env['SERVER_ROOT']! + '/diary/$diaryID/retire/fill';
     final Map<String, dynamic> credentials = {
       'comment': comment,
@@ -936,7 +936,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
           'Authorization': 'Bearer $token',
         },
         body: json.encode(credentials),
-        encoding: utf8);
+        encoding: utf8,);
 
     return response;
   }

lib/presentation/diary/diary_edit_screen/bloc/diary_edit_event.dart

@@ -159,7 +159,7 @@ class SendModeration extends DiaryEditEvent {
       required this.energyOn100gr,
       required this.proteinsOn100gr,
       required this.fatsOn100gr,
-      required this.carbohydratesOn100gr});
+      required this.carbohydratesOn100gr,});
   String name;
   String energyOn100gr;
   String proteinsOn100gr;

lib/presentation/diary/diary_edit_screen/bloc/diary_edit_state.dart

@@ -47,7 +47,7 @@ class DiaryEditLoadedState extends DiaryEditState {
       required this.selectedSatiety,
       required this.moderationExpanded,
       required this.wakeupExpanded,
-      required this.moodExpanded})
+      required this.moodExpanded,})
       : super(diaryEditModelObj: null);
 
   DiaryEditModel? diaryEditModelObj;
@@ -109,7 +109,7 @@ class DiaryEditLoadedState extends DiaryEditState {
         moderationExpanded,
         isLoading,
         isAdded,
-        currentMeal
+        currentMeal,
       ];
   DiaryEditLoadedState copyWith({
     DiaryEditModel? diaryEditModelObj,
@@ -174,7 +174,7 @@ class DiaryEditLoadedState extends DiaryEditState {
         moderationExpanded: moderationExpanded ?? this.moderationExpanded,
         moodExpanded: moodExpanded ?? this.moodExpanded,
         isAdded: isAdded ?? this.isAdded,
-        isLoading: isLoading ?? this.isLoading);
+        isLoading: isLoading ?? this.isLoading,);
   }
 }
 

lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart

@@ -21,7 +21,7 @@ class DiaryEditScreen extends StatelessWidget {
 
   static Widget builder(BuildContext context) {
     return BlocProvider<DiaryEditBloc>(
-        create: (context) => DiaryEditBloc(DiaryEditState(diaryEditModelObj: DiaryEditModel()))..add(DiaryEditInitialEvent()), child: DiaryEditScreen());
+        create: (context) => DiaryEditBloc(DiaryEditState(diaryEditModelObj: DiaryEditModel()))..add(DiaryEditInitialEvent()), child: DiaryEditScreen(),);
   }
 
   Widget build(BuildContext context) {
@@ -221,7 +221,7 @@ class DiaryEditScreen extends StatelessWidget {
                   Icon(
                     Icons.photo_library,
                     color: appTheme.blueGray300,
-                  )
+                  ),
                 ],
               ),
             ),
@@ -332,7 +332,7 @@ class DiaryEditScreen extends StatelessWidget {
                         defaultValue: diaryEditModelObj?.mealList[0],
                         onChanged: changeMeal(context, state),
                       );
-                    })),
+                    },),),
             SizedBox(height: 20.v),
             Padding(
               padding: EdgeInsets.symmetric(horizontal: 10.h),
@@ -381,7 +381,7 @@ class DiaryEditScreen extends StatelessWidget {
                         ),
                       ),
                     );
-                  }),
+                  },),
             ),
             SizedBox(height: 20.v),
             if (state.moderationExpanded)
@@ -492,9 +492,9 @@ class DiaryEditScreen extends StatelessWidget {
                   return Container(); // Возвращаем пустой контейнер, если состояние не является DiaryEditLoadedState
                 }
               },
-            )
+            ),
           ],
-        ));
+        ),);
   }
 
   openCaloriesDialog(BuildContext context, DiaryEditLoadedState state) {
@@ -543,7 +543,7 @@ class DiaryEditScreen extends StatelessWidget {
             ),
             TextButton(
               onPressed: triggerModeration(context, state.productNameController!.text, state.caloriesController!.text, state.proteinsController!.text,
-                  state.fatsController!.text, state.carbsController!.text, dialogContext),
+                  state.fatsController!.text, state.carbsController!.text, dialogContext,),
               child: Text('Отправить'),
             ),
           ],
@@ -553,11 +553,11 @@ class DiaryEditScreen extends StatelessWidget {
   }
 
   triggerModeration(BuildContext context, String name, String energyOn100gr, String proteinsOn100gr, String fatsOn100gr, String carbohydratesOn100gr,
-      BuildContext dialogContext) {
+      BuildContext dialogContext,) {
     return () {
       // Call function to send moderation with the entered values
       context.read<DiaryEditBloc>().add(SendModeration(
-          name: name, energyOn100gr: energyOn100gr, proteinsOn100gr: proteinsOn100gr, fatsOn100gr: fatsOn100gr, carbohydratesOn100gr: carbohydratesOn100gr));
+          name: name, energyOn100gr: energyOn100gr, proteinsOn100gr: proteinsOn100gr, fatsOn100gr: fatsOn100gr, carbohydratesOn100gr: carbohydratesOn100gr,),);
       Navigator.of(dialogContext).pop(); // Dismiss the dialog
     };
   }
@@ -647,7 +647,7 @@ class DiaryEditScreen extends StatelessWidget {
               child: Text(
                 portion['product_name'].length > 8 ? portion['product_name'].substring(0, 8) : portion['product_name'],
                 style: CustomTextStyles.titleMedium16,
-              )),
+              ),),
           Padding(
             padding: EdgeInsets.only(
               left: 20.h,
@@ -667,7 +667,7 @@ class DiaryEditScreen extends StatelessWidget {
                   Icons.close,
                   color: appTheme.blueGray300,
                 ),
-              )),
+              ),),
         ],
       ),
     );
@@ -783,26 +783,26 @@ class DiaryEditScreen extends StatelessWidget {
                         BarChartRodData(
                           toY: consumedValues[0] / recommendedValues[0] * 100,
                           color: checkConsumedValues([recommendedValues[0]], [consumedValues[1]]) ? Colors.red : Colors.blue,
-                        )
-                      ]),
+                        ),
+                      ],),
                       BarChartGroupData(x: 1, barRods: [
                         BarChartRodData(
                           toY: consumedValues[1] / recommendedValues[1] * 100,
                           color: checkConsumedValues([recommendedValues[1]], [consumedValues[1]]) ? Colors.red : Colors.blue,
-                        )
-                      ]),
+                        ),
+                      ],),
                       BarChartGroupData(x: 2, barRods: [
                         BarChartRodData(
                           toY: consumedValues[2] / recommendedValues[2] * 100,
                           color: checkConsumedValues([recommendedValues[2]], [consumedValues[2]]) ? Colors.red : Colors.blue,
-                        )
-                      ]),
+                        ),
+                      ],),
                       BarChartGroupData(x: 3, barRods: [
                         BarChartRodData(
                           toY: consumedValues[3] / recommendedValues[3] * 100,
                           color: checkConsumedValues([recommendedValues[3]], [consumedValues[3]]) ? Colors.red : Colors.blue,
-                        )
-                      ]),
+                        ),
+                      ],),
                     ],
                   ),
                 ),
@@ -909,7 +909,7 @@ class DiaryEditScreen extends StatelessWidget {
             Text(
               "*Превышенная суточная норма",
               style: theme.textTheme.labelLarge,
-            )
+            ),
         ],
       ),
     );
@@ -1147,7 +1147,7 @@ class DiaryEditScreen extends StatelessWidget {
                 // Остальные элементы шкалы
               ],
             ),
-        ]));
+        ],),);
   }
 
   changeMood(BuildContext context, int satiety) {