TF-2089 Fix pull-to-refresh in mailbox view
(cherry picked from commit cd53c87be8fc986072f1610f7b37d839d3552f3f)
This commit is contained in:
dab246
@@ -205,10 +205,6 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleScrollEnable() {
|
|
||||||
isMailboxListScrollable.value = mailboxListScrollController.hasClients && mailboxListScrollController.position.maxScrollExtent > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void _registerObxStreamListener() {
|
void _registerObxStreamListener() {
|
||||||
ever(mailboxDashBoardController.accountId, (accountId) {
|
ever(mailboxDashBoardController.accountId, (accountId) {
|
||||||
if (accountId != null && mailboxDashBoardController.sessionCurrent != null) {
|
if (accountId != null && mailboxDashBoardController.sessionCurrent != null) {
|
||||||
@@ -299,7 +295,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void refreshAllMailbox() {
|
Future<void> refreshAllMailbox() async {
|
||||||
final session = mailboxDashBoardController.sessionCurrent;
|
final session = mailboxDashBoardController.sessionCurrent;
|
||||||
final accountId = mailboxDashBoardController.accountId.value;
|
final accountId = mailboxDashBoardController.accountId.value;
|
||||||
if (session != null && accountId != null) {
|
if (session != null && accountId != null) {
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class MailboxView extends BaseMailboxView {
|
|||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
child: RefreshIndicator(
|
child: RefreshIndicator(
|
||||||
color: AppColor.primaryColor,
|
color: AppColor.primaryColor,
|
||||||
onRefresh: () async => controller.refreshAllMailbox(),
|
onRefresh: controller.refreshAllMailbox,
|
||||||
child: SafeArea(
|
child: SafeArea(
|
||||||
top: false,
|
top: false,
|
||||||
right: false,
|
right: false,
|
||||||
@@ -154,124 +154,118 @@ class MailboxView extends BaseMailboxView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildListMailbox(BuildContext context) {
|
Widget _buildListMailbox(BuildContext context) {
|
||||||
return NotificationListener(
|
return SingleChildScrollView(
|
||||||
onNotification: (_) {
|
controller: controller.mailboxListScrollController,
|
||||||
controller.handleScrollEnable();
|
key: const PageStorageKey('mailbox_list'),
|
||||||
return true;
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
},
|
padding: const EdgeInsets.only(bottom: 16),
|
||||||
child: SingleChildScrollView(
|
child: Column(children: [
|
||||||
controller: controller.mailboxListScrollController,
|
Obx(() {
|
||||||
key: const PageStorageKey('mailbox_list'),
|
if (controller.isSelectionEnabled() && responsiveUtils.isLandscapeMobile(context)) {
|
||||||
physics: const ClampingScrollPhysics(),
|
return const SizedBox.shrink();
|
||||||
padding: const EdgeInsets.only(bottom: 16),
|
}
|
||||||
child: Column(children: [
|
return buildUserInformation(context);
|
||||||
Obx(() {
|
}),
|
||||||
if (controller.isSelectionEnabled() && responsiveUtils.isLandscapeMobile(context)) {
|
buildLoadingView(),
|
||||||
return const SizedBox.shrink();
|
AppConfig.appGridDashboardAvailable
|
||||||
}
|
? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
|
||||||
return buildUserInformation(context);
|
: const SizedBox.shrink(),
|
||||||
}),
|
const SizedBox(height: 8),
|
||||||
buildLoadingView(),
|
Obx(() {
|
||||||
AppConfig.appGridDashboardAvailable
|
if (controller.defaultMailboxIsNotEmpty) {
|
||||||
? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
|
return _buildMailboxCategory(
|
||||||
: const SizedBox.shrink(),
|
context,
|
||||||
const SizedBox(height: 8),
|
MailboxCategories.exchange,
|
||||||
Obx(() {
|
controller.defaultRootNode
|
||||||
if (controller.defaultMailboxIsNotEmpty) {
|
);
|
||||||
return _buildMailboxCategory(
|
} else {
|
||||||
context,
|
return const SizedBox.shrink();
|
||||||
MailboxCategories.exchange,
|
}
|
||||||
controller.defaultRootNode
|
}),
|
||||||
);
|
Obx(() {
|
||||||
} else {
|
if (controller.mailboxDashBoardController.listSendingEmails.isNotEmpty &&
|
||||||
return const SizedBox.shrink();
|
PlatformInfo.isMobile &&
|
||||||
}
|
!controller.isSelectionEnabled()) {
|
||||||
}),
|
return SendingQueueMailboxWidget(
|
||||||
Obx(() {
|
listSendingEmails: controller.mailboxDashBoardController.listSendingEmails,
|
||||||
if (controller.mailboxDashBoardController.listSendingEmails.isNotEmpty &&
|
onOpenSendingQueueAction: () => controller.openSendingQueueViewAction(context),
|
||||||
PlatformInfo.isMobile &&
|
isSelected: controller.mailboxDashBoardController.dashboardRoute.value == DashboardRoutes.sendingQueue,
|
||||||
!controller.isSelectionEnabled()) {
|
);
|
||||||
return SendingQueueMailboxWidget(
|
} else {
|
||||||
listSendingEmails: controller.mailboxDashBoardController.listSendingEmails,
|
return const SizedBox.shrink();
|
||||||
onOpenSendingQueueAction: () => controller.openSendingQueueViewAction(context),
|
}
|
||||||
isSelected: controller.mailboxDashBoardController.dashboardRoute.value == DashboardRoutes.sendingQueue,
|
}),
|
||||||
);
|
const SizedBox(height: 8),
|
||||||
} else {
|
const Divider(color: AppColor.colorDividerMailbox, height: 1),
|
||||||
return const SizedBox.shrink();
|
const SizedBox(height: 12),
|
||||||
}
|
Container(
|
||||||
}),
|
margin: EdgeInsetsDirectional.only(
|
||||||
const SizedBox(height: 8),
|
start: responsiveUtils.isLandscapeMobile(context) ? 0 : 8,
|
||||||
const Divider(color: AppColor.colorDividerMailbox, height: 1),
|
end: 16),
|
||||||
const SizedBox(height: 12),
|
padding: const EdgeInsetsDirectional.only(start: 8),
|
||||||
Container(
|
child: Row(
|
||||||
margin: EdgeInsetsDirectional.only(
|
children: [
|
||||||
start: responsiveUtils.isLandscapeMobile(context) ? 0 : 8,
|
Expanded(
|
||||||
end: 16),
|
child: Text(
|
||||||
padding: const EdgeInsetsDirectional.only(start: 8),
|
AppLocalizations.of(context).mailBoxes,
|
||||||
child: Row(
|
style: const TextStyle(
|
||||||
children: [
|
fontSize: 20,
|
||||||
Expanded(
|
color: Colors.black,
|
||||||
child: Text(
|
fontWeight: FontWeight.bold
|
||||||
AppLocalizations.of(context).folders,
|
)
|
||||||
style: const TextStyle(
|
|
||||||
fontSize: 20,
|
|
||||||
color: Colors.black,
|
|
||||||
fontWeight: FontWeight.bold
|
|
||||||
)
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Row(children: [
|
),
|
||||||
buildIconWeb(
|
Row(children: [
|
||||||
minSize: 40,
|
buildIconWeb(
|
||||||
iconPadding: EdgeInsets.zero,
|
minSize: 40,
|
||||||
icon: SvgPicture.asset(
|
iconPadding: EdgeInsets.zero,
|
||||||
imagePaths.icSearchBar,
|
icon: SvgPicture.asset(
|
||||||
colorFilter: AppColor.colorTextButton.asFilter(),
|
imagePaths.icSearchBar,
|
||||||
fit: BoxFit.fill
|
colorFilter: AppColor.colorTextButton.asFilter(),
|
||||||
),
|
fit: BoxFit.fill
|
||||||
tooltip: AppLocalizations.of(context).searchForMailboxes,
|
|
||||||
onTap: () => controller.openSearchViewAction(context)
|
|
||||||
),
|
),
|
||||||
buildIconWeb(
|
tooltip: AppLocalizations.of(context).searchForMailboxes,
|
||||||
minSize: 40,
|
onTap: () => controller.openSearchViewAction(context)
|
||||||
iconSize: 20,
|
),
|
||||||
iconPadding: EdgeInsets.zero,
|
buildIconWeb(
|
||||||
splashRadius: 15,
|
minSize: 40,
|
||||||
icon: SvgPicture.asset(
|
iconSize: 20,
|
||||||
imagePaths.icAddNewFolder,
|
iconPadding: EdgeInsets.zero,
|
||||||
colorFilter: AppColor.colorTextButton.asFilter(),
|
splashRadius: 15,
|
||||||
fit: BoxFit.fill),
|
icon: SvgPicture.asset(
|
||||||
tooltip: AppLocalizations.of(context).new_mailbox,
|
imagePaths.icAddNewFolder,
|
||||||
onTap: () => controller.goToCreateNewMailboxView(context)),
|
colorFilter: AppColor.colorTextButton.asFilter(),
|
||||||
]),
|
fit: BoxFit.fill),
|
||||||
|
tooltip: AppLocalizations.of(context).new_mailbox,
|
||||||
|
onTap: () => controller.goToCreateNewMailboxView(context)),
|
||||||
]),
|
]),
|
||||||
),
|
]),
|
||||||
const SizedBox(height: 8),
|
),
|
||||||
Obx(() {
|
const SizedBox(height: 8),
|
||||||
if (controller.personalMailboxIsNotEmpty) {
|
Obx(() {
|
||||||
return _buildMailboxCategory(
|
if (controller.personalMailboxIsNotEmpty) {
|
||||||
context,
|
return _buildMailboxCategory(
|
||||||
MailboxCategories.personalFolders,
|
context,
|
||||||
controller.personalRootNode
|
MailboxCategories.personalFolders,
|
||||||
);
|
controller.personalRootNode
|
||||||
} else {
|
);
|
||||||
return const SizedBox.shrink();
|
} else {
|
||||||
}
|
return const SizedBox.shrink();
|
||||||
}),
|
}
|
||||||
const SizedBox(height: 8),
|
}),
|
||||||
Obx(() {
|
const SizedBox(height: 8),
|
||||||
if (controller.teamMailboxesIsNotEmpty) {
|
Obx(() {
|
||||||
return _buildMailboxCategory(
|
if (controller.teamMailboxesIsNotEmpty) {
|
||||||
context,
|
return _buildMailboxCategory(
|
||||||
MailboxCategories.teamMailboxes,
|
context,
|
||||||
controller.teamMailboxesRootNode
|
MailboxCategories.teamMailboxes,
|
||||||
);
|
controller.teamMailboxesRootNode
|
||||||
} else {
|
);
|
||||||
return const SizedBox.shrink();
|
} else {
|
||||||
}
|
return const SizedBox.shrink();
|
||||||
}),
|
}
|
||||||
])
|
}),
|
||||||
),
|
])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
@@ -40,11 +41,7 @@ class MailboxView extends BaseMailboxView {
|
|||||||
color: responsiveUtils.isDesktop(context)
|
color: responsiveUtils.isDesktop(context)
|
||||||
? AppColor.colorBgDesktop
|
? AppColor.colorBgDesktop
|
||||||
: Colors.white,
|
: Colors.white,
|
||||||
child: RefreshIndicator(
|
child: _buildListMailbox(context),
|
||||||
color: AppColor.primaryColor,
|
|
||||||
onRefresh: () async => controller.refreshAllMailbox(),
|
|
||||||
child: _buildListMailbox(context)
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
)),
|
)),
|
||||||
const QuotasView(),
|
const QuotasView(),
|
||||||
@@ -83,101 +80,115 @@ class MailboxView extends BaseMailboxView {
|
|||||||
Widget _buildListMailbox(BuildContext context) {
|
Widget _buildListMailbox(BuildContext context) {
|
||||||
return Stack(
|
return Stack(
|
||||||
children: [
|
children: [
|
||||||
SingleChildScrollView(
|
ScrollConfiguration(
|
||||||
controller: controller.mailboxListScrollController,
|
behavior: ScrollConfiguration.of(context).copyWith(
|
||||||
key: const PageStorageKey('mailbox_list'),
|
physics: const BouncingScrollPhysics(),
|
||||||
physics: const ClampingScrollPhysics(),
|
dragDevices: {
|
||||||
padding: EdgeInsetsDirectional.only(end: responsiveUtils.isDesktop(context) ? 16 : 0),
|
PointerDeviceKind.touch,
|
||||||
child: Column(children: [
|
PointerDeviceKind.mouse,
|
||||||
if (!responsiveUtils.isDesktop(context))
|
PointerDeviceKind.trackpad
|
||||||
buildUserInformation(context),
|
},
|
||||||
buildLoadingView(),
|
),
|
||||||
AppConfig.appGridDashboardAvailable && responsiveUtils.isWebNotDesktop(context)
|
child: RefreshIndicator(
|
||||||
? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
|
color: AppColor.primaryColor,
|
||||||
: const SizedBox.shrink(),
|
onRefresh: controller.refreshAllMailbox,
|
||||||
const SizedBox(height: 8),
|
child: SingleChildScrollView(
|
||||||
Obx(() {
|
controller: controller.mailboxListScrollController,
|
||||||
if (controller.defaultMailboxIsNotEmpty) {
|
key: const PageStorageKey('mailbox_list'),
|
||||||
return _buildMailboxCategory(
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
context,
|
padding: EdgeInsetsDirectional.only(end: responsiveUtils.isDesktop(context) ? 16 : 0),
|
||||||
MailboxCategories.exchange,
|
child: Column(children: [
|
||||||
controller.defaultRootNode
|
if (!responsiveUtils.isDesktop(context))
|
||||||
);
|
buildUserInformation(context),
|
||||||
} else {
|
buildLoadingView(),
|
||||||
return const SizedBox.shrink();
|
AppConfig.appGridDashboardAvailable && responsiveUtils.isWebNotDesktop(context)
|
||||||
}
|
? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
|
||||||
}),
|
: const SizedBox.shrink(),
|
||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
const Divider(color: AppColor.colorDividerMailbox, height: 1),
|
Obx(() {
|
||||||
const SizedBox(height: 13),
|
if (controller.defaultMailboxIsNotEmpty) {
|
||||||
Padding(
|
return _buildMailboxCategory(
|
||||||
padding: EdgeInsetsDirectional.only(
|
context,
|
||||||
start: responsiveUtils.isDesktop(context) ? 0 : 12,
|
MailboxCategories.exchange,
|
||||||
bottom: 8
|
controller.defaultRootNode
|
||||||
),
|
);
|
||||||
child: Row(
|
} else {
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
return const SizedBox.shrink();
|
||||||
children: [
|
}
|
||||||
Expanded(child: Text(
|
}),
|
||||||
AppLocalizations.of(context).folders,
|
const SizedBox(height: 8),
|
||||||
style: const TextStyle(
|
const Divider(color: AppColor.colorDividerMailbox, height: 1),
|
||||||
fontSize: 17,
|
const SizedBox(height: 13),
|
||||||
color: Colors.black,
|
Padding(
|
||||||
fontWeight: FontWeight.bold
|
padding: EdgeInsetsDirectional.only(
|
||||||
)
|
start: responsiveUtils.isDesktop(context) ? 0 : 12,
|
||||||
)),
|
bottom: 8
|
||||||
Padding(
|
),
|
||||||
padding: EdgeInsetsDirectional.only(end: responsiveUtils.isDesktop(context) ? 0 : 12),
|
child: Row(
|
||||||
child: Row(
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
buildIconWeb(
|
Expanded(child: Text(
|
||||||
minSize: 40,
|
AppLocalizations.of(context).folders,
|
||||||
iconPadding: EdgeInsets.zero,
|
style: const TextStyle(
|
||||||
icon: SvgPicture.asset(
|
fontSize: 17,
|
||||||
imagePaths.icSearchBar,
|
color: Colors.black,
|
||||||
colorFilter: AppColor.colorTextButton.asFilter(),
|
fontWeight: FontWeight.bold
|
||||||
fit: BoxFit.fill
|
)
|
||||||
),
|
|
||||||
onTap: () => controller.openSearchViewAction(context)
|
|
||||||
),
|
|
||||||
buildIconWeb(
|
|
||||||
minSize: 40,
|
|
||||||
iconSize: 20,
|
|
||||||
iconPadding: EdgeInsets.zero,
|
|
||||||
splashRadius: 15,
|
|
||||||
icon: SvgPicture.asset(
|
|
||||||
imagePaths.icAddNewFolder,
|
|
||||||
colorFilter: AppColor.colorTextButton.asFilter(),
|
|
||||||
fit: BoxFit.fill),
|
|
||||||
tooltip: AppLocalizations.of(context).new_mailbox,
|
|
||||||
onTap: () => controller.goToCreateNewMailboxView(context)),
|
|
||||||
],
|
|
||||||
)),
|
)),
|
||||||
]),
|
Padding(
|
||||||
|
padding: EdgeInsetsDirectional.only(end: responsiveUtils.isDesktop(context) ? 0 : 12),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
buildIconWeb(
|
||||||
|
minSize: 40,
|
||||||
|
iconPadding: EdgeInsets.zero,
|
||||||
|
icon: SvgPicture.asset(
|
||||||
|
imagePaths.icSearchBar,
|
||||||
|
colorFilter: AppColor.colorTextButton.asFilter(),
|
||||||
|
fit: BoxFit.fill
|
||||||
|
),
|
||||||
|
onTap: () => controller.openSearchViewAction(context)
|
||||||
|
),
|
||||||
|
buildIconWeb(
|
||||||
|
minSize: 40,
|
||||||
|
iconSize: 20,
|
||||||
|
iconPadding: EdgeInsets.zero,
|
||||||
|
splashRadius: 15,
|
||||||
|
icon: SvgPicture.asset(
|
||||||
|
imagePaths.icAddNewFolder,
|
||||||
|
colorFilter: AppColor.colorTextButton.asFilter(),
|
||||||
|
fit: BoxFit.fill),
|
||||||
|
tooltip: AppLocalizations.of(context).new_mailbox,
|
||||||
|
onTap: () => controller.goToCreateNewMailboxView(context)),
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
Obx(() {
|
||||||
|
if (controller.personalMailboxIsNotEmpty) {
|
||||||
|
return _buildMailboxCategory(
|
||||||
|
context,
|
||||||
|
MailboxCategories.personalFolders,
|
||||||
|
controller.personalRootNode
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return const SizedBox.shrink();
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
Obx(() {
|
||||||
|
if (controller.teamMailboxesIsNotEmpty) {
|
||||||
|
return _buildMailboxCategory(
|
||||||
|
context,
|
||||||
|
MailboxCategories.teamMailboxes,
|
||||||
|
controller.teamMailboxesRootNode
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return const SizedBox.shrink();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
])
|
||||||
),
|
),
|
||||||
Obx(() {
|
),
|
||||||
if (controller.personalMailboxIsNotEmpty) {
|
|
||||||
return _buildMailboxCategory(
|
|
||||||
context,
|
|
||||||
MailboxCategories.personalFolders,
|
|
||||||
controller.personalRootNode
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
Obx(() {
|
|
||||||
if (controller.teamMailboxesIsNotEmpty) {
|
|
||||||
return _buildMailboxCategory(
|
|
||||||
context,
|
|
||||||
MailboxCategories.teamMailboxes,
|
|
||||||
controller.teamMailboxesRootNode
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
}
|
|
||||||
})
|
|
||||||
])
|
|
||||||
),
|
),
|
||||||
Obx(() => controller.mailboxDashBoardController.isDraggingMailbox && controller.activeScrollTop
|
Obx(() => controller.mailboxDashBoardController.isDraggingMailbox && controller.activeScrollTop
|
||||||
? Align(
|
? Align(
|
||||||
|
|||||||
Reference in New Issue
Block a user