From da3fdd1202937b9ae0804f1088a974af939e8613 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 16 Apr 2024 19:51:38 +0700 Subject: [PATCH] TF-2584 Update padding toolbox buttons of composer in mobile --- .../mobile_app_bar_composer_widget_style.dart | 3 +-- .../widgets/mobile/app_bar_composer_widget.dart | 8 +++----- .../mobile/landscape_app_bar_composer_widget.dart | 8 +++----- .../mobile_responsive_app_bar_composer_widget.dart | 14 ++------------ 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/lib/features/composer/presentation/styles/mobile_app_bar_composer_widget_style.dart b/lib/features/composer/presentation/styles/mobile_app_bar_composer_widget_style.dart index a3cc769e4..827574f81 100644 --- a/lib/features/composer/presentation/styles/mobile_app_bar_composer_widget_style.dart +++ b/lib/features/composer/presentation/styles/mobile_app_bar_composer_widget_style.dart @@ -5,8 +5,7 @@ import 'package:flutter/material.dart'; class MobileAppBarComposerWidgetStyle { static const double height = 56; static const double iconSize = 24; - static const double space = 12; - static const double iconRadius = 8; + static const double space = 4; static const double sendButtonIconSize = 30; static const double richTextIconSize = 28; diff --git a/lib/features/composer/presentation/widgets/mobile/app_bar_composer_widget.dart b/lib/features/composer/presentation/widgets/mobile/app_bar_composer_widget.dart index e9ccfa030..0200424ec 100644 --- a/lib/features/composer/presentation/widgets/mobile/app_bar_composer_widget.dart +++ b/lib/features/composer/presentation/widgets/mobile/app_bar_composer_widget.dart @@ -45,7 +45,6 @@ class AppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).saveAndClose, iconSize: MobileAppBarComposerWidgetStyle.iconSize, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - padding: MobileAppBarComposerWidgetStyle.iconPadding, onTapActionCallback: onCloseViewAction ), const Spacer(), @@ -60,7 +59,7 @@ class AppBarComposerWidget extends StatelessWidget { ), if (isNetworkConnectionAvailable) ...[ - const SizedBox(width: 4), + const SizedBox(width: MobileAppBarComposerWidgetStyle.space), TMailButtonWidget.fromIcon( icon: _imagePaths.icAttachFile, iconColor: MobileAppBarComposerWidgetStyle.iconColor, @@ -69,7 +68,7 @@ class AppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).attach_file, onTapActionCallback: attachFileAction, ), - const SizedBox(width: 4), + const SizedBox(width: MobileAppBarComposerWidgetStyle.space), TMailButtonWidget.fromIcon( icon: _imagePaths.icInsertImage, iconColor: MobileAppBarComposerWidgetStyle.iconColor, @@ -78,7 +77,7 @@ class AppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).insertImage, onTapActionCallback: insertImageAction, ), - const SizedBox(width: 4), + const SizedBox(width: MobileAppBarComposerWidgetStyle.space), ], TMailButtonWidget.fromIcon( icon: isSendButtonEnabled @@ -94,7 +93,6 @@ class AppBarComposerWidget extends StatelessWidget { TMailButtonWidget.fromIcon( icon: _imagePaths.icMore, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - borderRadius: MobileAppBarComposerWidgetStyle.iconRadius, backgroundColor: Colors.transparent, padding: MobileAppBarComposerWidgetStyle.iconPadding, iconSize: MobileAppBarComposerWidgetStyle.iconSize, diff --git a/lib/features/composer/presentation/widgets/mobile/landscape_app_bar_composer_widget.dart b/lib/features/composer/presentation/widgets/mobile/landscape_app_bar_composer_widget.dart index bb7cbd183..2d74fc056 100644 --- a/lib/features/composer/presentation/widgets/mobile/landscape_app_bar_composer_widget.dart +++ b/lib/features/composer/presentation/widgets/mobile/landscape_app_bar_composer_widget.dart @@ -48,7 +48,6 @@ class LandscapeAppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).saveAndClose, iconSize: MobileAppBarComposerWidgetStyle.iconSize, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - padding: MobileAppBarComposerWidgetStyle.iconPadding, onTapActionCallback: onCloseViewAction ), const Spacer(), @@ -63,7 +62,7 @@ class LandscapeAppBarComposerWidget extends StatelessWidget { ), if (isNetworkConnectionAvailable) ...[ - const SizedBox(width: 4), + const SizedBox(width: MobileAppBarComposerWidgetStyle.space), TMailButtonWidget.fromIcon( icon: _imagePaths.icAttachFile, iconColor: MobileAppBarComposerWidgetStyle.iconColor, @@ -72,7 +71,7 @@ class LandscapeAppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).attach_file, onTapActionCallback: attachFileAction, ), - const SizedBox(width: 4), + const SizedBox(width: MobileAppBarComposerWidgetStyle.space), TMailButtonWidget.fromIcon( icon: _imagePaths.icInsertImage, iconColor: MobileAppBarComposerWidgetStyle.iconColor, @@ -81,7 +80,7 @@ class LandscapeAppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).insertImage, onTapActionCallback: insertImageAction, ), - const SizedBox(width: 4), + const SizedBox(width: MobileAppBarComposerWidgetStyle.space), ], TMailButtonWidget.fromIcon( icon: isSendButtonEnabled @@ -97,7 +96,6 @@ class LandscapeAppBarComposerWidget extends StatelessWidget { TMailButtonWidget.fromIcon( icon: _imagePaths.icMore, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - borderRadius: MobileAppBarComposerWidgetStyle.iconRadius, backgroundColor: Colors.transparent, padding: MobileAppBarComposerWidgetStyle.iconPadding, iconSize: MobileAppBarComposerWidgetStyle.iconSize, diff --git a/lib/features/composer/presentation/widgets/web/mobile_responsive_app_bar_composer_widget.dart b/lib/features/composer/presentation/widgets/web/mobile_responsive_app_bar_composer_widget.dart index 72cd05b5c..5c7b0790e 100644 --- a/lib/features/composer/presentation/widgets/web/mobile_responsive_app_bar_composer_widget.dart +++ b/lib/features/composer/presentation/widgets/web/mobile_responsive_app_bar_composer_widget.dart @@ -48,13 +48,11 @@ class MobileResponsiveAppBarComposerWidget extends StatelessWidget { tooltipMessage: AppLocalizations.of(context).saveAndClose, iconSize: MobileAppBarComposerWidgetStyle.iconSize, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - padding: MobileAppBarComposerWidgetStyle.iconPadding, onTapActionCallback: onCloseViewAction ), const Spacer(), TMailButtonWidget.fromIcon( icon: _imagePaths.icRichToolbar, - borderRadius: MobileAppBarComposerWidgetStyle.iconRadius, padding: MobileAppBarComposerWidgetStyle.richTextIconPadding, backgroundColor: isFormattingOptionsEnabled ? MobileAppBarComposerWidgetStyle.selectedBackgroundColor @@ -70,27 +68,21 @@ class MobileResponsiveAppBarComposerWidget extends StatelessWidget { TMailButtonWidget.fromIcon( icon: _imagePaths.icAttachFile, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - borderRadius: MobileAppBarComposerWidgetStyle.iconRadius, backgroundColor: Colors.transparent, - padding: MobileAppBarComposerWidgetStyle.iconPadding, iconSize: MobileAppBarComposerWidgetStyle.iconSize, tooltipMessage: AppLocalizations.of(context).attach_file, onTapActionCallback: attachFileAction, ), const SizedBox(width: MobileAppBarComposerWidgetStyle.space), - AbsorbPointer( - absorbing: isCodeViewEnabled, - child: TMailButtonWidget.fromIcon( + if (!isCodeViewEnabled) + TMailButtonWidget.fromIcon( icon: _imagePaths.icInsertImage, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - borderRadius: MobileAppBarComposerWidgetStyle.iconRadius, backgroundColor: Colors.transparent, - padding: MobileAppBarComposerWidgetStyle.iconPadding, iconSize: MobileAppBarComposerWidgetStyle.iconSize, tooltipMessage: AppLocalizations.of(context).insertImage, onTapActionCallback: insertImageAction, ), - ), const SizedBox(width: MobileAppBarComposerWidgetStyle.space), TMailButtonWidget.fromIcon( icon: isSendButtonEnabled @@ -106,9 +98,7 @@ class MobileResponsiveAppBarComposerWidget extends StatelessWidget { TMailButtonWidget.fromIcon( icon: _imagePaths.icMore, iconColor: MobileAppBarComposerWidgetStyle.iconColor, - borderRadius: MobileAppBarComposerWidgetStyle.iconRadius, backgroundColor: Colors.transparent, - padding: MobileAppBarComposerWidgetStyle.iconPadding, iconSize: MobileAppBarComposerWidgetStyle.iconSize, tooltipMessage: AppLocalizations.of(context).more, onTapActionAtPositionCallback: openContextMenuAction,