TF-3312 Add logout confirmation dialog
This commit is contained in:
@@ -28,6 +28,7 @@ import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
|||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:rule_filter/rule_filter/capability_rule_filter.dart';
|
import 'package:rule_filter/rule_filter/capability_rule_filter.dart';
|
||||||
import 'package:tmail_ui_user/features/base/before_reconnect_manager.dart';
|
import 'package:tmail_ui_user/features/base/before_reconnect_manager.dart';
|
||||||
|
import 'package:tmail_ui_user/features/base/mixin/logout_mixin.dart';
|
||||||
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_mixin.dart';
|
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_mixin.dart';
|
||||||
import 'package:tmail_ui_user/features/base/mixin/popup_context_menu_action_mixin.dart';
|
import 'package:tmail_ui_user/features/base/mixin/popup_context_menu_action_mixin.dart';
|
||||||
import 'package:tmail_ui_user/features/caching/caching_manager.dart';
|
import 'package:tmail_ui_user/features/caching/caching_manager.dart';
|
||||||
@@ -73,7 +74,8 @@ import 'package:uuid/uuid.dart';
|
|||||||
|
|
||||||
abstract class BaseController extends GetxController
|
abstract class BaseController extends GetxController
|
||||||
with MessageDialogActionMixin,
|
with MessageDialogActionMixin,
|
||||||
PopupContextMenuActionMixin {
|
PopupContextMenuActionMixin,
|
||||||
|
LogoutMixin {
|
||||||
|
|
||||||
final CachingManager cachingManager = Get.find<CachingManager>();
|
final CachingManager cachingManager = Get.find<CachingManager>();
|
||||||
final LanguageCacheManager languageCacheManager = Get.find<LanguageCacheManager>();
|
final LanguageCacheManager languageCacheManager = Get.find<LanguageCacheManager>();
|
||||||
@@ -437,11 +439,28 @@ abstract class BaseController extends GetxController
|
|||||||
arguments: LoginArguments(LoginFormType.none));
|
arguments: LoginArguments(LoginFormType.none));
|
||||||
}
|
}
|
||||||
|
|
||||||
void logout(Session? session, AccountId? accountId) async {
|
void logout(
|
||||||
|
BuildContext context,
|
||||||
|
Session? session,
|
||||||
|
AccountId? accountId,
|
||||||
|
) {
|
||||||
|
if (PlatformInfo.isMobile) {
|
||||||
|
showLogoutConfirmDialog(
|
||||||
|
context: context,
|
||||||
|
username: session?.username.value ?? '',
|
||||||
|
onConfirmAction: () => _handleLogoutAction(session, accountId),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
_handleLogoutAction(session, accountId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _handleLogoutAction(Session? session, AccountId? accountId) async {
|
||||||
if (session == null || accountId == null) {
|
if (session == null || accountId == null) {
|
||||||
await clearDataAndGoToLoginPage();
|
await clearDataAndGoToLoginPage();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_isFcmEnabled = _isFcmActivated(session, accountId);
|
_isFcmEnabled = _isFcmActivated(session, accountId);
|
||||||
if (isAuthenticatedWithOidc) {
|
if (isAuthenticatedWithOidc) {
|
||||||
consumeState(logoutOidcInteractor.execute());
|
consumeState(logoutOidcInteractor.execute());
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import 'package:core/presentation/extensions/color_extension.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_mixin.dart';
|
||||||
|
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||||
|
|
||||||
|
mixin LogoutMixin implements MessageDialogActionMixin {
|
||||||
|
void showLogoutConfirmDialog({
|
||||||
|
required BuildContext context,
|
||||||
|
required String username,
|
||||||
|
required Function? onConfirmAction,
|
||||||
|
}) {
|
||||||
|
final appLocalizations = AppLocalizations.of(context);
|
||||||
|
|
||||||
|
showConfirmDialogAction(
|
||||||
|
context,
|
||||||
|
'',
|
||||||
|
appLocalizations.yesLogout,
|
||||||
|
title: appLocalizations.logoutConfirmation,
|
||||||
|
alignCenter: true,
|
||||||
|
outsideDismissible: false,
|
||||||
|
titleActionButtonMaxLines: 1,
|
||||||
|
titlePadding: const EdgeInsetsDirectional.only(
|
||||||
|
start: 24,
|
||||||
|
top: 24,
|
||||||
|
end: 24,
|
||||||
|
bottom: 12,
|
||||||
|
),
|
||||||
|
messageStyle: const TextStyle(
|
||||||
|
color: AppColor.colorTextBody,
|
||||||
|
fontSize: 15,
|
||||||
|
fontWeight: FontWeight.w400,
|
||||||
|
),
|
||||||
|
listTextSpan: [
|
||||||
|
TextSpan(text: AppLocalizations.of(context).messageConfirmationLogout),
|
||||||
|
TextSpan(
|
||||||
|
text: ' $username',
|
||||||
|
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
|
||||||
|
color: AppColor.colorTextBody,
|
||||||
|
fontSize: 15,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const TextSpan(text: '?'),
|
||||||
|
],
|
||||||
|
onConfirmAction: onConfirmAction,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,11 +37,17 @@ mixin MessageDialogActionMixin {
|
|||||||
PopInvokedCallback? onPopInvoked,
|
PopInvokedCallback? onPopInvoked,
|
||||||
bool isArrangeActionButtonsVertical = false,
|
bool isArrangeActionButtonsVertical = false,
|
||||||
int? titleActionButtonMaxLines,
|
int? titleActionButtonMaxLines,
|
||||||
|
EdgeInsetsGeometry? titlePadding,
|
||||||
}
|
}
|
||||||
) async {
|
) async {
|
||||||
final responsiveUtils = Get.find<ResponsiveUtils>();
|
final responsiveUtils = Get.find<ResponsiveUtils>();
|
||||||
final imagePaths = Get.find<ImagePaths>();
|
final imagePaths = Get.find<ImagePaths>();
|
||||||
|
|
||||||
|
final paddingTitle = titlePadding ??
|
||||||
|
(icon != null
|
||||||
|
? const EdgeInsetsDirectional.only(top: 24, start: 24, end: 24)
|
||||||
|
: const EdgeInsetsDirectional.symmetric(horizontal: 24));
|
||||||
|
|
||||||
if (alignCenter) {
|
if (alignCenter) {
|
||||||
final childWidget = PointerInterceptor(
|
final childWidget = PointerInterceptor(
|
||||||
child: (ConfirmDialogBuilder(
|
child: (ConfirmDialogBuilder(
|
||||||
@@ -57,10 +63,7 @@ mixin MessageDialogActionMixin {
|
|||||||
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
|
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
|
||||||
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
|
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
|
||||||
..marginIcon(icon != null ? (marginIcon ?? const EdgeInsets.only(top: 24)) : null)
|
..marginIcon(icon != null ? (marginIcon ?? const EdgeInsets.only(top: 24)) : null)
|
||||||
..paddingTitle(icon != null
|
..paddingTitle(paddingTitle)
|
||||||
? const EdgeInsetsDirectional.only(top: 24, start: 24, end: 24)
|
|
||||||
: const EdgeInsetsDirectional.symmetric(horizontal: 24)
|
|
||||||
)
|
|
||||||
..radiusButton(12)
|
..radiusButton(12)
|
||||||
..paddingButton(paddingButton)
|
..paddingButton(paddingButton)
|
||||||
..paddingContent(const EdgeInsets.only(left: 24, right: 24, bottom: 24, top: 12))
|
..paddingContent(const EdgeInsets.only(left: 24, right: 24, bottom: 24, top: 12))
|
||||||
@@ -114,10 +117,7 @@ mixin MessageDialogActionMixin {
|
|||||||
..widthDialog(responsiveUtils.getSizeScreenWidth(context))
|
..widthDialog(responsiveUtils.getSizeScreenWidth(context))
|
||||||
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
|
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
|
||||||
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
|
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
|
||||||
..paddingTitle(icon != null
|
..paddingTitle(paddingTitle)
|
||||||
? const EdgeInsetsDirectional.only(top: 24, start: 24, end: 24)
|
|
||||||
: const EdgeInsetsDirectional.symmetric(horizontal: 24)
|
|
||||||
)
|
|
||||||
..marginIcon(EdgeInsets.zero)
|
..marginIcon(EdgeInsets.zero)
|
||||||
..paddingContent(const EdgeInsets.only(left: 44, right: 44, bottom: 24, top: 12))
|
..paddingContent(const EdgeInsets.only(left: 44, right: 44, bottom: 24, top: 12))
|
||||||
..marginButton(hasCancelButton ? null : const EdgeInsets.only(bottom: 16, left: 44, right: 44))
|
..marginButton(hasCancelButton ? null : const EdgeInsets.only(bottom: 16, left: 44, right: 44))
|
||||||
@@ -194,9 +194,7 @@ mixin MessageDialogActionMixin {
|
|||||||
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
|
..colorConfirmButton(actionButtonColor ?? AppColor.colorTextButton)
|
||||||
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
|
..colorCancelButton(cancelButtonColor ?? AppColor.colorCancelButton)
|
||||||
..marginIcon(icon != null ? const EdgeInsets.only(top: 24) : null)
|
..marginIcon(icon != null ? const EdgeInsets.only(top: 24) : null)
|
||||||
..paddingTitle(icon != null
|
..paddingTitle(paddingTitle)
|
||||||
? const EdgeInsetsDirectional.only(top: 24, start: 24, end: 24)
|
|
||||||
: const EdgeInsetsDirectional.symmetric(horizontal: 24))
|
|
||||||
..marginIcon(EdgeInsets.zero)
|
..marginIcon(EdgeInsets.zero)
|
||||||
..paddingContent(const EdgeInsets.only(left: 44, right: 44, bottom: 24, top: 12))
|
..paddingContent(const EdgeInsets.only(left: 44, right: 44, bottom: 24, top: 12))
|
||||||
..marginButton(hasCancelButton ? null : const EdgeInsets.only(bottom: 16, left: 44, right: 44))
|
..marginButton(hasCancelButton ? null : const EdgeInsets.only(bottom: 16, left: 44, right: 44))
|
||||||
|
|||||||
+1
@@ -3077,6 +3077,7 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
onLogoutAction: () {
|
onLogoutAction: () {
|
||||||
popBack();
|
popBack();
|
||||||
logout(
|
logout(
|
||||||
|
context,
|
||||||
sessionCurrent,
|
sessionCurrent,
|
||||||
accountId.value
|
accountId.value
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ class ManageAccountDashBoardController extends ReloadableController with UserSet
|
|||||||
sessionCurrent?.username,
|
sessionCurrent?.username,
|
||||||
onLogoutAction: () {
|
onLogoutAction: () {
|
||||||
popBack();
|
popBack();
|
||||||
logout(sessionCurrent, accountId.value);
|
logout(context, sessionCurrent, accountId.value);
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
|
|||||||
child: InkWell(
|
child: InkWell(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
controller.dashBoardController.logout(
|
controller.dashBoardController.logout(
|
||||||
|
context,
|
||||||
controller.dashBoardController.sessionCurrent,
|
controller.dashBoardController.sessionCurrent,
|
||||||
controller.dashBoardController.accountId.value
|
controller.dashBoardController.accountId.value
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
|
|||||||
AppLocalizations.of(context).sign_out,
|
AppLocalizations.of(context).sign_out,
|
||||||
controller.imagePaths.icSignOut,
|
controller.imagePaths.icSignOut,
|
||||||
() => controller.manageAccountDashboardController.logout(
|
() => controller.manageAccountDashboardController.logout(
|
||||||
|
context,
|
||||||
controller.manageAccountDashboardController.sessionCurrent,
|
controller.manageAccountDashboardController.sessionCurrent,
|
||||||
controller.manageAccountDashboardController.accountId.value)
|
controller.manageAccountDashboardController.accountId.value)
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"@@last_modified": "2024-12-03T10:03:02.076482",
|
"@@last_modified": "2024-12-05T18:34:48.830922",
|
||||||
"initializing_data": "Initializing data...",
|
"initializing_data": "Initializing data...",
|
||||||
"@initializing_data": {
|
"@initializing_data": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@@ -2860,6 +2860,12 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
|
"errorWhileFetchingSubaddress": "Error while fetching the subaddress",
|
||||||
|
"@errorWhileFetchingSubaddress": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
|
},
|
||||||
"connectedToTheInternet": "Connected to the internet",
|
"connectedToTheInternet": "Connected to the internet",
|
||||||
"@connectedToTheInternet": {
|
"@connectedToTheInternet": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@@ -4094,6 +4100,24 @@
|
|||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
},
|
},
|
||||||
|
"yesLogout": "Yes, Log out",
|
||||||
|
"@yesLogout": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
|
},
|
||||||
|
"logoutConfirmation": "Logout Confirmation",
|
||||||
|
"@logoutConfirmation": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
|
},
|
||||||
|
"messageConfirmationLogout": "Do you want to log out of",
|
||||||
|
"@messageConfirmationLogout": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
|
},
|
||||||
"getHelpOrReportABug": "Get help or report a bug",
|
"getHelpOrReportABug": "Get help or report a bug",
|
||||||
"@getHelpOrReportABug": {
|
"@getHelpOrReportABug": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
|
|||||||
@@ -4294,6 +4294,27 @@ class AppLocalizations {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String get yesLogout {
|
||||||
|
return Intl.message(
|
||||||
|
'Yes, Log out',
|
||||||
|
name: 'yesLogout',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String get logoutConfirmation {
|
||||||
|
return Intl.message(
|
||||||
|
'Logout Confirmation',
|
||||||
|
name: 'logoutConfirmation',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String get messageConfirmationLogout {
|
||||||
|
return Intl.message(
|
||||||
|
'Do you want to log out of',
|
||||||
|
name: 'messageConfirmationLogout',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
String get getHelpOrReportABug {
|
String get getHelpOrReportABug {
|
||||||
return Intl.message(
|
return Intl.message(
|
||||||
'Get help or report a bug',
|
'Get help or report a bug',
|
||||||
|
|||||||
Reference in New Issue
Block a user