diff --git a/lib/features/chat/models/chat_messages_model.dart b/lib/features/chat/models/chat_messages_model.dart index fbf6fc05..84a51b48 100644 --- a/lib/features/chat/models/chat_messages_model.dart +++ b/lib/features/chat/models/chat_messages_model.dart @@ -1,4 +1,5 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart'; +import 'package:eatvio_app/features/chat/models/chat_meta_model.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; part 'chat_messages_model.freezed.dart'; @@ -8,8 +9,8 @@ part 'chat_messages_model.g.dart'; @freezed class ChatMessagesModel with _$ChatMessagesModel { const factory ChatMessagesModel({ - @JsonKey(name: 'data') - required List messagesList, + @JsonKey(name: 'data') required List messagesList, + required ChatMetaModel meta, }) = _ChatMessagesModel; factory ChatMessagesModel.fromJson(Map json) => _$ChatMessagesModelFromJson(json); diff --git a/lib/features/chat/models/chat_messages_model.freezed.dart b/lib/features/chat/models/chat_messages_model.freezed.dart index 594498a7..a970241c 100644 --- a/lib/features/chat/models/chat_messages_model.freezed.dart +++ b/lib/features/chat/models/chat_messages_model.freezed.dart @@ -22,6 +22,7 @@ ChatMessagesModel _$ChatMessagesModelFromJson(Map json) { mixin _$ChatMessagesModel { @JsonKey(name: 'data') List get messagesList => throw _privateConstructorUsedError; + ChatMetaModel get meta => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -35,7 +36,11 @@ abstract class $ChatMessagesModelCopyWith<$Res> { ChatMessagesModel value, $Res Function(ChatMessagesModel) then) = _$ChatMessagesModelCopyWithImpl<$Res, ChatMessagesModel>; @useResult - $Res call({@JsonKey(name: 'data') List messagesList}); + $Res call( + {@JsonKey(name: 'data') List messagesList, + ChatMetaModel meta}); + + $ChatMetaModelCopyWith<$Res> get meta; } /// @nodoc @@ -52,14 +57,27 @@ class _$ChatMessagesModelCopyWithImpl<$Res, $Val extends ChatMessagesModel> @override $Res call({ Object? messagesList = null, + Object? meta = null, }) { return _then(_value.copyWith( messagesList: null == messagesList ? _value.messagesList : messagesList // ignore: cast_nullable_to_non_nullable as List, + meta: null == meta + ? _value.meta + : meta // ignore: cast_nullable_to_non_nullable + as ChatMetaModel, ) as $Val); } + + @override + @pragma('vm:prefer-inline') + $ChatMetaModelCopyWith<$Res> get meta { + return $ChatMetaModelCopyWith<$Res>(_value.meta, (value) { + return _then(_value.copyWith(meta: value) as $Val); + }); + } } /// @nodoc @@ -70,7 +88,12 @@ abstract class _$$ChatMessagesModelImplCopyWith<$Res> __$$ChatMessagesModelImplCopyWithImpl<$Res>; @override @useResult - $Res call({@JsonKey(name: 'data') List messagesList}); + $Res call( + {@JsonKey(name: 'data') List messagesList, + ChatMetaModel meta}); + + @override + $ChatMetaModelCopyWith<$Res> get meta; } /// @nodoc @@ -85,12 +108,17 @@ class __$$ChatMessagesModelImplCopyWithImpl<$Res> @override $Res call({ Object? messagesList = null, + Object? meta = null, }) { return _then(_$ChatMessagesModelImpl( messagesList: null == messagesList ? _value._messagesList : messagesList // ignore: cast_nullable_to_non_nullable as List, + meta: null == meta + ? _value.meta + : meta // ignore: cast_nullable_to_non_nullable + as ChatMetaModel, )); } } @@ -100,7 +128,8 @@ class __$$ChatMessagesModelImplCopyWithImpl<$Res> class _$ChatMessagesModelImpl implements _ChatMessagesModel { const _$ChatMessagesModelImpl( {@JsonKey(name: 'data') - required final List messagesList}) + required final List messagesList, + required this.meta}) : _messagesList = messagesList; factory _$ChatMessagesModelImpl.fromJson(Map json) => @@ -115,9 +144,12 @@ class _$ChatMessagesModelImpl implements _ChatMessagesModel { return EqualUnmodifiableListView(_messagesList); } + @override + final ChatMetaModel meta; + @override String toString() { - return 'ChatMessagesModel(messagesList: $messagesList)'; + return 'ChatMessagesModel(messagesList: $messagesList, meta: $meta)'; } @override @@ -126,13 +158,14 @@ class _$ChatMessagesModelImpl implements _ChatMessagesModel { (other.runtimeType == runtimeType && other is _$ChatMessagesModelImpl && const DeepCollectionEquality() - .equals(other._messagesList, _messagesList)); + .equals(other._messagesList, _messagesList) && + (identical(other.meta, meta) || other.meta == meta)); } @JsonKey(ignore: true) @override int get hashCode => Object.hash( - runtimeType, const DeepCollectionEquality().hash(_messagesList)); + runtimeType, const DeepCollectionEquality().hash(_messagesList), meta); @JsonKey(ignore: true) @override @@ -151,9 +184,9 @@ class _$ChatMessagesModelImpl implements _ChatMessagesModel { abstract class _ChatMessagesModel implements ChatMessagesModel { const factory _ChatMessagesModel( - {@JsonKey(name: 'data') - required final List messagesList}) = - _$ChatMessagesModelImpl; + {@JsonKey(name: 'data') + required final List messagesList, + required final ChatMetaModel meta}) = _$ChatMessagesModelImpl; factory _ChatMessagesModel.fromJson(Map json) = _$ChatMessagesModelImpl.fromJson; @@ -162,6 +195,8 @@ abstract class _ChatMessagesModel implements ChatMessagesModel { @JsonKey(name: 'data') List get messagesList; @override + ChatMetaModel get meta; + @override @JsonKey(ignore: true) _$$ChatMessagesModelImplCopyWith<_$ChatMessagesModelImpl> get copyWith => throw _privateConstructorUsedError; diff --git a/lib/features/chat/models/chat_messages_model.g.dart b/lib/features/chat/models/chat_messages_model.g.dart index 80f78746..6216cd83 100644 --- a/lib/features/chat/models/chat_messages_model.g.dart +++ b/lib/features/chat/models/chat_messages_model.g.dart @@ -12,10 +12,12 @@ _$ChatMessagesModelImpl _$$ChatMessagesModelImplFromJson( messagesList: (json['data'] as List) .map((e) => ChatMessageModel.fromJson(e as Map)) .toList(), + meta: ChatMetaModel.fromJson(json['meta'] as Map), ); Map _$$ChatMessagesModelImplToJson( _$ChatMessagesModelImpl instance) => { 'data': instance.messagesList, + 'meta': instance.meta, }; diff --git a/lib/features/chat/models/chat_meta_model.dart b/lib/features/chat/models/chat_meta_model.dart new file mode 100644 index 00000000..4c4d6cf0 --- /dev/null +++ b/lib/features/chat/models/chat_meta_model.dart @@ -0,0 +1,14 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'chat_meta_model.freezed.dart'; + +part 'chat_meta_model.g.dart'; + +@freezed +class ChatMetaModel with _$ChatMetaModel { + const factory ChatMetaModel({ + @JsonKey(name: "last_page") required int lastPage, + }) = _ChatMetaModel; + + factory ChatMetaModel.fromJson(Map json) => _$ChatMetaModelFromJson(json); +} diff --git a/lib/features/chat/models/chat_meta_model.freezed.dart b/lib/features/chat/models/chat_meta_model.freezed.dart new file mode 100644 index 00000000..11ecb9e2 --- /dev/null +++ b/lib/features/chat/models/chat_meta_model.freezed.dart @@ -0,0 +1,158 @@ +// coverage:ignore-file +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'chat_meta_model.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +T _$identity(T value) => value; + +final _privateConstructorUsedError = UnsupportedError( + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models'); + +ChatMetaModel _$ChatMetaModelFromJson(Map json) { + return _ChatMetaModel.fromJson(json); +} + +/// @nodoc +mixin _$ChatMetaModel { + @JsonKey(name: "last_page") + int get lastPage => throw _privateConstructorUsedError; + + Map toJson() => throw _privateConstructorUsedError; + @JsonKey(ignore: true) + $ChatMetaModelCopyWith get copyWith => + throw _privateConstructorUsedError; +} + +/// @nodoc +abstract class $ChatMetaModelCopyWith<$Res> { + factory $ChatMetaModelCopyWith( + ChatMetaModel value, $Res Function(ChatMetaModel) then) = + _$ChatMetaModelCopyWithImpl<$Res, ChatMetaModel>; + @useResult + $Res call({@JsonKey(name: "last_page") int lastPage}); +} + +/// @nodoc +class _$ChatMetaModelCopyWithImpl<$Res, $Val extends ChatMetaModel> + implements $ChatMetaModelCopyWith<$Res> { + _$ChatMetaModelCopyWithImpl(this._value, this._then); + + // ignore: unused_field + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + + @pragma('vm:prefer-inline') + @override + $Res call({ + Object? lastPage = null, + }) { + return _then(_value.copyWith( + lastPage: null == lastPage + ? _value.lastPage + : lastPage // ignore: cast_nullable_to_non_nullable + as int, + ) as $Val); + } +} + +/// @nodoc +abstract class _$$ChatMetaModelImplCopyWith<$Res> + implements $ChatMetaModelCopyWith<$Res> { + factory _$$ChatMetaModelImplCopyWith( + _$ChatMetaModelImpl value, $Res Function(_$ChatMetaModelImpl) then) = + __$$ChatMetaModelImplCopyWithImpl<$Res>; + @override + @useResult + $Res call({@JsonKey(name: "last_page") int lastPage}); +} + +/// @nodoc +class __$$ChatMetaModelImplCopyWithImpl<$Res> + extends _$ChatMetaModelCopyWithImpl<$Res, _$ChatMetaModelImpl> + implements _$$ChatMetaModelImplCopyWith<$Res> { + __$$ChatMetaModelImplCopyWithImpl( + _$ChatMetaModelImpl _value, $Res Function(_$ChatMetaModelImpl) _then) + : super(_value, _then); + + @pragma('vm:prefer-inline') + @override + $Res call({ + Object? lastPage = null, + }) { + return _then(_$ChatMetaModelImpl( + lastPage: null == lastPage + ? _value.lastPage + : lastPage // ignore: cast_nullable_to_non_nullable + as int, + )); + } +} + +/// @nodoc +@JsonSerializable() +class _$ChatMetaModelImpl implements _ChatMetaModel { + const _$ChatMetaModelImpl( + {@JsonKey(name: "last_page") required this.lastPage}); + + factory _$ChatMetaModelImpl.fromJson(Map json) => + _$$ChatMetaModelImplFromJson(json); + + @override + @JsonKey(name: "last_page") + final int lastPage; + + @override + String toString() { + return 'ChatMetaModel(lastPage: $lastPage)'; + } + + @override + bool operator ==(Object other) { + return identical(this, other) || + (other.runtimeType == runtimeType && + other is _$ChatMetaModelImpl && + (identical(other.lastPage, lastPage) || + other.lastPage == lastPage)); + } + + @JsonKey(ignore: true) + @override + int get hashCode => Object.hash(runtimeType, lastPage); + + @JsonKey(ignore: true) + @override + @pragma('vm:prefer-inline') + _$$ChatMetaModelImplCopyWith<_$ChatMetaModelImpl> get copyWith => + __$$ChatMetaModelImplCopyWithImpl<_$ChatMetaModelImpl>(this, _$identity); + + @override + Map toJson() { + return _$$ChatMetaModelImplToJson( + this, + ); + } +} + +abstract class _ChatMetaModel implements ChatMetaModel { + const factory _ChatMetaModel( + {@JsonKey(name: "last_page") required final int lastPage}) = + _$ChatMetaModelImpl; + + factory _ChatMetaModel.fromJson(Map json) = + _$ChatMetaModelImpl.fromJson; + + @override + @JsonKey(name: "last_page") + int get lastPage; + @override + @JsonKey(ignore: true) + _$$ChatMetaModelImplCopyWith<_$ChatMetaModelImpl> get copyWith => + throw _privateConstructorUsedError; +} diff --git a/lib/features/chat/models/chat_meta_model.g.dart b/lib/features/chat/models/chat_meta_model.g.dart new file mode 100644 index 00000000..7126e2dd --- /dev/null +++ b/lib/features/chat/models/chat_meta_model.g.dart @@ -0,0 +1,17 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'chat_meta_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_$ChatMetaModelImpl _$$ChatMetaModelImplFromJson(Map json) => + _$ChatMetaModelImpl( + lastPage: (json['last_page'] as num).toInt(), + ); + +Map _$$ChatMetaModelImplToJson(_$ChatMetaModelImpl instance) => + { + 'last_page': instance.lastPage, + }; diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart index aff8fa8f..712adf04 100644 --- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart +++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart @@ -14,6 +14,9 @@ import 'package:flutter_bloc/flutter_bloc.dart'; class ChatRoomCubit extends Cubit { final ChatRepository chatRepository; + int currentPage = 1; + late final int lastPage; + late final PusherChannelsClient client; late final PrivateChannel privateChannel; @@ -21,11 +24,40 @@ class ChatRoomCubit extends Cubit { required this.chatRepository, }) : super(ChatRoomState.loading()); + loadNextPage(String chatId) async { + if (currentPage < lastPage) { + emit(ChatRoomState.loaded( + chatRoom: (state as ChatRoomStateLoaded).chatRoom, + chatMessages: (state as ChatRoomStateLoaded).chatMessages, + isTyping: (state as ChatRoomStateLoaded).isTyping, + isLoading: true, + )); + + try { + final chatMessages = await chatRepository.getChatMessages(chatId, currentPage + 1); + + emit(ChatRoomState.loaded( + chatRoom: (state as ChatRoomStateLoaded).chatRoom, + chatMessages: [...(state as ChatRoomStateLoaded).chatMessages, ...chatMessages.messagesList], + isTyping: (state as ChatRoomStateLoaded).isTyping, + isLoading: false, + )); + + currentPage++; + + } catch (e) { + print(e); + emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных')); + } + } + } + initChat(String chatId) async { try { final chatRoom = await chatRepository.getChatRoom(chatId); - final chatMessages = await chatRepository.getChatMessages(chatId); + final chatMessages = await chatRepository.getChatMessages(chatId, currentPage); + lastPage = chatMessages.meta.lastPage; final initCubit = sl(); @@ -38,8 +70,9 @@ class ChatRoomCubit extends Cubit { emit(ChatRoomState.loaded( chatRoom: chatRoom, - chatMessages: chatMessages, + chatMessages: chatMessages.messagesList, isTyping: false, + isLoading: false, )); } catch (e) { emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных')); @@ -67,13 +100,14 @@ class ChatRoomCubit extends Cubit { privateChannel.bind('App\\Events\\ChatMessageUpdated').listen((event) { List messagesList = [ ChatMessageModel.fromJson(jsonDecode(event.data)['message']), - ...(state as ChatRoomStateLoaded).chatMessages.messagesList, + ...(state as ChatRoomStateLoaded).chatMessages, ]; emit( ChatRoomState.loaded( chatRoom: (state as ChatRoomStateLoaded).chatRoom, - chatMessages: (state as ChatRoomStateLoaded).chatMessages.copyWith(messagesList: messagesList), + chatMessages: messagesList, isTyping: (state as ChatRoomStateLoaded).isTyping, + isLoading: false, ), ); }); @@ -84,6 +118,7 @@ class ChatRoomCubit extends Cubit { chatRoom: (state as ChatRoomStateLoaded).chatRoom, chatMessages: (state as ChatRoomStateLoaded).chatMessages, isTyping: true, + isLoading: false, ), ); EasyDebounce.debounce( @@ -94,6 +129,7 @@ class ChatRoomCubit extends Cubit { chatRoom: (state as ChatRoomStateLoaded).chatRoom, chatMessages: (state as ChatRoomStateLoaded).chatMessages, isTyping: false, + isLoading: false, ), ), ); diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart index dbf82382..24113e62 100644 --- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart +++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart @@ -1,4 +1,4 @@ -import 'package:eatvio_app/features/chat/models/chat_messages_model.dart'; +import 'package:eatvio_app/features/chat/models/chat_message_model.dart'; import 'package:eatvio_app/features/chat/models/chat_room_model.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; @@ -12,8 +12,9 @@ abstract class ChatRoomState with _$ChatRoomState { const factory ChatRoomState.loaded({ required ChatRoomModel chatRoom, - required ChatMessagesModel chatMessages, + required List chatMessages, required bool isTyping, + required bool isLoading, }) = ChatRoomStateLoaded; const factory ChatRoomState.error({ diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.freezed.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.freezed.dart index 4831cccb..43bf9df9 100644 --- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.freezed.dart +++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.freezed.dart @@ -21,7 +21,7 @@ mixin _$ChatRoomState { TResult Function() $default, { required TResult Function() loading, required TResult Function(ChatRoomModel chatRoom, - ChatMessagesModel chatMessages, bool isTyping) + List chatMessages, bool isTyping, bool isLoading) loaded, required TResult Function(String errorMessage) error, }) => @@ -30,8 +30,8 @@ mixin _$ChatRoomState { TResult? whenOrNull( TResult? Function()? $default, { TResult? Function()? loading, - TResult? Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult? Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult? Function(String errorMessage)? error, }) => @@ -40,8 +40,8 @@ mixin _$ChatRoomState { TResult maybeWhen( TResult Function()? $default, { TResult Function()? loading, - TResult Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult Function(String errorMessage)? error, required TResult orElse(), @@ -133,7 +133,7 @@ class _$ChatRoomStateImpl implements _ChatRoomState { TResult Function() $default, { required TResult Function() loading, required TResult Function(ChatRoomModel chatRoom, - ChatMessagesModel chatMessages, bool isTyping) + List chatMessages, bool isTyping, bool isLoading) loaded, required TResult Function(String errorMessage) error, }) { @@ -145,8 +145,8 @@ class _$ChatRoomStateImpl implements _ChatRoomState { TResult? whenOrNull( TResult? Function()? $default, { TResult? Function()? loading, - TResult? Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult? Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult? Function(String errorMessage)? error, }) { @@ -158,8 +158,8 @@ class _$ChatRoomStateImpl implements _ChatRoomState { TResult maybeWhen( TResult Function()? $default, { TResult Function()? loading, - TResult Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult Function(String errorMessage)? error, required TResult orElse(), @@ -254,7 +254,7 @@ class _$ChatRoomStateLoadingImpl implements ChatRoomStateLoading { TResult Function() $default, { required TResult Function() loading, required TResult Function(ChatRoomModel chatRoom, - ChatMessagesModel chatMessages, bool isTyping) + List chatMessages, bool isTyping, bool isLoading) loaded, required TResult Function(String errorMessage) error, }) { @@ -266,8 +266,8 @@ class _$ChatRoomStateLoadingImpl implements ChatRoomStateLoading { TResult? whenOrNull( TResult? Function()? $default, { TResult? Function()? loading, - TResult? Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult? Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult? Function(String errorMessage)? error, }) { @@ -279,8 +279,8 @@ class _$ChatRoomStateLoadingImpl implements ChatRoomStateLoading { TResult maybeWhen( TResult Function()? $default, { TResult Function()? loading, - TResult Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult Function(String errorMessage)? error, required TResult orElse(), @@ -340,10 +340,12 @@ abstract class _$$ChatRoomStateLoadedImplCopyWith<$Res> { __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>; @useResult $Res call( - {ChatRoomModel chatRoom, ChatMessagesModel chatMessages, bool isTyping}); + {ChatRoomModel chatRoom, + List chatMessages, + bool isTyping, + bool isLoading}); $ChatRoomModelCopyWith<$Res> get chatRoom; - $ChatMessagesModelCopyWith<$Res> get chatMessages; } /// @nodoc @@ -360,6 +362,7 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res> Object? chatRoom = null, Object? chatMessages = null, Object? isTyping = null, + Object? isLoading = null, }) { return _then(_$ChatRoomStateLoadedImpl( chatRoom: null == chatRoom @@ -367,13 +370,17 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res> : chatRoom // ignore: cast_nullable_to_non_nullable as ChatRoomModel, chatMessages: null == chatMessages - ? _value.chatMessages + ? _value._chatMessages : chatMessages // ignore: cast_nullable_to_non_nullable - as ChatMessagesModel, + as List, isTyping: null == isTyping ? _value.isTyping : isTyping // ignore: cast_nullable_to_non_nullable as bool, + isLoading: null == isLoading + ? _value.isLoading + : isLoading // ignore: cast_nullable_to_non_nullable + as bool, )); } @@ -384,14 +391,6 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res> return _then(_value.copyWith(chatRoom: value)); }); } - - @override - @pragma('vm:prefer-inline') - $ChatMessagesModelCopyWith<$Res> get chatMessages { - return $ChatMessagesModelCopyWith<$Res>(_value.chatMessages, (value) { - return _then(_value.copyWith(chatMessages: value)); - }); - } } /// @nodoc @@ -399,19 +398,29 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res> class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded { const _$ChatRoomStateLoadedImpl( {required this.chatRoom, - required this.chatMessages, - required this.isTyping}); + required final List chatMessages, + required this.isTyping, + required this.isLoading}) + : _chatMessages = chatMessages; @override final ChatRoomModel chatRoom; + final List _chatMessages; @override - final ChatMessagesModel chatMessages; + List get chatMessages { + if (_chatMessages is EqualUnmodifiableListView) return _chatMessages; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(_chatMessages); + } + @override final bool isTyping; + @override + final bool isLoading; @override String toString() { - return 'ChatRoomState.loaded(chatRoom: $chatRoom, chatMessages: $chatMessages, isTyping: $isTyping)'; + return 'ChatRoomState.loaded(chatRoom: $chatRoom, chatMessages: $chatMessages, isTyping: $isTyping, isLoading: $isLoading)'; } @override @@ -421,15 +430,17 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded { other is _$ChatRoomStateLoadedImpl && (identical(other.chatRoom, chatRoom) || other.chatRoom == chatRoom) && - (identical(other.chatMessages, chatMessages) || - other.chatMessages == chatMessages) && + const DeepCollectionEquality() + .equals(other._chatMessages, _chatMessages) && (identical(other.isTyping, isTyping) || - other.isTyping == isTyping)); + other.isTyping == isTyping) && + (identical(other.isLoading, isLoading) || + other.isLoading == isLoading)); } @override - int get hashCode => - Object.hash(runtimeType, chatRoom, chatMessages, isTyping); + int get hashCode => Object.hash(runtimeType, chatRoom, + const DeepCollectionEquality().hash(_chatMessages), isTyping, isLoading); @JsonKey(ignore: true) @override @@ -444,11 +455,11 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded { TResult Function() $default, { required TResult Function() loading, required TResult Function(ChatRoomModel chatRoom, - ChatMessagesModel chatMessages, bool isTyping) + List chatMessages, bool isTyping, bool isLoading) loaded, required TResult Function(String errorMessage) error, }) { - return loaded(chatRoom, chatMessages, isTyping); + return loaded(chatRoom, chatMessages, isTyping, isLoading); } @override @@ -456,12 +467,12 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded { TResult? whenOrNull( TResult? Function()? $default, { TResult? Function()? loading, - TResult? Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult? Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult? Function(String errorMessage)? error, }) { - return loaded?.call(chatRoom, chatMessages, isTyping); + return loaded?.call(chatRoom, chatMessages, isTyping, isLoading); } @override @@ -469,14 +480,14 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded { TResult maybeWhen( TResult Function()? $default, { TResult Function()? loading, - TResult Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult Function(String errorMessage)? error, required TResult orElse(), }) { if (loaded != null) { - return loaded(chatRoom, chatMessages, isTyping); + return loaded(chatRoom, chatMessages, isTyping, isLoading); } return orElse(); } @@ -522,12 +533,14 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded { abstract class ChatRoomStateLoaded implements ChatRoomState { const factory ChatRoomStateLoaded( {required final ChatRoomModel chatRoom, - required final ChatMessagesModel chatMessages, - required final bool isTyping}) = _$ChatRoomStateLoadedImpl; + required final List chatMessages, + required final bool isTyping, + required final bool isLoading}) = _$ChatRoomStateLoadedImpl; ChatRoomModel get chatRoom; - ChatMessagesModel get chatMessages; + List get chatMessages; bool get isTyping; + bool get isLoading; @JsonKey(ignore: true) _$$ChatRoomStateLoadedImplCopyWith<_$ChatRoomStateLoadedImpl> get copyWith => throw _privateConstructorUsedError; @@ -602,7 +615,7 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError { TResult Function() $default, { required TResult Function() loading, required TResult Function(ChatRoomModel chatRoom, - ChatMessagesModel chatMessages, bool isTyping) + List chatMessages, bool isTyping, bool isLoading) loaded, required TResult Function(String errorMessage) error, }) { @@ -614,8 +627,8 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError { TResult? whenOrNull( TResult? Function()? $default, { TResult? Function()? loading, - TResult? Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult? Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult? Function(String errorMessage)? error, }) { @@ -627,8 +640,8 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError { TResult maybeWhen( TResult Function()? $default, { TResult Function()? loading, - TResult Function(ChatRoomModel chatRoom, ChatMessagesModel chatMessages, - bool isTyping)? + TResult Function(ChatRoomModel chatRoom, + List chatMessages, bool isTyping, bool isLoading)? loaded, TResult Function(String errorMessage)? error, required TResult orElse(), diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart index b25be66d..7d9528fa 100644 --- a/lib/features/chat/presentation/pages/chat_screen.dart +++ b/lib/features/chat/presentation/pages/chat_screen.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart'; import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart'; import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart'; @@ -20,19 +22,15 @@ class ChatScreen extends StatefulWidget { class _ChatScreenState extends State { final scrollController = ScrollController(); + bool isLoading = false; Widget build(BuildContext context) { return BlocProvider( create: (BuildContext context) => sl()..initChat(widget.chatId), child: BlocBuilder( builder: (context, state) { - if (state is ChatRoomStateLoading) { - return Scaffold( - body: Center( - child: CupertinoActivityIndicator(), - ), - ); - } else if (state is ChatRoomStateLoaded) { + setupScrollController(context); + if (state is ChatRoomStateLoaded) { return _buildChat(context, state); } else if (state is ChatRoomStateError) { return Scaffold( @@ -55,16 +53,16 @@ class _ChatScreenState extends State { void setupScrollController(BuildContext context) { scrollController.addListener(() { + /// todo change rule for request new page if (scrollController.position.atEdge) { if (scrollController.position.pixels != 0) { - context.read(); + context.read().loadNextPage(widget.chatId); } } }); } _buildChat(BuildContext context, ChatRoomStateLoaded state) { - mediaQueryData = MediaQuery.of(context); return Scaffold( resizeToAvoidBottomInset: true, backgroundColor: PrimaryColors().gray50, @@ -136,12 +134,24 @@ class _ChatScreenState extends State { padding: EdgeInsets.symmetric(vertical: 16), sliver: SliverList( delegate: SliverChildBuilderDelegate( - (context, index) => ChatBubbleWidget( - text: state.chatMessages.messagesList[index].data.trim(), - isCurrentUser: state.chatRoom.users['to_chat_user']!.id != state.chatMessages.messagesList[index].authorId, - mediaData: state.chatMessages.messagesList[index].mediaData ?? [], - ), - childCount: state.chatMessages.messagesList.length, + (context, index) { + if (index < state.chatMessages.length) { + return ChatBubbleWidget( + text: state.chatMessages[index].data.trim(), + isCurrentUser: state.chatRoom.users['to_chat_user']!.id != state.chatMessages[index].authorId, + mediaData: state.chatMessages[index].mediaData ?? [], + ); + } else { + Timer(const Duration(milliseconds: 30), () { + scrollController.jumpTo(scrollController.position.maxScrollExtent); + }); + return Padding( + padding: const EdgeInsets.all(8), + child: Center(child: CupertinoActivityIndicator()), + ); + } + }, + childCount: state.chatMessages.length + (state.isLoading ? 1 : 0), ), ), ), diff --git a/lib/features/chat/repositories/chat_repository.dart b/lib/features/chat/repositories/chat_repository.dart index 38383f23..dbc67609 100644 --- a/lib/features/chat/repositories/chat_repository.dart +++ b/lib/features/chat/repositories/chat_repository.dart @@ -19,9 +19,9 @@ class ChatRepository { } } - Future getChatMessages(String chatId) async { + Future getChatMessages(String chatId, int page) async { try { - return (await chatService.getChatMessages(chatId)); + return (await chatService.getChatMessages(chatId, page)); } catch (e) { print(e); rethrow; diff --git a/lib/features/chat/services/chat_service.dart b/lib/features/chat/services/chat_service.dart index 3dd4a123..fa81a008 100644 --- a/lib/features/chat/services/chat_service.dart +++ b/lib/features/chat/services/chat_service.dart @@ -13,8 +13,8 @@ abstract class ChatService { @GET('/chat/show/{id}') Future> getChatRoom(@Path() String id); - @GET('/chat/show/{id}/messages') - Future getChatMessages(@Path() String id); + @GET('/chat/show/{id}/messages?page={page}') + Future getChatMessages(@Path() String id, @Path() int page); @GET('/profile/ws/params') Future getWebsocket(); diff --git a/lib/features/chat/services/chat_service.g.dart b/lib/features/chat/services/chat_service.g.dart index f4f04d1d..be6ed456 100644 --- a/lib/features/chat/services/chat_service.g.dart +++ b/lib/features/chat/services/chat_service.g.dart @@ -47,7 +47,10 @@ class _ChatService implements ChatService { } @override - Future getChatMessages(String id) async { + Future getChatMessages( + String id, + int page, + ) async { final _extra = {}; final queryParameters = {}; final _headers = {}; @@ -60,7 +63,7 @@ class _ChatService implements ChatService { ) .compose( _dio.options, - '/chat/show/${id}/messages', + '/chat/show/${id}/messages?page=${page}', queryParameters: queryParameters, data: _data, )