From 1184841c247b25fa5b2357ff32a32bba27041e3a Mon Sep 17 00:00:00 2001 From: Junyuan Feng Date: Tue, 8 Feb 2022 21:33:14 +0800 Subject: [PATCH] Check drawer state when back. --- lib/data/model/app/menu_item.dart | 2 +- lib/data/res/build_data.dart | 6 +++--- lib/view/page/home.dart | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/data/model/app/menu_item.dart b/lib/data/model/app/menu_item.dart index 1a0d75b8..0ca6fedb 100644 --- a/lib/data/model/app/menu_item.dart +++ b/lib/data/model/app/menu_item.dart @@ -32,4 +32,4 @@ class MenuItems { ], ); } -} \ No newline at end of file +} diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 4747778b..1e01cbfc 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 94; + static const int build = 95; static const String engine = "Flutter 2.10.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 5f105a6ca7 (7 days ago) • 2022-02-01 14:15:42 -0800\nEngine • revision 776efd2034\nTools • Dart 2.16.0 • DevTools 2.9.2\n"; - static const String buildAt = "2022-02-08 21:12:52.441728"; - static const int modifications = 0; + static const String buildAt = "2022-02-08 21:30:51.218738"; + static const int modifications = 3; } diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index 11bdcec7..499000b3 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -83,6 +83,18 @@ class _MyHomePageState extends State Widget build(BuildContext context) { setTransparentNavigationBar(context); super.build(context); + return WillPopScope( + child: _buildMain(context), + onWillPop: () { + if (_advancedDrawerController.value.visible) { + _advancedDrawerController.hideDrawer(); + return Future.value(false); + } + return Future.value(true); + }); + } + + Widget _buildMain(BuildContext context) { return AdvancedDrawer( controller: _advancedDrawerController, animationCurve: Curves.easeInOutCirc,