TF-1074 Change name app routes

This commit is contained in:
dab246
2022-10-24 15:53:30 +07:00
committed by Dat H. Pham
parent 5dc38460c8
commit b5e0569907
23 changed files with 104 additions and 107 deletions
@@ -136,7 +136,7 @@ class AdvancedFilterController extends BaseController {
void selectedMailBox() async {
final destinationMailbox = await push(
AppRoutes.DESTINATION_PICKER,
AppRoutes.destinationPicker,
arguments: DestinationPickerArguments(
_mailboxDashBoardController.accountId.value!,
MailboxActions.select,
@@ -51,6 +51,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/download/download_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/download/download_task_state.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
@@ -113,7 +114,7 @@ class MailboxDashBoardController extends ReloadableController {
final accountId = Rxn<AccountId>();
final userProfile = Rxn<UserProfile>();
final dashBoardAction = Rxn<UIAction>();
final routePath = AppRoutes.MAILBOX_DASHBOARD.obs;
final dashboardRoute = DashboardRoutes.thread.obs;
final appInformation = Rxn<PackageInfo>();
final currentSelectMode = SelectMode.INACTIVE.obs;
final filterMessageOption = FilterMessageOption.all.obs;
@@ -163,7 +164,7 @@ class MailboxDashBoardController extends ReloadableController {
@override
void onReady() {
log('MailboxDashBoardController::onReady()');
dispatchRoute(AppRoutes.THREAD);
dispatchRoute(DashboardRoutes.thread);
_registerPendingEmailAddress();
_registerPendingFileInfo();
_setSessionCurrent();
@@ -425,7 +426,7 @@ class MailboxDashBoardController extends ReloadableController {
bool _searchInsideEmailDetailedViewIsActive(BuildContext context) {
return BuildUtils.isWeb
&& _responsiveUtils.isDesktop(context)
&& routePath.value == AppRoutes.EMAIL;
&& dashboardRoute.value == DashboardRoutes.emailDetailed;
}
void _unSelectedMailbox() {
@@ -433,7 +434,7 @@ class MailboxDashBoardController extends ReloadableController {
}
void _closeEmailDetailedView() {
dispatchRoute(AppRoutes.THREAD);
dispatchRoute(DashboardRoutes.thread);
clearSelectedEmail();
}
@@ -619,7 +620,7 @@ class MailboxDashBoardController extends ReloadableController {
) async {
if (accountId.value != null) {
final destinationMailbox = await push(
AppRoutes.DESTINATION_PICKER,
AppRoutes.destinationPicker,
arguments: DestinationPickerArguments(accountId.value!, MailboxActions.moveEmail));
if (destinationMailbox != null && destinationMailbox is PresentationMailbox) {
@@ -968,10 +969,10 @@ class MailboxDashBoardController extends ReloadableController {
composerOverlayState.value = ComposerOverlayState.inActive;
}
void dispatchRoute(String route) {
routePath.value = route;
void dispatchRoute(DashboardRoutes route) {
dashboardRoute.value = route;
if (routePath.value == AppRoutes.SEARCH_EMAIL) {
if (dashboardRoute.value == DashboardRoutes.searchEmail) {
searchController.enableSearch();
}
}
@@ -1072,7 +1073,7 @@ class MailboxDashBoardController extends ReloadableController {
openComposerOverlay(arguments);
}
} else {
push(AppRoutes.COMPOSER, arguments: arguments);
push(AppRoutes.composer, arguments: arguments);
}
}
@@ -1084,7 +1085,7 @@ class MailboxDashBoardController extends ReloadableController {
if (isDrawerOpen) {
closeMailboxMenuDrawer();
}
final result = await push(AppRoutes.MANAGE_ACCOUNT,
final result = await push(AppRoutes.settings,
arguments: ManageAccountArguments(sessionCurrent));
if (result is VacationResponse) {
@@ -1139,7 +1140,7 @@ class MailboxDashBoardController extends ReloadableController {
}
void goToVacationSetting() async {
final result = await push(AppRoutes.MANAGE_ACCOUNT,
final result = await push(AppRoutes.settings,
arguments: ManageAccountArguments(
sessionCurrent,
menuSettingCurrent: AccountMenuItem.vacation));
@@ -1,12 +1,13 @@
import 'package:core/core.dart';
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/views/responsive/responsive_widget.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tmail_ui_user/features/email/presentation/email_view.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_view.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
import 'package:tmail_ui_user/features/search/presentation/search_email_view.dart';
import 'package:tmail_ui_user/features/thread/presentation/thread_view.dart';
import 'package:tmail_ui_user/main/routes/app_routes.dart';
class MailboxDashBoardView extends BaseMailboxDashBoardView {
@@ -47,8 +48,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
drawerEnableOpenDragGesture: responsiveUtils.hasLeftMenuDrawerActive(context),
body: Stack(children: [
Obx(() {
switch(controller.routePath.value) {
case AppRoutes.THREAD:
switch(controller.dashboardRoute.value) {
case DashboardRoutes.thread:
return ResponsiveWidget(
responsiveUtils: responsiveUtils,
desktop: controller.searchController.isSearchEmailRunning
@@ -61,7 +62,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
? EmailView()
: bodyLandscapeTablet,
mobile: ThreadView());
case AppRoutes.EMAIL:
case DashboardRoutes.emailDetailed:
return ResponsiveWidget(
responsiveUtils: responsiveUtils,
desktop: controller.searchController.isSearchEmailRunning
@@ -74,7 +75,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
? EmailView()
: bodyLandscapeTablet,
mobile: EmailView());
case AppRoutes.SEARCH_EMAIL:
case DashboardRoutes.searchEmail:
return SafeArea(child: SearchEmailView());
default:
return ResponsiveWidget(
@@ -12,6 +12,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailb
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_overlay.dart';
@@ -25,7 +26,6 @@ import 'package:tmail_ui_user/features/search/presentation/search_email_view.dar
import 'package:tmail_ui_user/features/thread/domain/model/filter_message_option.dart';
import 'package:tmail_ui_user/features/thread/presentation/thread_view.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.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/utils/app_config.dart';
@@ -109,8 +109,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
_buildListButtonQuickSearchFilter(context),
_buildMarkAsMailboxReadLoading(context),
Expanded(child: Obx(() {
switch(controller.routePath.value) {
case AppRoutes.THREAD:
switch(controller.dashboardRoute.value) {
case DashboardRoutes.thread:
return Container(
margin: const EdgeInsets.only(right: 16, top: 16, bottom: 16),
decoration: BoxDecoration(
@@ -151,7 +151,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
]),
),
);
case AppRoutes.EMAIL:
case DashboardRoutes.emailDetailed:
return EmailView();
default:
return const SizedBox.shrink();
@@ -163,10 +163,10 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
]),
),
tabletLarge: Obx(() {
switch(controller.routePath.value) {
case AppRoutes.SEARCH_EMAIL:
switch(controller.dashboardRoute.value) {
case DashboardRoutes.searchEmail:
return SearchEmailView();
case AppRoutes.EMAIL:
case DashboardRoutes.emailDetailed:
return controller.searchController.isSearchEmailRunning
? EmailView()
: Row(
@@ -191,12 +191,12 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
}
}),
mobile: Obx(() {
switch(controller.routePath.value) {
case AppRoutes.THREAD:
switch(controller.dashboardRoute.value) {
case DashboardRoutes.thread:
return ThreadView();
case AppRoutes.EMAIL:
case DashboardRoutes.emailDetailed:
return EmailView();
case AppRoutes.SEARCH_EMAIL:
case DashboardRoutes.searchEmail:
return SearchEmailView();
default:
return ThreadView();
@@ -463,7 +463,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
return controller.searchController.isSearchActive()
&& controller.searchController.searchIsActive.isTrue
&& responsiveUtils.isWebDesktop(context)
&& controller.routePath.value != AppRoutes.EMAIL;
&& controller.dashboardRoute.value != DashboardRoutes.emailDetailed;
}
Widget _buildListButtonQuickSearchFilter(BuildContext context) {
@@ -0,0 +1,6 @@
enum DashboardRoutes {
thread,
emailDetailed,
searchEmail
}