fixed pagination

2025-03-13 02:30:10 +07:00
parent 102dc9ee55
commit 9d53760137
38 changed files with 778 additions and 294 deletions
--- 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
@@ -86,6 +86,17 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
    }
  }

+  Future<void> updateChatRoom(String chatId) async{
+    try {
+      final chatRoom = await chatRepository.getChatRoom(chatId);      
+      emit(
+        (state as ChatRoomStateLoaded).copyWith(chatRoom: chatRoom),        
+      );
+    } catch (e) {
+      emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
+    }
+  }
+
  Future<void> _subscribeToChatChannel({
    required String chatId,
  }) async {
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:developer';

 import 'package:eatvio_app/core/enums/base_state.dart';
 import 'package:eatvio_app/core/websockets/ws_manager.dart';
@@ -30,21 +31,24 @@ class ChatsCubit extends Cubit<ChatsState> {
    });
  }
  String? _query;
+  int page = 1;
+  late int lastPage;
  Future<void> getChatRoomsWithLoading({String? query}) async {
+    page = 1;
    _query = query;
    emit(state.copyWith(state: BaseState.loading));
    try {
-      final chatRooms = await chatRepository.getChatRoomPreviews(query: query);
-      final unreadChats = chatRooms.where(
-        (element) => element.unreadMessagesCount > 0,
-      );
+      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
+      final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
+      lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
      emit(
        state.copyWith(
-          chatRooms: chatRooms,
-          chatsWithUnreadMessagesCount: unreadChats.length,
+          chatRooms: chatRoomsPaginationModel.chatRooms.data,
+          chatsWithUnreadMessagesCount: unreadChats,
          state: BaseState.success,
        ),
      );
+      page++;
    } catch (e) {
      emit(
        state.copyWith(errorMessage: e.toString(), state: BaseState.error),
@@ -53,26 +57,55 @@ class ChatsCubit extends Cubit<ChatsState> {
  }

  Future<void> getChatRooms({String? query}) async {
+    page = 1;
    _query = query;
    try {
-      final chatRooms = await chatRepository.getChatRoomPreviews(query: query);
-      final unreadChats = chatRooms.where(
-        (element) => element.unreadMessagesCount > 0,
-      );
+      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
+      final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
+      lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
      emit(
        state.copyWith(
-          chatRooms: chatRooms,
-          chatsWithUnreadMessagesCount: unreadChats.length,
+          chatRooms: chatRoomsPaginationModel.chatRooms.data,
+          chatsWithUnreadMessagesCount: unreadChats,
          state: BaseState.success,
        ),
      );
-    } catch (e) {
+      page++;
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
      emit(
        state.copyWith(errorMessage: e.toString(), state: BaseState.error),
      );
    }
  }

+  Future<void> loadMoreChatRooms() async {
+    try {
+      if (state.isLoadingMoreChats || lastPage == page) return;
+      emit(state.copyWith(isLoadingMoreChats: true));
+      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: _query, page: page);
+      final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
+      emit(
+        state.copyWith(
+          chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.chatRooms.data],
+          chatsWithUnreadMessagesCount: unreadChats,
+          state: BaseState.success,
+          isLoadingMoreChats: false,
+        ),
+      );
+      page++;
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      emit(
+        state.copyWith(
+          errorMessage: e.toString(),
+          state: BaseState.error,
+          isLoadingMoreChats: false,
+        ),
+      );
+    }
+  }
+
  void reduceUnreadMessagesCount({required String chatId, required int count}) {
    bool isChatRead = false;
    final updatedChatRooms = state.chatRooms.map((room) {
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_state.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_state.dart
@@ -1,5 +1,5 @@
 import 'package:eatvio_app/core/enums/base_state.dart';
-import 'package:eatvio_app/features/chat/models/chat_room_preview_model.dart';
+import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

 part 'chats_state.freezed.dart';
@@ -11,6 +11,7 @@ class ChatsState with _$ChatsState {
    @Default(BaseState.initial) BaseState state, 
    @Default(0) int chatsWithUnreadMessagesCount,
    @Default([]) List<ChatRoom> chatRooms,
+    @Default(false) bool isLoadingMoreChats,
    @Default(null) String? errorMessage,    
  }) = _ChatsState;
 
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_state.freezed.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_state.freezed.dart
@@ -19,6 +19,7 @@ mixin _$ChatsState {
  BaseState get state => throw _privateConstructorUsedError;
  int get chatsWithUnreadMessagesCount => throw _privateConstructorUsedError;
  List<ChatRoom> get chatRooms => throw _privateConstructorUsedError;
+  bool get isLoadingMoreChats => throw _privateConstructorUsedError;
  String? get errorMessage => throw _privateConstructorUsedError;

  /// Create a copy of ChatsState
@@ -38,6 +39,7 @@ abstract class $ChatsStateCopyWith<$Res> {
      {BaseState state,
      int chatsWithUnreadMessagesCount,
      List<ChatRoom> chatRooms,
+      bool isLoadingMoreChats,
      String? errorMessage});
 }

@@ -59,6 +61,7 @@ class _$ChatsStateCopyWithImpl<$Res, $Val extends ChatsState>
    Object? state = null,
    Object? chatsWithUnreadMessagesCount = null,
    Object? chatRooms = null,
+    Object? isLoadingMoreChats = null,
    Object? errorMessage = freezed,
  }) {
    return _then(_value.copyWith(
@@ -74,6 +77,10 @@ class _$ChatsStateCopyWithImpl<$Res, $Val extends ChatsState>
          ? _value.chatRooms
          : chatRooms // ignore: cast_nullable_to_non_nullable
              as List<ChatRoom>,
+      isLoadingMoreChats: null == isLoadingMoreChats
+          ? _value.isLoadingMoreChats
+          : isLoadingMoreChats // ignore: cast_nullable_to_non_nullable
+              as bool,
      errorMessage: freezed == errorMessage
          ? _value.errorMessage
          : errorMessage // ignore: cast_nullable_to_non_nullable
@@ -94,6 +101,7 @@ abstract class _$$ChatsStateImplCopyWith<$Res>
      {BaseState state,
      int chatsWithUnreadMessagesCount,
      List<ChatRoom> chatRooms,
+      bool isLoadingMoreChats,
      String? errorMessage});
 }

@@ -113,6 +121,7 @@ class __$$ChatsStateImplCopyWithImpl<$Res>
    Object? state = null,
    Object? chatsWithUnreadMessagesCount = null,
    Object? chatRooms = null,
+    Object? isLoadingMoreChats = null,
    Object? errorMessage = freezed,
  }) {
    return _then(_$ChatsStateImpl(
@@ -128,6 +137,10 @@ class __$$ChatsStateImplCopyWithImpl<$Res>
          ? _value._chatRooms
          : chatRooms // ignore: cast_nullable_to_non_nullable
              as List<ChatRoom>,
+      isLoadingMoreChats: null == isLoadingMoreChats
+          ? _value.isLoadingMoreChats
+          : isLoadingMoreChats // ignore: cast_nullable_to_non_nullable
+              as bool,
      errorMessage: freezed == errorMessage
          ? _value.errorMessage
          : errorMessage // ignore: cast_nullable_to_non_nullable
@@ -143,6 +156,7 @@ class _$ChatsStateImpl implements _ChatsState {
      {this.state = BaseState.initial,
      this.chatsWithUnreadMessagesCount = 0,
      final List<ChatRoom> chatRooms = const [],
+      this.isLoadingMoreChats = false,
      this.errorMessage = null})
      : _chatRooms = chatRooms;

@@ -161,13 +175,16 @@ class _$ChatsStateImpl implements _ChatsState {
    return EqualUnmodifiableListView(_chatRooms);
  }

+  @override
+  @JsonKey()
+  final bool isLoadingMoreChats;
  @override
  @JsonKey()
  final String? errorMessage;

  @override
  String toString() {
-    return 'ChatsState(state: $state, chatsWithUnreadMessagesCount: $chatsWithUnreadMessagesCount, chatRooms: $chatRooms, errorMessage: $errorMessage)';
+    return 'ChatsState(state: $state, chatsWithUnreadMessagesCount: $chatsWithUnreadMessagesCount, chatRooms: $chatRooms, isLoadingMoreChats: $isLoadingMoreChats, errorMessage: $errorMessage)';
  }

  @override
@@ -182,6 +199,8 @@ class _$ChatsStateImpl implements _ChatsState {
                    chatsWithUnreadMessagesCount) &&
            const DeepCollectionEquality()
                .equals(other._chatRooms, _chatRooms) &&
+            (identical(other.isLoadingMoreChats, isLoadingMoreChats) ||
+                other.isLoadingMoreChats == isLoadingMoreChats) &&
            (identical(other.errorMessage, errorMessage) ||
                other.errorMessage == errorMessage));
  }
@@ -192,6 +211,7 @@ class _$ChatsStateImpl implements _ChatsState {
      state,
      chatsWithUnreadMessagesCount,
      const DeepCollectionEquality().hash(_chatRooms),
+      isLoadingMoreChats,
      errorMessage);

  /// Create a copy of ChatsState
@@ -208,6 +228,7 @@ abstract class _ChatsState implements ChatsState {
      {final BaseState state,
      final int chatsWithUnreadMessagesCount,
      final List<ChatRoom> chatRooms,
+      final bool isLoadingMoreChats,
      final String? errorMessage}) = _$ChatsStateImpl;

  @override
@@ -217,6 +238,8 @@ abstract class _ChatsState implements ChatsState {
  @override
  List<ChatRoom> get chatRooms;
  @override
+  bool get isLoadingMoreChats;
+  @override
  String? get errorMessage;

  /// Create a copy of ChatsState
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -11,7 +11,6 @@ import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
--- a/lib/features/chat/presentation/pages/chats_screen.dart
+++ b/lib/features/chat/presentation/pages/chats_screen.dart
@@ -1,5 +1,6 @@
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:eatvio_app/core/enums/base_state.dart';
+import 'package:eatvio_app/core/utils/pagination_utils.dart';
 import 'package:eatvio_app/core/widgets/data_error_widget.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
@@ -16,7 +17,7 @@ class ChatsScreen extends StatefulWidget {
  State<ChatsScreen> createState() => _ChatsScreenState();
 }

-class _ChatsScreenState extends State<ChatsScreen> {  
+class _ChatsScreenState extends State<ChatsScreen> {
  final searchController = TextEditingController();

  Widget build(BuildContext context) {
@@ -65,45 +66,40 @@ class _ChatsScreenState extends State<ChatsScreen> {
                ),
              ];
            },
-            body: stateBuilder(state),
+            body: switch (state.state) {
+              BaseState.error => DataErrorWidget(onReload: () => context.read<ChatsCubit>().getChatRooms()),
+              BaseState.success => _buildChatList(context, state),
+              _ => const Loader(),
+            },
          ),
        );
      },
    );
  }

