diff --git a/lib/features/base/widget/default_field/default_autocomplete_input_field_widget.dart b/lib/features/base/widget/default_field/default_autocomplete_input_field_widget.dart index 25b31c10f..61a90751d 100644 --- a/lib/features/base/widget/default_field/default_autocomplete_input_field_widget.dart +++ b/lib/features/base/widget/default_field/default_autocomplete_input_field_widget.dart @@ -160,6 +160,7 @@ class _DefaultAutocompleteInputFieldWidgetState final currentEmailAddress = _currentListEmailAddress.elementAt(index); return DefaultAutocompleteTagItemWidget( field: widget.field, + imagePaths: _imagePaths, currentEmailAddress: currentEmailAddress, currentListEmailAddress: _currentListEmailAddress, collapsedListEmailAddress: _collapsedListEmailAddress, diff --git a/lib/features/base/widget/default_field/default_autocomplete_tag_item_widget.dart b/lib/features/base/widget/default_field/default_autocomplete_tag_item_widget.dart index 0afca3fd2..27f43ada3 100644 --- a/lib/features/base/widget/default_field/default_autocomplete_tag_item_widget.dart +++ b/lib/features/base/widget/default_field/default_autocomplete_tag_item_widget.dart @@ -1,4 +1,5 @@ import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/views/button/tmail_button_widget.dart'; import 'package:core/utils/direction_utils.dart'; import 'package:core/utils/platform_info.dart'; @@ -15,6 +16,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/ad class DefaultAutocompleteTagItemWidget extends StatelessWidget { + final ImagePaths imagePaths; final bool isCollapsed; final bool isTagFocused; final FilterField field; @@ -27,6 +29,7 @@ class DefaultAutocompleteTagItemWidget extends StatelessWidget { const DefaultAutocompleteTagItemWidget({ Key? key, + required this.imagePaths, required this.field, required this.currentEmailAddress, required this.currentListEmailAddress, @@ -73,10 +76,12 @@ class DefaultAutocompleteTagItemWidget extends StatelessWidget { ), feedback: DefaultDraggableTagWidget( emailAddress: currentEmailAddress, + imagePaths: imagePaths, padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4), ), childWhenDragging: DefaultDraggableTagWidget( emailAddress: currentEmailAddress, + imagePaths: imagePaths, padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4), ), child: TextFieldTapRegion( diff --git a/lib/features/base/widget/default_field/default_draggable_tag_widget.dart b/lib/features/base/widget/default_field/default_draggable_tag_widget.dart index e931affef..0fa84cb99 100644 --- a/lib/features/base/widget/default_field/default_draggable_tag_widget.dart +++ b/lib/features/base/widget/default_field/default_draggable_tag_widget.dart @@ -4,20 +4,19 @@ import 'package:core/presentation/resources/image_paths.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/base/widget/default_field/default_draggable_tag_widget_style.dart'; class DefaultDraggableTagWidget extends StatelessWidget { + final ImagePaths imagePaths; final EmailAddress emailAddress; final EdgeInsetsGeometry? padding; - final _imagePaths = Get.find(); - - DefaultDraggableTagWidget({ + const DefaultDraggableTagWidget({ super.key, required this.emailAddress, + required this.imagePaths, this.padding, }); @@ -54,7 +53,7 @@ class DefaultDraggableTagWidget extends StatelessWidget { ), ), SvgPicture.asset( - _imagePaths.icClose, + imagePaths.icClose, colorFilter: DefaultDraggableTagWidgetStyle.deleteIconColor.asFilter(), fit: BoxFit.fill,