Skip to content

SK-645: Update UI for Search screen #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artem-yatchenko merged 2 commits into from
Apr 7, 2026
Merged

SK-645: Update UI for Search screen #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
148d17d
update search form
Mar 24, 2026
b5e27f0
fix Forward message screen
Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions sama_chat_client/lib/src/features/conversation/view/messages_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,27 +367,16 @@ class MessageItem extends StatelessWidget {
leadingIcon: const Icon(Icons.forward_outlined),
title: const Text('Forward'),
onPressed: () {
print('forward message= ${message.body}');
showModalBottomSheet<dynamic>(
isScrollControlled: true,
useSafeArea: false,
context: context,
backgroundColor: black,
backgroundColor: Colors.transparent,
builder: (BuildContext bc) {
return Container(
color: lightWhite,
margin: EdgeInsets.only(
top: MediaQueryData.fromView(
View.of(context))
.padding
.top),
child: BlocProvider.value(
value:
BlocProvider.of<ConversationBloc>(
context),
child:
ForwardMessagesWidget({message}),
));
return BlocProvider.value(
value: BlocProvider.of<ConversationBloc>(
context),
child: ForwardMessagesWidget({message}),
);
});
}),
FocusedPopupMenuItem(
Expand Down
158 changes: 43 additions & 115 deletions ...at_client/lib/src/features/conversation/widgets/forward_messages/forward_search_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
Expand All @@ -6,13 +8,11 @@ import '../../../../db/models/models.dart';
import '../../../../navigation/constants.dart';
import '../../../../shared/ui/colors.dart';
import '../../../conversation_create/bloc/conversation_create_bloc.dart';
import '../../../conversation_create/bloc/conversation_create_event.dart';
import '../../../conversation_create/bloc/conversation_create_state.dart';
import '../../../conversations_list/conversations_list.dart';
import '../../../conversations_list/widgets/avatar_letter_icon.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 '../../bloc/conversation_bloc.dart';
import '../../bloc/forward_message/forward_messages_bloc.dart';
import '../../models/chat_message.dart';
Expand All @@ -27,12 +27,34 @@ class ForwardSearchForm extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Column(
children: <Widget>[
const GlobalSearchBar(withBack: false),
_SearchBody(forwardMessages),
],
);
final window = WidgetsBinding.instance.platformDispatcher.views.first;
double topPadding = window.viewPadding.top / window.devicePixelRatio -
(Platform.isIOS ? 30 : 15);
return ClipRRect(
borderRadius: const BorderRadius.vertical(
top: Radius.circular(28),
),
child: Scaffold(
appBar: AppBar(
backgroundColor: black,
automaticallyImplyLeading: false,
centerTitle: true,
toolbarHeight: kToolbarHeight + topPadding,
title: Padding(
padding: EdgeInsets.only(top: topPadding + 5),
child: const Text(
'Forward message',
style: TextStyle(color: white),
))),
body: Container(
padding: const EdgeInsets.only(left: 20, right: 20, top: 20),
child: Column(
spacing: 4,
children: [
const GlobalSearchBar(),
_SearchBody(forwardMessages),
],
))));
}
}

Expand Down Expand Up @@ -116,7 +138,12 @@ class _SearchBody extends StatelessWidget {
padding: EdgeInsets.only(top: 18.0),
child: Text('Please start typing to find chat'),
)
: Expanded(child: _SearchResults(null, chats, forwardMessages)),
: Expanded(
child: SearchResults(null, chats, chatOnTap: (chat) {
context
.read<ForwardMessagesBloc>()
.add(SendForwardMessage([chat], forwardMessages));
})),
SearchStateLoading() => const Padding(
padding: EdgeInsets.only(top: 18.0),
child: CircularProgressIndicator.adaptive(),
Expand All @@ -126,114 +153,15 @@ class _SearchBody extends StatelessWidget {
child: Text(state.error),
),
SearchStateSuccess() => Expanded(
child: _SearchResults(
state.users, state.conversations, forwardMessages)),
child: SearchResults(state.users, state.conversations,
chatOnTap: (chat) {
context
.read<ForwardMessagesBloc>()
.add(SendForwardMessage([chat], forwardMessages));
})),
};
},
),
);
}
}

