From b5326ec18655bffed551c1a447d62e313458fd27 Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 6 Sep 2023 11:44:41 +0700 Subject: [PATCH] TF-2116 Sync all icon and remove icon unused (cherry picked from commit df2b913e6309b64014e43b50d22d79c12b83ca9e) --- .../presentation/widgets/app_bar_contact_widget.dart | 2 +- .../presentation/widgets/contact_input_tag_item.dart | 6 +++--- .../presentation/widgets/contact_suggestion_box_item.dart | 6 +++--- .../widgets/email_address_bottom_sheet_builder.dart | 5 +++-- .../presentation/widgets/email_address_dialog_builder.dart | 2 +- lib/features/mailbox/presentation/mailbox_view.dart | 2 +- .../advanced_search_filter_bottom_sheet.dart | 2 +- .../advanced_search/avatar_suggestion_item_widget.dart | 3 ++- .../presentation/widgets/top_bar_thread_selection.dart | 2 +- .../forward/widgets/list_email_forward_widget.dart | 2 +- .../presentation/rules_filter_creator_view.dart | 6 +++--- .../email/presentation/widgets/app_bar_selection_mode.dart | 2 +- .../presentation/widgets/app_bar_thread_widget_builder.dart | 2 +- .../widgets/spam_banner/spam_report_banner_web_widget.dart | 2 +- 14 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/features/contact/presentation/widgets/app_bar_contact_widget.dart b/lib/features/contact/presentation/widgets/app_bar_contact_widget.dart index b823e84fc..de3a01ace 100644 --- a/lib/features/contact/presentation/widgets/app_bar_contact_widget.dart +++ b/lib/features/contact/presentation/widgets/app_bar_contact_widget.dart @@ -25,7 +25,7 @@ class AppBarContactWidget extends StatelessWidget { left: 0, child: buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseComposer, + _imagePaths.icClose, colorFilter: AppColor.colorCloseButton.asFilter(), width: 24, height: 24, diff --git a/lib/features/contact/presentation/widgets/contact_input_tag_item.dart b/lib/features/contact/presentation/widgets/contact_input_tag_item.dart index 91fe91d33..1ea277967 100644 --- a/lib/features/contact/presentation/widgets/contact_input_tag_item.dart +++ b/lib/features/contact/presentation/widgets/contact_input_tag_item.dart @@ -2,6 +2,7 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/style_utils.dart'; +import 'package:core/presentation/views/avatar/gradient_circle_avatar_icon.dart'; import 'package:core/utils/direction_utils.dart'; import 'package:core/utils/platform_info.dart'; import 'package:flutter/material.dart'; @@ -9,7 +10,6 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/extensions/email_address_extension.dart'; -import 'package:tmail_ui_user/features/contact/presentation/widgets/gradient_color_avatar_icon.dart'; import 'package:tmail_ui_user/main/utils/app_utils.dart'; typedef DeleteContactCallbackAction = Function(EmailAddress contactDeleted); @@ -38,8 +38,8 @@ class ContactInputTagItem extends StatelessWidget { final itemChild = Chip( materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, avatar: contact.displayName.isNotEmpty - ? GradientColorAvatarIcon( - contact.avatarColors, + ? GradientCircleAvatarIcon( + colors: contact.avatarColors, iconSize: 20, labelFontSize: 11, label: contact.labelAvatar) diff --git a/lib/features/contact/presentation/widgets/contact_suggestion_box_item.dart b/lib/features/contact/presentation/widgets/contact_suggestion_box_item.dart index c0f177f2f..97ac8c1b6 100644 --- a/lib/features/contact/presentation/widgets/contact_suggestion_box_item.dart +++ b/lib/features/contact/presentation/widgets/contact_suggestion_box_item.dart @@ -2,13 +2,13 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/style_utils.dart'; +import 'package:core/presentation/views/avatar/gradient_circle_avatar_icon.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/extensions/email_address_extension.dart'; import 'package:tmail_ui_user/features/composer/presentation/widgets/suggestion_email_address.dart'; -import 'package:tmail_ui_user/features/contact/presentation/widgets/gradient_color_avatar_icon.dart'; typedef SelectedContactCallbackAction = Function(EmailAddress contactSelected); @@ -31,8 +31,8 @@ class ContactSuggestionBoxItem extends StatelessWidget { final imagePaths = Get.find(); final itemChild = Row(children: [ - GradientColorAvatarIcon( - suggestionEmailAddress.emailAddress.avatarColors, + GradientCircleAvatarIcon( + colors: suggestionEmailAddress.emailAddress.avatarColors, label: suggestionEmailAddress.emailAddress.labelAvatar, ), const SizedBox(width: 12), diff --git a/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart b/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart index 88f5cab67..458c7b1ea 100644 --- a/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart +++ b/lib/features/email/presentation/widgets/email_address_bottom_sheet_builder.dart @@ -80,8 +80,9 @@ class EmailAddressBottomSheetBuilder { padding: const EdgeInsets.only(top: 16, right: 16), onPressed: () => _onCloseBottomSheetAction?.call(), icon: SvgPicture.asset( - _imagePaths.icCloseMailbox, - width: 24, height: 24, + _imagePaths.icCircleClose, + width: 24, + height: 24, fit: BoxFit.fill))), (AvatarBuilder() ..text(_emailAddress.asString().firstLetterToUpperCase) diff --git a/lib/features/email/presentation/widgets/email_address_dialog_builder.dart b/lib/features/email/presentation/widgets/email_address_dialog_builder.dart index d5589ded2..7b9487ea4 100644 --- a/lib/features/email/presentation/widgets/email_address_dialog_builder.dart +++ b/lib/features/email/presentation/widgets/email_address_dialog_builder.dart @@ -56,7 +56,7 @@ class EmailAddressDialogBuilder extends StatelessWidget { padding: const EdgeInsets.only(top: 16, right: 16), onPressed: () => onCloseDialogAction?.call(), icon: SvgPicture.asset( - imagePaths.icCloseMailbox, + imagePaths.icCircleClose, width: 24, height: 24, fit: BoxFit.fill))), diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart index fc9ac766a..c432d9272 100644 --- a/lib/features/mailbox/presentation/mailbox_view.dart +++ b/lib/features/mailbox/presentation/mailbox_view.dart @@ -132,7 +132,7 @@ class MailboxView extends BaseMailboxView { Widget _buildCloseScreenButton(BuildContext context) { return buildIconWeb( - icon: SvgPicture.asset(imagePaths.icCloseMailbox, width: 28, height: 28, fit: BoxFit.fill), + icon: SvgPicture.asset(imagePaths.icCircleClose, width: 28, height: 28, fit: BoxFit.fill), tooltip: AppLocalizations.of(context).close, onTap: () => controller.closeMailboxScreen(context)); } diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_bottom_sheet.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_bottom_sheet.dart index 1a0f2d0ab..cd7c5d7b2 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_bottom_sheet.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_bottom_sheet.dart @@ -19,7 +19,7 @@ Future showAdvancedSearchFilterBottomSheet(BuildContext context) async { cancelWidget: Padding( padding: const EdgeInsets.only(right: 16), child: SvgPicture.asset( - imagePaths.icCloseAdvancedSearch, + imagePaths.icCircleClose, colorFilter: AppColor.colorHintSearchBar.asFilter(), width: 24, height: 24, diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_suggestion_item_widget.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_suggestion_item_widget.dart index 3e49f1ffd..b577f74d0 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_suggestion_item_widget.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_suggestion_item_widget.dart @@ -1,3 +1,4 @@ +import 'package:core/presentation/extensions/string_extension.dart'; import 'package:flutter/material.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/extensions/email_address_extension.dart'; @@ -25,7 +26,7 @@ class AvatarSuggestionItemWidget extends StatelessWidget { ), child: Text( emailAddress.asString().isNotEmpty - ? emailAddress.asString()[0].toUpperCase() + ? emailAddress.asString().firstLetterToUpperCase : '', style: AvatarSuggestionItemStyle.labelTextStyle ) diff --git a/lib/features/mailbox_dashboard/presentation/widgets/top_bar_thread_selection.dart b/lib/features/mailbox_dashboard/presentation/widgets/top_bar_thread_selection.dart index c811b9c3b..1fc685714 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/top_bar_thread_selection.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/top_bar_thread_selection.dart @@ -41,7 +41,7 @@ class TopBarThreadSelection { return Row(children: [ buildIconWeb( icon: SvgPicture.asset( - imagePaths.icCloseComposer, + imagePaths.icClose, colorFilter: AppColor.colorTextButton.asFilter(), fit: BoxFit.fill), tooltip: AppLocalizations.of(context).cancel, diff --git a/lib/features/manage_account/presentation/forward/widgets/list_email_forward_widget.dart b/lib/features/manage_account/presentation/forward/widgets/list_email_forward_widget.dart index c985cac34..fd1dbbe86 100644 --- a/lib/features/manage_account/presentation/forward/widgets/list_email_forward_widget.dart +++ b/lib/features/manage_account/presentation/forward/widgets/list_email_forward_widget.dart @@ -106,7 +106,7 @@ class ListEmailForwardsWidget extends GetWidget { children: [ buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseComposer, + _imagePaths.icClose, colorFilter: AppColor.colorTextButton.asFilter(), fit: BoxFit.fill), tooltip: AppLocalizations.of(context).cancel, diff --git a/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart b/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart index 83122c8d1..f257593ea 100644 --- a/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart +++ b/lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart @@ -253,7 +253,7 @@ class RuleFilterCreatorView extends GetWidget { Positioned(top: 8, right: 8, child: buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseMailbox, + _imagePaths.icCircleClose, fit: BoxFit.fill), tooltip: AppLocalizations.of(context).close, onTap: () => controller.closeView(context))) @@ -404,7 +404,7 @@ class RuleFilterCreatorView extends GetWidget { Positioned(top: 8, right: 8, child: buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseMailbox, + _imagePaths.icCircleClose, fit: BoxFit.fill), tooltip: AppLocalizations.of(context).close, onTap: () => controller.closeView(context))) @@ -573,7 +573,7 @@ class RuleFilterCreatorView extends GetWidget { Positioned(top: 8, right: 8, child: buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseMailbox, + _imagePaths.icCircleClose, fit: BoxFit.fill), tooltip: AppLocalizations.of(context).close, onTap: () => controller.closeView(context))) diff --git a/lib/features/search/email/presentation/widgets/app_bar_selection_mode.dart b/lib/features/search/email/presentation/widgets/app_bar_selection_mode.dart index 01e402268..4da6f2f57 100644 --- a/lib/features/search/email/presentation/widgets/app_bar_selection_mode.dart +++ b/lib/features/search/email/presentation/widgets/app_bar_selection_mode.dart @@ -39,7 +39,7 @@ class AppBarSelectionMode extends StatelessWidget { return Row(children: [ buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseComposer, + _imagePaths.icClose, colorFilter: AppColor.colorTextButton.asFilter(), fit: BoxFit.fill), minSize: 25, diff --git a/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart b/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart index d20831b14..42f7c3cee 100644 --- a/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart +++ b/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart @@ -92,7 +92,7 @@ class AppBarThreadWidgetBuilder extends StatelessWidget { return Row(children: [ buildIconWeb( icon: SvgPicture.asset( - _imagePaths.icCloseComposer, + _imagePaths.icClose, colorFilter: AppColor.colorTextButton.asFilter(), fit: BoxFit.fill), minSize: 25, diff --git a/lib/features/thread/presentation/widgets/spam_banner/spam_report_banner_web_widget.dart b/lib/features/thread/presentation/widgets/spam_banner/spam_report_banner_web_widget.dart index 7fa575f01..a4e23f596 100644 --- a/lib/features/thread/presentation/widgets/spam_banner/spam_report_banner_web_widget.dart +++ b/lib/features/thread/presentation/widgets/spam_banner/spam_report_banner_web_widget.dart @@ -73,7 +73,7 @@ class SpamReportBannerWebWidget extends StatelessWidget { label: AppLocalizations.of(context).dismiss, labelColor: SpamReportBannerButtonStyles.negativeButtonTextColor, onTap: () => spamReportController.dismissSpamReportAction(context), - icon: imagePaths.icCloseComposer, + icon: imagePaths.icClose, wrapContent: true, ), )