SK-673: Update UI for search and create group (#112)

* fix update user avatar

* fix create group chat

* add recent users to show

* fix open group chat from search

* update search form logic

* minor fixes

* fix recent users

---------

Co-authored-by: Magellan <magellan@connectycube.com>

Author: CubeRomanMagellan

sama_chat_client/lib/src/db/db_service.dart

@@ -57,21 +57,27 @@ class DatabaseService {
   /// ////////////////////////////////
 
   Future<List<ConversationModel>> getAllConversationsLocal(
-      DateTime? ltDate) async {
+      DateTime? ltDate, int? limit, String? type) async {
     var filter = ConversationModel_.type
         .equals('u')
         .and(ConversationModel_.lastMessageBind.notEquals(0).and(
             ConversationModel_.updatedAt
                 .lessThanDate(ltDate ?? DateTime.now())))
         .or(ConversationModel_.type.equals('g'));
 
+    var condition =
+        ConversationModel_.updatedAt.lessThanDate(ltDate ?? DateTime.now());
+    if (type != null) {
+      condition = condition.and(ConversationModel_.type.equals(type));
+    }
+
     final query = store!
         .box<ConversationModel>()
         // .query(filtered ? filter : null)
-        .query(
-            ConversationModel_.updatedAt.lessThanDate(ltDate ?? DateTime.now()))
+        .query(condition)
         .order(ConversationModel_.updatedAt, flags: Order.descending)
-        .build();
+        .build()
+      ..limit = limit ?? 0;
     final results = await query.findAsync();
     query.close();
     return results;
@@ -264,6 +270,13 @@ class DatabaseService {
       user.bid = userInDb?.bid;
       if (userInDb?.avatar?.fileId == user.avatar?.fileId) {
         user.avatar?.bid = userInDb?.avatar?.bid;
+        if (user.avatar?.imageUrl != userInDb?.avatar?.imageUrl) {
+          //to check
+          print('user.avatar putAsync');
+          await store!
+              .box<AvatarModel>()
+              .putAsync(user.avatar!, mode: PutMode.update);
+        }
       }
     }
     return store!.box<UserModel>().putAndGetManyAsync(items, mode: PutMode.put);

sama_chat_client/lib/src/db/local/conversation_local_datasource.dart

@@ -8,10 +8,11 @@ class ConversationLocalDatasource {
   // ConversationLocalDataSource(this.databaseService);
 
   Future<List<ConversationModel>> getAllConversationsLocal(
-      {DateTime? ltDate}) async {
+      {DateTime? ltDate, int? limit, String? type}) async {
     print('getAllConversationsLocal');
     try {
-      return await _databaseService.getAllConversationsLocal(ltDate);
+      return await _databaseService.getAllConversationsLocal(
+          ltDate, limit, type);
     } catch (e) {
       print('getAllConversationsLocal e ${e.toString()}');
       throw DatabaseException(e.toString());

sama_chat_client/lib/src/features/conversation/view/messages_list.dart

@@ -76,11 +76,15 @@ class _MessagesListState extends State<MessagesList> {
           })
         ],
         child: Stack(children: [
-          BlocSelector<ConversationBloc, ConversationState, ConversationStatus>(
-            selector: (state) => state.status,
-            builder: (context, status) {
+          BlocSelector<ConversationBloc, ConversationState,
+              ({ConversationStatus status, bool initial})>(
+            selector: (state) => (
+              status: state.status,
+              initial: state.initial,
+            ),
+            builder: (context, data) {
               var state = context.read<ConversationBloc>().state;
-              switch (status) {
+              switch (data.status) {
                 case ConversationStatus.failure:
                   WidgetsBinding.instance
                       .addPostFrameCallback((_) => ScaffoldMessenger.of(context)
@@ -94,7 +98,7 @@ class _MessagesListState extends State<MessagesList> {
                 success:
                 case ConversationStatus.success:
                   if (state.messages.isEmpty) {
-                    return state.initial
+                    return data.initial
                         ? const Center(child: CircularProgressIndicator())
                         : Center(
                             child: Container(

sama_chat_client/lib/src/features/conversation/widgets/forward_messages/forward_messages_widget.dart

@@ -5,7 +5,7 @@ import '../../../../repository/conversation/conversation_repository.dart';
 import '../../../../repository/global_search/global_search_repository.dart';
 import '../../../../repository/messages/messages_repository.dart';
 import '../../../conversation_create/bloc/conversation_create_bloc.dart';
-import '../../../search/bloc/global_search_bloc.dart';
+import '../../../global_search/bloc/global_search_bloc.dart';
 import '../../bloc/forward_message/forward_messages_bloc.dart';
 import '../../models/chat_message.dart';
 import 'forward_search_form.dart';

sama_chat_client/lib/src/features/conversation/widgets/forward_messages/forward_search_form.dart

@@ -9,10 +9,10 @@ import '../../../../navigation/constants.dart';
 import '../../../../shared/ui/colors.dart';
 import '../../../conversation_create/bloc/conversation_create_bloc.dart';
 import '../../../conversation_create/bloc/conversation_create_state.dart';
-import '../../../search/bloc/global_search_bloc.dart';
-import '../../../search/bloc/global_search_state.dart';
-import '../../../search/view/search_bar.dart';
-import '../../../search/view/search_form.dart';
+import '../../../global_search/bloc/global_search_bloc.dart';
+import '../../../global_search/bloc/global_search_state.dart';
+import '../../../global_search/view/search_bar.dart';
+import '../../../global_search/view/search_result.dart';
 import '../../bloc/conversation_bloc.dart';
 import '../../bloc/forward_message/forward_messages_bloc.dart';
 import '../../models/chat_message.dart';
@@ -51,7 +51,9 @@ class ForwardSearchForm extends StatelessWidget {
                 child: Column(
                   spacing: 4,
                   children: [
-                    const GlobalSearchBar(),
+                    const Padding(
+                        padding: EdgeInsets.only(bottom: 8),
+                        child: GlobalSearchBar()),
                     _SearchBody(forwardMessages),
                   ],
                 ))));

sama_chat_client/lib/src/features/conversation_create/view/conversation_create_form.dart

@@ -6,6 +6,8 @@ import 'package:formz/formz.dart';
 import 'package:image_picker/image_picker.dart';
 
 import '../../../db/models/user_model.dart';
+import '../../../repository/conversation/conversation_repository.dart';
+import '../../../repository/user/user_repository.dart';
 import '../models/avatar.dart';
 import '../models/groupname.dart';
 import '../models/participants.dart';
@@ -15,7 +17,11 @@ part 'group_event.dart';
 part 'group_state.dart';
 
 class GroupBloc extends Bloc<GroupEvent, GroupState> {
-  GroupBloc() : super(const GroupState()) {
+  final ConversationRepository conversationRepository;
+  final UserRepository userRepository;
+
+  GroupBloc(this.conversationRepository, this.userRepository)
+      : super(const GroupState()) {
     on<GroupnameChanged>(_onGroupnameChanged);
     on<GroupAvatarPicked>(_onGroupAvatarPicked);
     on<GroupParticipantsAdded>(_onGroupParticipantsAdded);

sama_chat_client/lib/src/features/conversation_create/view/conversation_create_page.dart

@@ -8,11 +8,11 @@ import '../../../features/conversation_create/bloc/conversation_create_event.dar
 import '../../../shared/ui/colors.dart';
 import '../../../shared/ui/view/participants_forms.dart';
 import '../../../shared/ui/view/text_button_forms.dart';
-import '../../../shared/utils/api_utils.dart';
 import '../../../shared/utils/screen_factor.dart';
 import '../../conversation_create/bloc/conversation_create_bloc.dart';
 import '../../conversations_list/widgets/avatar_letter_icon.dart';
-import '../../search/view/search_bar.dart';
+import '../../global_search/view/search_bar.dart';
+import '../../search/bloc/search_bloc.dart';
 import '../bloc/group_bloc.dart';
 import '../models/groupname.dart';
 
@@ -39,7 +39,7 @@ class GroupCreateFormState extends State<GroupCreateForm> {
             leading: const BackButton(color: white),
             centerTitle: true,
             title: const Text(
-              'Group create',
+              'New group',
               style: TextStyle(color: white),
             )),
         body: BlocListener<GroupBloc, GroupState>(
@@ -63,30 +63,37 @@ class GroupCreateFormState extends State<GroupCreateForm> {
               }
             },
             child: Container(
-              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-              child: Column(mainAxisSize: MainAxisSize.min, children: [
-                const GlobalSearchBar(),
-                Expanded(
-                    child: BlocBuilder<GroupBloc, GroupState>(
-                        buildWhen: (previous, current) {
-                  return previous.participants != current.participants;
-                }, builder: (context, state) {
-                  var users = state.participants.value;
-                  return ParticipantsForm(
-                    users: List.of(users),
-                    onAddParticipants: (user) {
-                      context
-                          .read<GroupBloc>()
-                          .add(GroupParticipantsAdded(user));
-                    },
-                    onRemoveParticipants: (user) {
-                      context
-                          .read<GroupBloc>()
-                          .add(GroupParticipantsRemoved(user));
-                    },
-                  );
-                }))
-              ]),
+              padding: const EdgeInsets.symmetric(vertical: 16),
+              child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  spacing: 10,
+                  children: [
+                    const GlobalSearchBar(hintText: 'Search for people to add'),
+                    Expanded(
+                        child: BlocBuilder<GroupBloc, GroupState>(
+                            buildWhen: (previous, current) {
+                      return previous.participants != current.participants;
+                    }, builder: (context, state) {
+                      return Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 25),
+                          child: ParticipantsForm(
+                            participants: List.of(state.participants.value),
+                            users: context.select(
+                              (SearchBloc bloc) => bloc.state.users,
+                            ),
+                            onAddParticipants: (user) {
+                              context
+                                  .read<GroupBloc>()
+                                  .add(GroupParticipantsAdded(user));
+                            },
+                            onRemoveParticipants: (user) {
+                              context
+                                  .read<GroupBloc>()
+                                  .add(GroupParticipantsRemoved(user));
+                            },
+                          ));
+                    }))
+                  ]),
             )),
         floatingActionButton:
             BlocBuilder<GroupBloc, GroupState>(buildWhen: (previous, current) {