From 9ce398d9373aaa6f37526e2a37089fdf6b329e27 Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 9 Mar 2022 15:03:51 +0700 Subject: [PATCH] TF-313 Apply new ui for BottomBar EmailView --- assets/images/ic_forward.svg | 12 +++++++-- assets/images/ic_new_message.svg | 4 +++ assets/images/ic_reply.svg | 4 +-- .../presentation/resources/image_paths.dart | 1 + .../email/presentation/email_view.dart | 3 ++- .../bottom_bar_mail_widget_builder.dart | 25 ++++++++++++++----- lib/main/localizations/app_localizations.dart | 7 ++++++ 7 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 assets/images/ic_new_message.svg diff --git a/assets/images/ic_forward.svg b/assets/images/ic_forward.svg index 253fa170a..f63f37192 100644 --- a/assets/images/ic_forward.svg +++ b/assets/images/ic_forward.svg @@ -1,3 +1,11 @@ - - + + + + + + + + + + diff --git a/assets/images/ic_new_message.svg b/assets/images/ic_new_message.svg new file mode 100644 index 000000000..8449ef5de --- /dev/null +++ b/assets/images/ic_new_message.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/ic_reply.svg b/assets/images/ic_reply.svg index f37f425c3..ef21e079a 100644 --- a/assets/images/ic_reply.svg +++ b/assets/images/ic_reply.svg @@ -1,3 +1,3 @@ - - + + diff --git a/core/lib/presentation/resources/image_paths.dart b/core/lib/presentation/resources/image_paths.dart index 6a7b73304..ea2f20404 100644 --- a/core/lib/presentation/resources/image_paths.dart +++ b/core/lib/presentation/resources/image_paths.dart @@ -64,6 +64,7 @@ class ImagePaths { String get icRemoveDialog => _getImagePath('ic_remove_dialog.svg'); String get icDeleteEmailAddress => _getImagePath('ic_delete_email_address.svg'); String get icDeleteEmail => _getImagePath('ic_delete_email.svg'); + String get icNewMessage => _getImagePath('ic_new_message.svg'); String _getImagePath(String imageName) { return AssetsPaths.images + imageName; diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart index c663a5dc3..e9cd0fe91 100644 --- a/lib/features/email/presentation/email_view.dart +++ b/lib/features/email/presentation/email_view.dart @@ -38,6 +38,7 @@ class EmailView extends GetView { _buildAppBar(context), _buildDivider(), Expanded(child: _buildEmailBody(context)), + Divider(color: AppColor.colorDividerEmailView, height: 1), _buildBottomBar(context), ] ) @@ -75,7 +76,7 @@ class EmailView extends GetView { Widget _buildBottomBar(BuildContext context) { return Padding( - padding: EdgeInsets.only(left: 6, top: 6, right: 6, bottom: 6), + padding: EdgeInsets.zero, child: Obx(() => (BottomBarMailWidgetBuilder( context, imagePaths, 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 8ca4eea2f..7617f0e97 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 @@ -51,8 +51,7 @@ class BottomBarMailWidgetBuilder { bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, right: 5)) ..textStyle(TextStyle( - fontWeight: FontWeight.w500, - fontSize: _responsiveUtils.isMobileDevice(_context) ? 13 : 16, + fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, color: AppColor.colorTextButton)) ..onPressActionClick(() { if (_onPressEmailActionClick != null) { @@ -68,8 +67,7 @@ class BottomBarMailWidgetBuilder { bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, right: 5)) ..textStyle(TextStyle( - fontWeight: FontWeight.w500, - fontSize: _responsiveUtils.isMobileDevice(_context) ? 13 : 16, + fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, color: AppColor.colorTextButton)) ..onPressActionClick(() { if (_onPressEmailActionClick != null) { @@ -85,14 +83,29 @@ class BottomBarMailWidgetBuilder { bottom: _responsiveUtils.isMobileDevice(_context) ? 8 : 16, right: 5)) ..textStyle(TextStyle( - fontWeight: FontWeight.w500, - fontSize: _responsiveUtils.isMobileDevice(_context) ? 13 : 16, + 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(), + (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, + right: 5)) + ..textStyle(TextStyle( + fontSize: _responsiveUtils.isMobileDevice(_context) ? 12 : 16, + color: AppColor.colorTextButton)) + ..onPressActionClick(() { + if (_onPressEmailActionClick != null) { + _onPressEmailActionClick!(EmailActionType.compose); + }}) + ..text(AppLocalizations.of(_context).new_message, isVertical: _responsiveUtils.isMobile(_context))) .build() ] ); diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart index 1f1a084cc..e40142b28 100644 --- a/lib/main/localizations/app_localizations.dart +++ b/lib/main/localizations/app_localizations.dart @@ -736,4 +736,11 @@ class AppLocalizations { name: 'preparing_to_save' ); } + + String get new_message { + return Intl.message( + 'New message', + name: 'new_message', + ); + } } \ No newline at end of file