diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart index e7e5e1b6b..c8627eaf3 100644 --- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart +++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart @@ -55,96 +55,99 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { ResponsiveWidget( responsiveUtils: responsiveUtils, desktop: Scaffold( - body: Container( - color: AppColor.colorBgDesktop, - child: Column(children: [ - Row(children: [ - Container( - width: ResponsiveUtils.defaultSizeMenu, - color: Colors.white, - padding: EdgeInsets.only( - left: AppUtils.isDirectionRTL(context) ? 0 : 28, - right: AppUtils.isDirectionRTL(context) ? 28 : 0, - ), - alignment: Alignment.center, - height: 80, - child: Row(children: [ - SloganBuilder( - sizeLogo: 24, - text: AppLocalizations.of(context).app_name, - textAlign: TextAlign.center, - textStyle: const TextStyle(color: Colors.black, fontSize: 20, fontWeight: FontWeight.bold), - logo: imagePaths.icLogoTMail - ), - Obx(() { - if (controller.appInformation.value != null) { - return Padding(padding: const EdgeInsets.only(top: 6), - child: Text( - 'v${controller.appInformation.value!.version}', - textAlign: TextAlign.center, - style: const TextStyle( - fontSize: 13, - color: AppColor.colorContentEmail, - fontWeight: FontWeight.w500), - )); - } else { - return const SizedBox.shrink(); - } - }), - ]) - ), - Expanded(child: Container( - color: Colors.white, - alignment: Alignment.center, - padding: EdgeInsets.only( - right: AppUtils.isDirectionRTL(context) ? 0 : 10, - left: AppUtils.isDirectionRTL(context) ? 10 : 0, - ), - height: 80, - child: _buildRightHeader(context))) - ]), - Expanded(child: Row(children: [ - Column(children: [ - _buildComposerButton(context), - Expanded(child: SizedBox( + body: GestureDetector( + onTap: () => FocusScope.of(context).unfocus(), + child: Container( + color: AppColor.colorBgDesktop, + child: Column(children: [ + Row(children: [ + Container( width: ResponsiveUtils.defaultSizeMenu, - child: Obx(() { - if (controller.searchMailboxActivated.isTrue) { - return const SearchMailboxView( - backgroundColor: AppColor.colorBgDesktop - ); - } else { - return MailboxView(); - } - }) - )) - ]), - Expanded(child: Column(children: [ - const SpamReportBannerWebWidget(), - _buildEmptyTrashButton(context), - QuotasWarningBannerWidget( - margin: EdgeInsets.only( - right: AppUtils.isDirectionRTL(context) ? 0 : 16, - left: AppUtils.isDirectionRTL(context) ? 16 : 0, - top: 8 + color: Colors.white, + padding: EdgeInsets.only( + left: AppUtils.isDirectionRTL(context) ? 0 : 28, + right: AppUtils.isDirectionRTL(context) ? 28 : 0, ), + alignment: Alignment.center, + height: 80, + child: Row(children: [ + SloganBuilder( + sizeLogo: 24, + text: AppLocalizations.of(context).app_name, + textAlign: TextAlign.center, + textStyle: const TextStyle(color: Colors.black, fontSize: 20, fontWeight: FontWeight.bold), + logo: imagePaths.icLogoTMail + ), + Obx(() { + if (controller.appInformation.value != null) { + return Padding(padding: const EdgeInsets.only(top: 6), + child: Text( + 'v${controller.appInformation.value!.version}', + textAlign: TextAlign.center, + style: const TextStyle( + fontSize: 13, + color: AppColor.colorContentEmail, + fontWeight: FontWeight.w500), + )); + } else { + return const SizedBox.shrink(); + } + }), + ]) ), - _buildVacationNotificationMessage(context), - _buildListButtonQuickSearchFilter(context), - _buildMarkAsMailboxReadLoading(context), - Expanded(child: Obx(() { - switch(controller.dashboardRoute.value) { - case DashboardRoutes.thread: - return _buildThreadViewForWebDesktop(context); - case DashboardRoutes.emailDetailed: - return EmailView(); - default: - return const SizedBox.shrink(); - } - })) + Expanded(child: Container( + color: Colors.white, + alignment: Alignment.center, + padding: EdgeInsets.only( + right: AppUtils.isDirectionRTL(context) ? 0 : 10, + left: AppUtils.isDirectionRTL(context) ? 10 : 0, + ), + height: 80, + child: _buildRightHeader(context))) + ]), + Expanded(child: Row(children: [ + Column(children: [ + _buildComposerButton(context), + Expanded(child: SizedBox( + width: ResponsiveUtils.defaultSizeMenu, + child: Obx(() { + if (controller.searchMailboxActivated.isTrue) { + return const SearchMailboxView( + backgroundColor: AppColor.colorBgDesktop + ); + } else { + return MailboxView(); + } + }) + )) + ]), + Expanded(child: Column(children: [ + const SpamReportBannerWebWidget(), + _buildEmptyTrashButton(context), + QuotasWarningBannerWidget( + margin: EdgeInsets.only( + right: AppUtils.isDirectionRTL(context) ? 0 : 16, + left: AppUtils.isDirectionRTL(context) ? 16 : 0, + top: 8 + ), + ), + _buildVacationNotificationMessage(context), + _buildListButtonQuickSearchFilter(context), + _buildMarkAsMailboxReadLoading(context), + Expanded(child: Obx(() { + switch(controller.dashboardRoute.value) { + case DashboardRoutes.thread: + return _buildThreadViewForWebDesktop(context); + case DashboardRoutes.emailDetailed: + return EmailView(); + default: + return const SizedBox.shrink(); + } + })) + ])) ])) - ])) - ]), + ]), + ), ), ), tabletLarge: Obx(() { diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart index 27c958815..8ac430a97 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart @@ -362,24 +362,28 @@ class AdvancedSearchInputForm extends GetWidget onTap: onTap, decoration: InputDecoration( filled: true, - fillColor: AppColor.loginTextFieldBackgroundColor, + fillColor: isSelectFormList ? AppColor.colorItemSelected : Colors.white, contentPadding: const EdgeInsets.only( right: 8, left: 12, ), - enabledBorder: const OutlineInputBorder( - borderRadius: BorderRadius.all( + enabledBorder: OutlineInputBorder( + borderRadius: const BorderRadius.all( Radius.circular(10), ), borderSide: BorderSide( - width: 0.5, + width: isSelectFormList ? 0.5 : 1, color: AppColor.colorInputBorderCreateMailbox, ), ), - border: const OutlineInputBorder( - borderRadius: BorderRadius.all( + border: OutlineInputBorder( + borderRadius: const BorderRadius.all( Radius.circular(10), ), + borderSide: BorderSide( + width: isSelectFormList ? 0.5 : 1, + color: AppColor.colorInputBorderCreateMailbox, + ), ), hintText: advancedSearchFilterField.getHintText(context), hintStyle: TextStyle( diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_overlay.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_overlay.dart index 98d76c0ee..702797f26 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_overlay.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_overlay.dart @@ -22,7 +22,7 @@ class AdvancedSearchFilterOverlay extends StatelessWidget { child: GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Padding( - padding: const EdgeInsets.only(top: 4, bottom: 16), + padding: const EdgeInsets.only(top: 4, bottom: 16, right: 22), child: Container( constraints: BoxConstraints( maxHeight: _getHeightOverlay(context, responsiveUtils), diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart index 6dfde2fa2..1bf245193 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/date_drop_down_button.dart @@ -40,7 +40,7 @@ class DateDropDownButton extends StatelessWidget { borderRadius: BorderRadius.circular(10), border: Border.all( color: AppColor.colorInputBorderCreateMailbox, - width: 1, + width: 0.5, ), color: AppColor.colorInputBackgroundCreateMailbox ), diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart index 4876704e6..0d4f2aba5 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart @@ -140,7 +140,7 @@ class _TextFieldAutoCompleteEmailAddressState textInputAction: TextInputAction.next, decoration: InputDecoration( filled: true, - fillColor: AppColor.loginTextFieldBackgroundColor, + fillColor: Colors.white, contentPadding: const EdgeInsets.only( right: 8, left: 12, @@ -150,7 +150,7 @@ class _TextFieldAutoCompleteEmailAddressState Radius.circular(10), ), borderSide: BorderSide( - width: 0.5, + width: 1, color: AppColor.colorInputBorderCreateMailbox, ), ), @@ -158,10 +158,14 @@ class _TextFieldAutoCompleteEmailAddressState borderRadius: BorderRadius.all( Radius.circular(10), ), + borderSide: BorderSide( + width: 1, + color: AppColor.colorInputBorderCreateMailbox, + ), ), hintText: widget.advancedSearchFilterField.getHintText(context), hintStyle: const TextStyle( - fontSize: 14, + fontSize: 16, color: AppColor.colorHintSearchBar, ), prefixIconConstraints: BoxConstraints(maxWidth: _distanceToField * 0.74), @@ -177,10 +181,14 @@ class _TextFieldAutoCompleteEmailAddressState : null, ), onChanged: (value) { - onChanged?.call(value); + if (value.trim().isNotEmpty) { + onChanged?.call(value); + } }, onSubmitted: (tag) { - onSubmitted?.call(tag); + if (tag.trim().isNotEmpty) { + onSubmitted?.call(tag); + } }, ), );