TF-691 Update title and add option all mailbox in destination picker
This commit is contained in:
@@ -9,5 +9,7 @@ class CommonTextStyle {
|
|||||||
fontWeight: FontWeight.normal,
|
fontWeight: FontWeight.normal,
|
||||||
);
|
);
|
||||||
|
|
||||||
static final defaultTextOverFlow = BuildUtils.isWeb ? null : TextOverflow.ellipsis;
|
static final defaultTextOverFlow = BuildUtils.isWeb
|
||||||
|
? TextOverflow.fade
|
||||||
|
: TextOverflow.ellipsis;
|
||||||
}
|
}
|
||||||
@@ -55,7 +55,9 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
width: _getWidthDestinationPicker(context),
|
width: _getWidthDestinationPicker(context),
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(Radius.circular(14)),
|
borderRadius: const BorderRadius.all(Radius.circular(14)),
|
||||||
child: _buildDestinationPickerWebWidget(context, actions)
|
child: GestureDetector(
|
||||||
|
onTap: () => {},
|
||||||
|
child: _buildDestinationPickerWebWidget(context, actions))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -141,9 +143,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
? _buildInputSearchFormWidget(context)
|
? _buildInputSearchFormWidget(context)
|
||||||
: const SizedBox.shrink()),
|
: const SizedBox.shrink()),
|
||||||
Expanded(child: Container(
|
Expanded(child: Container(
|
||||||
color: actions == MailboxActions.create
|
color: actions?.getBackgroundColor(),
|
||||||
? AppColor.colorBgMailbox
|
|
||||||
: Colors.white,
|
|
||||||
child: _buildBodyDestinationPicker(context, actions)))
|
child: _buildBodyDestinationPicker(context, actions)))
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
@@ -234,12 +234,12 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
return SingleChildScrollView(
|
return SingleChildScrollView(
|
||||||
physics: const ClampingScrollPhysics(),
|
physics: const ClampingScrollPhysics(),
|
||||||
child: Column(children: [
|
child: Column(children: [
|
||||||
if (actions == MailboxActions.moveEmail || actions == MailboxActions.move)
|
if (actions?.hasSearchActive() == true)
|
||||||
_buildSearchBarWidget(context),
|
_buildSearchBarWidget(context),
|
||||||
_buildLoadingView(),
|
_buildLoadingView(),
|
||||||
if (actions == MailboxActions.create && !BuildUtils.isWeb && _responsiveUtils.isScreenWithShortestSide(context))
|
if (actions == MailboxActions.create && !BuildUtils.isWeb && _responsiveUtils.isScreenWithShortestSide(context))
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
if (actions == MailboxActions.create || actions == MailboxActions.move)
|
if (actions?.hasAllMailboxDefault() == true)
|
||||||
_buildUnifiedMailbox(context, actions),
|
_buildUnifiedMailbox(context, actions),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
Obx(() => controller.defaultMailboxHasChild
|
Obx(() => controller.defaultMailboxHasChild
|
||||||
@@ -259,7 +259,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildMailboxCategory(BuildContext context, MailboxCategories categories, MailboxNode mailboxNode, MailboxActions? actions) {
|
Widget _buildMailboxCategory(BuildContext context, MailboxCategories categories, MailboxNode mailboxNode, MailboxActions? actions) {
|
||||||
if (actions == MailboxActions.moveEmail || actions == MailboxActions.move) {
|
if (actions?.canCollapseMailboxGroup() == false) {
|
||||||
return _buildBodyMailboxCategory(context, categories, mailboxNode, actions);
|
return _buildBodyMailboxCategory(context, categories, mailboxNode, actions);
|
||||||
}
|
}
|
||||||
return Column(children: [
|
return Column(children: [
|
||||||
@@ -308,10 +308,8 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
EdgeInsets _marginMailboxList(BuildContext context, MailboxActions? actions) {
|
EdgeInsets _marginMailboxList(BuildContext context, MailboxActions? actions) {
|
||||||
if (BuildUtils.isWeb) {
|
if (BuildUtils.isWeb) {
|
||||||
return EdgeInsets.only(
|
return EdgeInsets.only(
|
||||||
left: actions == MailboxActions.moveEmail
|
left: actions?.canCollapseMailboxGroup() == false ? 0 : 16,
|
||||||
|| actions == MailboxActions.move ? 0 : 16,
|
right: actions?.canCollapseMailboxGroup() == false ? 0 : 16);
|
||||||
right: actions == MailboxActions.moveEmail
|
|
||||||
|| actions == MailboxActions.move ? 0 : 16);
|
|
||||||
} else {
|
} else {
|
||||||
return EdgeInsets.only(
|
return EdgeInsets.only(
|
||||||
left: _responsiveUtils.isLandscapeMobile(context) ? 0 : 16,
|
left: _responsiveUtils.isLandscapeMobile(context) ? 0 : 16,
|
||||||
@@ -357,9 +355,14 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
|
|
||||||
Widget _buildListMailboxSearched(BuildContext context) {
|
Widget _buildListMailboxSearched(BuildContext context) {
|
||||||
return Obx(() => Container(
|
return Obx(() => Container(
|
||||||
margin: const EdgeInsets.only(right: 8, bottom: 12),
|
margin: const EdgeInsets.only(
|
||||||
|
right: 8,
|
||||||
|
bottom: 12,
|
||||||
|
top: BuildUtils.isWeb ? 8 : 0),
|
||||||
decoration: _responsiveUtils.isDesktop(context)
|
decoration: _responsiveUtils.isDesktop(context)
|
||||||
? BoxDecoration(borderRadius: BorderRadius.circular(14), color: Colors.white)
|
? BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(14),
|
||||||
|
color: Colors.white)
|
||||||
: null,
|
: null,
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
padding: const EdgeInsets.only(left: 16, right: 8),
|
padding: const EdgeInsets.only(left: 16, right: 8),
|
||||||
@@ -382,14 +385,16 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildUnifiedMailbox(BuildContext context, MailboxActions? actions) {
|
Widget _buildUnifiedMailbox(BuildContext context, MailboxActions? actions) {
|
||||||
if (actions == MailboxActions.move) {
|
if (actions == MailboxActions.move || actions == MailboxActions.select) {
|
||||||
return InkWell(
|
return InkWell(
|
||||||
onTap: () => controller.selectMailboxAction(PresentationMailbox.unifiedMailbox),
|
onTap: () => controller.selectMailboxAction(PresentationMailbox.unifiedMailbox),
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(Radius.circular(14)),
|
borderRadius: const BorderRadius.all(Radius.circular(14)),
|
||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
margin: const EdgeInsets.only(left: BuildUtils.isWeb ? 8 : 0),
|
margin: const EdgeInsets.only(
|
||||||
|
left: BuildUtils.isWeb ? 8 : 0,
|
||||||
|
top: 8),
|
||||||
padding: const EdgeInsets.only(left: 16, top: 16),
|
padding: const EdgeInsets.only(left: 16, top: 16),
|
||||||
child: Row(children: [
|
child: Row(children: [
|
||||||
SvgPicture.asset(
|
SvgPicture.asset(
|
||||||
@@ -399,7 +404,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
|
|||||||
fit: BoxFit.fill),
|
fit: BoxFit.fill),
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
Expanded(child: Text(
|
Expanded(child: Text(
|
||||||
AppLocalizations.of(context).default_mailbox,
|
AppLocalizations.of(context).allMailboxes,
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: CommonTextStyle.defaultTextOverFlow,
|
overflow: CommonTextStyle.defaultTextOverFlow,
|
||||||
style: const TextStyle(
|
style: const TextStyle(
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||||
|
|
||||||
@@ -21,11 +20,10 @@ extension MailboxActionsExtension on MailboxActions {
|
|||||||
case MailboxActions.create:
|
case MailboxActions.create:
|
||||||
return AppLocalizations.of(context).mailbox_location;
|
return AppLocalizations.of(context).mailbox_location;
|
||||||
case MailboxActions.moveEmail:
|
case MailboxActions.moveEmail:
|
||||||
return AppLocalizations.of(context).move_message;
|
case MailboxActions.move:
|
||||||
|
return AppLocalizations.of(context).moveTo;
|
||||||
case MailboxActions.select:
|
case MailboxActions.select:
|
||||||
return AppLocalizations.of(context).selectMailbox;
|
return AppLocalizations.of(context).selectMailbox;
|
||||||
case MailboxActions.move:
|
|
||||||
return AppLocalizations.of(context).allMailboxes;
|
|
||||||
default:
|
default:
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@@ -69,4 +67,46 @@ extension MailboxActionsExtension on MailboxActions {
|
|||||||
return Colors.black;
|
return Colors.black;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Color getBackgroundColor() {
|
||||||
|
switch(this) {
|
||||||
|
case MailboxActions.create:
|
||||||
|
return AppColor.colorBgMailbox;
|
||||||
|
default:
|
||||||
|
return Colors.white;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool hasSearchActive() {
|
||||||
|
switch(this) {
|
||||||
|
case MailboxActions.moveEmail:
|
||||||
|
case MailboxActions.move:
|
||||||
|
case MailboxActions.select:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool hasAllMailboxDefault() {
|
||||||
|
switch(this) {
|
||||||
|
case MailboxActions.create:
|
||||||
|
case MailboxActions.move:
|
||||||
|
case MailboxActions.select:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool canCollapseMailboxGroup() {
|
||||||
|
switch(this) {
|
||||||
|
case MailboxActions.moveEmail:
|
||||||
|
case MailboxActions.move:
|
||||||
|
case MailboxActions.select:
|
||||||
|
return false;
|
||||||
|
default:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -113,7 +113,7 @@ class AdvancedFilterController extends GetxController {
|
|||||||
AppRoutes.DESTINATION_PICKER,
|
AppRoutes.DESTINATION_PICKER,
|
||||||
arguments: DestinationPickerArguments(
|
arguments: DestinationPickerArguments(
|
||||||
_mailboxDashBoardController.accountId.value!,
|
_mailboxDashBoardController.accountId.value!,
|
||||||
MailboxActions.moveEmail));
|
MailboxActions.select));
|
||||||
searchController.updateFilterEmail(mailbox: destinationMailbox);
|
searchController.updateFilterEmail(mailbox: destinationMailbox);
|
||||||
mailBoxFilterInputController.text =
|
mailBoxFilterInputController.text =
|
||||||
StringConvert.writeNullToEmpty(destinationMailbox.name?.name);
|
StringConvert.writeNullToEmpty(destinationMailbox.name?.name);
|
||||||
|
|||||||
+9
@@ -57,6 +57,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
context: context,
|
context: context,
|
||||||
advancedSearchFilterField: AdvancedSearchFilterField.mailBox,
|
advancedSearchFilterField: AdvancedSearchFilterField.mailBox,
|
||||||
isSelectFormList: true,
|
isSelectFormList: true,
|
||||||
|
mouseCursor: SystemMouseCursors.click,
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
await controller.selectedMailBox();
|
await controller.selectedMailBox();
|
||||||
}),
|
}),
|
||||||
@@ -118,6 +119,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
required TextEditingController textEditingController,
|
required TextEditingController textEditingController,
|
||||||
VoidCallback? onTap,
|
VoidCallback? onTap,
|
||||||
bool isSelectFormList = false,
|
bool isSelectFormList = false,
|
||||||
|
MouseCursor? mouseCursor,
|
||||||
}) {
|
}) {
|
||||||
final child = [
|
final child = [
|
||||||
SizedBox(
|
SizedBox(
|
||||||
@@ -137,6 +139,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
isSelectFormList: isSelectFormList,
|
isSelectFormList: isSelectFormList,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
context: context,
|
context: context,
|
||||||
|
mouseCursor: mouseCursor,
|
||||||
advancedSearchFilterField: advancedSearchFilterField,
|
advancedSearchFilterField: advancedSearchFilterField,
|
||||||
textEditingController: textEditingController,
|
textEditingController: textEditingController,
|
||||||
)
|
)
|
||||||
@@ -148,6 +151,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
isSelectFormList: isSelectFormList,
|
isSelectFormList: isSelectFormList,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
context: context,
|
context: context,
|
||||||
|
mouseCursor: mouseCursor,
|
||||||
advancedSearchFilterField: advancedSearchFilterField,
|
advancedSearchFilterField: advancedSearchFilterField,
|
||||||
textEditingController: textEditingController,
|
textEditingController: textEditingController,
|
||||||
)
|
)
|
||||||
@@ -157,6 +161,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
isSelectFormList: isSelectFormList,
|
isSelectFormList: isSelectFormList,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
context: context,
|
context: context,
|
||||||
|
mouseCursor: mouseCursor,
|
||||||
advancedSearchFilterField: advancedSearchFilterField,
|
advancedSearchFilterField: advancedSearchFilterField,
|
||||||
textEditingController: textEditingController,
|
textEditingController: textEditingController,
|
||||||
),
|
),
|
||||||
@@ -181,6 +186,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
required TextEditingController textEditingController,
|
required TextEditingController textEditingController,
|
||||||
VoidCallback? onTap,
|
VoidCallback? onTap,
|
||||||
bool isSelectFormList = false,
|
bool isSelectFormList = false,
|
||||||
|
MouseCursor? mouseCursor,
|
||||||
}) {
|
}) {
|
||||||
switch (advancedSearchFilterField) {
|
switch (advancedSearchFilterField) {
|
||||||
case AdvancedSearchFilterField.date:
|
case AdvancedSearchFilterField.date:
|
||||||
@@ -190,6 +196,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
isSelectFormList: isSelectFormList,
|
isSelectFormList: isSelectFormList,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
context: context,
|
context: context,
|
||||||
|
mouseCursor: mouseCursor,
|
||||||
advancedSearchFilterField: advancedSearchFilterField,
|
advancedSearchFilterField: advancedSearchFilterField,
|
||||||
textEditingController: textEditingController,
|
textEditingController: textEditingController,
|
||||||
);
|
);
|
||||||
@@ -304,10 +311,12 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
|||||||
required TextEditingController textEditingController,
|
required TextEditingController textEditingController,
|
||||||
VoidCallback? onTap,
|
VoidCallback? onTap,
|
||||||
bool isSelectFormList = false,
|
bool isSelectFormList = false,
|
||||||
|
MouseCursor? mouseCursor,
|
||||||
}) {
|
}) {
|
||||||
return TextField(
|
return TextField(
|
||||||
controller: textEditingController,
|
controller: textEditingController,
|
||||||
readOnly: isSelectFormList,
|
readOnly: isSelectFormList,
|
||||||
|
mouseCursor: mouseCursor,
|
||||||
onTap: onTap,
|
onTap: onTap,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
filled: true,
|
filled: true,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"@@last_modified": "2022-08-03T00:27:26.944930",
|
"@@last_modified": "2022-08-04T11:25:19.254781",
|
||||||
"initializing_data": "Initializing data...",
|
"initializing_data": "Initializing data...",
|
||||||
"@initializing_data": {
|
"@initializing_data": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
@@ -1747,5 +1747,11 @@
|
|||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [],
|
"placeholders_order": [],
|
||||||
"placeholders": {}
|
"placeholders": {}
|
||||||
|
},
|
||||||
|
"moveTo": "Move To",
|
||||||
|
"@moveTo": {
|
||||||
|
"type": "text",
|
||||||
|
"placeholders_order": [],
|
||||||
|
"placeholders": {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1791,4 +1791,11 @@ class AppLocalizations {
|
|||||||
'Bulleted list',
|
'Bulleted list',
|
||||||
name: 'bulletedList');
|
name: 'bulletedList');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String get moveTo {
|
||||||
|
return Intl.message(
|
||||||
|
'Move To',
|
||||||
|
name: 'moveTo',
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user