refactor: profile model

2024-09-09 18:18:35 +03:00
parent 3ccf5b6d92
commit 8ea819c5bc
77 changed files with 2735 additions and 2950 deletions
--- 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
@@ -90,6 +90,9 @@ class _$ChatRoomStateCopyWithImpl<$Res, $Val extends ChatRoomState>
  final $Val _value;
  // ignore: unused_field
  final $Res Function($Val) _then;
+
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
 }

 /// @nodoc
@@ -106,6 +109,9 @@ class __$$ChatRoomStateImplCopyWithImpl<$Res>
  __$$ChatRoomStateImplCopyWithImpl(
      _$ChatRoomStateImpl _value, $Res Function(_$ChatRoomStateImpl) _then)
      : super(_value, _then);
+
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
 }

 /// @nodoc
@@ -226,6 +232,9 @@ class __$$ChatRoomStateLoadingImplCopyWithImpl<$Res>
  __$$ChatRoomStateLoadingImplCopyWithImpl(_$ChatRoomStateLoadingImpl _value,
      $Res Function(_$ChatRoomStateLoadingImpl) _then)
      : super(_value, _then);
+
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
 }

 /// @nodoc
@@ -356,6 +365,8 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>
      $Res Function(_$ChatRoomStateLoadedImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -384,6 +395,8 @@ class __$$ChatRoomStateLoadedImplCopyWithImpl<$Res>
    ));
  }

