Replace WillPopScope to PopScope
(cherry picked from commit 0c610bd08916fc91273994e1a961247432b58e75)
This commit is contained in:
@@ -34,11 +34,9 @@ class MobileContainerView extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return WillPopScope(
|
return PopScope(
|
||||||
onWillPop: () async {
|
onPopInvoked: (didPop) => !didPop ? onCloseViewAction : null,
|
||||||
onCloseViewAction.call();
|
canPop: false,
|
||||||
return false;
|
|
||||||
},
|
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: onClearFocusAction,
|
onTap: onClearFocusAction,
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
|
|||||||
@@ -31,11 +31,9 @@ class TabletContainerView extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return WillPopScope(
|
return PopScope(
|
||||||
onWillPop: () async {
|
onPopInvoked: (didPop) => !didPop ? onCloseViewAction : null,
|
||||||
onCloseViewAction.call();
|
canPop: false,
|
||||||
return false;
|
|
||||||
},
|
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: onClearFocusAction,
|
onTap: onClearFocusAction,
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
|
|||||||
@@ -1199,6 +1199,18 @@ class ThreadController extends BaseController with EmailActionController {
|
|||||||
return DismissDirection.startToEnd;
|
return DismissDirection.startToEnd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool get inboxMailboxSelected => mailboxDashBoardController.selectedMailbox.value?.isInbox == true;
|
||||||
|
|
||||||
|
bool get systemBackGesturesEnable => inboxMailboxSelected && !mailboxDashBoardController.isDrawerOpen;
|
||||||
|
|
||||||
|
void backButtonPressedCallbackAction(BuildContext context) {
|
||||||
|
if (mailboxDashBoardController.isDrawerOpen) {
|
||||||
|
mailboxDashBoardController.closeMailboxMenuDrawer();
|
||||||
|
} else {
|
||||||
|
mailboxDashBoardController.openDefaultMailbox();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void scrollToTop() {
|
void scrollToTop() {
|
||||||
if (listEmailController.hasClients) {
|
if (listEmailController.hasClients) {
|
||||||
listEmailController.animateTo(0, duration: const Duration(milliseconds: 500), curve: Curves.fastOutSlowIn);
|
listEmailController.animateTo(0, duration: const Duration(milliseconds: 500), curve: Curves.fastOutSlowIn);
|
||||||
|
|||||||
Reference in New Issue
Block a user