rm dep. menu & optimize

lib/view/page/convert.dart

@@ -44,22 +44,20 @@ class _ConvertPageState extends State<ConvertPage>
   Widget build(BuildContext context) {
     super.build(context);
     return Scaffold(
-      body: GestureDetector(
-        child: SingleChildScrollView(
-            padding: const EdgeInsets.symmetric(horizontal: 7),
-            controller: ScrollController(),
-            child: Column(children: [
-              const SizedBox(height: 13),
-              _buildInputTop(),
-              _buildTypeOption(),
-              _buildResult(),
-            ])),
-        onTap: () => FocusScope.of(context).requestFocus(FocusNode()),
-      ),
+      body: SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(horizontal: 7),
+          controller: ScrollController(),
+          child: Column(children: [
+            const SizedBox(height: 13),
+            _buildInputTop(),
+            _buildTypeOption(),
+            _buildResult(),
+          ])),
       floatingActionButton: FloatingActionButton(
         onPressed: () {
           try {
             _textEditingControllerResult.text = doConvert();
+            FocusScope.of(context).requestFocus(FocusNode());
           } catch (e) {
             showSnackBar(context, Text('Error: \n$e'));
           }
@@ -89,8 +87,7 @@ class _ConvertPageState extends State<ConvertPage>
   Widget _buildInputTop() {
     return SizedBox(
       height: _media.size.height * 0.33,
-      child: buildInput(context, _textEditingController,
-          onSubmitted: (_) => _textEditingControllerResult.text = doConvert()),
+      child: buildInput(context, _textEditingController),
     );
   }
 
@@ -159,8 +156,8 @@ class _ConvertPageState extends State<ConvertPage>
                   title: Text(
                     e,
                     style: TextStyle(
-                        color:
-                            _theme.textTheme.bodyText2!.color!.withAlpha(177)),
+                      color: _theme.textTheme.bodyText2!.color!.withAlpha(177),
+                    ),
                   ),
                   trailing: _buildRadio(typeOption.indexOf(e)),
                 ))

lib/view/page/home.dart

@@ -1,7 +1,6 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_advanced_drawer/flutter_advanced_drawer.dart';
 import 'package:get_it/get_it.dart';
 import 'package:toolbox/core/analysis.dart';
 import 'package:toolbox/core/build_mode.dart';
@@ -46,7 +45,6 @@ class _MyHomePageState extends State<MyHomePage>
         WidgetsBindingObserver {
   late final ServerProvider _serverProvider;
   late final PageController _pageController;
-  late final AdvancedDrawerController _advancedDrawerController;
   late int _selectIndex;
   late double _width;
   late S s;
@@ -58,7 +56,6 @@ class _MyHomePageState extends State<MyHomePage>
     WidgetsBinding.instance.addObserver(this);
     _selectIndex = locator<SettingStore>().launchPage.fetch()!;
     _pageController = PageController(initialPage: _selectIndex);
-    _advancedDrawerController = AdvancedDrawerController();
   }
 
   @override
