diff --git a/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart b/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart index 6fbf418ed..9121eef8b 100644 --- a/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart +++ b/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart @@ -11,7 +11,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:jmap_dart_client/jmap/account_id.dart'; -import 'package:jmap_dart_client/jmap/core/id.dart'; import 'package:jmap_dart_client/jmap/identities/identity.dart'; import 'package:tmail_ui_user/features/base/base_controller.dart'; import 'package:tmail_ui_user/features/identity_creator/presentation/model/identity_creator_arguments.dart'; @@ -47,9 +46,6 @@ class IdentitiesController extends BaseController { final selectedIndex = Rxn(); final identitySelected = Rxn(); final listAllIdentities = [].obs; - final listSelectedIdentities = [].obs; - - final idIdentityAll = IdentityId(Id('all')); late Worker accountIdWorker; @@ -184,8 +180,6 @@ class IdentitiesController extends BaseController { } void openConfirmationDialogDeleteIdentityAction(BuildContext context, Identity identity) { - popBack(); - if (_responsiveUtils.isScreenWithShortestSide(context)) { (ConfirmationDialogActionSheetBuilder(context) ..messageText(AppLocalizations.of(context).message_confirmation_dialog_delete_identity) @@ -232,8 +226,6 @@ class IdentitiesController extends BaseController { } void _deleteIdentityAction(Identity identity) { - popBack(); - final accountId = _accountDashBoardController.accountId.value; if (accountId != null && identity.id != null) { consumeState(_deleteIdentityInteractor.execute(accountId, identity.id!)); @@ -276,8 +268,6 @@ class IdentitiesController extends BaseController { } void goToEditIdentity(BuildContext context, Identity identity) async { - popBack(); - final accountId = _accountDashBoardController.accountId.value; final userProfile = _accountDashBoardController.userProfile.value; if (accountId != null && userProfile != null) { diff --git a/lib/features/manage_account/presentation/profiles/identities/widgets/identity_bottom_sheet_action_tile_builder.dart b/lib/features/manage_account/presentation/profiles/identities/widgets/identity_bottom_sheet_action_tile_builder.dart deleted file mode 100644 index 14ea33ea4..000000000 --- a/lib/features/manage_account/presentation/profiles/identities/widgets/identity_bottom_sheet_action_tile_builder.dart +++ /dev/null @@ -1,52 +0,0 @@ - -import 'package:core/core.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; -import 'package:jmap_dart_client/jmap/identities/identity.dart'; - -class IdentityBottomSheetActionTileBuilder extends CupertinoActionSheetActionBuilder { - - final Identity identity; - final SvgPicture? actionSelected; - final Color? bgColor; - final EdgeInsets? iconLeftPadding; - final EdgeInsets? iconRightPadding; - - IdentityBottomSheetActionTileBuilder( - Key key, - SvgPicture actionIcon, - String actionName, - this.identity, - { - this.actionSelected, - this.bgColor, - this.iconLeftPadding, - this.iconRightPadding, - } - ) : super(key, actionIcon, actionName); - - @override - Widget build() { - return Container( - color: bgColor ?? Colors.white, - child: MouseRegion( - cursor: BuildUtils.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer, - child: CupertinoActionSheetAction( - key: key, - child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ - Padding( - padding: iconLeftPadding ?? const EdgeInsets.only(left: 12, right: 16), - child: actionIcon), - Expanded(child: Text(actionName, textAlign: TextAlign.left, style: actionTextStyle())), - ]), - onPressed: () { - if (onCupertinoActionSheetActionClick != null) { - onCupertinoActionSheetActionClick!(identity); - } - }, - ), - ), - ); - } -} \ No newline at end of file diff --git a/lib/features/manage_account/presentation/profiles/identities/widgets/identity_info_tile_builder.dart b/lib/features/manage_account/presentation/profiles/identities/widgets/identity_info_tile_builder.dart deleted file mode 100644 index ce0f871a3..000000000 --- a/lib/features/manage_account/presentation/profiles/identities/widgets/identity_info_tile_builder.dart +++ /dev/null @@ -1,139 +0,0 @@ -import 'package:core/core.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:jmap_dart_client/jmap/identities/identity.dart'; -import 'package:model/model.dart'; -import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; - -typedef OnMenuItemIdentityAction = Function(Identity identity, RelativeRect? positon); - -class IdentityInfoTileBuilder extends StatelessWidget { - - final ImagePaths _imagePaths; - final ResponsiveUtils _responsiveUtils; - final Identity? _identity; - final OnMenuItemIdentityAction? onMenuItemIdentityAction; - - const IdentityInfoTileBuilder( - this._imagePaths, - this._responsiveUtils, - this._identity, - { - Key? key, - this.onMenuItemIdentityAction, - } - ) : super(key: key); - - @override - Widget build(BuildContext context) { - if (_identity == null) { - return const SizedBox.shrink(); - } - - return Container( - key: const Key('identity_info_tile'), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16), - border: Border.all(color: AppColor.colorBorderIdentityInfo, width: 1), - color: Colors.white), - padding: const EdgeInsets.only(top: 12, bottom: 12), - child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding( - padding: const EdgeInsets.only(left: 12, right: 8), - child: Row(children: [ - if (_identity?.mayDelete == false) - Expanded(child: Wrap(children: [ - Padding( - padding: const EdgeInsets.only(right: 10), - child: Text(_identity?.name ?? '', - maxLines: 1, - overflow: BuildUtils.isWeb ? null : TextOverflow.ellipsis, - style: const TextStyle( - fontWeight: FontWeight.w500, - fontSize: 17, - color: Colors.black))), - Text('(${AppLocalizations.of(context).default_value})', - maxLines: 1, - overflow: BuildUtils.isWeb ? null : TextOverflow.ellipsis, - style: const TextStyle( - fontWeight: FontWeight.normal, - fontSize: 15, - color: AppColor.colorHintSearchBar)) - ])) - else - Expanded(child: Text(_identity?.name ?? '', - maxLines: 1, - overflow: BuildUtils.isWeb ? null : TextOverflow.ellipsis, - style: const TextStyle( - fontWeight: FontWeight.w500, - fontSize: 17, - color: Colors.black)),), - buildIconWebHasPosition( - context, - icon: SvgPicture.asset(_imagePaths.icMoreVertical, fit: BoxFit.fill), - onTap: () { - if (_responsiveUtils.isScreenWithShortestSide(context)) { - onMenuItemIdentityAction?.call(_identity!, null); - } - }, - onTapDown: (position) { - if (!_responsiveUtils.isScreenWithShortestSide(context)) { - onMenuItemIdentityAction?.call(_identity!, position); - } - }) - ])), - const SizedBox(height: 10), - const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), - const SizedBox(height: 12), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Text(_identity?.name ?? '', - style: const TextStyle(fontWeight: FontWeight.normal, fontSize: 17, color: Colors.black))), - if (_identity?.email != null) const SizedBox(height: 10), - if (_identity?.email != null) - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Row(children: [ - SizedBox( - width: 40, - child: SvgPicture.asset(_imagePaths.icEmail, width: 15, height: 15)), - const SizedBox(width: 4), - Expanded(child: Text(_identity?.email ?? '', - style: const TextStyle(fontWeight: FontWeight.normal, fontSize: 15, color: AppColor.colorHintSearchBar))) - ])), - if (_identity?.replyTo != null && _identity?.replyTo?.isNotEmpty == true) - const SizedBox(height: 10), - if (_identity?.replyTo != null && _identity?.replyTo?.isNotEmpty == true) - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Row(children: [ - SizedBox( - width: 40, - child: SvgPicture.asset(_imagePaths.icReplyTo, width: 15, height: 15)), - const SizedBox(width: 4), - Expanded(child: Text(_identity?.replyTo?.listEmailAddressToString(isFullEmailAddress: true) ?? '', - style: const TextStyle(fontWeight: FontWeight.normal, fontSize: 15, color: AppColor.colorHintSearchBar))) - ])), - if (_identity?.bcc != null && _identity?.bcc?.isNotEmpty == true) - const SizedBox(height: 6), - if (_identity?.bcc != null && _identity?.bcc?.isNotEmpty == true) - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Row(children: [ - Container( - padding: const EdgeInsets.only(left: 6), - width: 40, - child: Text(AppLocalizations.of(context).bcc_email_address_prefix, - style: const TextStyle( - fontSize: 15, - fontWeight: FontWeight.normal, - decoration: TextDecoration.underline, - color: AppColor.colorTextButton))), - const SizedBox(width: 4), - Expanded(child: Text(_identity?.bcc?.listEmailAddressToString(isFullEmailAddress: true) ?? '', - style: const TextStyle(fontWeight: FontWeight.normal, fontSize: 15, color: AppColor.colorHintSearchBar))) - ])), - ]) - ); - } -} \ No newline at end of file