TF-1831 Persist browser history when invoke system back button in Setting View

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit fe6b0a52c93be1b92024ff38aaf59f4e92677920)
This commit is contained in:
dab246
2023-12-11 00:46:28 +07:00
committed by Dat H. Pham
parent 9b9dc3c3b8
commit 1d58957ab3
3 changed files with 55 additions and 31 deletions
@@ -1,6 +1,7 @@
import 'package:back_button_interceptor/back_button_interceptor.dart';
import 'package:core/core.dart';
import 'package:dartz/dartz.dart';
import 'package:flutter/material.dart';
import 'package:forward/forward/capability_forward.dart';
import 'package:get/get.dart';
@@ -51,6 +52,7 @@ class ManageAccountDashBoardController extends ReloadableController {
Session? sessionCurrent;
bool? isVacationDateDialogDisplayed;
Uri? previousUri;
@override
void onInit() {
@@ -97,6 +99,7 @@ class ManageAccountDashBoardController extends ReloadableController {
if (arguments is ManageAccountArguments) {
sessionCurrent = arguments.session;
accountId.value = arguments.session?.personalAccount.accountId;
previousUri = arguments.previousUri;
_getUserProfile();
_bindingInteractorForMenuItemView(sessionCurrent, accountId.value);
_getVacationResponse();
@@ -217,7 +220,7 @@ class ManageAccountDashBoardController extends ReloadableController {
void backToMailboxDashBoard({BuildContext? context}) {
if (context != null && canBack(context)) {
popBack(result: vacationResponse.value);
popBack(result: Tuple2(vacationResponse.value, previousUri));
} else {
log('ManageAccountDashBoardController::backToMailboxDashBoard(): canBack: FALSE');
pushAndPopAll(
@@ -316,32 +319,22 @@ class ManageAccountDashBoardController extends ReloadableController {
bool _navigateToScreen() {
log('ManageAccountDashBoardController::_navigateToScreen: settingsPageLevel: $settingsPageLevel');
if (PlatformInfo.isMobile) {
if (currentContext != null && responsiveUtils.isWebDesktop(currentContext!)) {
if (accountMenuItemSelected.value == AccountMenuItem.profiles) {
backToMailboxDashBoard(context: currentContext);
return true;
} else {
selectSettings(AccountMenuItem.profiles);
return true;
}
} else {
switch(settingsPageLevel.value) {
case SettingsPageLevel.level1:
backToUniversalSettings();
return true;
case SettingsPageLevel.universal:
return false;
}
} else {
if (currentContext != null && responsiveUtils.isWebDesktop(currentContext!)) {
if (accountMenuItemSelected.value == AccountMenuItem.profiles) {
backToMailboxDashBoard(context: currentContext);
return true;
} else {
selectSettings(AccountMenuItem.profiles);
return true;
}
} else {
switch(settingsPageLevel.value) {
case SettingsPageLevel.level1:
backToUniversalSettings();
return true;
case SettingsPageLevel.universal:
backToMailboxDashBoard(context: currentContext);
return true;
}
}
}
}
@@ -7,9 +7,20 @@ class ManageAccountArguments with EquatableMixin {
final Session? session;
final AccountMenuItem? menuSettingCurrent;
final Uri? previousUri;
ManageAccountArguments(this.session, {this.menuSettingCurrent});
ManageAccountArguments(
this.session,
{
this.menuSettingCurrent,
this.previousUri,
}
);
@override
List<Object?> get props => [session, menuSettingCurrent];
List<Object?> get props => [
session,
menuSettingCurrent,
previousUri,
];
}