eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-381 Apply new UI search emails

Browse Source
This commit is contained in:
dab246
2022-03-22 11:50:09 +07:00
committed by Dat H. Pham
parent c3f73a8649
commit dc35d5e5a0
5 changed files with 218 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox/presentation/mailbox_controller.dart
+5 -1
View File
@@ -267,7 +267,11 @@ class MailboxController extends BaseMailboxController {
mailboxDashBoardController.setSelectedMailbox(presentationMailboxSelected); mailboxDashBoardController.setSelectedMailbox(presentationMailboxSelected);
mailboxDashBoardController.clearSelectedEmail(); mailboxDashBoardController.clearSelectedEmail();
if (!responsiveUtils.isDesktop(context)) { if (mailboxDashBoardController.isSearchActive()) {
mailboxDashBoardController.disableSearch();
}
if (!responsiveUtils.isDesktop(context) && !responsiveUtils.isTabletLarge(context)) {
mailboxDashBoardController.closeDrawer(); mailboxDashBoardController.closeDrawer();
} }
} }
lib/features/mailbox/presentation/mailbox_view.dart
+2
View File
@@ -342,7 +342,9 @@ class MailboxView extends GetWidget<MailboxController> {
children: [ children: [
_buildBackSearchButton(context), _buildBackSearchButton(context),
Expanded(child: (SearchAppBarWidget( Expanded(child: (SearchAppBarWidget(
context,
_imagePaths, _imagePaths,
_responsiveUtils,
controller.searchQuery.value, controller.searchQuery.value,
controller.searchFocus, controller.searchFocus,
controller.searchInputController, controller.searchInputController,
lib/features/thread/presentation/thread_controller.dart
+8
View File
@@ -50,6 +50,7 @@ import 'package:tmail_ui_user/features/thread/domain/usecases/refresh_changes_em
import 'package:tmail_ui_user/features/thread/domain/usecases/search_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/domain/usecases/search_email_interactor.dart';
import 'package:tmail_ui_user/features/thread/domain/usecases/search_more_email_interactor.dart'; import 'package:tmail_ui_user/features/thread/domain/usecases/search_more_email_interactor.dart';
import 'package:tmail_ui_user/features/thread/presentation/extensions/filter_message_option_extension.dart'; import 'package:tmail_ui_user/features/thread/presentation/extensions/filter_message_option_extension.dart';
import 'package:tmail_ui_user/features/thread/presentation/model/search_status.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/routes/app_routes.dart'; import 'package:tmail_ui_user/main/routes/app_routes.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -149,12 +150,19 @@ class ThreadController extends BaseController {
} }
}); });
}); });
mailboxDashBoardController.searchState.listen((state) {
if (state.searchStatus == SearchStatus.INACTIVE) {
emailListSearch.clear();
}
});
} }
@override @override
void onClose() { void onClose() {
mailboxDashBoardController.selectedMailbox.close(); mailboxDashBoardController.selectedMailbox.close();
mailboxDashBoardController.viewState.close(); mailboxDashBoardController.viewState.close();
mailboxDashBoardController.searchState.close();
listEmailController.dispose(); listEmailController.dispose();
super.onClose(); super.onClose();
} }
lib/features/thread/presentation/thread_view.dart
+191 -122
View File
@@ -40,73 +40,35 @@ class ThreadView extends GetWidget<ThreadController> {
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only(right: 10, top: 16, bottom: 10), padding: EdgeInsets.only(right: 10, top: 16, bottom: 10),
child: _buildHeader(context)), child: _buildHeader(context)),
Obx(() => controller.isSearchActive() _buildSearchInputFormForMobile(context),
? _buildSearchForm(context) _buildSearchButtonViewForMobile(context),
: _responsiveUtils.isDesktop(context) ? SizedBox.shrink() : _buildAppBarNormal(context)),
Obx(() => !controller.isSearchActive() && !_responsiveUtils.isDesktop(context)
? Padding(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 10),
child: (SearchBarView(_imagePaths)
..hintTextSearch(AppLocalizations.of(context).hint_search_emails)
..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
.build())
: SizedBox.shrink()),
Expanded(child: Container( Expanded(child: Container(
color: AppColor.colorBgDesktop, color: AppColor.colorBgDesktop,
margin: _responsiveUtils.isDesktop(context) ? EdgeInsets.all(16) : EdgeInsets.zero, margin: _responsiveUtils.isDesktop(context) ? EdgeInsets.all(16) : EdgeInsets.zero,
child: Stack( child: Stack(children: [
children: [
Container( Container(
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: _responsiveUtils.isDesktop(context) ? BorderRadius.circular(20) : null, borderRadius: _responsiveUtils.isDesktop(context) ? BorderRadius.circular(20) : null,
border: _responsiveUtils.isDesktop(context) ? Border.all(color: AppColor.colorBorderBodyThread, width: 1) : null, border: _responsiveUtils.isDesktop(context) ? Border.all(color: AppColor.colorBorderBodyThread, width: 1) : null,
color: Colors.white), color: Colors.white),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
_buildStatusResultSearch(context), _buildStatusResultSearch(context),
_buildLoadingView(), _buildLoadingView(),
Expanded(child: _buildListEmail(context)), Expanded(child: _buildListEmail(context)),
_buildLoadingViewLoadMore(), _buildLoadingViewLoadMore(),
] ]
) )
), ),
_buildSuggestionBox(context) _buildSuggestionBox(context)
], ]))),
)) _buildListButtonSelectionForMobile(context),
),
Obx(() => controller.isSelectionEnabled() && !_responsiveUtils.isDesktop(context)
? Column(children: [
Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2),
_buildOptionSelectionBottomBar(context)
])
: SizedBox.shrink()),
] ]
) )
), ),
floatingActionButton: Obx(() => !controller.isSearchActive() && !controller.isSelectionEnabled() floatingActionButton: _buildFloatingButtonCompose(context),
? Container(
padding: EdgeInsets.only(bottom: controller.isSelectionEnabled()
? 80
: _responsiveUtils.isMobileDevice(context) ? 0 : 16),
child: Align(
alignment: Alignment.bottomRight,
child: ScrollingFloatingButtonAnimated(
icon: SvgPicture.asset(_imagePaths.icCompose, width: 20, height: 20, fit: BoxFit.fill),
text: Padding(
padding: EdgeInsets.only(right: 10),
child: Text(
AppLocalizations.of(context).compose,
style: TextStyle(color: AppColor.colorTextButton, fontSize: 15.0, fontWeight: FontWeight.w500))
),
onPress: () => controller.composeEmailAction(),
scrollController: controller.listEmailController,
color: Colors.white,
elevation: 4.0,
width: 140,
animateIcon: false)))
: SizedBox.shrink()),
), ),
); );
} }
@@ -114,20 +76,15 @@ class ThreadView extends GetWidget<ThreadController> {
Widget _buildHeader(BuildContext context) { Widget _buildHeader(BuildContext context) {
return Row(children: [ return Row(children: [
Obx(() => !controller.isSelectionEnabled() && _responsiveUtils.isDesktop(context) Obx(() => !controller.isSelectionEnabled() && _responsiveUtils.isDesktop(context)
? _buildOptionTopBar(context) ? _buildListButtonTopBar(context)
: SizedBox.shrink()), : SizedBox.shrink()),
Obx(() => controller.isSelectionEnabled() && _responsiveUtils.isDesktop(context) Obx(() => controller.isSelectionEnabled() && _responsiveUtils.isDesktop(context)
? _buildOptionSelectionTopBar(context) ? _buildListButtonSelectionForDesktop(context)
: SizedBox.shrink()), : SizedBox.shrink()),
SizedBox(width: 16), SizedBox(width: 16),
Spacer(), Obx(() => !controller.isSearchActive() && _responsiveUtils.isDesktop(context) ? Spacer() : SizedBox.shrink()),
Padding( Expanded(child: _buildSearchInputFormForDesktop(context)),
padding: EdgeInsets.only(right: 16), _buildSearchButtonViewForDesktop(context),
child: (SearchBarView(_imagePaths)
..hintTextSearch(AppLocalizations.of(context).search_emails)
..maxSizeWidth(240)
..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
.build()),
Padding( Padding(
padding: EdgeInsets.only(right: 16), padding: EdgeInsets.only(right: 16),
child: (AvatarBuilder() child: (AvatarBuilder()
@@ -136,10 +93,7 @@ class ThreadView extends GetWidget<ThreadController> {
..textColor(Colors.black) ..textColor(Colors.black)
..context(context) ..context(context)
..addOnTapAvatarActionWithPositionClick((position) => ..addOnTapAvatarActionWithPositionClick((position) =>
controller.openUserSettingAction( controller.openUserSettingAction(context, position, _popupMenuUserSettingActionTile(context)))
context,
position,
[PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: _logoutAction(context))]))
..addBoxShadows([BoxShadow( ..addBoxShadows([BoxShadow(
color: AppColor.colorShadowBgContentEmail, color: AppColor.colorShadowBgContentEmail,
spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))]) spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))])
@@ -148,18 +102,19 @@ class ThreadView extends GetWidget<ThreadController> {
]); ]);
} }
Widget _buildOptionTopBar(BuildContext context) { Widget _buildListButtonTopBar(BuildContext context) {
return Row(children: [ return Row(children: [
SizedBox(width: 16), if (!controller.isSearchActive()) SizedBox(width: 16),
(ButtonBuilder(_imagePaths.icRefresh) if (!controller.isSearchActive())
..key(Key('button_reload_thread')) (ButtonBuilder(_imagePaths.icRefresh)
..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread)) ..key(Key('button_reload_thread'))
..paddingIcon(EdgeInsets.zero) ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
..size(16) ..paddingIcon(EdgeInsets.zero)
..radiusSplash(10) ..size(16)
..padding(EdgeInsets.symmetric(horizontal: 8, vertical: 8)) ..radiusSplash(10)
..onPressActionClick(() => controller.refreshAllEmail())) ..padding(EdgeInsets.symmetric(horizontal: 8, vertical: 8))
.build(), ..onPressActionClick(() => controller.refreshAllEmail()))
.build(),
SizedBox(width: 16), SizedBox(width: 16),
(ButtonBuilder(_imagePaths.icSelectAll) (ButtonBuilder(_imagePaths.icSelectAll)
..key(Key('button_select_all')) ..key(Key('button_select_all'))
@@ -192,36 +147,38 @@ class ThreadView extends GetWidget<ThreadController> {
}) })
..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false)) ..text(AppLocalizations.of(context).mark_all_as_read, isVertical: false))
.build(), .build(),
SizedBox(width: 16), if (!controller.isSearchActive()) SizedBox(width: 16),
(ButtonBuilder(_imagePaths.icFilterWeb) if (!controller.isSearchActive())
..key(Key('button_filter_messages')) (ButtonBuilder(_imagePaths.icFilterWeb)
..context(context) ..key(Key('button_filter_messages'))
..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread)) ..context(context)
..paddingIcon(EdgeInsets.only(right: 8)) ..decoration(BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.colorButtonHeaderThread))
..size(16) ..paddingIcon(EdgeInsets.only(right: 8))
..padding(EdgeInsets.symmetric(horizontal: 12, vertical: 8)) ..size(16)
..radiusSplash(10) ..padding(EdgeInsets.symmetric(horizontal: 12, vertical: 8))
..textStyle(TextStyle( ..radiusSplash(10)
fontSize: 12, ..textStyle(TextStyle(
color: controller.filterMessageOption.value == FilterMessageOption.all ? AppColor.colorTextButtonHeaderThread : AppColor.colorNameEmail, fontSize: 12,
fontWeight: controller.filterMessageOption.value == FilterMessageOption.all ? FontWeight.normal : FontWeight.w500)) color: controller.filterMessageOption.value == FilterMessageOption.all ? AppColor.colorTextButtonHeaderThread : AppColor.colorNameEmail,
..addIconAction(Padding( fontWeight: controller.filterMessageOption.value == FilterMessageOption.all ? FontWeight.normal : FontWeight.w500))
padding: EdgeInsets.only(left: 8), ..addIconAction(Padding(
child: SvgPicture.asset(_imagePaths.icArrowDown, fit: BoxFit.fill))) padding: EdgeInsets.only(left: 8),
..addOnPressActionWithPositionClick((position) => child: SvgPicture.asset(_imagePaths.icArrowDown, fit: BoxFit.fill)))
controller.openFilterMessagesForTablet( ..addOnPressActionWithPositionClick((position) =>
context, controller.openFilterMessagesForTablet(
position, context,
_popupMenuEmailActionTile(context, controller.filterMessageOption.value))) position,
..text(controller.filterMessageOption.value == FilterMessageOption.all _popupMenuEmailActionTile(context, controller.filterMessageOption.value)))
? AppLocalizations.of(context).filter_messages ..text(controller.filterMessageOption.value == FilterMessageOption.all
: controller.filterMessageOption.value.getTitle(context), isVertical: false)) ? AppLocalizations.of(context).filter_messages
.build(), : controller.filterMessageOption.value.getTitle(context), isVertical: false))
.build(),
]); ]);
} }
Widget _buildOptionSelectionTopBar(BuildContext context) { Widget _buildListButtonSelectionForDesktop(BuildContext context) {
return Row(children: [ return Row(children: [
SizedBox(width: 16),
buildIconWeb( buildIconWeb(
icon: SvgPicture.asset(_imagePaths.icCloseComposer, color: AppColor.colorTextButton, fit: BoxFit.fill), icon: SvgPicture.asset(_imagePaths.icCloseComposer, color: AppColor.colorTextButton, fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).cancel, tooltip: AppLocalizations.of(context).cancel,
@@ -251,22 +208,101 @@ class ThreadView extends GetWidget<ThreadController> {
]); ]);
} }
Widget _buildOptionSelectionBottomBar(BuildContext context) { Widget _buildListButtonSelectionForMobile(BuildContext context) {
return Padding( return Obx(() {
padding: EdgeInsets.all(10), if (controller.isSelectionEnabled() && !_responsiveUtils.isDesktop(context)) {
child: (BottomBarThreadSelectionWidget( return Column(children: [
context, Divider(color: AppColor.lineItemListColor, height: 1, thickness: 0.2),
_imagePaths, Padding(
_responsiveUtils, padding: EdgeInsets.all(10),
controller.listEmailSelected) child: (BottomBarThreadSelectionWidget(context, _imagePaths, _responsiveUtils, controller.listEmailSelected)
..addOnPressEmailSelectionActionClick((actionType, selectionEmail) => ..addOnPressEmailSelectionActionClick((actionType, selectionEmail) => controller.pressEmailSelectionAction(context, actionType, selectionEmail)))
controller.pressEmailSelectionAction(context, actionType, selectionEmail))) .build()),
.build()); ]);
} else {
return SizedBox.shrink();
}
});
}
Widget _buildSearchButtonViewForMobile(BuildContext context) {
return Obx(() {
if (!controller.isSearchActive() && !_responsiveUtils.isDesktop(context)) {
return Padding(
padding: EdgeInsets.only(left: 16, right: 16, bottom: 10),
child: (SearchBarView(_imagePaths)
..hintTextSearch(AppLocalizations.of(context).hint_search_emails)
..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
.build());
} else {
return SizedBox.shrink();
}
});
}
Widget _buildSearchInputFormForMobile(BuildContext context) {
return Obx(() {
if (controller.isSearchActive() && !_responsiveUtils.isDesktop(context)) {
return _buildSearchForm(context);
} else {
return _responsiveUtils.isDesktop(context) ? SizedBox.shrink() : _buildAppBarNormal(context);
}
});
}
Widget _buildSearchButtonViewForDesktop(BuildContext context) {
return Obx(() {
if (!controller.isSearchActive() && _responsiveUtils.isDesktop(context)) {
return Padding(
padding: EdgeInsets.only(right: 16),
child: (SearchBarView(_imagePaths)
..hintTextSearch(AppLocalizations.of(context).search_emails)
..maxSizeWidth(240)
..addOnOpenSearchViewAction(() => controller.enableSearch(context)))
.build());
} else {
return SizedBox.shrink();
}
});
}
Widget _buildSearchInputFormForDesktop(BuildContext context) {
return Obx(() {
if (controller.isSearchActive() && _responsiveUtils.isDesktop(context)) {
return _buildSearchFormForDesktop(context);
} else {
return SizedBox.shrink();
}
});
}
Widget _buildSearchFormForDesktop(BuildContext context) {
return (SearchAppBarWidget(
context,
_imagePaths,
_responsiveUtils,
controller.searchQuery,
controller.mailboxDashBoardController.searchFocus,
controller.mailboxDashBoardController.searchInputController,
suggestionSearch: controller.mailboxDashBoardController.suggestionSearch,)
..addDecoration(BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)),
color: AppColor.colorBgSearchBar))
..setMargin(EdgeInsets.only(right: 10))
..setHeightSearchBar(45)
..setHintText(AppLocalizations.of(context).search_mail)
..addOnCancelSearchPressed(() => controller.disableSearch())
..addOnClearTextSearchAction(() => controller.mailboxDashBoardController.clearSearchText())
..addOnTextChangeSearchAction((query) => controller.mailboxDashBoardController.addSuggestionSearch(query))
..addOnSearchTextAction((query) => controller.mailboxDashBoardController.searchEmail(context, query)))
.build();
} }
Widget _buildSearchForm(BuildContext context) { Widget _buildSearchForm(BuildContext context) {
return (SearchAppBarWidget( return (SearchAppBarWidget(
context,
_imagePaths, _imagePaths,
_responsiveUtils,
controller.searchQuery, controller.searchQuery,
controller.mailboxDashBoardController.searchFocus, controller.mailboxDashBoardController.searchFocus,
controller.mailboxDashBoardController.searchInputController, controller.mailboxDashBoardController.searchInputController,
@@ -306,6 +342,33 @@ class ThreadView extends GetWidget<ThreadController> {
.build(); .build();
} }
Widget _buildFloatingButtonCompose(BuildContext context) {
return Obx(() {
if (!controller.isSearchActive() && !controller.isSelectionEnabled() && !_responsiveUtils.isDesktop(context)) {
return Container(
padding: EdgeInsets.only(bottom: controller.isSelectionEnabled() ? 80 : _responsiveUtils.isMobileDevice(context) ? 0 : 16),
child: Align(
alignment: Alignment.bottomRight,
child: ScrollingFloatingButtonAnimated(
icon: SvgPicture.asset(_imagePaths.icCompose, width: 20, height: 20, fit: BoxFit.fill),
text: Padding(padding: EdgeInsets.only(right: 10),
child: Text(AppLocalizations.of(context).compose,
style: TextStyle(color: AppColor.colorTextButton, fontSize: 15.0, fontWeight: FontWeight.w500))),
onPress: () => controller.composeEmailAction(),
scrollController: controller.listEmailController,
color: Colors.white,
elevation: 4.0,
width: 140,
animateIcon: false
)
)
);
} else {
return SizedBox.shrink();
}
});
}
List<Widget> _filterMessagesCupertinoActionTile(BuildContext context, FilterMessageOption optionCurrent) { List<Widget> _filterMessagesCupertinoActionTile(BuildContext context, FilterMessageOption optionCurrent) {
return <Widget>[ return <Widget>[
_filterMessageWithAttachmentsAction(context, optionCurrent), _filterMessageWithAttachmentsAction(context, optionCurrent),
@@ -462,11 +525,11 @@ class ThreadView extends GetWidget<ThreadController> {
if (controller.currentSelectMode.value == SelectMode.INACTIVE) { if (controller.currentSelectMode.value == SelectMode.INACTIVE) {
return listPresentationEmail.isNotEmpty return listPresentationEmail.isNotEmpty
? RefreshIndicator( ? RefreshIndicator(
color: AppColor.primaryColor, color: AppColor.colorTextButton,
onRefresh: () async => controller.refreshAllEmail(), onRefresh: () async => controller.refreshAllEmail(),
child: _buildListEmailBody(context, listPresentationEmail)) child: _buildListEmailBody(context, listPresentationEmail))
: RefreshIndicator( : RefreshIndicator(
color: AppColor.primaryColor, color: AppColor.colorTextButton,
onRefresh: () async => controller.refreshAllEmail(), onRefresh: () async => controller.refreshAllEmail(),
child: _buildEmptyEmail(context)); child: _buildEmptyEmail(context));
} else { } else {
@@ -569,6 +632,12 @@ class ThreadView extends GetWidget<ThreadController> {
}); });
} }
List<PopupMenuEntry> _popupMenuUserSettingActionTile(BuildContext context) {
return [
PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: _logoutAction(context)),
];
}
Widget _logoutAction(BuildContext context) { Widget _logoutAction(BuildContext context) {
return (AppActionSheetActionBuilder( return (AppActionSheetActionBuilder(
Key('logout_action'), Key('logout_action'),
lib/features/thread/presentation/widgets/search_app_bar_widget.dart
+12 -8
View File
@@ -15,7 +15,9 @@ class SearchAppBarWidget {
OnClearTextSearchAction? _onClearTextSearchAction; OnClearTextSearchAction? _onClearTextSearchAction;
OnSearchTextAction? _onSearchTextAction; OnSearchTextAction? _onSearchTextAction;
final BuildContext _context;
final ImagePaths _imagePaths; final ImagePaths _imagePaths;
final ResponsiveUtils _responsiveUtils;
final SearchQuery? _searchQuery; final SearchQuery? _searchQuery;
final TextEditingController? _searchInputController; final TextEditingController? _searchInputController;
final FocusNode? _searchFocusNode; final FocusNode? _searchFocusNode;
@@ -31,7 +33,9 @@ class SearchAppBarWidget {
Widget? _iconClearText; Widget? _iconClearText;
SearchAppBarWidget( SearchAppBarWidget(
this._context,
this._imagePaths, this._imagePaths,
this._responsiveUtils,
this._searchQuery, this._searchQuery,
this._searchFocusNode, this._searchFocusNode,
this._searchInputController, this._searchInputController,
@@ -85,19 +89,20 @@ class SearchAppBarWidget {
Widget build() { Widget build() {
return Container( return Container(
key: Key('search_app_bar_widget'), key: Key('search_app_bar_widget'),
alignment: Alignment.topCenter,
height: _heightSearchBar, height: _heightSearchBar,
decoration: _decoration, decoration: _decoration,
padding: _padding ?? EdgeInsets.symmetric(vertical: 8), padding: _padding ?? EdgeInsets.zero,
margin: _margin, margin: _margin,
child: MediaQuery( child: MediaQuery(
data: MediaQueryData(padding: EdgeInsets.zero), data: MediaQueryData(padding: EdgeInsets.zero),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
if (hasBackButton) _buildBackButton(), if (hasBackButton) _buildBackButton(),
if (hasSearchButton) _buildSearchButton(), if (hasSearchButton) _buildSearchButton(),
Expanded(child: _buildSearchInputForm()), Expanded(child: Transform(
transform: Matrix4.translationValues(0.0, _responsiveUtils.isDesktop(_context) ? -2.0 : 0.0, 0.0),
child: _buildSearchInputForm(),
)),
if (suggestionSearch?.isNotEmpty == true || (_searchQuery != null && _searchQuery!.value.isNotEmpty)) if (suggestionSearch?.isNotEmpty == true || (_searchQuery != null && _searchQuery!.value.isNotEmpty))
_buildClearTextSearchButton(), _buildClearTextSearchButton(),
] ]
@@ -111,11 +116,10 @@ class SearchAppBarWidget {
shape: CircleBorder(), shape: CircleBorder(),
color: Colors.transparent, color: Colors.transparent,
child: Padding( child: Padding(
padding: EdgeInsets.only(left: 8), padding: EdgeInsets.only(left: _responsiveUtils.isDesktop(_context) ? 0 : 8),
child: IconButton( child: IconButton(
splashRadius: 20, splashRadius: 20,
color: AppColor.appColor, icon: SvgPicture.asset(_imagePaths.icBack, color: AppColor.colorTextButton, fit: BoxFit.fill),
icon: SvgPicture.asset(_imagePaths.icBack, color: AppColor.appColor, fit: BoxFit.fill),
onPressed: () { onPressed: () {
_searchInputController?.clear(); _searchInputController?.clear();
if (_onCancelSearchPressed != null) { if (_onCancelSearchPressed != null) {
@@ -155,7 +159,7 @@ class SearchAppBarWidget {
border: InputBorder.none, border: InputBorder.none,
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
contentPadding: EdgeInsets.symmetric(vertical: 7), contentPadding: EdgeInsets.zero,
hintText: _hintText, hintText: _hintText,
hintStyle: TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0), hintStyle: TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0),
labelStyle: TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0))) labelStyle: TextStyle(color: AppColor.colorHintSearchBar, fontSize: 17.0)))