+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
  @override
  @pragma('vm:prefer-inline')
  $ChatRoomModelCopyWith<$Res> get chatRoom {
@@ -442,7 +455,9 @@ class _$ChatRoomStateLoadedImpl implements ChatRoomStateLoaded {
  int get hashCode => Object.hash(runtimeType, chatRoom,
      const DeepCollectionEquality().hash(_chatMessages), isTyping, isLoading);

-  @JsonKey(ignore: true)
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ChatRoomStateLoadedImplCopyWith<_$ChatRoomStateLoadedImpl> get copyWith =>
@@ -541,7 +556,10 @@ abstract class ChatRoomStateLoaded implements ChatRoomState {
  List<ChatMessageModel> get chatMessages;
  bool get isTyping;
  bool get isLoading;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ChatRoomStateLoadedImplCopyWith<_$ChatRoomStateLoadedImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -563,6 +581,8 @@ class __$$ChatRoomStateErrorImplCopyWithImpl<$Res>
      $Res Function(_$ChatRoomStateErrorImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -602,7 +622,9 @@ class _$ChatRoomStateErrorImpl implements ChatRoomStateError {
  @override
  int get hashCode => Object.hash(runtimeType, errorMessage);

-  @JsonKey(ignore: true)
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ChatRoomStateErrorImplCopyWith<_$ChatRoomStateErrorImpl> get copyWith =>
@@ -695,7 +717,10 @@ abstract class ChatRoomStateError implements ChatRoomState {
      _$ChatRoomStateErrorImpl;

  String get errorMessage;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ChatRoomState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ChatRoomStateErrorImplCopyWith<_$ChatRoomStateErrorImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/features/chat/presentation/bloc/chat_select_cubit/chat_select_state.freezed.dart
+++ b/lib/features/chat/presentation/bloc/chat_select_cubit/chat_select_state.freezed.dart
@@ -84,6 +84,9 @@ class _$ChatSelectStateCopyWithImpl<$Res, $Val extends ChatSelectState>
  final $Val _value;
  // ignore: unused_field
  final $Res Function($Val) _then;
+
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
 }

 /// @nodoc
@@ -100,6 +103,9 @@ class __$$ChatSelectStateImplCopyWithImpl<$Res>
  __$$ChatSelectStateImplCopyWithImpl(
      _$ChatSelectStateImpl _value, $Res Function(_$ChatSelectStateImpl) _then)
      : super(_value, _then);
+
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
 }

 /// @nodoc
@@ -216,6 +222,9 @@ class __$$ChatSelectStateLoadingImplCopyWithImpl<$Res>
      _$ChatSelectStateLoadingImpl _value,
      $Res Function(_$ChatSelectStateLoadingImpl) _then)
      : super(_value, _then);
+
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
 }

 /// @nodoc
@@ -334,6 +343,8 @@ class __$$ChatSelectStateErrorImplCopyWithImpl<$Res>
      $Res Function(_$ChatSelectStateErrorImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -373,7 +384,9 @@ class _$ChatSelectStateErrorImpl implements ChatSelectStateError {
  @override
  int get hashCode => Object.hash(runtimeType, errorMessage);

-  @JsonKey(ignore: true)
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ChatSelectStateErrorImplCopyWith<_$ChatSelectStateErrorImpl>
@@ -461,7 +474,10 @@ abstract class ChatSelectStateError implements ChatSelectState {
      _$ChatSelectStateErrorImpl;

  String get errorMessage;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ChatSelectStateErrorImplCopyWith<_$ChatSelectStateErrorImpl>
      get copyWith => throw _privateConstructorUsedError;
 }
@@ -484,6 +500,8 @@ class __$$ChatSelectStateLoadedImplCopyWithImpl<$Res>
      $Res Function(_$ChatSelectStateLoadedImpl) _then)
      : super(_value, _then);

+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -530,7 +548,9 @@ class _$ChatSelectStateLoadedImpl implements ChatSelectStateLoaded {
  int get hashCode =>
      Object.hash(runtimeType, const DeepCollectionEquality().hash(_chatRooms));

-  @JsonKey(ignore: true)
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$ChatSelectStateLoadedImplCopyWith<_$ChatSelectStateLoadedImpl>
@@ -617,7 +637,10 @@ abstract class ChatSelectStateLoaded implements ChatSelectState {
      {required final List<ChatRoom> chatRooms}) = _$ChatSelectStateLoadedImpl;

  List<ChatRoom> get chatRooms;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of ChatSelectState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$ChatSelectStateLoadedImplCopyWith<_$ChatSelectStateLoadedImpl>
      get copyWith => throw _privateConstructorUsedError;
 }
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -1,12 +1,11 @@
 import 'dart:io';
-
+import 'package:intl/intl.dart';
 import 'package:eatvio_app/core/app_export.dart';
 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';
 import 'package:eatvio_app/locator_service.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

 class ChatScreen extends StatefulWidget {
@@ -60,7 +59,7 @@ class _ChatScreenState extends State<ChatScreen> {
          } else {
            return Scaffold(
              body: Center(
-                child: CupertinoActivityIndicator(),
+                child: CircularProgressIndicator(),
              ),
            );
          }
@@ -145,16 +144,25 @@ class _ChatScreenState extends State<ChatScreen> {
                        delegate: SliverChildBuilderDelegate(
                          (context, index) {
                            if (index < state.chatMessages.length) {
-                              return ChatBubbleWidget(
-                                sendTime: state.chatMessages[index].updatedAt,
-                                text: state.chatMessages[index].data.trim(),
-                                isCurrentUser: state.chatRoom.users['to_chat_user']!.id != state.chatMessages[index].authorId,
-                                mediaData: state.chatMessages[index].mediaData ?? [],
+                              return Column(
+                                children: [
+                                  if ((index + 1 != state.chatMessages.length &&
+                                          DateTime.parse(state.chatMessages[index].updatedAt).day !=
+                                              DateTime.parse(state.chatMessages[index + 1].updatedAt).day) ||
+                                      index + 1 == state.chatMessages.length)
+                                    _messageDate(state.chatMessages[index].updatedAt),
+                                  ChatBubbleWidget(
+                                    sendTime: state.chatMessages[index].updatedAt,
+                                    text: state.chatMessages[index].data.trim(),
+                                    isCurrentUser: state.chatRoom.users['to_chat_user']!.id != state.chatMessages[index].authorId,
+                                    mediaData: state.chatMessages[index].mediaData ?? [],
+                                  ),
+                                ],
                              );
                            } else {
                              return Padding(
                                padding: const EdgeInsets.all(8),
-                                child: Center(child: CupertinoActivityIndicator()),
+                                child: Center(child: CircularProgressIndicator()),
                              );
                            }
                          },
@@ -311,4 +319,20 @@ class _ChatScreenState extends State<ChatScreen> {
      ),
    );
  }
+
+  _messageDate(String date) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: Text(
+        DateFormat.MMMMd('RU').format(
+          DateTime.parse(date),
+        ),
+        style: const TextStyle(
+          height: 1,
+          color: Color(0xFF8393A1),
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+    );
+  }
 }
--- a/lib/features/chat/presentation/pages/chat_select_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_select_screen.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_select_cubit/cha
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_select_cubit/chat_select_state.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_entry_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_search_bar_widget.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:eatvio_app/locator_service.dart';
 import 'package:flutter/material.dart';

 class ChatSelectScreen extends StatefulWidget {
@@ -15,58 +15,62 @@ class ChatSelectScreen extends StatefulWidget {
 }

 class _ChatSelectScreenState extends State<ChatSelectScreen> {
+  final ChatSelectCubit chatSelectCubit = sl<ChatSelectCubit>();
  final searchController = TextEditingController();

  Widget build(BuildContext context) {
-    return BlocBuilder<ChatSelectCubit, ChatSelectState>(
-      builder: (context, state) {
-        return Scaffold(
-          appBar: AppBar(
-            backgroundColor: Colors.white,
-            toolbarHeight: 0,
-          ),
-          body: NestedScrollView(
-            headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
-              return [
-                SliverPadding(
-                  padding: const EdgeInsets.only(top: 8),
-                  sliver: SliverAppBar(
-                    automaticallyImplyLeading: false,
-                    stretchTriggerOffset: 1,
-                    scrolledUnderElevation: 0,
-                    floating: true,
-                    snap: true,
-                    title: Padding(
-                      padding: const EdgeInsets.only(top: 8),
-                      child: ChatSearchBarWidget(
-                        onSuffixIconTap: () => context.read<ChatSelectCubit>().getChatRooms(),
-                        onChanged: (query) {
-                          if (query.length > 2) {
-                            EasyDebounce.debounce(
-                              'searchChatRoom',
-                              Duration(milliseconds: 300),
-                              () => context.read<ChatSelectCubit>().getChatRooms(query: query),
-                            );
-                          } else {
-                            context.read<ChatSelectCubit>().getChatRooms();
-                          }
-                        },
-                        controller: searchController,
-                        fillColor: Color(0xFFF0F2F5),
-                        hintText: "Поиск",
-                        hintStyle: TextStyle(
-                          color: Color(0xFF7B8794),
+    return BlocProvider<ChatSelectCubit>(
+      create: (context) => chatSelectCubit..getChatRooms(),
+      child: BlocBuilder<ChatSelectCubit, ChatSelectState>(
+        builder: (context, state) {
+          return Scaffold(
+            appBar: AppBar(
+              backgroundColor: Colors.white,
+              toolbarHeight: 0,
+            ),
+            body: NestedScrollView(
+              headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+                return [
+                  SliverPadding(
+                    padding: const EdgeInsets.only(top: 8),
+                    sliver: SliverAppBar(
+                      automaticallyImplyLeading: false,
+                      stretchTriggerOffset: 1,
+                      scrolledUnderElevation: 0,
+                      floating: true,
+                      snap: true,
+                      title: Padding(
+                        padding: const EdgeInsets.only(top: 8),
+                        child: ChatSearchBarWidget(
+                          onSuffixIconTap: () => context.read<ChatSelectCubit>().getChatRooms(),
+                          onChanged: (query) {
+                            if (query.length > 2) {
+                              EasyDebounce.debounce(
+                                'searchChatRoom',
+                                Duration(milliseconds: 300),
+                                () => context.read<ChatSelectCubit>().getChatRooms(query: query),
+                              );
+                            } else {
+                              context.read<ChatSelectCubit>().getChatRooms();
+                            }
+                          },
+                          controller: searchController,
+                          fillColor: Color(0xFFF0F2F5),
+                          hintText: "Поиск",
+                          hintStyle: TextStyle(
+                            color: Color(0xFF7B8794),
+                          ),
                        ),
                      ),
                    ),
                  ),
-                ),
-              ];
-            },
-            body: stateBuilder(state),
-          ),
-        );
-      },
+                ];
+              },
+              body: stateBuilder(state),
+            ),
+          );
+        },
+      ),
    );
  }

@@ -74,7 +78,7 @@ class _ChatSelectScreenState extends State<ChatSelectScreen> {
    if (state is ChatSelectStateLoading) {
      return Scaffold(
        body: Center(
-          child: CupertinoActivityIndicator(),
+          child: CircularProgressIndicator(),
        ),
      );
    } else if (state is ChatSelectStateLoaded) {
@@ -87,7 +91,7 @@ class _ChatSelectScreenState extends State<ChatSelectScreen> {
    } else {
      return Scaffold(
        body: Center(
-          child: CupertinoActivityIndicator(),
+          child: CircularProgressIndicator(),
        ),
      );
    }