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

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

lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_state.freezed.dart

@@ -84,6 +84,9 @@ class _$NewMessagesStateCopyWithImpl<$Res, $Val extends NewMessagesState>
   final $Val _value;
   // ignore: unused_field
   final $Res Function($Val) _then;
+
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -100,6 +103,9 @@ class __$$NewMessagesStateImplCopyWithImpl<$Res>
   __$$NewMessagesStateImplCopyWithImpl(_$NewMessagesStateImpl _value,
       $Res Function(_$NewMessagesStateImpl) _then)
       : super(_value, _then);
+
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -215,6 +221,9 @@ class __$$NewMessagesStateEmptyImplCopyWithImpl<$Res>
   __$$NewMessagesStateEmptyImplCopyWithImpl(_$NewMessagesStateEmptyImpl _value,
       $Res Function(_$NewMessagesStateEmptyImpl) _then)
       : super(_value, _then);
+
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -335,6 +344,8 @@ class __$$NewMessagesStateLoadedImplCopyWithImpl<$Res>
       $Res Function(_$NewMessagesStateLoadedImpl) _then)
       : super(_value, _then);
 
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -374,7 +385,9 @@ class _$NewMessagesStateLoadedImpl implements NewMessagesStateLoaded {
   @override
   int get hashCode => Object.hash(runtimeType, messagesCount);
 
-  @JsonKey(ignore: true)
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   @pragma('vm:prefer-inline')
   _$$NewMessagesStateLoadedImplCopyWith<_$NewMessagesStateLoadedImpl>
@@ -461,7 +474,10 @@ abstract class NewMessagesStateLoaded implements NewMessagesState {
       _$NewMessagesStateLoadedImpl;
 
   int get messagesCount;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   _$$NewMessagesStateLoadedImplCopyWith<_$NewMessagesStateLoadedImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
@@ -484,6 +500,8 @@ class __$$NewMessagesStateErrorImplCopyWithImpl<$Res>
       $Res Function(_$NewMessagesStateErrorImpl) _then)
       : super(_value, _then);
 
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -523,7 +541,9 @@ class _$NewMessagesStateErrorImpl implements NewMessagesStateError {
   @override
   int get hashCode => Object.hash(runtimeType, errorMessage);
 
-  @JsonKey(ignore: true)
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   @pragma('vm:prefer-inline')
   _$$NewMessagesStateErrorImplCopyWith<_$NewMessagesStateErrorImpl>
@@ -610,7 +630,10 @@ abstract class NewMessagesStateError implements NewMessagesState {
       _$NewMessagesStateErrorImpl;
 
   String get errorMessage;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of NewMessagesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   _$$NewMessagesStateErrorImplCopyWith<_$NewMessagesStateErrorImpl>
       get copyWith => throw _privateConstructorUsedError;
 }

lib/features/bottom_navigation_bar/presentation/bloc/notifications_cubit/notifications_state.freezed.dart

@@ -84,6 +84,9 @@ class _$NotificationsStateCopyWithImpl<$Res, $Val extends NotificationsState>
   final $Val _value;
   // ignore: unused_field
   final $Res Function($Val) _then;
+
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -100,6 +103,9 @@ class __$$NotificationsStateImplCopyWithImpl<$Res>
   __$$NotificationsStateImplCopyWithImpl(_$NotificationsStateImpl _value,
       $Res Function(_$NotificationsStateImpl) _then)
       : super(_value, _then);
+
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -217,6 +223,9 @@ class __$$NotificationsStateEmptyImplCopyWithImpl<$Res>
       _$NotificationsStateEmptyImpl _value,
       $Res Function(_$NotificationsStateEmptyImpl) _then)
       : super(_value, _then);
+
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
 }
 
 /// @nodoc
@@ -338,6 +347,8 @@ class __$$NotificationsStateLoadedImplCopyWithImpl<$Res>
       $Res Function(_$NotificationsStateLoadedImpl) _then)
       : super(_value, _then);
 
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -377,7 +388,9 @@ class _$NotificationsStateLoadedImpl implements NotificationsStateLoaded {
   @override
   int get hashCode => Object.hash(runtimeType, notificationsCount);
 
-  @JsonKey(ignore: true)
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   @pragma('vm:prefer-inline')
   _$$NotificationsStateLoadedImplCopyWith<_$NotificationsStateLoadedImpl>
@@ -464,7 +477,10 @@ abstract class NotificationsStateLoaded implements NotificationsState {
       {required final int notificationsCount}) = _$NotificationsStateLoadedImpl;
 
   int get notificationsCount;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   _$$NotificationsStateLoadedImplCopyWith<_$NotificationsStateLoadedImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
@@ -489,6 +505,8 @@ class __$$NotificationsStateErrorImplCopyWithImpl<$Res>
       $Res Function(_$NotificationsStateErrorImpl) _then)
       : super(_value, _then);
 
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -528,7 +546,9 @@ class _$NotificationsStateErrorImpl implements NotificationsStateError {
   @override
   int get hashCode => Object.hash(runtimeType, errorMessage);
 
-  @JsonKey(ignore: true)
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   @override
   @pragma('vm:prefer-inline')
   _$$NotificationsStateErrorImplCopyWith<_$NotificationsStateErrorImpl>
@@ -615,7 +635,10 @@ abstract class NotificationsStateError implements NotificationsState {
       _$NotificationsStateErrorImpl;
 
   String get errorMessage;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of NotificationsState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
   _$$NotificationsStateErrorImplCopyWith<_$NotificationsStateErrorImpl>
       get copyWith => throw _privateConstructorUsedError;
 }