-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
TW-1923: Improve search screen #1961
Open
hieutbui
wants to merge
5
commits into
main
Choose a base branch
from
TW-1923-Improve-search-screen
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3f38000
TW-1923: Hide no results when search matrix ID
hieutbui 7b370f6
TW-1923: Add padding at the top of search in chat
hieutbui db457c5
TW-1923: Write test for case when search MatrixID
hieutbui fcb36bc
TW-1923:Removed messages section when search result is empty
KhaledNjim b50199d
fixup! TW-1923: Hide no results when search matrix ID
KhaledNjim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,11 +28,13 @@ class ServerSearchMessagesList extends StatelessWidget { | |
searchController.serverSearchController.searchResultsNotifier, | ||
builder: (context, serverSearchNotifier, child) { | ||
if (serverSearchNotifier is PresentationServerSideEmptySearch) { | ||
final keyword = searchController.textEditingController.text; | ||
if (searchController.searchContactAndRecentChatController! | ||
.recentAndContactsNotifier.value.isNotEmpty) { | ||
return const SizedBox.shrink(); | ||
.recentAndContactsNotifier.value.isEmpty && | ||
!(keyword.isValidMatrixId && keyword.startsWith('@'))) { | ||
return child!; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same |
||
} | ||
return child!; | ||
return const SizedBox.shrink(); | ||
} | ||
|
||
if (serverSearchNotifier is PresentationServerSideSearch) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
import 'package:fluffychat/config/localizations/localization_service.dart'; | ||
import 'package:fluffychat/config/themes.dart'; | ||
import 'package:fluffychat/pages/search/search.dart'; | ||
import 'package:fluffychat/pages/search/search_contacts_and_chats_controller.dart'; | ||
import 'package:fluffychat/pages/search/server_search_controller.dart'; | ||
import 'package:fluffychat/pages/search/server_search_view.dart'; | ||
import 'package:fluffychat/presentation/model/search/presentation_search.dart'; | ||
import 'package:fluffychat/presentation/model/search/presentation_server_side_empty_search.dart'; | ||
import 'package:fluffychat/presentation/model/search/presentation_server_side_state.dart'; | ||
import 'package:fluffychat/utils/custom_scroll_behaviour.dart'; | ||
import 'package:fluffychat/utils/responsive/responsive_utils.dart'; | ||
import 'package:fluffychat/widgets/search/empty_search_widget.dart'; | ||
import 'package:fluffychat/widgets/theme_builder.dart'; | ||
import 'package:flutter/material.dart' hide SearchController; | ||
import 'package:flutter_localizations/flutter_localizations.dart'; | ||
import 'package:flutter_localized_locales/flutter_localized_locales.dart'; | ||
import 'package:flutter_test/flutter_test.dart'; | ||
import 'package:get_it/get_it.dart'; | ||
import 'package:linagora_design_flutter/linagora_design_flutter.dart'; | ||
import 'package:mockito/annotations.dart'; | ||
import 'package:flutter_gen/gen_l10n/l10n.dart'; | ||
import 'package:mockito/mockito.dart'; | ||
import 'server_search_view_test.mocks.dart'; | ||
|
||
@GenerateNiceMocks([ | ||
MockSpec<SearchController>(), | ||
MockSpec<ServerSearchController>(), | ||
MockSpec<TextEditingController>(), | ||
MockSpec<SearchContactsAndChatsController>(), | ||
]) | ||
void main() { | ||
late final SearchController mockSearchController; | ||
late final ServerSearchController mockServerSearchController; | ||
late final TextEditingController mockTextEditingController; | ||
late final SearchContactsAndChatsController | ||
mockSearchContactAndRecentChatController; | ||
|
||
setUpAll(() { | ||
final getIt = GetIt.instance; | ||
getIt.registerSingleton(ResponsiveUtils()); | ||
mockSearchController = MockSearchController(); | ||
mockServerSearchController = MockServerSearchController(); | ||
mockTextEditingController = MockTextEditingController(); | ||
mockSearchContactAndRecentChatController = | ||
MockSearchContactsAndChatsController(); | ||
}); | ||
|
||
Future<void> makeTestable(WidgetTester tester) async { | ||
await tester.pumpWidget( | ||
ThemeBuilder( | ||
builder: (context, themeMode, primaryColor) => MaterialApp( | ||
locale: const Locale('en'), | ||
scrollBehavior: CustomScrollBehavior(), | ||
localizationsDelegates: const [ | ||
LocaleNamesLocalizationsDelegate(), | ||
L10n.delegate, | ||
GlobalMaterialLocalizations.delegate, | ||
GlobalCupertinoLocalizations.delegate, | ||
GlobalWidgetsLocalizations.delegate, | ||
], | ||
supportedLocales: LocalizationService.supportedLocales, | ||
theme: TwakeThemes.buildTheme( | ||
context, | ||
Brightness.light, | ||
primaryColor, | ||
), | ||
home: Scaffold( | ||
backgroundColor: LinagoraSysColors.material().onPrimary, | ||
body: CustomScrollView( | ||
physics: const ClampingScrollPhysics(), | ||
slivers: [ | ||
ServerSearchMessagesList( | ||
searchController: mockSearchController, | ||
), | ||
], | ||
), | ||
), | ||
), | ||
), | ||
); | ||
} | ||
|
||
group('[ServerSearchMessagesList] TEST', () { | ||
group('GIVEN searchResultsNotifier is PresentationServerSideEmptySearch', | ||
() { | ||
testWidgets( | ||
'GIVEN notifier value is empty\n' | ||
'AND recentAndContactsNotifier value is empty\n' | ||
'AND keyword is a Matrix ID\n' | ||
'THEN should display SizedBox.shrink\n', | ||
(WidgetTester tester) async { | ||
when(mockSearchController.serverSearchController) | ||
.thenReturn(mockServerSearchController); | ||
when(mockSearchController.textEditingController) | ||
.thenReturn(mockTextEditingController); | ||
when(mockSearchController.searchContactAndRecentChatController) | ||
.thenReturn( | ||
mockSearchContactAndRecentChatController, | ||
); | ||
when(mockTextEditingController.text).thenReturn('@test:domain.com'); | ||
when(mockServerSearchController.searchResultsNotifier).thenReturn( | ||
ValueNotifier<PresentationServerSideUIState>( | ||
PresentationServerSideEmptySearch(), | ||
), | ||
); | ||
when( | ||
mockSearchContactAndRecentChatController.recentAndContactsNotifier, | ||
).thenReturn(ValueNotifier<List<PresentationSearch>>([])); | ||
|
||
await makeTestable(tester); | ||
|
||
expect(find.byType(SizedBox), findsOneWidget); | ||
|
||
final SizedBox foundSizedBox = | ||
tester.firstWidget(find.byType(SizedBox)); | ||
expect(foundSizedBox.child, isNull); | ||
expect(foundSizedBox.width, equals(0)); | ||
expect(foundSizedBox.height, equals(0)); | ||
}, | ||
); | ||
|
||
testWidgets( | ||
'GIVEN searchResultsNotifier value is empty\n' | ||
'AND recentAndContactsNotifier value is empty\n' | ||
'AND keyword is not a Matrix ID\n' | ||
'THEN should display EmptySearchWidget\n', | ||
(WidgetTester tester) async { | ||
when(mockSearchController.serverSearchController) | ||
.thenReturn(mockServerSearchController); | ||
when(mockSearchController.textEditingController) | ||
.thenReturn(mockTextEditingController); | ||
when(mockSearchController.searchContactAndRecentChatController) | ||
.thenReturn( | ||
mockSearchContactAndRecentChatController, | ||
); | ||
when(mockTextEditingController.text).thenReturn('test'); | ||
when(mockServerSearchController.searchResultsNotifier).thenReturn( | ||
ValueNotifier<PresentationServerSideUIState>( | ||
PresentationServerSideEmptySearch(), | ||
), | ||
); | ||
when( | ||
mockSearchContactAndRecentChatController.recentAndContactsNotifier, | ||
).thenReturn(ValueNotifier<List<PresentationSearch>>([])); | ||
|
||
await makeTestable(tester); | ||
await tester.pumpAndSettle(); | ||
|
||
expect(find.byType(EmptySearchWidget), findsOneWidget); | ||
}, | ||
); | ||
}); | ||
}); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Better to make a function