From 2bae5c31cea244d703e7a75a4f5dc5d0afc1ab1e Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 14 Apr 2022 12:20:22 +0700 Subject: [PATCH] Fix align center button on bottom bar of email detailed view --- .../bottom_bar_mail_widget_builder.dart | 108 +++++++++--------- .../bottom_bar_selection_mailbox_widget.dart | 18 +-- .../bottom_bar_thread_selection_widget.dart | 38 +++--- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/lib/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart b/lib/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart index 5ac20fd53..5fb232894 100644 --- a/lib/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart +++ b/lib/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart @@ -39,75 +39,75 @@ class BottomBarMailWidgetBuilder { Widget _buildListOptionButton(PresentationEmail presentationEmail) { return Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ if (presentationEmail.numberOfAllEmailAddress() > 1) - (ButtonBuilder(_imagePaths.icReplyAll) - ..key(Key('button_reply_all_message')) - ..size(15) - ..paddingIcon(EdgeInsets.only( - top: _responsiveUtils.isMobileDevice(_context) ? 10 : 16, - bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, - right: 5)) - ..textStyle(TextStyle( - fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, - color: AppColor.colorTextButton)) - ..onPressActionClick(() { - if (_onPressEmailActionClick != null) { - _onPressEmailActionClick!(EmailActionType.replyAll); - }}) - ..text(AppLocalizations.of(_context).reply_all, isVertical: _responsiveUtils.isMobile(_context))) - .build(), - (ButtonBuilder(_imagePaths.icReply) - ..key(Key('button_reply_message')) - ..size(20) - ..paddingIcon(EdgeInsets.only( - top: _responsiveUtils.isMobileDevice(_context) ? 10 : 16, - bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, - right: 5)) - ..textStyle(TextStyle( - fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, - color: AppColor.colorTextButton)) - ..onPressActionClick(() { - if (_onPressEmailActionClick != null) { - _onPressEmailActionClick!(EmailActionType.reply); - }}) - ..text(AppLocalizations.of(_context).reply, isVertical: _responsiveUtils.isMobile(_context))) - .build(), - (ButtonBuilder(_imagePaths.icForward) - ..key(Key('button_forward_message')) - ..size(20) - ..paddingIcon(EdgeInsets.only( - top: _responsiveUtils.isMobileDevice(_context) ? 10 : 16, - bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, - right: 5)) - ..textStyle(TextStyle( - fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, - color: AppColor.colorTextButton)) - ..onPressActionClick(() { - if (_onPressEmailActionClick != null) { - _onPressEmailActionClick!(EmailActionType.forward); - }}) - ..text(AppLocalizations.of(_context).forward, isVertical: _responsiveUtils.isMobile(_context))) - .build(), + Expanded(child: (ButtonBuilder(_imagePaths.icReplyAll) + ..key(Key('button_reply_all_message')) + ..size(15) + ..paddingIcon(EdgeInsets.only( + top: _responsiveUtils.isMobile(_context) ? 10 : 16, + bottom: _responsiveUtils.isMobile(_context) ? 8 : 16, + right: 5)) + ..textStyle(TextStyle( + fontSize: _responsiveUtils.isMobile(_context) ? 10 : 16, + color: AppColor.colorTextButton)) + ..onPressActionClick(() { + if (_onPressEmailActionClick != null) { + _onPressEmailActionClick!(EmailActionType.replyAll); + }}) + ..text(AppLocalizations.of(_context).reply_all, isVertical: _responsiveUtils.isMobile(_context))) + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icReply) + ..key(Key('button_reply_message')) + ..size(20) + ..paddingIcon(EdgeInsets.only( + top: _responsiveUtils.isMobile(_context) ? 10 : 16, + bottom: _responsiveUtils.isMobile(_context) ? 8 : 16, + right: 5)) + ..textStyle(TextStyle( + fontSize: _responsiveUtils.isMobile(_context) ? 10 : 16, + color: AppColor.colorTextButton)) + ..onPressActionClick(() { + if (_onPressEmailActionClick != null) { + _onPressEmailActionClick!(EmailActionType.reply); + }}) + ..text(AppLocalizations.of(_context).reply, isVertical: _responsiveUtils.isMobile(_context))) + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icForward) + ..key(Key('button_forward_message')) + ..size(20) + ..paddingIcon(EdgeInsets.only( + top: _responsiveUtils.isMobile(_context) ? 10 : 16, + bottom: _responsiveUtils.isMobile(_context) ? 8 : 16, + right: 5)) + ..textStyle(TextStyle( + fontSize: _responsiveUtils.isMobile(_context) ? 10 : 16, + color: AppColor.colorTextButton)) + ..onPressActionClick(() { + if (_onPressEmailActionClick != null) { + _onPressEmailActionClick!(EmailActionType.forward); + }}) + ..text(AppLocalizations.of(_context).forward, isVertical: _responsiveUtils.isMobile(_context))) + .build()), if (!_responsiveUtils.isDesktop(_context)) - (ButtonBuilder(_imagePaths.icNewMessage) + Expanded(child: (ButtonBuilder(_imagePaths.icNewMessage) ..key(Key('button_new_message')) ..size(20) ..paddingIcon(EdgeInsets.only( - top: _responsiveUtils.isMobileDevice(_context) ? 10 : 16, - bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, + top: _responsiveUtils.isMobile(_context) ? 10 : 16, + bottom: _responsiveUtils.isMobile(_context) ? 8 : 16, right: 5)) ..textStyle(TextStyle( - fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, + fontSize: _responsiveUtils.isMobile(_context) ? 10 : 16, color: AppColor.colorTextButton)) ..onPressActionClick(() { if (_onPressEmailActionClick != null) { _onPressEmailActionClick!(EmailActionType.compose); }}) ..text(AppLocalizations.of(_context).new_message, isVertical: _responsiveUtils.isMobile(_context))) - .build() + .build()) ] ); } diff --git a/lib/features/mailbox/presentation/widgets/bottom_bar_selection_mailbox_widget.dart b/lib/features/mailbox/presentation/widgets/bottom_bar_selection_mailbox_widget.dart index 5bf6d7083..7b57615f2 100644 --- a/lib/features/mailbox/presentation/widgets/bottom_bar_selection_mailbox_widget.dart +++ b/lib/features/mailbox/presentation/widgets/bottom_bar_selection_mailbox_widget.dart @@ -38,18 +38,18 @@ class BottomBarSelectionMailboxWidget { Widget _buildListOptionButton() { return Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - (ButtonBuilder(_imagePaths.icMove) + Expanded(child: (ButtonBuilder(_imagePaths.icMove) ..key(Key('button_move_all_mailbox')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton.withOpacity(0.3))) ..iconColor(AppColor.colorTextButton.withOpacity(0.3)) ..onPressActionClick(() => {}) ..text(AppLocalizations.of(_context).move, isVertical: true)) - .build(), - (ButtonBuilder(_imagePaths.icRenameMailbox) + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icRenameMailbox) ..key(Key('button_rename_mailbox')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle( @@ -62,16 +62,16 @@ class BottomBarSelectionMailboxWidget { } }) ..text(AppLocalizations.of(_context).rename, isVertical: true)) - .build(), - (ButtonBuilder(_imagePaths.icRead) + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icRead) ..key(Key('button_mark_read_all_mailbox')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton.withOpacity(0.3))) ..iconColor(AppColor.colorTextButton.withOpacity(0.3)) ..onPressActionClick(() => {}) ..text(AppLocalizations.of(_context).mark_as_read, isVertical: true)) - .build(), - (ButtonBuilder(_imagePaths.icDelete) + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icDelete) ..key(Key('button_delete_all_mailbox')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle( @@ -84,7 +84,7 @@ class BottomBarSelectionMailboxWidget { } }) ..text(AppLocalizations.of(_context).delete, isVertical: true)) - .build() + .build()) ] ); } diff --git a/lib/features/thread/presentation/widgets/bottom_bar_thread_selection_widget.dart b/lib/features/thread/presentation/widgets/bottom_bar_thread_selection_widget.dart index 539159fe2..e1f5837f6 100644 --- a/lib/features/thread/presentation/widgets/bottom_bar_thread_selection_widget.dart +++ b/lib/features/thread/presentation/widgets/bottom_bar_thread_selection_widget.dart @@ -41,10 +41,10 @@ class BottomBarThreadSelectionWidget { Widget _buildListOptionButton() { return Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - (ButtonBuilder(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead) + Expanded(child: (ButtonBuilder(_listSelectionEmail.isAllEmailRead ? _imagePaths.icUnread : _imagePaths.icRead) ..key(Key('button_mark_read_email')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) @@ -57,8 +57,8 @@ class BottomBarThreadSelectionWidget { ..text( _listSelectionEmail.isAllEmailRead ? AppLocalizations.of(_context).unread : AppLocalizations.of(_context).read, isVertical: _responsiveUtils.isMobile(_context))) - .build(), - (ButtonBuilder(_listSelectionEmail.isAllEmailStarred ? _imagePaths.icUnStar : _imagePaths.icStar) + .build()), + Expanded(child: (ButtonBuilder(_listSelectionEmail.isAllEmailStarred ? _imagePaths.icUnStar : _imagePaths.icStar) ..key(Key('button_mark_as_star_email')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) @@ -70,8 +70,8 @@ class BottomBarThreadSelectionWidget { }}) ..text(_listSelectionEmail.isAllEmailStarred ? AppLocalizations.of(_context).mark_as_unstar : AppLocalizations.of(_context).mark_as_star, isVertical: _responsiveUtils.isMobile(_context))) - .build(), - (ButtonBuilder(_imagePaths.icMove) + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icMove) ..key(Key('button_move_email')) ..paddingIcon(EdgeInsets.all(8)) ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) @@ -80,20 +80,20 @@ class BottomBarThreadSelectionWidget { _onPressEmailSelectionActionClick!(EmailActionType.move, _listSelectionEmail); }}) ..text(AppLocalizations.of(_context).move, isVertical: _responsiveUtils.isMobile(_context))) - .build(), - (ButtonBuilder(_imagePaths.icDelete) - ..key(Key('button_delete_email')) - ..paddingIcon(EdgeInsets.all(8)) - ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) - ..onPressActionClick(() { - if (_currentMailbox?.role != PresentationMailbox.roleTrash) { - _onPressEmailSelectionActionClick?.call(EmailActionType.moveToTrash, _listSelectionEmail); - } else { - _onPressEmailSelectionActionClick?.call(EmailActionType.deletePermanently, _listSelectionEmail); - } + .build()), + Expanded(child: (ButtonBuilder(_imagePaths.icDelete) + ..key(Key('button_delete_email')) + ..paddingIcon(EdgeInsets.all(8)) + ..textStyle(TextStyle(fontSize: 12, color: AppColor.colorTextButton)) + ..onPressActionClick(() { + if (_currentMailbox?.role != PresentationMailbox.roleTrash) { + _onPressEmailSelectionActionClick?.call(EmailActionType.moveToTrash, _listSelectionEmail); + } else { + _onPressEmailSelectionActionClick?.call(EmailActionType.deletePermanently, _listSelectionEmail); + } }) - ..text(AppLocalizations.of(_context).delete, isVertical: _responsiveUtils.isMobile(_context))) - .build() + ..text(AppLocalizations.of(_context).delete, isVertical: _responsiveUtils.isMobile(_context))) + .build()) ] ); }