Merge remote-tracking branch 'refs/remotes/origin/feature/feed'

# Conflicts:
#	lib/features/calendar/presentation/pages/calendar_screen.dart
#	lib/features/diary/presentation/pages/diary_screen.dart

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

@@ -182,4 +182,4 @@ class DiaryEditErrorState extends DiaryEditState {
 
   @override
   List<Object> get props => [errorMessage];
-}*/
+}*/

lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart

@@ -1250,4 +1250,4 @@ bool checkConsumedValues(List<int> recommendedValues, List<int> consumedValues)
   // Если ни одно потребленное значение не превышает рекомендованное с соответствующим индексом
   return false; // Возвращаем true
 }
-*/
+*/

lib/presentation/diary/diary_edit_screen/models/diary_edit_model.dart

@@ -10,6 +10,7 @@ class DiaryEditModel extends Equatable {
 
   List<SelectionPopupModel> mealList;
   List<SelectionPopupModel>? portionList;
+
   DiaryEditModel copyWith({
     List<SelectionPopupModel>? mealList,
     List<SelectionPopupModel>? portionList,

lib/presentation/diets/diet_edit_screen/bloc/diet_edit_state.dart

@@ -14,6 +14,7 @@ class DietEditState extends Equatable {
 
   @override
   List<Object?> get props => [dietModelObj];
+
   DietEditState copyWith({DietEditModel? dietModelObj}) {
     return DietEditState(
       dietModelObj: dietModelObj ?? this.dietModelObj,
@@ -35,8 +36,10 @@ class DietEditLoadedState extends DietEditState {
   TextEditingController? name;
   TextEditingController? details;
   TextEditingController? duration;
+
   @override
   List<Object?> get props => [dietModelObj, diet, name, details, duration];
+
   DietEditLoadedState copyWith({
     DietEditModel? dietModelObj,
     Map<String, dynamic>? diet,

lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart

@@ -81,9 +81,9 @@ class BlogPostCreateBloc extends Bloc<BlogPostCreateEvent, BlogPostCreateState>
     String url = baseUrl + '/api/blogPosts/create';
 
     FormData formData = FormData.fromMap({
-      'title': title,
-      'description': description,
-      'youtube_url': youtubeURL,
+      'title': title ?? '',
+      'description': description ?? '',
+      'youtube_url': youtubeURL ?? '',
       'state': 'active',
       'image': await MultipartFile.fromFile(image!.path, filename: image.name),
     });