eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-1074 Handle go to path /mailbox_creator

Browse Source
This commit is contained in:
dab246
2022-10-25 00:25:08 +07:00
committed by Dat H. Pham
parent daddeb78dc
commit 50bba630d5
9 changed files with 142 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/base/mixin/view_as_dialog_action_mixin.dart
+35 -1
View File
@@ -4,6 +4,10 @@ import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/destination_picker_bindings.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/destination_picker_view.dart';
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/mailbox_creator_bindings.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/mailbox_creator_view.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/mailbox_creator_arguments.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/new_mailbox_arguments.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
mixin ViewAsDialogActionMixin {
@@ -19,7 +23,7 @@ mixin ViewAsDialogActionMixin {
context: context,
barrierDismissible: true,
barrierLabel: '',
barrierColor: Colors.black54,
barrierColor: Colors.black.withAlpha(24),
pageBuilder: (context, animation, secondaryAnimation) {
return DestinationPickerView.fromArguments(
arguments,
@@ -37,4 +41,34 @@ mixin ViewAsDialogActionMixin {
});
});
}
void showDialogMailboxCreator({
required BuildContext context,
required MailboxCreatorArguments arguments,
required Function(NewMailboxArguments) onCreatedMailbox
}) {
MailboxCreatorBindings().dependencies();
showGeneralDialog(
context: context,
barrierDismissible: true,
barrierLabel: '',
barrierColor: Colors.black.withAlpha(24),
pageBuilder: (context, animation, secondaryAnimation) {
return MailboxCreatorView.fromArguments(
arguments,
onDismissCallback: () {
MailboxCreatorBindings().dispose();
popBack();
},
onCreatedMailboxCallback: (arguments) {
MailboxCreatorBindings().dispose();
popBack();
if (arguments is NewMailboxArguments) {
onCreatedMailbox.call(arguments);
}
});
});
}
}
lib/features/mailbox/presentation/mailbox_controller.dart
+28 -11
View File
@@ -380,20 +380,37 @@ class MailboxController extends BaseMailboxController {
_openMailboxEventController.add(OpenMailboxViewEvent(context, presentationMailboxSelected));
}
void goToCreateNewMailboxView() async {
void goToCreateNewMailboxView(BuildContext context) async {
final accountId = mailboxDashBoardController.accountId.value;
if (accountId != null) {
final newMailboxArguments = await push(
AppRoutes.mailboxCreator,
arguments: MailboxCreatorArguments(accountId, defaultMailboxTree.value, folderMailboxTree.value)
);
final arguments = MailboxCreatorArguments(
accountId,
defaultMailboxTree.value,
folderMailboxTree.value);
if (newMailboxArguments != null && newMailboxArguments is NewMailboxArguments) {
final generateCreateId = Id(_uuid.v1());
_createNewMailboxAction(accountId, CreateNewMailboxRequest(
generateCreateId,
newMailboxArguments.newName,
parentId: newMailboxArguments.mailboxLocation?.id));
if (BuildUtils.isWeb) {
showDialogMailboxCreator(
context: context,
arguments: arguments,
onCreatedMailbox: (newMailboxArguments) {
final generateCreateId = Id(_uuid.v1());
_createNewMailboxAction(accountId, CreateNewMailboxRequest(
generateCreateId,
newMailboxArguments.newName,
parentId: newMailboxArguments.mailboxLocation?.id));
});
} else {
final newMailboxArguments = await push(
AppRoutes.mailboxCreator,
arguments: arguments);
if (newMailboxArguments != null && newMailboxArguments is NewMailboxArguments) {
final generateCreateId = Id(_uuid.v1());
_createNewMailboxAction(accountId, CreateNewMailboxRequest(
generateCreateId,
newMailboxArguments.newName,
parentId: newMailboxArguments.mailboxLocation?.id));
}
}
}
}
lib/features/mailbox/presentation/mailbox_view.dart
+1 -1
View File
@@ -147,7 +147,7 @@ class MailboxView extends GetWidget<MailboxController> {
return buildIconWeb(
icon: SvgPicture.asset(_imagePaths.icAddNewFolder, width: 28, height: 24, color: AppColor.colorTextButton, fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).new_mailbox,
onTap: () => controller.goToCreateNewMailboxView());
onTap: () => controller.goToCreateNewMailboxView(context));
}
Widget _buildEditMailboxButton(BuildContext context, bool isSelectionEnabled) {
lib/features/mailbox/presentation/mailbox_view_web.dart
+1 -1
View File
@@ -186,7 +186,7 @@ class MailboxView extends GetWidget<MailboxController> with AppLoaderMixin, Popu
splashRadius: 15,
icon: SvgPicture.asset(_imagePaths.icAddNewFolder, color: AppColor.colorTextButton, fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).new_mailbox,
onTap: () => controller.goToCreateNewMailboxView())),
onTap: () => controller.goToCreateNewMailboxView(context))),
]),
Obx(() => controller.folderMailboxHasChild
? _buildMailboxCategory(context, MailboxCategories.folders, controller.folderRootNode)
lib/features/mailbox_creator/presentation/mailbox_creator_bindings.dart
+5 -3
View File
@@ -7,9 +7,7 @@ class MailboxCreatorBindings extends BaseBindings {
@override
void bindingsController() {
Get.lazyPut(() => MailboxCreatorController(
Get.find<VerifyNameInteractor>(),
));
Get.lazyPut(() => MailboxCreatorController(Get.find<VerifyNameInteractor>()));
}
@override
@@ -28,4 +26,8 @@ class MailboxCreatorBindings extends BaseBindings {
@override
void bindingsRepositoryImpl() {}
void dispose() {
Get.delete<MailboxCreatorController>();
}
}
lib/features/mailbox_creator/presentation/mailbox_creator_controller.dart
+40 -16
View File
@@ -20,6 +20,8 @@ import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/new_ma
import 'package:tmail_ui_user/main/routes/app_routes.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
typedef OnCreatedMailboxCallback = Function(NewMailboxArguments? arguments);
class MailboxCreatorController extends BaseController {
final VerifyNameInteractor _verifyNameInteractor;
@@ -27,27 +29,34 @@ class MailboxCreatorController extends BaseController {
final selectedMailbox = Rxn<PresentationMailbox>();
final newNameMailbox = Rxn<String>();
final nameInputFocusNode = FocusNode();
FocusNode? nameInputFocusNode;
MailboxCreatorArguments? arguments;
AccountId? accountId;
MailboxTree? folderMailboxTree;
MailboxTree? defaultMailboxTree;
OnCreatedMailboxCallback? onCreatedMailboxCallback;
VoidCallback? onDismissMailboxCreator;
List<String> listMailboxNameAsStringExist = <String>[];
MailboxCreatorController(
this._verifyNameInteractor,
);
MailboxCreatorController(this._verifyNameInteractor);
void setNewNameMailbox(String newName) => newNameMailbox.value = newName;
@override
void onInit() {
super.onInit();
nameInputFocusNode = FocusNode();
}
@override
void onReady() {
super.onReady();
final arguments = Get.arguments;
if (arguments is MailboxCreatorArguments) {
folderMailboxTree = arguments.folderMailboxTree;
defaultMailboxTree = arguments.defaultMailboxTree;
accountId = arguments.accountId;
if (arguments != null) {
folderMailboxTree = arguments!.folderMailboxTree;
defaultMailboxTree = arguments!.defaultMailboxTree;
accountId = arguments!.accountId;
_createListMailboxNameAsStringInMailboxLocation();
}
}
@@ -61,14 +70,14 @@ class MailboxCreatorController extends BaseController {
@override
void onClose() {
nameInputFocusNode.dispose();
nameInputFocusNode?.dispose();
super.onClose();
}
bool isCreateMailboxValidated(BuildContext context) {
final nameValidated = getErrorInputNameString(context);
if (!nameInputFocusNode.hasFocus && newNameMailbox.value == null) {
if (nameInputFocusNode?.hasFocus == false && newNameMailbox.value == null) {
return false;
}
@@ -109,14 +118,12 @@ class MailboxCreatorController extends BaseController {
listMailboxNameAsStringExist = [];
}
}
log('MailboxCreatorController::_createListMailboxNameAsStringInMailboxLocation(): ${listMailboxNameAsStringExist.toString()}');
}
String? getErrorInputNameString(BuildContext context) {
final nameMailbox = newNameMailbox.value;
if (!nameInputFocusNode.hasFocus && nameMailbox == null) {
if (nameInputFocusNode?.hasFocus == false && nameMailbox == null) {
return null;
}
@@ -178,17 +185,34 @@ class MailboxCreatorController extends BaseController {
void createNewMailbox(BuildContext context) {
FocusScope.of(context).unfocus();
final nameMailbox = newNameMailbox.value;
if (nameMailbox != null && nameMailbox.isNotEmpty) {
final newMailboxArguments = NewMailboxArguments(
MailboxName(nameMailbox),
mailboxLocation: selectedMailbox.value);
popBack(result: newMailboxArguments);
if (BuildUtils.isWeb) {
nameInputFocusNode?.dispose();
nameInputFocusNode = null;
onCreatedMailboxCallback?.call(newMailboxArguments);
} else {
popBack(result: newMailboxArguments);
}
}
}
void closeMailboxCreator(BuildContext context) {
FocusScope.of(context).unfocus();
popBack();
if (BuildUtils.isWeb) {
nameInputFocusNode?.dispose();
nameInputFocusNode = null;
onDismissMailboxCreator?.call();
} else {
popBack();
}
}
}
lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
+26 -3
View File
@@ -1,10 +1,16 @@
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:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/text/text_field_builder.dart';
import 'package:core/utils/build_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'package:tmail_ui_user/features/mailbox/domain/extensions/presentation_mailbox_extension.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/mailbox_creator_controller.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/mailbox_creator_arguments.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/widgets/app_bar_mailbox_creator_builder.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/widgets/create_mailbox_name_input_decoration_builder.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
@@ -15,7 +21,24 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
final _imagePaths = Get.find<ImagePaths>();
final _responsiveUtils = Get.find<ResponsiveUtils>();
MailboxCreatorView({Key? key}) : super(key: key);
@override
final controller = Get.find<MailboxCreatorController>();
MailboxCreatorView({Key? key}) : super(key: key) {
controller.arguments = Get.arguments;
}
MailboxCreatorView.fromArguments(
MailboxCreatorArguments arguments, {
Key? key,
OnCreatedMailboxCallback? onCreatedMailboxCallback,
VoidCallback? onDismissCallback
}) : super(key: key) {
controller.arguments = arguments;
controller.onCreatedMailboxCallback = onCreatedMailboxCallback;
controller.onDismissMailboxCreator = onDismissCallback;
controller.onInit();
}
@override
Widget build(BuildContext context) {
@@ -95,7 +118,7 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
..keyboardType(TextInputType.visiblePassword)
..cursorColor(AppColor.colorTextButton)
..maxLines(1)
..textStyle(TextStyle(
..textStyle(const TextStyle(
color: AppColor.colorNameEmail,
fontSize: 16,
overflow: CommonTextStyle.defaultTextOverFlow))
lib/main/pages/app_pages.dart
+5 -5
View File
@@ -42,6 +42,11 @@ class AppPages {
opaque: false,
page: () => DeferredWidget(destination_picker.loadLibrary, () => destination_picker.DestinationPickerView()),
binding: DestinationPickerBindings()),
GetPage(
name: AppRoutes.mailboxCreator,
opaque: false,
page: () => DeferredWidget(mailbox_creator.loadLibrary, () => mailbox_creator.MailboxCreatorView()),
binding: MailboxCreatorBindings()),
];
static final pages = [
@@ -61,11 +66,6 @@ class AppPages {
name: AppRoutes.dashboard,
page: () => DeferredWidget(mailbox_dashboard.loadLibrary, () => mailbox_dashboard.MailboxDashBoardView()),
binding: MailboxDashBoardBindings()),
GetPage(
name: AppRoutes.mailboxCreator,
opaque: false,
page: () => DeferredWidget(mailbox_creator.loadLibrary, () => mailbox_creator.MailboxCreatorView()),
binding: MailboxCreatorBindings()),
GetPage(
name: AppRoutes.settings,
page: () => DeferredWidget(manage_account_dashboard.loadLibrary,
lib/main/routes/app_routes.dart
+1 -1
View File
@@ -7,7 +7,7 @@ abstract class AppRoutes {
static const composer = '/composer';
static const destinationPicker = '/destination_picker';
static const mailboxCreator = '$dashboard/mailbox_creator';
static const mailboxCreator = '/mailbox_creator';
static const contact = '$dashboard/contact';
static const identityCreator = '$settings/identity_creator';
static const rulesFilterCreator = '$settings/rules_filter_creator';