-  stateBuilder(ChatsState state) {
-    if (state.state == BaseState.loading) {
-      return Scaffold(
-        body: const Loader(),
-      );
-    } else if (state.state == BaseState.success) {
-      return _buildChatList(context, state);
-    } else if (state.state == BaseState.error) {
-      return Scaffold(
-        body: DataErrorWidget(onReload: () => context.read<ChatsCubit>().getChatRooms()),
-      );
-    } else {
-      return Scaffold(
-        body: const Loader(),
-      );
-    }
-  }
-
  _buildChatList(BuildContext context, ChatsState state) {
-    return ListView.separated(
-      padding: EdgeInsets.all(16),
-      shrinkWrap: true,
-      physics: NeverScrollableScrollPhysics(),
-      separatorBuilder: (context, index) {
-        return SizedBox(
-          height: 8,
-        );
-      },
-      itemCount: state.chatRooms.length,
-      itemBuilder: (context, index) {
-        return ChatEntryWidget(chatRoom: state.chatRooms[index]);
+    return NotificationListener<ScrollNotification>(
+      onNotification: (notification) {
+        loadNewContent(notification, context.read<ChatsCubit>().loadMoreChatRooms);
+        return false;
      },
+      child: ListView.separated(
+        padding: EdgeInsets.all(16),
+        shrinkWrap: true,
+        physics: NeverScrollableScrollPhysics(),
+        separatorBuilder: (context, index) {
+          return SizedBox(
+            height: 8,
+          );
+        },
+        itemCount: state.isLoadingMoreChats ? state.chatRooms.length + 1 : state.chatRooms.length,
+        itemBuilder: (context, index) {
+          if (index == state.chatRooms.length) {
+            return Center(child: Loader());
+          }
+          return ChatEntryWidget(chatRoom: state.chatRooms[index]);
+        },
+      ),
    );
  }
 }
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -1,10 +1,8 @@
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:eatvio_app/features/chat/models/chat_room_preview_model.dart';
+import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';

 class ChatEntryWidget extends StatefulWidget {
--- a/lib/features/chat/presentation/widgets/order_card.dart
+++ b/lib/features/chat/presentation/widgets/order_card.dart
@@ -0,0 +1,20 @@
+import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
+import 'package:flutter/material.dart';
+
+class OrderCard extends StatelessWidget {
+  final PlanModel plan;
+  final bool isUserView;
+  const OrderCard({super.key, required this.plan, required this.isUserView});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.only(top: 8, bottom: 12, left: 8, right: 8),
+      child: Column(
+        children: [
+
+        ],
+      ),
+    );
+  }
+}