class _SearchResults extends StatelessWidget {
final List<UserModel>? users;
final List<ConversationModel> chats;
final Set<ChatMessage> forwardMessages;

const _SearchResults(this.users, this.chats, this.forwardMessages);

Widget _header(String title) {
return Padding(
padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
child: Container(
padding: const EdgeInsets.only(left: 18.0),
width: double.maxFinite,
color: gainsborough, //define the background color
child: Text(
title,
style: const TextStyle(fontSize: 18),
),
),
);
}

Widget _emptyListText(String title) {
return Padding(
padding: const EdgeInsets.all(10.0),
child: Text(
title,
style: const TextStyle(
fontWeight: FontWeight.w300,
fontSize: 16,
),
textAlign: TextAlign.center,
),
);
}

@override
Widget build(BuildContext context) {
final userList = users == null
? null
: users!.isEmpty
? _emptyListText('We couldn\'t find the specified users')
: ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: users!.length,
itemBuilder: (BuildContext context, int index) {
final user = users![index];
return ListTile(
leading: AvatarLetterIcon(
name: user.login!, avatar: user.avatar),
title: Text(
user.login!,
style: const TextStyle(
fontWeight: FontWeight.w500, fontSize: 20),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
contentPadding:
const EdgeInsets.fromLTRB(18.0, 8.0, 18.0, 8.0),
onTap: () {
context
.read<ConversationCreateBloc>()
.add(ConversationCreated(user: user, type: 'u'));
},
);
},
);

final conversationList = chats.isEmpty
? _emptyListText('We couldn\'t find the specified chats')
: ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: chats.length,
itemBuilder: (BuildContext context, int index) {
final conversation = chats[index];
return ConversationListItem(
conversation: conversation,
onTap: () {
context
.read<ForwardMessagesBloc>()
.add(SendForwardMessage([conversation], forwardMessages));
},
);
},
);

return MediaQuery.removePadding(
context: context,
removeTop: true,
child: ListView(
padding: const EdgeInsets.only(top: 10.0),
children: <Widget>[
if (userList != null) ...[_header('Users'), userList],
_header('Chats'),
conversationList,
],
),
);
}
}
23 changes: 7 additions & 16 deletions sama_chat_client/lib/src/features/conversation/widgets/select_input.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,15 @@ class _SelectInputState extends State<SelectInput> {
context,
() => showModalBottomSheet<dynamic>(
isScrollControlled: true,
useSafeArea: false,
context: context,
backgroundColor: black,
backgroundColor: Colors.transparent,
builder: (BuildContext bc) {
return Container(
color: lightWhite,
margin: EdgeInsets.only(
top: MediaQueryData.fromView(
View.of(context))
.padding
.top),
child: BlocProvider.value(
value:
BlocProvider.of<ConversationBloc>(
context),
child: ForwardMessagesWidget(
state.selectedMessages.value),
));
return BlocProvider.value(
value: BlocProvider.of<ConversationBloc>(
context),
child: ForwardMessagesWidget(
state.selectedMessages.value),
);
}));
},
),
Expand Down
19 changes: 15 additions & 4 deletions sama_chat_client/lib/src/features/conversation_create/view/conversation_create_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,28 @@ class ConversationCreateFormState extends State<ConversationCreateForm> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: const GlobalSearchBar(),
appBar: AppBar(
backgroundColor: black,
iconTheme: const IconThemeData(
color: white,
),
title: const Text(
'Create chat',
style: TextStyle(color: white),
),
centerTitle: true,
),
body: Container(
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 4),
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const GlobalSearchBar(),
Row(children: <Widget>[
Expanded(
child: Padding(
padding: const EdgeInsets.only(top: 20.0, bottom: 16.0),
padding: const EdgeInsets.fromLTRB(15, 20, 15, 16),
child: TextButton.icon(
style: const ButtonStyle(
backgroundColor: WidgetStatePropertyAll(slateBlue),
Expand Down Expand Up @@ -65,7 +76,7 @@ class ConversationCreateFormState extends State<ConversationCreateForm> {
),
),
),
SearchBody(searchType: SearchType.users)
SearchForm(searchType: SearchType.both)
]))
]),
));
Expand Down
54 changes: 31 additions & 23 deletions sama_chat_client/lib/src/features/conversation_group_create/view/group_create_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,38 @@ class GroupCreateFormState extends State<GroupCreateForm> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: const GlobalSearchBar(),
body: Container(
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 4),
child: BlocListener<GroupBloc, GroupState>(
listener: (context, state) {
if (state.status.isInitial) {
} else if (state.status.isFailure) {
ScaffoldMessenger.of(context)
..hideCurrentSnackBar()
..showSnackBar(
SnackBar(content: Text(state.errorMessage ?? '')),
);
} else if (state.status.isSuccess) {
context
.read<ConversationCreateBloc>()
.add(ConversationGroupCreated(
users: state.participants.value.toList(),
type: 'g',
name: state.groupname.value,
avatarUrl: state.avatar.value,
));
}
},
appBar: AppBar(
backgroundColor: black,
leading: const BackButton(color: white),
centerTitle: true,
title: const Text(
'Group create',
style: TextStyle(color: white),
)),
body: BlocListener<GroupBloc, GroupState>(
listener: (context, state) {
if (state.status.isInitial) {
} else if (state.status.isFailure) {
ScaffoldMessenger.of(context)
..hideCurrentSnackBar()
..showSnackBar(
SnackBar(content: Text(state.errorMessage ?? '')),
);
} else if (state.status.isSuccess) {
context
.read<ConversationCreateBloc>()
.add(ConversationGroupCreated(
users: state.participants.value.toList(),
type: 'g',
name: state.groupname.value,
avatarUrl: state.avatar.value,
));
}
},
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) {
Expand Down
Loading