diff --git a/lib/features/base/mixin/contact_support_mixin.dart b/lib/features/base/mixin/contact_support_mixin.dart index 535984d45..cf78294cc 100644 --- a/lib/features/base/mixin/contact_support_mixin.dart +++ b/lib/features/base/mixin/contact_support_mixin.dart @@ -1,35 +1,34 @@ -import 'package:core/utils/app_logger.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/extensions/contact_support_capability_extension.dart'; import 'package:model/support/contact_support_capability.dart'; import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; +import 'package:tmail_ui_user/main/routes/route_navigation.dart'; +import 'package:tmail_ui_user/main/routes/route_utils.dart'; import 'package:tmail_ui_user/main/utils/app_utils.dart'; typedef OnTapContactSupportAction = Function(ContactSupportCapability contactSupport); mixin ContactSupportMixin { - void onGetHelpOrReportBug( - ContactSupportCapability contactSupport, - MailboxDashBoardController mailboxDashBoardController, - ) { - log('ContactSupportMixin::onGetHelpOrReportBug:contactSupport = $contactSupport'); + void onGetHelpOrReportBug(ContactSupportCapability contactSupport) { if (contactSupport.isMailAddressSupported) { - _handleMailAddress(contactSupport.supportMailAddress!, mailboxDashBoardController); + _handleMailAddress(contactSupport.supportMailAddress!); } else if (contactSupport.isHttpLinkSupported) { _handleHttpLink(contactSupport.httpLink!); } } - void _handleMailAddress( - String mailAddress, - MailboxDashBoardController mailboxDashBoardController, - ) { - mailboxDashBoardController.goToComposer( - ComposerArguments.fromEmailAddress(EmailAddress(null, mailAddress)), - ); + void _handleMailAddress(String mailAddress) { + final mailboxDashBoardController = getBinding(); + if (mailboxDashBoardController != null) { + mailboxDashBoardController.goToComposer( + ComposerArguments.fromEmailAddress(EmailAddress(null, mailAddress)), + ); + } else { + AppUtils.launchLink('${RouteUtils.mailtoPrefix}:$mailAddress'); + } } void _handleHttpLink(String httpLink) { diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart index 6117a92ac..e2a8d9eaf 100644 --- a/lib/features/mailbox/presentation/mailbox_view.dart +++ b/lib/features/mailbox/presentation/mailbox_view.dart @@ -121,7 +121,6 @@ class MailboxView extends BaseMailboxView { onTapActionCallback: () => controller.onGetHelpOrReportBug( controller.contactSupportCapability!, - controller.mailboxDashBoardController, ), ), ), diff --git a/lib/features/mailbox/presentation/mailbox_view_web.dart b/lib/features/mailbox/presentation/mailbox_view_web.dart index 0be90fdbf..5816b92fe 100644 --- a/lib/features/mailbox/presentation/mailbox_view_web.dart +++ b/lib/features/mailbox/presentation/mailbox_view_web.dart @@ -104,7 +104,6 @@ class MailboxView extends BaseMailboxView { onTapActionCallback: () => controller.onGetHelpOrReportBug( controller.contactSupportCapability!, - controller.mailboxDashBoardController, ), ), ), diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart index 334c542fc..6d2016723 100644 --- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart +++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart @@ -76,10 +76,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { onTapApplicationLogoAction: controller.redirectToInboxAction, onTapAvatarAction: (position) => controller.handleClickAvatarAction(context, position), onTapContactSupportAction: (contactSupport) => - controller.onGetHelpOrReportBug( - contactSupport, - controller, - ), + controller.onGetHelpOrReportBug(contactSupport), ); } }), diff --git a/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart b/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart index 08e6b1900..dc0c8274c 100644 --- a/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart +++ b/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart @@ -15,7 +15,6 @@ import 'package:server_settings/server_settings/capability_server_settings.dart' import 'package:tmail_ui_user/features/base/action/ui_action.dart'; import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart'; import 'package:tmail_ui_user/features/base/state/banner_state.dart'; -import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart'; import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_vacation_state.dart'; import 'package:tmail_ui_user/features/manage_account/domain/state/update_vacation_state.dart'; @@ -256,23 +255,6 @@ class ManageAccountDashBoardController extends ReloadableController with UserSet } } - bool get isContactSupportCapabilitySupported { - if (accountId.value != null && sessionCurrent != null) { - final isSupported = [SessionExtensions.linagoraContactSupportCapability].isSupported(sessionCurrent!, accountId.value!); - return isSupported && contactSupportCapability != null; - } else { - return false; - } - } - - ContactSupportCapability? get contactSupportCapability { - if (accountId.value != null && sessionCurrent != null) { - return sessionCurrent!.getContactSupportCapability(accountId.value!); - } else { - return null; - } - } - void disableVacationResponder() { if (accountId.value != null && _updateVacationInteractor != null) { final vacationDisabled = vacationResponse.value != null diff --git a/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart b/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart index ed8adccb9..04e473ec8 100644 --- a/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart +++ b/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart @@ -6,6 +6,7 @@ import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/widget/application_version_widget.dart'; import 'package:tmail_ui_user/features/base/widget/application_logo_with_text_widget.dart'; +import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/menu/manage_account_menu_controller.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/menu/widgets/account_menu_item_tile_builder.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; @@ -96,37 +97,57 @@ class ManageAccountMenuView extends GetWidget { const Padding( padding: EdgeInsets.symmetric(vertical: 16), child: Divider()), - if (controller.dashBoardController.isContactSupportCapabilitySupported) - Padding( - padding: const EdgeInsetsDirectional.only(start: 20, end: 10), - child: Material( - color: Colors.transparent, - child: InkWell( - onTap: () { - controller.onGetHelpOrReportBug( - controller.dashBoardController.contactSupportCapability!, - controller.mailboxDashBoardController - ); - }, - borderRadius: BorderRadius.circular(10), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), - child: Row(children: [ - SvgPicture.asset(controller.imagePaths.icHelp, width: 20, height: 20, fit: BoxFit.fill), - const SizedBox(width: 12), - Expanded(child: Text( - AppLocalizations.of(context).contactSupport, - style: const TextStyle( - fontWeight: FontWeight.normal, - fontSize: 15, - color: Colors.black - ) - )) - ]), + Obx(() { + final accountId = controller + .dashBoardController + .accountId + .value; + + if (accountId == null) return const SizedBox.shrink(); + + final contactSupportCapability = controller + .dashBoardController + .sessionCurrent + ?.getContactSupportCapability(accountId); + + if (contactSupportCapability == null) return const SizedBox.shrink(); + + return Padding( + padding: const EdgeInsetsDirectional.only(start: 20, end: 10), + child: Material( + color: Colors.transparent, + child: InkWell( + onTap: () => controller.onGetHelpOrReportBug(contactSupportCapability), + borderRadius: const BorderRadius.all(Radius.circular(10)), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 6, + ), + child: Row(children: [ + SvgPicture.asset( + controller.imagePaths.icHelp, + width: 20, + height: 20, + fit: BoxFit.fill, + ), + const SizedBox(width: 12), + Expanded( + child: Text( + AppLocalizations.of(context).contactSupport, + style: const TextStyle( + fontWeight: FontWeight.normal, + fontSize: 15, + color: Colors.black, + ), + ), ) - ), - ) - ), + ]), + ) + ), + ), + ); + }), Padding( padding: const EdgeInsetsDirectional.only(start: 20, end: 10), child: Material( diff --git a/lib/features/manage_account/presentation/menu/settings/settings_controller.dart b/lib/features/manage_account/presentation/menu/settings/settings_controller.dart index 42fcad9a2..a1bb5e454 100644 --- a/lib/features/manage_account/presentation/menu/settings/settings_controller.dart +++ b/lib/features/manage_account/presentation/menu/settings/settings_controller.dart @@ -2,13 +2,11 @@ import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/responsive_utils.dart'; import 'package:get/get.dart'; import 'package:tmail_ui_user/features/base/mixin/contact_support_mixin.dart'; -import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/model/account_menu_item.dart'; class SettingsController extends GetxController with ContactSupportMixin { final manageAccountDashboardController = Get.find(); - final mailboxDashBoardController = Get.find(); final responsiveUtils = Get.find(); final imagePaths = Get.find(); diff --git a/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart b/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart index 98b4fad98..69d9ec5d4 100644 --- a/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart +++ b/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart @@ -2,6 +2,7 @@ import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/utils/platform_info.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings/settings_controller.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings_utils.dart'; @@ -154,24 +155,39 @@ class SettingsFirstLevelView extends GetWidget { ) ], Obx(() { - if (controller.manageAccountDashboardController.isContactSupportCapabilitySupported) { - return Column(children: [ - Divider( - color: AppColor.colorDividerHorizontal, - height: 1, - indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), - endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) + final accountId = controller + .manageAccountDashboardController + .accountId + .value; + + if (accountId == null) return const SizedBox.shrink(); + + final contactSupportCapability = controller + .manageAccountDashboardController + .sessionCurrent + ?.getContactSupportCapability(accountId); + + if (contactSupportCapability == null) return const SizedBox.shrink(); + + return Column(children: [ + Divider( + color: AppColor.colorDividerHorizontal, + height: 1, + indent: SettingsUtils.getHorizontalPadding( + context, + controller.responsiveUtils, ), - SettingFirstLevelTileBuilder( - AccountMenuItem.contactSupport.getName(context), - AccountMenuItem.contactSupport.getIcon(controller.imagePaths), - () => controller.onGetHelpOrReportBug( - controller.manageAccountDashboardController.contactSupportCapability!, - controller.mailboxDashBoardController)), - ]); - } else { - return const SizedBox.shrink(); - } + endIndent: SettingsUtils.getHorizontalPadding( + context, + controller.responsiveUtils, + ), + ), + SettingFirstLevelTileBuilder( + AccountMenuItem.contactSupport.getName(context), + AccountMenuItem.contactSupport.getIcon(controller.imagePaths), + () => controller.onGetHelpOrReportBug(contactSupportCapability), + ), + ]); }), Divider( color: AppColor.colorDividerHorizontal,