fixup! TF-2666 Handle action change email address for recipient

linagora · Mar 13, 2024 · b552553 · b552553
1 parent d80c1ab
commit b552553
Showing 1 changed file with 33 additions and 35 deletions.
diff --git a/lib/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart b/lib/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart
@@ -1,8 +1,10 @@
 
-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/views/popup_menu/popup_menu_item_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:model/model.dart';
+import 'package:model/user/user_profile.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
 mixin UserSettingPopupMenuMixin {
@@ -25,18 +27,21 @@ mixin UserSettingPopupMenuMixin {
       if (onSettingAction != null)
         ...[
           const PopupMenuDivider(height: 0.5),
-          PopupMenuItem(
-            padding: EdgeInsets.zero,
-            child: _settingAction(context, onSettingAction)
+          _popupMenuAction(
+            context: context,
+            title: AppLocalizations.of(context).manage_account,
+            icon: _imagePaths.icSetting,
+            onCallBack: onSettingAction
           ),
-          const PopupMenuDivider(height: 0.5),
         ],
       if (onLogoutAction != null)
         ...[
           const PopupMenuDivider(height: 0.5),
-          PopupMenuItem(
-            padding: EdgeInsets.zero,
-            child: _logoutAction(context, onLogoutAction)
+          _popupMenuAction(
+            context: context,
+            title: AppLocalizations.of(context).sign_out,
+            icon: _imagePaths.icLogout,
+            onCallBack: onSettingAction
           ),
         ]
     ];
@@ -57,33 +62,26 @@ mixin UserSettingPopupMenuMixin {
     return const SizedBox.shrink();
   }
 
-  Widget _settingAction(BuildContext context, VoidCallback? onCallBack) {
-    return PopupMenuItemWidget(
-      name: AppLocalizations.of(context).manage_account,
-      icon: _imagePaths.icSetting,
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-      textStyle: Theme.of(context).textTheme.labelMedium?.copyWith(
-        fontSize: 15,
-        color: Colors.black,
-        fontWeight: FontWeight.w500
-      ),
-      space: 12,
-      onCallbackAction: onCallBack,
-    );
-  }
-
-  Widget _logoutAction(BuildContext context, VoidCallback? onCallBack) {
-    return PopupMenuItemWidget(
-      name: AppLocalizations.of(context).sign_out,
-      icon: _imagePaths.icLogout,
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-      textStyle: Theme.of(context).textTheme.labelMedium?.copyWith(
-        fontSize: 15,
-        color: Colors.black,
-        fontWeight: FontWeight.w500
+  PopupMenuEntry _popupMenuAction({
+    required BuildContext context,
+    required String title,
+    required String icon,
+    VoidCallback? onCallBack
+  }) {
+    return PopupMenuItem(
+      padding: EdgeInsets.zero,
+      child: PopupMenuItemWidget(
+        name: title,
+        icon: icon,
+        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+        textStyle: Theme.of(context).textTheme.labelMedium?.copyWith(
+          fontSize: 15,
+          color: Colors.black,
+          fontWeight: FontWeight.w500
+        ),
+        space: 12,
+        onCallbackAction: onCallBack,
       ),
-      space: 12,
-      onCallbackAction: onCallBack,
     );
   }
 }