Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions app/lib/pages/conversations/conversations_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:friend_private/backend/schema/conversation.dart';
import 'package:friend_private/pages/capture/widgets/widgets.dart';
import 'package:friend_private/pages/conversations/widgets/local_sync.dart';
import 'package:friend_private/pages/conversations/widgets/processing_capture.dart';
import 'package:friend_private/pages/conversations/widgets/search_result_header_widget.dart';
import 'package:friend_private/pages/conversations/widgets/search_widget.dart';
import 'package:friend_private/providers/conversation_provider.dart';
import 'package:provider/provider.dart';
Expand Down Expand Up @@ -54,6 +55,7 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
const SliverToBoxAdapter(child: SizedBox(height: 16)),
const SliverToBoxAdapter(child: SearchWidget()),
const SliverToBoxAdapter(child: SizedBox(height: 16)),
const SliverToBoxAdapter(child: SearchResultHeaderWidget()),
getProcessingConversationsWidget(convoProvider.processingConversations),
if (convoProvider.groupedConversations.isEmpty && !convoProvider.isLoadingConversations)
const SliverToBoxAdapter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class _EmptyConversationsWidgetState extends State<EmptyConversationsWidget> {
@override
Widget build(BuildContext context) {
return const Padding(
padding: EdgeInsets.only(top: 240.0),
padding: EdgeInsets.only(top: 120.0),
child: Text(
'No conversations yet.',
style: TextStyle(color: Colors.grey, fontSize: 16),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
import 'package:friend_private/providers/conversation_provider.dart';
import 'package:provider/provider.dart';

class SearchResultHeaderWidget extends StatefulWidget {
const SearchResultHeaderWidget({super.key});

@override
State<SearchResultHeaderWidget> createState() => _SearchResultHeaderWidgetState();
}

class _SearchResultHeaderWidgetState extends State<SearchResultHeaderWidget> {
@override
Widget build(BuildContext context) {
return Consumer<ConversationProvider>(builder: (context, provider, child) {
var onSearches = provider.previousQuery.isNotEmpty;
var isSearching = provider.isFetchingConversations;

return Container(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
child: onSearches
? (isSearching
? const Text(
"Search your converstations",
style: TextStyle(color: Colors.white, fontSize: 14),
)
: provider.totalSearchPages > 0
? Text(
"Search result ${provider.currentSearchPage}/${provider.totalSearchPages}",
style: const TextStyle(color: Colors.white, fontSize: 14),
)
: const SizedBox.shrink())
: const SizedBox.shrink(),
);
});
}
}
5 changes: 5 additions & 0 deletions app/lib/providers/conversation_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,17 @@ class ConversationProvider extends ChangeNotifier implements IWalServiceListener

Future<void> searchConversations(String query) async {
if (query.isEmpty) {
previousQuery = "";
currentSearchPage = 0;
totalSearchPages = 0;
searchedConversations = conversations;
groupSearchConvosByDate();
return;
}
if (query == previousQuery) {
return;
}

setIsFetchingConversations(true);
previousQuery = query;
var (convos, current, total) = await searchConversationsServer(query);
Expand All @@ -88,6 +92,7 @@ class ConversationProvider extends ChangeNotifier implements IWalServiceListener
totalSearchPages = total;
groupSearchConvosByDate();
setIsFetchingConversations(false);

notifyListeners();
}

Expand Down