Handle contact support on mobile

Signed-off-by: dab246 <tdvu@linagora.com>

lib/features/base/mixin/contact_support_mixin.dart

@@ -1,9 +1,11 @@
 
+import 'package:core/utils/platform_info.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/app_routes.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';
@@ -12,22 +14,26 @@ typedef OnTapContactSupportAction = Function(ContactSupportCapability contactSup
 
 mixin ContactSupportMixin {
 
-  void onGetHelpOrReportBug(ContactSupportCapability contactSupport) {
+  void onGetHelpOrReportBug(
+    ContactSupportCapability contactSupport,
+    {String route = AppRoutes.dashboard}
+  ) {
     if (contactSupport.isMailAddressSupported) {
-      _handleMailAddress(contactSupport.supportMailAddress!);
+      _handleMailAddress(contactSupport.supportMailAddress!, route: route);
     } else if (contactSupport.isHttpLinkSupported) {
       _handleHttpLink(contactSupport.httpLink!);
     }
   }
 
-  void _handleMailAddress(String mailAddress) {
+  void _handleMailAddress(String mailAddress, {String route = AppRoutes.dashboard}) {
-    final mailboxDashBoardController = getBinding<MailboxDashBoardController>();
+    if (route == AppRoutes.settings && PlatformInfo.isWeb) {
-    if (mailboxDashBoardController != null) {
+      final mailtoLink = RouteUtils.generateMailtoLink(mailAddress);
-      mailboxDashBoardController.goToComposer(
+      AppUtils.launchLink(mailtoLink);
+    } else {
+      final mailboxDashBoardController = getBinding<MailboxDashBoardController>();
+      mailboxDashBoardController?.goToComposer(
         ComposerArguments.fromEmailAddress(EmailAddress(null, mailAddress)),
       );
-    } else {
-      AppUtils.launchLink('${RouteUtils.mailtoPrefix}:$mailAddress');
     }
   }
 

lib/features/manage_account/presentation/manage_account_dashboard_controller.dart

@@ -195,9 +195,7 @@ class ManageAccountDashBoardController extends ReloadableController with UserSet
       case AccountMenuItem.notification:
         NotificationBinding().dependencies();
         break;
-      case AccountMenuItem.vacation:
+      default:
-      case AccountMenuItem.contactSupport:
-      case AccountMenuItem.none:
         break;
     }
   }

lib/features/manage_account/presentation/menu/manage_account_menu_view.dart

@@ -1,15 +1,17 @@
 
-import 'package:core/core.dart';
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/views/button/tmail_button_widget.dart';
 import 'package:core/utils/direction_utils.dart';
 import 'package:flutter/material.dart';
-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/features/manage_account/presentation/model/account_menu_item.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
+import 'package:tmail_ui_user/main/routes/app_routes.dart';
 
 class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
 
@@ -84,8 +86,10 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
                              itemBuilder: (context, index) => Obx(() {
                                final menuItem = controller.listAccountMenuItem[index];
                                return AccountMenuItemTileBuilder(
-                                 menuItem,
+                                 imagePaths: controller.imagePaths,
-                                 controller.dashBoardController.accountMenuItemSelected.value,
+                                 responsiveUtils: controller.responsiveUtils,
+                                 menuItem: menuItem,
+                                 menuItemSelected: controller.dashBoardController.accountMenuItemSelected.value,
                                  onSelectAccountMenuItemAction: controller.selectAccountMenuItem
                                );
                              })
@@ -112,72 +116,31 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
 
                          if (contactSupportCapability?.isAvailable != true) return const SizedBox.shrink();
 
-                         return Padding(
+                         return AccountMenuItemTileBuilder(
-                           padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
+                           imagePaths: controller.imagePaths,
-                           child: Material(
+                           responsiveUtils: controller.responsiveUtils,
-                             color: Colors.transparent,
+                           menuItem: AccountMenuItem.contactSupport,
-                             child: InkWell(
+                           padding: const EdgeInsetsDirectional.only(start: 16, end: 8, bottom: 6),
-                               onTap: () => controller.onGetHelpOrReportBug(contactSupportCapability!),
+                           onSelectAccountMenuItemAction: (_) {
-                               borderRadius: const BorderRadius.all(Radius.circular(10)),
+                             controller.onGetHelpOrReportBug(
-                               child: Padding(
+                               contactSupportCapability!,
-                                 padding: const EdgeInsets.symmetric(
+                               route: AppRoutes.settings,
-                                   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(
+                       AccountMenuItemTileBuilder(
-                         padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
+                         imagePaths: controller.imagePaths,
-                         child: Material(
+                         responsiveUtils: controller.responsiveUtils,
-                           color: Colors.transparent,
+                         menuItem: AccountMenuItem.signOut,
-                           child: InkWell(
+                         padding: const EdgeInsetsDirectional.only(start: 16, end: 8),
-                             onTap: () {
+                         onSelectAccountMenuItemAction: (_) {
-                               controller.dashBoardController.logout(
+                           controller.dashBoardController.logout(
-                                 context,
+                             context,
-                                 controller.dashBoardController.sessionCurrent,
+                             controller.dashBoardController.sessionCurrent,
-                                 controller.dashBoardController.accountId.value
+                             controller.dashBoardController.accountId.value,
-                               );
+                           );
-                             },
+                         }
-                             borderRadius: BorderRadius.circular(10),
-                             child: Padding(
-                               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
-                               child: Row(children: [
-                                 SvgPicture.asset(controller.imagePaths.icSignOut, width: 20, height: 20, fit: BoxFit.fill),
-                                 const SizedBox(width: 12),
-                                 Expanded(child: Text(
-                                   AppLocalizations.of(context).sign_out,
-                                   style: const TextStyle(
-                                     fontWeight: FontWeight.normal,
-                                     fontSize: 15,
-                                     color: Colors.black
-                                   )
-                                 ))
-                               ]),
-                             )
-                           ),
-                         )
                        ),
                      ]
                    ),

lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart

@@ -9,6 +9,7 @@ import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings
 import 'package:tmail_ui_user/features/manage_account/presentation/menu/widgets/setting_first_level_tile_builder.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/model/account_menu_item.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
+import 'package:tmail_ui_user/main/routes/app_routes.dart';
 
 class SettingsFirstLevelView extends GetWidget<SettingsController> {
   const SettingsFirstLevelView({Key? key}) : super(key: key);
@@ -121,20 +122,18 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
             return const SizedBox.shrink();
           }
         }),
-        Column(children: [
+        SettingFirstLevelTileBuilder(
-          SettingFirstLevelTileBuilder(
+          AccountMenuItem.mailboxVisibility.getName(context),
-            AccountMenuItem.mailboxVisibility.getName(context),
+          AccountMenuItem.mailboxVisibility.getIcon(controller.imagePaths),
-            AccountMenuItem.mailboxVisibility.getIcon(controller.imagePaths),
+          subtitle: AppLocalizations.of(context).folderVisibilitySubtitle,
-            subtitle: AppLocalizations.of(context).folderVisibilitySubtitle,
+          () => controller.selectSettings(AccountMenuItem.mailboxVisibility)
-            () => controller.selectSettings(AccountMenuItem.mailboxVisibility)
+        ),
-          ),
+        Divider(
-          Divider(
+          color: AppColor.colorDividerHorizontal,
-            color: AppColor.colorDividerHorizontal,
+          height: 1,
-            height: 1,
+          indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
-            indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
+          endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
-            endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
+        ),
-          ),
-        ]),
         SettingFirstLevelTileBuilder(
           AccountMenuItem.languageAndRegion.getName(context),
           AccountMenuItem.languageAndRegion.getIcon(controller.imagePaths),
@@ -185,7 +184,10 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
             SettingFirstLevelTileBuilder(
               AccountMenuItem.contactSupport.getName(context),
               AccountMenuItem.contactSupport.getIcon(controller.imagePaths),
-              () => controller.onGetHelpOrReportBug(contactSupportCapability!),
+              () => controller.onGetHelpOrReportBug(
+                contactSupportCapability!,
+                route: AppRoutes.settings,
+              ),
             ),
           ]);
         }),

lib/features/manage_account/presentation/menu/widgets/account_menu_item_tile_builder.dart

@@ -1,53 +1,59 @@
-import 'package:core/core.dart';
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/resources/image_paths.dart';
+import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/model/account_menu_item.dart';
 
 typedef OnSelectAccountMenuItemAction = void Function(AccountMenuItem);
 
 class AccountMenuItemTileBuilder extends StatelessWidget {
 
-  final AccountMenuItem _menuItem;
+  final ImagePaths imagePaths;
-  final AccountMenuItem? _menuItemSelected;
+  final ResponsiveUtils responsiveUtils;
-  final OnSelectAccountMenuItemAction? onSelectAccountMenuItemAction;
+  final AccountMenuItem menuItem;
+  final AccountMenuItem? menuItemSelected;
+  final EdgeInsetsGeometry? padding;
+  final OnSelectAccountMenuItemAction onSelectAccountMenuItemAction;
 
-  const AccountMenuItemTileBuilder(
+  const AccountMenuItemTileBuilder({
-    this._menuItem,
+    Key? key,
-    this._menuItemSelected,
+    required this.imagePaths,
-    {
+    required this.responsiveUtils,
-      Key? key,
+    required this.menuItem,
-      this.onSelectAccountMenuItemAction
+    required this.onSelectAccountMenuItemAction,
-    }
+    this.menuItemSelected,
-  ) : super(key: key);
+    this.padding,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final imagePaths = Get.find<ImagePaths>();
-
     return Padding(
-      key: const Key('account_menu_item_tile'),
+      key: Key('${menuItem.getAliasBrowser()}_account_menu_item_tile'),
-      padding: const EdgeInsets.only(top: 6),
+      padding: padding ?? const EdgeInsets.only(top: 6),
       child: Material(
         color: Colors.transparent,
         child: InkWell(
-          onTap: () => onSelectAccountMenuItemAction?.call(_menuItem),
+          onTap: () => onSelectAccountMenuItemAction.call(menuItem),
-          borderRadius: BorderRadius.circular(10),
+          borderRadius: const BorderRadius.all(Radius.circular(10)),
           child: Container(
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(Radius.circular(10)),
-              color: _getBackgroundColorItem(context)),
+              color: menuItemSelected == menuItem
+                ? AppColor.colorBgMailboxSelected
+                : Colors.transparent,
+            ),
             padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
             child: Column(children: [
               Row(children: [
                 SvgPicture.asset(
-                  _menuItem.getIcon(imagePaths),
+                  menuItem.getIcon(imagePaths),
                   width: 20,
                   height: 20,
                   fit: BoxFit.fill),
                 const SizedBox(width: 12),
                 Expanded(child: Text(
-                  _menuItem.getName(context),
+                  menuItem.getName(context),
                   style: const TextStyle(
                     fontWeight: FontWeight.normal,
                     fontSize: 15,
@@ -60,16 +66,4 @@ class AccountMenuItemTileBuilder extends StatelessWidget {
       ),
     );
   }
-
-  Color _getBackgroundColorItem(BuildContext context) {
-    final responsiveUtils = Get.find<ResponsiveUtils>();
-
-    if (_menuItemSelected == _menuItem) {
-      return AppColor.colorBgMailboxSelected;
-    } else {
-      return responsiveUtils.isWebDesktop(context)
-        ? Colors.transparent
-        : Colors.transparent;
-    }
-  }
 }

lib/features/manage_account/presentation/model/account_menu_item.dart

@@ -13,6 +13,7 @@ enum AccountMenuItem {
   mailboxVisibility,
   notification,
   contactSupport,
+  signOut,
   none;
 
   String getIcon(ImagePaths imagePaths) {
@@ -35,6 +36,8 @@ enum AccountMenuItem {
         return imagePaths.icNotification;
       case AccountMenuItem.contactSupport:
         return imagePaths.icHelp;
+      case AccountMenuItem.signOut:
+        return imagePaths.icSignOut;
       case AccountMenuItem.none:
         return imagePaths.icProfiles;
     }
@@ -60,6 +63,8 @@ enum AccountMenuItem {
         return AppLocalizations.of(context).notification;
       case AccountMenuItem.contactSupport:
         return AppLocalizations.of(context).contactSupport;
+      case AccountMenuItem.signOut:
+        return AppLocalizations.of(context).sign_out;
       case AccountMenuItem.none:
         return AppLocalizations.of(context).profiles;
     }
@@ -85,6 +90,8 @@ enum AccountMenuItem {
         return 'notification';
       case AccountMenuItem.contactSupport:
         return 'contact-support';
+      case AccountMenuItem.signOut:
+        return 'sign-out';
       case AccountMenuItem.none:
         return 'profiles';
     }

lib/main/routes/route_utils.dart

@@ -255,4 +255,8 @@ abstract class RouteUtils {
 
   static String get emailEMLPreviewerRoutePath =>
       _createEmailEMLPreviewerServicePath('$baseOriginUrl${AppRoutes.emailEMLPreviewer}').path;
+
+  static String generateMailtoLink(String mailAddress) {
+    return '$baseOriginUrl/$mailtoPrefix/?uri=$mailtoPrefix:$mailAddress';
+  }
 }