migrate flutter3.0

analysis_options.yaml

@@ -22,6 +22,8 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
+    library_private_types_in_public_api: false
+    use_build_context_synchronously: false
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
 

ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - countly_flutter (20.11.4):
+  - countly_flutter (21.11.0):
     - Flutter
   - Flutter (1.0.0)
   - flutter_native_splash (0.0.1):
@@ -39,7 +39,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  countly_flutter: 38419412e193a1faa5babeb5d28a63fda260687d
+  countly_flutter: e245f94349d8adf306c22e60c10648c69aae7380
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02

ios/Runner.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 129;
+				CURRENT_PROJECT_VERSION = 134;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -362,7 +362,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.129;
+				MARKETING_VERSION = 1.0.134;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -484,7 +484,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 129;
+				CURRENT_PROJECT_VERSION = 134;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -492,7 +492,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.129;
+				MARKETING_VERSION = 1.0.134;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -508,7 +508,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 129;
+				CURRENT_PROJECT_VERSION = 134;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -516,7 +516,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.129;
+				MARKETING_VERSION = 1.0.134;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Runner/Info.plist

@@ -46,5 +46,7 @@
 		    <string>en</string>
 		    <string>zh</string>
 		</array>
-	</dict>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
-</plist>
+	<true/>
+</dict>
+</plist>

lib/core/analysis.dart

@@ -1,6 +1,9 @@
 import 'dart:async';
+import 'dart:io';
 
+import 'package:countly_flutter/countly_config.dart';
 import 'package:countly_flutter/countly_flutter.dart';