@@ -92,8 +89,9 @@ class _MyHomePageState extends State<MyHomePage>
     return WillPopScope(
         child: _buildMain(context),
         onWillPop: () {
-          if (_advancedDrawerController.value.visible) {
-            _advancedDrawerController.hideDrawer();
+          final scaffold = Scaffold.of(context);
+          if (scaffold.isDrawerOpen) {
+            scaffold.closeDrawer();
             return Future.value(false);
           }
           return Future.value(true);
@@ -101,63 +99,31 @@ class _MyHomePageState extends State<MyHomePage>
   }
 
   Widget _buildMain(BuildContext context) {
-    return AdvancedDrawer(
-        controller: _advancedDrawerController,
-        animationCurve: Curves.easeInOut,
-        animationDuration: const Duration(milliseconds: 300),
-        animateChildDecoration: true,
-        rtlOpening: false,
-        childDecoration: const BoxDecoration(
-          // NOTICE: Uncomment if you want to add shadow behind the page.
-          // Keep in mind that it may cause animation jerks.
-          // boxShadow: <BoxShadow>[
-          //   BoxShadow(
-          //     color: Colors.black12,
-          //     blurRadius: 0.0,
-          //   ),
-          // ],
-          borderRadius: BorderRadius.all(Radius.circular(16)),
-        ),
-        drawer: _buildDrawer(),
-        child: Scaffold(
-          appBar: AppBar(
-            title: Text(tabTitleName(context, _selectIndex), style: size18),
-            actions: [
-              IconButton(
-                icon: const Icon(Icons.developer_mode, size: 23),
-                tooltip: s.debug,
-                onPressed: () =>
-                    AppRoute(const DebugPage(), 'Debug Page').go(context),
-              ),
-            ],
-            leading: IconButton(
-              onPressed: () => _advancedDrawerController.showDrawer(),
-              icon: ValueListenableBuilder<AdvancedDrawerValue>(
-                valueListenable: _advancedDrawerController,
-                builder: (_, value, __) {
-                  return AnimatedSwitcher(
-                    duration: const Duration(milliseconds: 250),
-                    child: Icon(
-                      value.visible ? Icons.clear : Icons.menu,
-                      key: ValueKey<bool>(value.visible),
-                    ),
-                  );
-                },
-              ),
-            ),
+    return Scaffold(
+      drawer: _buildDrawer(),
+      appBar: AppBar(
+        title: Text(tabTitleName(context, _selectIndex), style: size18),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.developer_mode, size: 23),
+            tooltip: s.debug,
+            onPressed: () =>
+                AppRoute(const DebugPage(), 'Debug Page').go(context),
           ),
-          body: PageView(
-            physics: const ClampingScrollPhysics(),
-            controller: _pageController,
-            onPageChanged: (i) {
-              FocusScope.of(context).unfocus();
-              _selectIndex = i;
-              setState(() {});
-            },
-            children: const [ServerPage(), ConvertPage(), PingPage()],
-          ),
-          bottomNavigationBar: _buildBottom(context),
-        ));
+        ],
+      ),
+      body: PageView(
+        physics: const ClampingScrollPhysics(),
+        controller: _pageController,
+        onPageChanged: (i) {
+          FocusScope.of(context).unfocus();
+          _selectIndex = i;
+          setState(() {});
+        },
+        children: const [ServerPage(), ConvertPage(), PingPage()],
+      ),
+      bottomNavigationBar: _buildBottom(context),
+    );
   }
 
   Widget _buildItem(int idx, NavigationItem item, bool isSelected) {
@@ -208,7 +174,7 @@ class _MyHomePageState extends State<MyHomePage>
   }
 
   Widget _buildDrawer() {
-    return SafeArea(
+    return Drawer(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [

lib/view/page/ping.dart

@@ -44,14 +44,12 @@ class _PingPageState extends State<PingPage>
   Widget build(BuildContext context) {
     super.build(context);
     return Scaffold(
-      body: GestureDetector(
-        child: SingleChildScrollView(
+      body: SingleChildScrollView(
             padding: const EdgeInsets.symmetric(horizontal: 7),
             child: Column(children: [
               const SizedBox(height: 13),
               buildInput(context, _textEditingController,
                   maxLines: 1, onSubmitted: (_) => doPing()),
-              _buildControl(),
               SizedBox(
                 width: double.infinity,
                 height: _media.size.height * 0.6,
@@ -64,7 +62,15 @@ class _PingPageState extends State<PingPage>
                     }),
               ),
             ])),
-        onTap: () => FocusScope.of(context).requestFocus(FocusNode()),
+      floatingActionButton: FloatingActionButton(
+        child: const Icon(Icons.play_arrow),
+        onPressed: () {
+          try {
+            doPing();
+          } catch (e) {
+            showSnackBar(context, Text('Error: \n$e'));
+          }
+        },
       ),
     );
   }
@@ -122,59 +128,6 @@ class _PingPageState extends State<PingPage>
     }));
   }
 
-  Widget _buildControl() {
-    return SizedBox(
-      height: 57,
-      child: RoundRectCard(
-        InkWell(
-          onTap: () => FocusScope.of(context).unfocus(),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              TextButton(
-                style: ButtonStyle(
-                    foregroundColor: MaterialStateProperty.all(primaryColor)),
-                child: Row(
-                  children: [
-                    const Icon(Icons.delete),
-                    const SizedBox(
-                      width: 7,
-                    ),
-                    Text(s.clear)
-                  ],
-                ),
-                onPressed: () {
-                  _results.clear();
-                  setState(() {});
-                },
-              ),
-              TextButton(
-                style: ButtonStyle(
-                    foregroundColor: MaterialStateProperty.all(primaryColor)),
-                child: Row(
-                  children: [
-                    const Icon(Icons.play_arrow),
-                    const SizedBox(
-                      width: 7,
-                    ),
-                    Text(s.start)
-                  ],
-                ),
-                onPressed: () {
-                  try {
-                    doPing();
-                  } catch (e) {
-                    showSnackBar(context, Text('Error: \n$e'));
-                  }
-                },
-              )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
   @override
   bool get wantKeepAlive => true;
 }