From 2e601fcc26211994dc298d2d5600258a3032119f Mon Sep 17 00:00:00 2001 From: sherlockvn Date: Tue, 7 Feb 2023 16:11:04 +0700 Subject: [PATCH] TF-1184 improve UI UX of ToolbarRichText in web --- .../composer/presentation/composer_view_web.dart | 4 +++- .../widgets/toolbar_rich_text_builder.dart | 6 ++++-- .../presentation/identity_creator_view.dart | 14 +++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/features/composer/presentation/composer_view_web.dart b/lib/features/composer/presentation/composer_view_web.dart index 46c02fdfa..d65a324e9 100644 --- a/lib/features/composer/presentation/composer_view_web.dart +++ b/lib/features/composer/presentation/composer_view_web.dart @@ -64,7 +64,9 @@ class ComposerView extends GetWidget Expanded(child: Column( children: [ _buildAttachmentsWidget(context), - ToolbarRichTextWebBuilder(richTextWebController: controller.richTextWebController), + ToolbarRichTextWebBuilder( + richTextWebController: controller.richTextWebController, + padding: const EdgeInsets.only(left: 20, top: 8, bottom: 8)), buildInlineLoadingView(controller), _buildEditorForm(context) ] diff --git a/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart b/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart index 5b4638224..e6c0928e7 100644 --- a/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart +++ b/lib/features/composer/presentation/widgets/toolbar_rich_text_builder.dart @@ -21,10 +21,12 @@ class ToolbarRichTextWebBuilder extends StatelessWidget with RichTextButtonMixin final RichTextWebController richTextWebController; final ImagePaths _imagePaths = Get.find(); + final EdgeInsetsGeometry? padding; ToolbarRichTextWebBuilder({ Key? key, - required this.richTextWebController + required this.richTextWebController, + this.padding, }) : super(key: key); @override @@ -34,7 +36,7 @@ class ToolbarRichTextWebBuilder extends StatelessWidget with RichTextButtonMixin final opacity = codeViewEnabled ? 0.5 : 1.0; return Container( - padding: const EdgeInsets.only(left: 20, top: 8, bottom: 8), + padding: padding, alignment: Alignment.centerLeft, child: Wrap( crossAxisAlignment: WrapCrossAlignment.center, diff --git a/lib/features/identity_creator/presentation/identity_creator_view.dart b/lib/features/identity_creator/presentation/identity_creator_view.dart index 8d7bb213a..dc5d17e9e 100644 --- a/lib/features/identity_creator/presentation/identity_creator_view.dart +++ b/lib/features/identity_creator/presentation/identity_creator_view.dart @@ -146,7 +146,7 @@ class IdentityCreatorView extends GetWidget { decoration: const BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(16))), - width: max(_responsiveUtils.getSizeScreenWidth(context) * 0.4, 600), + width: max(_responsiveUtils.getSizeScreenWidth(context) * 0.4, 650), height: _responsiveUtils.getSizeScreenHeight(context) * 0.75, child: ClipRRect( borderRadius: const BorderRadius.all(Radius.circular(16)), @@ -251,7 +251,6 @@ class IdentityCreatorView extends GetWidget { border: Border.all(color: AppColor.colorInputBorderCreateMailbox), color: Colors.white, ), - padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16), child: Stack( children: [ if (controller.signatureType.value == SignatureType.plainText) @@ -429,7 +428,9 @@ class IdentityCreatorView extends GetWidget { child: Column( children: [ if(BuildUtils.isWeb) - ToolbarRichTextWebBuilder(richTextWebController: controller.richTextWebController), + ToolbarRichTextWebBuilder( + richTextWebController: controller.richTextWebController, + padding: const EdgeInsets.only(top: 22, bottom: 8.0, left: 24, right: 12)), htmlEditor, ], ), @@ -440,8 +441,7 @@ class IdentityCreatorView extends GetWidget { log('IdentityCreatorView::_buildHtmlEditorWeb(): initContent: $initContent'); return Expanded( child: Padding( - padding: EdgeInsets.symmetric( - horizontal: _responsiveUtils.isMobile(context) ? 8 : 10), + padding: const EdgeInsets.only(left: 14.0, right: 2.0), child: html_editor_browser.HtmlEditor( key: const Key('identity_create_editor_web'), controller: controller.richTextWebController.editorController, @@ -478,8 +478,8 @@ class IdentityCreatorView extends GetWidget { log('IdentityCreatorView::_buildHtmlEditorWeb(): onChangeCodeView : $contentChanged'); controller.updateContentHtmlEditor(contentChanged); }), - ) - ) + ), + ), ); }