+import 'package:logging/logging.dart';
 
 class Analysis {
   static const _url = 'https://countly.xuty.cc';
@@ -9,12 +12,18 @@ class Analysis {
   static bool _enabled = false;
 
   static Future<void> init(bool debug) async {
-    _enabled = true;
+    if (Platform.isAndroid || Platform.isIOS) {
-    await Countly.setLoggingEnabled(debug);
+      _enabled = true;
-    await Countly.init(_url, _key);
+      final config = CountlyConfig(_url, _key)
-    await Countly.start();
+          .setLoggingEnabled(debug)
-    await Countly.enableCrashReporting();
+          .enableCrashReporting();
-    await Countly.giveAllConsent();
+      await Countly.initWithConfig(config);
+      await Countly.start();
+      await Countly.giveAllConsent();
+    } else {
+      Logger('COUNTLY')
+        .info('Unsupported platform ${Platform.operatingSystem}');
+    }
   }
 
   static void recordView(String view) {

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<DropdownBtnItem> firstItems = [sftp, snippet, apt, docker];
-  static const List<MenuItem> secondItems = [edit];
+  static const List<DropdownBtnItem> secondItems = [edit];
 
-  static const sftp = MenuItem(text: 'SFTP', icon: Icons.insert_drive_file);
+  static const sftp =
-  static const snippet = MenuItem(text: 'Snippet', icon: Icons.label);
+      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);
+      DropdownBtnItem(text: 'Apt/Yum', icon: Icons.system_security_update);
-  static const docker = MenuItem(text: 'Docker', icon: Icons.view_agenda);
+  static const docker =
-  static const edit = MenuItem(text: 'Edit', icon: Icons.edit);
+      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 rm = DropdownBtnItem(text: 'Remove', icon: Icons.delete);
-  static const start = MenuItem(text: 'Start', icon: Icons.play_arrow);
+  static const start = DropdownBtnItem(text: 'Start', icon: Icons.play_arrow);
-  static const stop = MenuItem(text: 'Stop', icon: Icons.stop);
+  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)
+    return '${(int.parse(value.split('\n')[idx].trim()) / 1000).toStringAsFixed(1)}°C';
-            .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";
+      "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-10 21:49:33.780998";
+  static const String buildAt = "2022-05-12 14:31:57.568409";
-  static const int modifications = 1;
+  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';

lib/generated/intl/messages_zh.dart

@@ -41,7 +41,7 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static String m8(myGithub) => "\n用❤️制作 by ${myGithub}";
 
-  static String m9(user) => "用户${user}的密码";
+  static String m9(user) => "${user}的密码";
 
   static String m10(url) => "请到 ${url} 提交问题";
 

lib/l10n/intl_zh.arb

@@ -112,7 +112,7 @@
     "noUpdateAvailable": "没有可用更新",
     "foundNUpdate": "找到 {count} 个更新",
     "updateAll": "更新全部",
-    "pwdForUser": "用户{user}的密码",
+    "pwdForUser": "{user}的密码",
     "platformNotSupportUpdate": "当前平台不支持更新，请编译最新源码后手动安装",
     "invalidVersionHelp": "请确保正确安装了docker，或者使用的非自编译版本。如果没有以上问题，请在 {url} 提交问题。",
     "noInterface": "没有可用的接口"

lib/view/page/apt.dart

@@ -60,12 +60,15 @@ class _AptManagePageState extends State<AptManagePage>
 
     // ignore: prefer_function_declarations_over_variables
     PwdRequestFunc onPwdRequest = (user) async {
+      if (!mounted) return '';
       final textController = TextEditingController();
       await showRoundDialog(
           context,
           s.pwdForUser(user ?? s.unknown),
           TextField(
             controller: textController,
+            keyboardType: TextInputType.visiblePassword,
+            obscureText: true,
             decoration: InputDecoration(
               labelText: s.pwd,
             ),
@@ -153,7 +156,8 @@ class _AptManagePageState extends State<AptManagePage>
             Padding(
               padding: const EdgeInsets.all(17),
               child: UrlText(
-                text: '${s.experimentalFeature}\n${s.reportBugsOnGithubIssue(issueUrl)}',
+                text:
+                    '${s.experimentalFeature}\n${s.reportBugsOnGithubIssue(issueUrl)}',
                 replace: 'Github Issue',
                 textAlign: TextAlign.center,
               ),

lib/view/page/convert.dart

@@ -96,7 +96,7 @@ class _ConvertPageState extends State<ConvertPage>
   Widget _buildTypeOption() {
     final decode = s.decode;
     final encode = s.encode;
-    final List<String> _typeOption = [
+    final List<String> typeOption = [
       'Base64 $decode',
       'Base64 $encode',
       'URL $encode',
@@ -135,7 +135,7 @@ class _ConvertPageState extends State<ConvertPage>
             crossAxisAlignment: CrossAxisAlignment.start,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Text(_typeOption[_typeOptionIndex],
+              Text(typeOption[_typeOptionIndex],
                   textScaleFactor: 1.0,
                   textAlign: TextAlign.left,
                   style: TextStyle(
@@ -151,7 +151,7 @@ class _ConvertPageState extends State<ConvertPage>
             ],
           ),
         ),
-        children: _typeOption
+        children: typeOption
             .map((e) => ListTile(
                   title: Text(
                     e,
@@ -159,7 +159,7 @@ class _ConvertPageState extends State<ConvertPage>
                         color:
                             _theme.textTheme.bodyText2!.color!.withAlpha(177)),
                   ),
-                  trailing: _buildRadio(_typeOption.indexOf(e)),
+                  trailing: _buildRadio(typeOption.indexOf(e)),
                 ))
             .toList(),
       ),

lib/view/page/docker.dart

@@ -26,7 +26,6 @@ class DockerManagePage extends StatefulWidget {
 class _DockerManagePageState extends State<DockerManagePage> {
   final _docker = locator<DockerProvider>();
   final greyTextStyle = const TextStyle(color: Colors.grey);
-  late MediaQueryData _media;
   late S s;
 
   @override
@@ -38,7 +37,6 @@ class _DockerManagePageState extends State<DockerManagePage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _media = MediaQuery.of(context);
     s = S.of(context);
   }
 
@@ -72,17 +70,25 @@ class _DockerManagePageState extends State<DockerManagePage> {
     return Consumer<DockerProvider>(builder: (_, docker, __) {
       final running = docker.items;
       if (docker.error != null && running == null) {
-        return SizedBox.expand(child: Column(
+        return SizedBox.expand(
-          mainAxisAlignment: MainAxisAlignment.center,
+          child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
-          children: [
+            crossAxisAlignment: CrossAxisAlignment.center,
-            const Icon(Icons.error, size: 37,),
+            children: [
-            const SizedBox(height: 27),
+              const Icon(
-            Text(docker.error!),
+                Icons.error,
-            const SizedBox(height: 27),
+                size: 37,
-            Padding(padding: const EdgeInsets.all(17), child: _buildSolution(docker.error!),)
+              ),
-          ],
+              const SizedBox(height: 27),
-        ),);
+              Text(docker.error!),
+              const SizedBox(height: 27),
+              Padding(
+                padding: const EdgeInsets.all(17),
+                child: _buildSolution(docker.error!),
+              )
+            ],
+          ),
+        );
       }
       if (running == null) {
         _docker.refresh();
@@ -109,7 +115,10 @@ class _DockerManagePageState extends State<DockerManagePage> {
       case 'no client':
         return Text(s.waitConnection);
       case 'invalid version':
-        return UrlText(text: s.invalidVersionHelp(issueUrl), replace: 'Github',);
+        return UrlText(
+          text: s.invalidVersionHelp(issueUrl),
+          replace: 'Github',
+        );
       default:
         return Text(s.unknownError);
     }
@@ -154,17 +163,17 @@ class _DockerManagePageState extends State<DockerManagePage> {
         ),
         customItemsHeight: 8,
         items: [
-          DropdownMenuItem<MenuItem>(
+          DropdownMenuItem<DropdownBtnItem>(
             value: item,
             child: item.build,
           ),
-          DropdownMenuItem<MenuItem>(
+          DropdownMenuItem<DropdownBtnItem>(
             value: DockerMenuItems.rm,
             child: DockerMenuItems.rm.build,
           ),
         ],
         onChanged: (value) {
-          final item = value as MenuItem;
+          final item = value as DropdownBtnItem;
           switch (item) {
             case DockerMenuItems.rm:
               _docker.delete(containerId);

lib/view/page/home.dart

@@ -53,7 +53,7 @@ class _MyHomePageState extends State<MyHomePage>
   void initState() {
     super.initState();
     _serverProvider = locator<ServerProvider>();
-    WidgetsBinding.instance?.addObserver(this);
+    WidgetsBinding.instance.addObserver(this);
     _selectIndex = locator<SettingStore>().launchPage.fetch()!;
     _pageController = PageController(initialPage: _selectIndex);
     _advancedDrawerController = AdvancedDrawerController();
@@ -69,7 +69,7 @@ class _MyHomePageState extends State<MyHomePage>
   @override
   void dispose() {
     super.dispose();
-    WidgetsBinding.instance?.removeObserver(this);
+    WidgetsBinding.instance.removeObserver(this);
   }
 
   @override
@@ -249,7 +249,6 @@ class _MyHomePageState extends State<MyHomePage>
                 ),
                 AboutListTile(
                   icon: const Icon(Icons.text_snippet),
-                  child: Text(s.license),
                   applicationName: BuildData.name,
                   applicationVersion: _buildVersionStr(),
                   applicationIcon: _buildIcon(),
@@ -261,6 +260,7 @@ class _MyHomePageState extends State<MyHomePage>
                       replace: 'RainSunMe',
                     ),
                   ],
+                  child: Text(s.license),
                 )
               ],
             ),

lib/view/page/ping.dart

@@ -80,9 +80,7 @@ class _PingPageState extends State<PingPage>
         style: summaryTextStyle,
       ),
       trailing: Text(
-          s.pingAvg +
+          '${s.pingAvg}${result.statistic?.avg?.toStringAsFixed(2) ?? s.unknown} $ms',
-              (result.statistic?.avg?.toStringAsFixed(2) ?? s.unknown) +
-              ' $ms',
           style: TextStyle(fontSize: 14, color: primaryColor)),
     ));
   }

lib/view/page/private_key/edit.dart

@@ -85,7 +85,6 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
         ],
       ),
       floatingActionButton: FloatingActionButton(
-        child: const Icon(Icons.save),
         tooltip: s.save,
         onPressed: () async {
           final name = nameController.text;
@@ -124,6 +123,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
           }
           Navigator.of(context).pop();
         },
+        child: const Icon(Icons.save),
       ),
     );
   }

lib/view/page/server/detail.dart

@@ -123,7 +123,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
       crossAxisAlignment: CrossAxisAlignment.end,
       children: [
         Text(
-          percent.toStringAsFixed(1) + '%',
+          '${percent.toStringAsFixed(1)}%',
           style: const TextStyle(fontSize: 13),
           textScaleFactor: 1.0,
         ),

lib/view/page/server/tab.dart

@@ -195,10 +195,9 @@ class _ServerPageState extends State<ServerPage>
           children: [
             _buildPercentCircle(ss.cpu2Status.usedPercent()),
             _buildPercentCircle(ss.memory.used / ss.memory.total * 100),
-            _buildIOData('Conn:\n' + ss.tcp.maxConn.toString(),
+            _buildIOData('Conn:\n${ss.tcp.maxConn}', 'Fail:\n${ss.tcp.fail}'),
-                'Fail:\n' + ss.tcp.fail.toString()),
+            _buildIOData(
-            _buildIOData('Total:\n' + rootDisk.size,
+                'Total:\n${rootDisk.size}', 'Used:\n${rootDisk.usedPercent}%')
-                'Used:\n' + rootDisk.usedPercent.toString() + '%')
           ],
         ),
         const SizedBox(height: 13),
@@ -229,21 +228,21 @@ class _ServerPageState extends State<ServerPage>
         customItemsHeight: 8,
         items: [
           ...ServerTabMenuItems.firstItems.map(
-            (item) => DropdownMenuItem<MenuItem>(
+            (item) => DropdownMenuItem<DropdownBtnItem>(
               value: item,
               child: item.build,
             ),
           ),
           const DropdownMenuItem<Divider>(enabled: false, child: Divider()),
           ...ServerTabMenuItems.secondItems.map(
-            (item) => DropdownMenuItem<MenuItem>(
+            (item) => DropdownMenuItem<DropdownBtnItem>(
               value: item,
               child: item.build,
             ),
           ),
         ],
         onChanged: (value) {
-          final item = value as MenuItem;
+          final item = value as DropdownBtnItem;
           switch (item) {
             case ServerTabMenuItems.apt:
               AppRoute(AptManagePage(spi), 'apt manage page').go(context);

lib/view/page/setting.dart

@@ -150,10 +150,6 @@ class _SettingPageState extends State<SettingPage> {
         textColor: priColor,
         tilePadding: roundRectCardPadding,
         childrenPadding: roundRectCardPadding,
-        children: [
-          _buildAppColorPicker(priColor),
-          _buildColorPickerConfirmBtn()
-        ],
         trailing: ClipOval(
           child: Container(
             color: priColor,
@@ -164,7 +160,11 @@ class _SettingPageState extends State<SettingPage> {
         title: Text(
           s.appPrimaryColor,
           style: textStyle,
-        ));
+        ),
+        children: [
+          _buildAppColorPicker(priColor),
+          _buildColorPickerConfirmBtn()
+        ]);
   }
 
   Widget _buildAppColorPicker(Color selected) {

lib/view/page/sftp/downloaded.dart

@@ -31,7 +31,7 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
     super.initState();
     sftpDownloadDir.then((dir) {
       _path = PathWithPrefix(dir.path);
-      _prefixPath = dir.path + '/';
+      _prefixPath = '${dir.path}/';
       setState(() {});
     });
   }
@@ -58,8 +58,8 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
         ],
       ),
       body: FadeIn(
-        child: _buildBody(),
         key: UniqueKey(),
+        child: _buildBody(),
       ),
       bottomNavigationBar: SafeArea(
         child: _buildPath(),

lib/view/page/sftp/view.dart

@@ -122,6 +122,7 @@ class _SFTPPageState extends State<SFTPPage> {
     } else {
       return RefreshIndicator(
           child: FadeIn(
+            key: Key(_status.spi!.name + _status.path!.path),
             child: ListView.builder(
               itemCount: _status.files!.length + 1,
               controller: _scrollController,
@@ -155,7 +156,6 @@ class _SFTPPageState extends State<SFTPPage> {
                 );
               },
             ),
-            key: Key(_status.spi!.name + _status.path!.path),
           ),
           onRefresh: () => listDir(path: _status.path?.path));
     }
@@ -277,7 +277,7 @@ class _SFTPPageState extends State<SFTPPage> {
                   return;
                 }
                 _status.client!
-                    .mkdir(_status.path!.path + '/' + textController.text);
+                    .mkdir('${_status.path!.path}/${textController.text}');
                 Navigator.of(context).pop();
                 listDir();
               },
@@ -316,7 +316,7 @@ class _SFTPPageState extends State<SFTPPage> {
                   return;
                 }
                 (await _status.client!
-                        .open(_status.path!.path + '/' + textController.text))
+                        .open('${_status.path!.path}/${textController.text}'))
                     .writeBytes(Uint8List(0));
                 Navigator.of(context).pop();
                 listDir();

lib/view/page/snippet/list.dart

@@ -215,6 +215,10 @@ class _SnippetListPageState extends State<SnippetListPage> {
           height: 111,
           child: Stack(children: [
             Positioned(
+              top: 36,
+              bottom: 36,
+              left: 0,
+              right: 0,
               child: Container(
                 height: 37,
                 decoration: const BoxDecoration(
@@ -222,10 +226,6 @@ class _SnippetListPageState extends State<SnippetListPage> {
                   color: Colors.black12,
                 ),
               ),
-              top: 36,
-              bottom: 36,
-              left: 0,
-              right: 0,
             ),
             ListWheelScrollView.useDelegate(
               itemExtent: 37,

lib/view/widget/round_rect_card.dart

@@ -8,10 +8,10 @@ class RoundRectCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Card(
-      child: child,
       clipBehavior: Clip.antiAlias,
       shape: const RoundedRectangleBorder(
           borderRadius: BorderRadius.all(Radius.circular(17))),
+      child: child,
     );
   }
 }

lib/view/widget/url_text.dart

@@ -22,11 +22,11 @@ class UrlText extends StatelessWidget {
   List<InlineSpan> _getTextSpans(bool isDarkMode) {
     List<InlineSpan> widgets = <InlineSpan>[];
     final reg = RegExp(regUrl);
-    Iterable<Match> _matches = reg.allMatches(text);
+    Iterable<Match> matches = reg.allMatches(text);
     List<_ResultMatch> resultMatches = <_ResultMatch>[];
     int start = 0;
 
-    for (Match match in _matches) {
+    for (Match match in matches) {
       final group0 = match.group(0);
       if (group0 != null && group0.isNotEmpty) {
         if (start != match.start) {

linux/flutter/generated_plugins.cmake

@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_linux
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

macos/Podfile.lock

@@ -25,7 +25,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
-  path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f
+  path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
   share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
   url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
 

make.dart

@@ -75,7 +75,7 @@ Future<void> updateBuildData() async {
 
 Future<void> dartFormat() async {
   final result = await Process.run('dart', ['format', '.']);
-  print('\n' + result.stdout);
+  print('\n${result.stdout}');
   if (result.exitCode != 0) {
     print(result.stderr);
     exit(1);

pubspec.lock

@@ -21,7 +21,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   asn1lib:
     dependency: transitive
     description:
@@ -86,7 +86,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   convert:
     dependency: transitive
     description:
@@ -99,10 +99,10 @@ packages:
     description:
       path: "."
       ref: master
-      resolved-ref: fb568d2e50714f65f85b822c343bb53f129b9f6f
+      resolved-ref: "585759048345ab7defdfd9cae3a6c76dc451fe51"
       url: "https://github.com/Countly/countly-sdk-flutter-bridge.git"
     source: git
-    version: "20.11.4"
+    version: "21.11.0"
   crypto:
     dependency: transitive
     description:
@@ -151,14 +151,14 @@ packages:
       name: extended_image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.3"
+    version: "6.2.0"
   extended_image_library:
     dependency: transitive
     description:
       name: extended_image_library
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.4"
+    version: "3.3.0"
   fading_edge_scrollview:
     dependency: transitive
     description:
@@ -172,7 +172,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   ffi:
     dependency: transitive
     description:
@@ -205,7 +205,7 @@ packages:
       name: flutter_lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.1"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -231,7 +231,7 @@ packages:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -292,7 +292,7 @@ packages:
     source: hosted
     version: "3.1.3"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       url: "https://pub.dartlang.org"
@@ -304,7 +304,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   lint:
     dependency: transitive
     description:
@@ -318,7 +318,7 @@ packages:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "2.0.0"
   logging:
     dependency: "direct main"
     description:
@@ -346,7 +346,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
@@ -374,56 +374,56 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.10"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.14"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.0.9"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   pedantic:
     dependency: transitive
     description:
@@ -437,7 +437,7 @@ packages:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.4.0"
+    version: "5.0.0"
   pinenacl:
     dependency: transitive
     description:
@@ -547,7 +547,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -582,7 +582,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.8"
+    version: "0.4.9"
   typed_data:
     dependency: transitive
     description:
@@ -603,35 +603,35 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.0"
+    version: "6.1.2"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.16"
+    version: "6.0.17"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.15"
+    version: "6.0.16"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -645,21 +645,21 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.11"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   win32:
     dependency: transitive
     description:
@@ -680,7 +680,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.3.1"
+    version: "5.4.1"
   yaml:
     dependency: transitive
     description:
@@ -689,5 +689,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.16.0 <3.0.0"
+  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=2.10.0"
+  flutter: ">=3.0.0"

pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.16.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -60,6 +60,7 @@ dependencies:
   path_provider: ^2.0.9
   easy_isolate: ^1.3.0
   share_plus: ^4.0.4
+  intl: ^0.17.0
 
 dev_dependencies:
   flutter_native_splash: ^2.1.6
@@ -71,7 +72,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^1.0.0
+  flutter_lints: ^2.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

windows/flutter/generated_plugins.cmake

@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_windows
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)