migrate flutter3.0

lib/data/model/app/menu_item.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:toolbox/data/res/color.dart';
 
-class MenuItem {
+class DropdownBtnItem {
   final String text;
   final IconData icon;
 
-  const MenuItem({
+  const DropdownBtnItem({
     required this.text,
     required this.icon,
   });
@@ -24,19 +24,21 @@ class MenuItem {
 }
 
 class ServerTabMenuItems {
-  static const List<MenuItem> firstItems = [sftp, snippet, apt, docker];
-  static const List<MenuItem> secondItems = [edit];
+  static const List<DropdownBtnItem> firstItems = [sftp, snippet, apt, docker];
+  static const List<DropdownBtnItem> secondItems = [edit];
 
-  static const sftp = MenuItem(text: 'SFTP', icon: Icons.insert_drive_file);
-  static const snippet = MenuItem(text: 'Snippet', icon: Icons.label);
+  static const sftp =
+      DropdownBtnItem(text: 'SFTP', icon: Icons.insert_drive_file);
+  static const snippet = DropdownBtnItem(text: 'Snippet', icon: Icons.label);
   static const apt =
-      MenuItem(text: 'Apt/Yum', icon: Icons.system_security_update);
-  static const docker = MenuItem(text: 'Docker', icon: Icons.view_agenda);
-  static const edit = MenuItem(text: 'Edit', icon: Icons.edit);
+      DropdownBtnItem(text: 'Apt/Yum', icon: Icons.system_security_update);
+  static const docker =
+      DropdownBtnItem(text: 'Docker', icon: Icons.view_agenda);
+  static const edit = DropdownBtnItem(text: 'Edit', icon: Icons.edit);
 }
 
 class DockerMenuItems {
-  static const rm = MenuItem(text: 'Remove', icon: Icons.delete);
-  static const start = MenuItem(text: 'Start', icon: Icons.play_arrow);
-  static const stop = MenuItem(text: 'Stop', icon: Icons.stop);
+  static const rm = DropdownBtnItem(text: 'Remove', icon: Icons.delete);
+  static const start = DropdownBtnItem(text: 'Start', icon: Icons.play_arrow);
+  static const stop = DropdownBtnItem(text: 'Stop', icon: Icons.stop);
 }

lib/data/provider/apt.dart

@@ -92,17 +92,20 @@ class AptProvider extends BusyProvider {
   Future<String> _update() async {
     switch (dist) {
       case Distribution.rehl:
-        return await client!.run(_wrap('yum check-update')).string;
+        return await client?.run(_wrap('yum check-update')).string ?? '';
       default:
         final session = await client!.execute(_wrap('apt update'));
         session.stderr.listen((event) => _onPwd(event, session.stdin));
         session.stdout.listen((event) {
           updateLog = (updateLog ?? '') + event.string;
           notifyListeners();
-          onUpdate!();
+          onUpdate ?? () {}();
         });
         await session.done;
-        return await client!.run('apt list --upgradeable'.withLangExport).string;
+        return await client
+                ?.run('apt list --upgradeable'.withLangExport)
+                .string ??
+            '';
     }
   }
 
@@ -151,7 +154,7 @@ class AptProvider extends BusyProvider {
       if (pwd.isEmpty) {
         logger.info('sudo password request cancelled');
       }
-      stdin.add(Uint8List.fromList(utf8.encode(pwd + '\n')));
+      stdin.add(Uint8List.fromList(utf8.encode('$pwd\n')));
     }
   }
 

lib/data/provider/debug.dart

@@ -34,8 +34,8 @@ class DebugProvider extends ChangeNotifier {
       ),
     );
     _addWidget(SingleChildScrollView(
-      child: widget,
       scrollDirection: Axis.horizontal,
+      child: widget,
     ));
   }
 

lib/data/provider/docker.dart

@@ -31,7 +31,6 @@ class DockerProvider extends BusyProvider {
     }
 
     final verRaw = await client!.run('docker version'.withLangExport).string;
-    print(verRaw);
     if (verRaw.contains(dockerNotFound)) {
       error = 'docker not found';
       notifyListeners();

lib/data/provider/server.dart

@@ -182,7 +182,7 @@ class ServerProvider extends BusyProvider {
             .run("echo '$shellCmd' > $shellPath && chmod +x $shellPath");
       } catch (e) {
         _servers[idx].connectionState = ServerConnectionState.failed;
-        _servers[idx].status.failedInfo = e.toString() + ' ## ';
+        _servers[idx].status.failedInfo = '$e ## ';
         logger.warning(e);
       } finally {
         notifyListeners();
@@ -264,9 +264,7 @@ class ServerProvider extends BusyProvider {
       }
       idx++;
     }
-    return (int.parse(value.split('\n')[idx].trim()) / 1000)
-            .toStringAsFixed(1) +
-        '°C';
+    return '${(int.parse(value.split('\n')[idx].trim()) / 1000).toStringAsFixed(1)}°C';
   }
 
   void _getCPU(

lib/data/res/build_data.dart

@@ -2,9 +2,9 @@
 
 class BuildData {
   static const String name = "ServerBox";
-  static const int build = 133;
+  static const int build = 134;
   static const String engine =
-      "Flutter 2.10.5 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 5464c5bac7 (3 weeks ago) • 2022-04-18 09:55:37 -0700\nEngine • revision 57d3bac3dd\nTools • Dart 2.16.2 • DevTools 2.9.2\n";
-  static const String buildAt = "2022-05-10 21:49:33.780998";
-  static const int modifications = 1;
+      "Flutter 3.0.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision ee4e09cce0 (2 days ago) • 2022-05-09 16:45:18 -0700\nEngine • revision d1b9a6938a\nTools • Dart 2.17.0 • DevTools 2.12.2\n";
+  static const String buildAt = "2022-05-12 14:31:57.568409";
+  static const int modifications = 37;
 }

lib/data/res/url.dart

@@ -1,5 +1,5 @@
 const backendUrl = 'https://res.lolli.tech';
-const baseUrl = backendUrl + '/toolbox';
+const baseUrl = '$backendUrl/toolbox';
 const joinQQGroupUrl = 'https://jq.qq.com/?_wv=1027&k=G0hUmPAq';
 const myGithub = 'https://github.com/LollipopKit';
 const rainSunMeGithub = 'https://github.com/RainSunMe';