Merge branch 'main' of https://github.com/lollipopkit/flutter_server_box

ios/Runner.xcodeproj/project.pbxproj

@@ -586,7 +586,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -596,7 +596,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -720,7 +720,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -730,7 +730,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -748,7 +748,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -758,7 +758,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -779,7 +779,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -792,7 +792,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
@@ -818,7 +818,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -831,7 +831,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -854,7 +854,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -867,7 +867,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -890,7 +890,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -902,7 +902,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
@@ -931,7 +931,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -943,7 +943,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;
@@ -969,7 +969,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -981,7 +981,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;

lib/app.dart

@@ -9,7 +9,6 @@ import 'package:toolbox/data/res/build_data.dart';
 import 'package:toolbox/data/res/color.dart';
 import 'package:toolbox/data/res/rebuild.dart';
 import 'package:toolbox/data/res/store.dart';
-import 'package:toolbox/view/page/full_screen.dart';
 import 'package:toolbox/view/page/home.dart';
 
 class MyApp extends StatelessWidget {
@@ -76,9 +75,7 @@ class MyApp extends StatelessWidget {
       themeMode: themeMode,
       theme: light,
       darkTheme: tMode < 3 ? dark : _getAmoledTheme(dark),
-      home: Stores.setting.fullScreen.fetch()
+      home: const HomePage(),
-          ? const FullScreenPage()
-          : const HomePage(),
     );
   }
 }

lib/core/route.dart

@@ -21,7 +21,6 @@ import 'package:toolbox/view/page/storage/local.dart';
 import '../data/model/server/snippet.dart';
 import '../view/page/debug.dart';
 import '../view/page/editor.dart';
-import '../view/page/full_screen.dart';
 import '../view/page/process.dart';
 import '../view/page/server/edit.dart';
 import '../view/page/server/tab.dart';
@@ -175,9 +174,9 @@ class AppRoute {
         'editor');
   }
 
-  static AppRoute fullscreen({Key? key}) {
+  // static AppRoute fullscreen({Key? key}) {
-    return AppRoute(FullScreenPage(key: key), 'fullscreen');
+  //   return AppRoute(FullScreenPage(key: key), 'fullscreen');
-  }
+  // }
 
   static AppRoute home({Key? key}) {
     return AppRoute(HomePage(key: key), 'home');

lib/core/utils/sync/icloud.dart

@@ -28,6 +28,7 @@ abstract final class ICloud {
     String? localPath,
   }) async {
     final completer = Completer<ICloudErr?>();
+    try {
       await ICloudStorage.upload(
         containerId: _containerId,
         filePath: localPath ?? '${await Paths.doc}/$relativePath',
@@ -42,6 +43,11 @@ abstract final class ICloud {
           );
         },
       );
+    } catch (e, s) {
+      _logger.warning('Upload $relativePath failed', e, s);
+      completer.complete(ICloudErr(type: ICloudErrType.generic, message: '$e'));
+    }
+
     return completer.future;
   }
 
@@ -52,10 +58,14 @@ abstract final class ICloud {
   }
 
   static Future<void> delete(String relativePath) async {
+    try {
       await ICloudStorage.delete(
         containerId: _containerId,
         relativePath: relativePath,
       );
+    } catch (e, s) {
+      _logger.warning('Delete $relativePath failed', e, s);
+    }
   }
 
   /// Download file from iCloud

lib/data/model/container/version.dart

@@ -26,9 +26,7 @@ class ContainerdClient {
   final String version;
   final String goVersion;
   final String gitCommit;
-  final String? builtTime;
+  final String builtTime;
-  final int? built; // more fields should be marked nullable
-  final String? osArch;
   final String os;
 
   ContainerdClient({
@@ -37,8 +35,6 @@ class ContainerdClient {
     required this.goVersion,
     required this.gitCommit,
     required this.builtTime,
-    required this.built,
-    required this.osArch,
     required this.os,
   });
 
@@ -54,8 +50,6 @@ class ContainerdClient {
         goVersion: json["GoVersion"],
         gitCommit: json["GitCommit"],
         builtTime: json["BuildTime"],
-        built: json["Built"], // should be Build?
-        osArch: json["OsArch"],
         os: json["Os"],
       );
 
@@ -65,8 +59,6 @@ class ContainerdClient {
         "GoVersion": goVersion,
         "GitCommit": gitCommit,
         "BuildTime": builtTime,
-        "Built": built,
-        "OsArch": osArch,
         "Os": os,
       };
 }

lib/data/provider/container.dart

@@ -139,7 +139,6 @@ class ContainerProvider extends ChangeNotifier {
     try {
       final imgLines = imageRaw.split('\n');
       imgLines.removeWhere((element) => element.isEmpty);
-      if (imgLines.isNotEmpty) imgLines.removeAt(0);
       images = imgLines.map((e) => ContainerImg.fromRawJson(e, type)).toList();
     } catch (e, trace) {
       error = ContainerErr(

lib/data/res/build_data.dart

@@ -2,9 +2,9 @@
 
 class BuildData {
   static const String name = "ServerBox";
-  static const int build = 738;
+  static const int build = 740;
   static const String engine = "3.16.9";
-  static const String buildAt = "2024-02-02 19:59:49";
+  static const String buildAt = "2024-02-02 22:52:02";
-  static const int modifications = 6;
+  static const int modifications = 2;
   static const int script = 37;
 }

lib/data/res/github_id.dart

@@ -4,6 +4,7 @@ abstract final class GithubIds {
   // Thanks
   // If you want to change your Github ID, please open an issue.
   static const contributors = <GhId>{
+    'PaperCube',
     'its-tom',
     'azkadev',
     'kalashnikov',
@@ -57,5 +58,6 @@ abstract final class GithubIds {
     'bxoooooo',
     'KatharsisKing',
     'mervinniu',
+    'L-Super',
   };
 }

lib/data/store/setting.dart

@@ -100,7 +100,7 @@ class SettingStore extends PersistentStore {
   late final termFontSize = property('termFontSize', 13.0);
 
   // Locale
-  late final locale = property<String>('locale', '');
+  late final locale = property('locale', '');
 
   // SSH virtual key (ctrl | alt) auto turn off
   late final sshVirtualKeyAutoOff = property('sshVirtualKeyAutoOff', true);
@@ -118,20 +118,20 @@ class SettingStore extends PersistentStore {
     Defaults.editorDarkTheme,
   );
 
-  late final fullScreen = property(
+  // late final fullScreen = property(
-    'fullScreen',
+  //   'fullScreen',
-    false,
+  //   false,
-  );
+  // );
 
-  late final fullScreenJitter = property(
+  // late final fullScreenJitter = property(
-    'fullScreenJitter',
+  //   'fullScreenJitter',
-    true,
+  //   true,
-  );
+  // );
 
-  late final fullScreenRotateQuarter = property(
+  // late final fullScreenRotateQuarter = property(
-    'fullScreenRotateQuarter',
+  //   'fullScreenRotateQuarter',
-    1,
+  //   1,
-  );
+  // );
 
   late final keyboardType = property(
     'keyboardType',

lib/view/page/full_screen.dart

@@ -1,373 +0,0 @@
-import 'dart:async';
-import 'dart:math';
-
-import 'package:after_layout/after_layout.dart';
-import 'package:circle_chart/circle_chart.dart';
-import 'package:flutter/material.dart';
-import 'package:get_it/get_it.dart';
-import 'package:provider/provider.dart';
-import 'package:toolbox/core/extension/context/locale.dart';
-import 'package:toolbox/core/route.dart';
-import 'package:toolbox/data/model/app/shell_func.dart';
-import 'package:toolbox/data/model/server/disk.dart';
-import 'package:toolbox/data/provider/server.dart';
-import 'package:toolbox/data/res/provider.dart';
-import 'package:toolbox/data/res/store.dart';
-import 'package:toolbox/data/res/ui.dart';
-
-import '../../core/analysis.dart';
-import '../../core/update.dart';
-import '../../core/utils/ui.dart';
-import '../../data/model/app/net_view.dart';
-import '../../data/model/server/server.dart';
-import '../../data/model/server/server_private_info.dart';
-import '../../data/res/color.dart';
-
-class FullScreenPage extends StatefulWidget {
-  const FullScreenPage({super.key});
-
-  @override
-  _FullScreenPageState createState() => _FullScreenPageState();
-}
-
-class _FullScreenPageState extends State<FullScreenPage> with AfterLayoutMixin {
-  late MediaQueryData _media;
-  late ThemeData _theme;
-  late Timer _timer;
-  late int _rotateQuarter;
-
-  final _pageController = PageController(initialPage: 0);
-
-  @override
-  void initState() {
-    super.initState();
-    switchStatusBar(hide: true);
-    _rotateQuarter = Stores.setting.fullScreenRotateQuarter.fetch();
-    _timer = Timer.periodic(const Duration(minutes: 1), (_) {
-      if (mounted) {
-        setState(() {});
-      } else {
-        _timer.cancel();
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    _timer.cancel();
-    _pageController.dispose();
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _media = MediaQuery.of(context);
-    _theme = Theme.of(context);
-  }
-
-  double get _offset {
-    // based on screen width
-    final x = _screenWidth * 0.03;
-    final r = Random().nextDouble();
-    final n = Random().nextBool() ? -1 : 1;
-    return n * x * r;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final offset = Offset(_offset, _offset);
-    return Scaffold(
-      body: SafeArea(
-        child: Padding(
-          // Avoid display cutout
-          // `_screenWidth * 0.03` is the offset value
-          padding: EdgeInsets.all(_screenWidth * 0.03),
-          child: ValueListenableBuilder<int>(
-            valueListenable:
-                Stores.setting.fullScreenRotateQuarter.listenable(),
-            builder: (_, val, __) {
-              _rotateQuarter = val;
-              return RotatedBox(
-                quarterTurns: val,
-                child: Transform.translate(
-                  offset: offset,
-                  child: Stack(
-                    children: [
-                      _buildMain(),
-                      Positioned(
-                        top: 0,
-                        left: 0,
-                        child: _buildSettingBtn(),
-                      ),
-                    ],
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  double get _screenWidth =>
-      _rotateQuarter % 2 == 0 ? _media.size.width : _media.size.height;
-  double get _screenHeight =>
-      _rotateQuarter % 2 == 0 ? _media.size.height : _media.size.width;
-
-  Widget _buildSettingBtn() {
-    return IconButton(
-        onPressed: () => AppRoute.settings().go(context),
-        icon: const Icon(Icons.settings, color: Colors.grey));
-  }
-
-  Widget _buildMain() {
-    return Consumer<ServerProvider>(builder: (_, pro, __) {
-      if (pro.serverOrder.isEmpty) {
-        return Center(
-          child: TextButton(
-              onPressed: () => AppRoute.serverEdit().go(context),
-              child: Text(
-                l10n.addAServer,
-                style: const TextStyle(fontSize: 27),
-              )),
-        );
-      }
-      return PageView.builder(
-        controller: _pageController,
-        itemCount: pro.serverOrder.length,
-        itemBuilder: (_, idx) {
-          final s = pro.pick(id: pro.serverOrder[idx]);
-          if (s == null) {
-            return Center(child: Text(l10n.noClient));
-          }
-          return _buildRealServerCard(s.status, s.state, s.spi);
-        },
-      );
-    });
-  }
-
-  Widget _buildRealServerCard(
-    ServerStatus ss,
-    ServerState cs,
-    ServerPrivateInfo spi,
-  ) {
-    final rootDisk = findRootDisk(ss.disk);
-
-    return InkWell(
-      onTap: () => AppRoute.serverDetail(spi: spi).go(context),
-      child: Stack(
-        children: [
-          Positioned(
-              top: 0,
-              left: 0,
-              right: 0,
-              child: _buildServerCardTitle(ss, cs, spi)),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              SizedBox(height: _screenWidth * 0.1),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
-                children: [
-                  _buildPercentCircle(ss.cpu.usedPercent()),
-                  _buildPercentCircle(ss.mem.usedPercent * 100),
-                  _buildNet(ss),
-                  _buildIOData(
-                    'Total:\n${rootDisk?.size}',
-                    'Used:\n${rootDisk?.usedPercent}%',
-                  )
-                ],
-              ),
-              SizedBox(height: _screenWidth * 0.1),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
-                children: [
-                  _buildExplainText('CPU'),
-                  _buildExplainText('Mem'),
-                  _buildExplainText('Net'),
-                  _buildExplainText('Disk'),
-                ],
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildServerCardTitle(
-    ServerStatus ss,
-    ServerState cs,
-    ServerPrivateInfo spi,
-  ) {
-    return Padding(
-      padding: EdgeInsets.symmetric(vertical: _screenWidth * 0.05),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          UIs.height13,
-          Row(
-            mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text(
-                spi.name,
-                style: const TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 19,
-                ),
-                textAlign: TextAlign.center,
-              ),
-              const Icon(
-                Icons.keyboard_arrow_right,
-                size: 21,
-                color: Colors.grey,
-              )
-            ],
-          ),
-          UIs.height13,
-          _buildTopRightText(ss, cs),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildTopRightText(ServerStatus ss, ServerState cs) {
-    final topRightStr = _getTopRightStr(
-      cs,
-      ss.temps.first,
-      ss.more[StatusCmdType.uptime] ?? '',
-      ss.err,
-    );
-    return Text(
-      topRightStr,
-      style: UIs.text11Grey,
-    );
-  }
-
-  Widget _buildExplainText(String text) {
-    return SizedBox(
-      width: _screenHeight * 0.2,
-      child: Text(
-        text,
-        style: const TextStyle(fontSize: 13),
-        textAlign: TextAlign.center,
-      ),
-    );
-  }
-
-  String _getTopRightStr(
-    ServerState cs,
-    double? temp,
-    String upTime,
-    String? failedInfo,
-  ) {
-    switch (cs) {
-      case ServerState.disconnected:
-        return l10n.disconnected;
-      case ServerState.connected:
-        final tempStr = temp == null ? '' : '${temp.toStringAsFixed(1)}°C';
-        final items = [tempStr, upTime];
-        final str = items.where((element) => element.isNotEmpty).join(' | ');
-        if (str.isEmpty) return l10n.serverTabLoading;
-        return str;
-      case ServerState.connecting:
-        return l10n.serverTabConnecting;
-      case ServerState.failed:
-        if (failedInfo == null) {
-          return l10n.serverTabFailed;
-        }
-        if (failedInfo.contains('encypted')) {
-          return l10n.serverTabPlzSave;
-        }
-        return failedInfo;
-      default:
-        return l10n.serverTabUnkown;
-    }
-  }
-
-  Widget _buildNet(ServerStatus ss) {
-    return ValueListenableBuilder<NetViewType>(
-      valueListenable: Stores.setting.netViewType.listenable(),
-      builder: (_, val, __) {
-        final (a, b) = val.build(ss);
-        return AnimatedSwitcher(
-          duration: const Duration(milliseconds: 177),
-          child: _buildIOData(a, b),
-        );
-      },
-    );
-  }
-
-  Widget _buildIOData(String up, String down) {
-    final statusTextStyle = TextStyle(
-        fontSize: 13, color: _theme.textTheme.bodyLarge!.color!.withAlpha(177));
-    return SizedBox(
-      width: _screenHeight * 0.23,
-      child: Column(
-        children: [
-          const SizedBox(height: 5),
-          Text(
-            up,
-            style: statusTextStyle,
-            textAlign: TextAlign.center,
-          ),
-          const SizedBox(height: 3),
-          Text(
-            down,
-            style: statusTextStyle,
-            textAlign: TextAlign.center,
-          )
-        ],
-      ),
-    );
-  }
-
-  Widget _buildPercentCircle(double percent) {
-    if (percent <= 0) percent = 0.01;
-    if (percent >= 100) percent = 99.9;
-    return SizedBox(
-      width: _screenHeight * 0.23,
-      child: Stack(
-        children: [
-          Center(
-            child: CircleChart(
-              progressColor: primaryColor,
-              progressNumber: percent,
-              animationDuration: const Duration(milliseconds: 377),
-              maxNumber: 100,
-              width: _screenWidth * 0.22,
-              height: _screenWidth * 0.22,
-            ),
-          ),
-          Positioned.fill(
-            child: Center(
-              child: Text(
-                '${percent.toStringAsFixed(1)}%',
-                textAlign: TextAlign.center,
-                style: const TextStyle(fontSize: 15),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  @override
-  Future<void> afterFirstLayout(BuildContext context) async {
-    if (Stores.setting.autoCheckAppUpdate.fetch()) {
-      doUpdate(context);
-    }
-    await GetIt.I.allReady();
-    await Pros.server.load();
-    await Pros.server.refresh();
-    if (!Analysis.enabled) {
-      await Analysis.init();
-    }
-  }
-}

lib/view/page/private_key/edit.dart

@@ -39,7 +39,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage> {
 
   late FocusScopeNode _focusScope;
 
-  Widget? _loading;
+  final _loading = ValueNotifier<Widget?>(null);
 
   @override
   void initState() {
@@ -134,9 +134,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage> {
           return;
         }
         FocusScope.of(context).unfocus();
-        setState(() {
+        _loading.value = UIs.centerSizedLoading;
-          _loading = UIs.centerSizedLoading;
-        });
         try {
           final decrypted = await Computer.shared.start(decyptPem, [key, pwd]);
           final pki = PrivateKeyInfo(id: name, key: decrypted);
@@ -149,9 +147,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage> {
           context.showSnackBar(e.toString());
           rethrow;
         } finally {
-          setState(() {
+          _loading.value = null;
-            _loading = null;
-          });
         }
         context.pop();
       },
@@ -219,7 +215,10 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage> {
           icon: Icons.password,
         ),
         SizedBox(height: MediaQuery.of(context).size.height * 0.1),
-        _loading ?? UIs.placeholder,
+        ValueListenableBuilder(
+          valueListenable: _loading,
+          builder: (_, val, __) => val ?? UIs.placeholder,
+        ),
       ],
     );
   }

lib/view/page/setting/entry.dart

@@ -51,7 +51,7 @@ class _SettingPageState extends State<SettingPage> {
   final _editorThemeKey = GlobalKey<PopupMenuButtonState<String>>();
   final _editorDarkThemeKey = GlobalKey<PopupMenuButtonState<String>>();
   final _keyboardTypeKey = GlobalKey<PopupMenuButtonState<int>>();
-  final _rotateQuarterKey = GlobalKey<PopupMenuButtonState<int>>();
+  //final _rotateQuarterKey = GlobalKey<PopupMenuButtonState<int>>();
   final _netViewTypeKey = GlobalKey<PopupMenuButtonState<NetViewType>>();
   final _setting = Stores.setting;
 
@@ -66,8 +66,8 @@ class _SettingPageState extends State<SettingPage> {
   late final _editorTheme = ValueNotifier(_setting.editorTheme.fetch());
   late final _editorDarkTheme = ValueNotifier(_setting.editorDarkTheme.fetch());
   late final _keyboardType = ValueNotifier(_setting.keyboardType.fetch());
-  late final _rotateQuarter =
+  // late final _rotateQuarter =
-      ValueNotifier(_setting.fullScreenRotateQuarter.fetch());
+  //     ValueNotifier(_setting.fullScreenRotateQuarter.fetch());
   late final _netViewType = ValueNotifier(_setting.netViewType.fetch());
   late final _textScaler = ValueNotifier(_setting.textFactor.fetch());
 
@@ -153,8 +153,8 @@ class _SettingPageState extends State<SettingPage> {
 
           /// Fullscreen Mode is designed for old mobile phone which can be
           /// used as a status screen, so it's only available on mobile phone.
-          if (!isDesktop) _buildTitle(l10n.fullScreen),
+          // if (!isDesktop) _buildTitle(l10n.fullScreen),
-          if (!isDesktop) _buildFullScreen(),
+          // if (!isDesktop) _buildFullScreen(),
           const SizedBox(height: 37),
         ],
       ),
@@ -191,15 +191,15 @@ class _SettingPageState extends State<SettingPage> {
     );
   }
 
-  Widget _buildFullScreen() {
+  // Widget _buildFullScreen() {
-    return Column(
+  //   return Column(
-      children: [
+  //     children: [
-        _buildFullScreenSwitch(),
+  //       _buildFullScreenSwitch(),
-        _buildFullScreenJitter(),
+  //       _buildFullScreenJitter(),
-        _buildFulScreenRotateQuarter(),
+  //       _buildFulScreenRotateQuarter(),
-      ].map((e) => CardX(child: e)).toList(),
+  //     ].map((e) => CardX(child: e)).toList(),
-    );
+  //   );
-  }
+  // }
 
   Widget _buildServer() {
     return Column(
@@ -227,7 +227,7 @@ class _SettingPageState extends State<SettingPage> {
         _buildSSHVirtualKeyAutoOff(),
         // Use hardware keyboard on desktop, so there is no need to set it
         if (isMobile) _buildKeyboardType(),
-        _buildSSHVirtKeys(),
+        if (isMobile) _buildSSHVirtKeys(),
       ].map((e) => CardX(child: e)).toList(),
     );
   }
@@ -740,56 +740,56 @@ class _SettingPageState extends State<SettingPage> {
     );
   }
 
-  Widget _buildFullScreenSwitch() {
+  // Widget _buildFullScreenSwitch() {
-    return ListTile(
+  //   return ListTile(
-      title: Text(l10n.fullScreen),
+  //     title: Text(l10n.fullScreen),
-      trailing: StoreSwitch(
+  //     trailing: StoreSwitch(
-        prop: _setting.fullScreen,
+  //       prop: _setting.fullScreen,
-        callback: (_) => RebuildNodes.app.rebuild(),
+  //       callback: (_) => RebuildNodes.app.rebuild(),
-      ),
+  //     ),
-    );
+  //   );
-  }
+  // }
 
-  Widget _buildFullScreenJitter() {
+  // Widget _buildFullScreenJitter() {
-    return ListTile(
+  //   return ListTile(
-      title: Text(l10n.fullScreenJitter),
+  //     title: Text(l10n.fullScreenJitter),
-      subtitle: Text(l10n.fullScreenJitterHelp, style: UIs.textGrey),
+  //     subtitle: Text(l10n.fullScreenJitterHelp, style: UIs.textGrey),
-      trailing: StoreSwitch(prop: _setting.fullScreenJitter),
+  //     trailing: StoreSwitch(prop: _setting.fullScreenJitter),
-    );
+  //   );
-  }
+  // }
 
-  Widget _buildFulScreenRotateQuarter() {
+  // Widget _buildFulScreenRotateQuarter() {
-    final degrees = List.generate(4, (idx) => '${idx * 90}°').toList();
+  //   final degrees = List.generate(4, (idx) => '${idx * 90}°').toList();
-    final items = List.generate(4, (idx) {
+  //   final items = List.generate(4, (idx) {
-      return PopupMenuItem<int>(
+  //     return PopupMenuItem<int>(
-        value: idx,
+  //       value: idx,
-        child: Text(degrees[idx]),
+  //       child: Text(degrees[idx]),
-      );
+  //     );
-    }).toList();
+  //   }).toList();
 
-    return ListTile(
+  //   return ListTile(
-      title: Text(l10n.rotateAngel),
+  //     title: Text(l10n.rotateAngel),
-      onTap: () {
+  //     onTap: () {
-        _rotateQuarterKey.currentState?.showButtonMenu();
+  //       _rotateQuarterKey.currentState?.showButtonMenu();
-      },
+  //     },
-      trailing: ListenableBuilder(
+  //     trailing: ListenableBuilder(
-        listenable: _rotateQuarter,
+  //       listenable: _rotateQuarter,
-        builder: (_, __) => PopupMenuButton(
+  //       builder: (_, __) => PopupMenuButton(
-          key: _rotateQuarterKey,
+  //         key: _rotateQuarterKey,
-          itemBuilder: (BuildContext context) => items,
+  //         itemBuilder: (BuildContext context) => items,
-          initialValue: _rotateQuarter.value,
+  //         initialValue: _rotateQuarter.value,
-          onSelected: (int idx) {
+  //         onSelected: (int idx) {
-            _rotateQuarter.value = idx;
+  //           _rotateQuarter.value = idx;
-            _setting.fullScreenRotateQuarter.put(idx);
+  //           _setting.fullScreenRotateQuarter.put(idx);
-          },
+  //         },
-          child: Text(
+  //         child: Text(
-            degrees[_rotateQuarter.value],
+  //           degrees[_rotateQuarter.value],
-            style: UIs.text15,
+  //           style: UIs.text15,
-          ),
+  //         ),
-        ),
+  //       ),
-      ),
+  //     ),
-    );
+  //   );
-  }
+  // }
 
   Widget _buildKeyboardType() {
     const List<String> names = <String>[

lib/view/page/setting/seq/srv_detail_seq.dart

@@ -17,6 +17,8 @@ class ServerDetailOrderPage extends StatefulWidget {
 }
 
 class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
+  final prop = Stores.setting.detailCardOrder;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -28,11 +30,10 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
   }
 
   Widget _buildBody() {
-    final keys_ = Stores.setting.detailCardOrder.fetch();
+    return ValueListenableBuilder(
-    final keys = <String>[];
+      valueListenable: prop.listenable(),
-    for (final key in keys_) {
+      builder: (_, vals, __) {
-      keys.add(key);
+        final keys = List<String>.from(vals);
-    }
         final disabled =
             Defaults.detailCardOrder.where((e) => !keys.contains(e)).toList();
         final allKeys = [...keys, ...disabled];
@@ -55,8 +56,9 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
               context.showSnackBar(l10n.disabled);
               return;
             }
-        keys.moveByItem(keys, o, n, property: Stores.setting.detailCardOrder);
+            keys.moveByItem(keys, o, n, property: prop);
-        setState(() {});
+          },
+        );
       },
     );
   }
@@ -75,8 +77,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
         } else {
           keys.remove(key);
         }
-        Stores.setting.detailCardOrder.put(keys);
+        prop.put(keys);
-        setState(() {});
       },
     );
   }

lib/view/page/setting/seq/srv_func_seq.dart

@@ -17,6 +17,8 @@ class ServerFuncBtnsOrderPage extends StatefulWidget {
 }
 
 class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
+  final prop = Stores.setting.serverFuncBtns;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -28,11 +30,10 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
   }
 
   Widget _buildBody() {
-    final keys_ = Stores.setting.serverFuncBtns.fetch();
+    return ValueListenableBuilder(
-    final keys = <int>[];
+      valueListenable: prop.listenable(),
-    for (final key in keys_) {
+      builder: (_, vals, __) {
-      keys.add(key);
+        final keys = List<int>.from(vals);
-    }
         final disabled = ServerFuncBtn.values
             .map((e) => e.index)
             .where((e) => !keys.contains(e))
@@ -57,8 +58,9 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
               context.showSnackBar(l10n.disabled);
               return;
             }
-        keys.moveByItem(keys, o, n, property: Stores.setting.serverFuncBtns);
+            keys.moveByItem(keys, o, n, property: prop);
-        setState(() {});
+          },
+        );
       },
     );
   }
@@ -82,8 +84,7 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
         } else {
           keys.remove(key);
         }
-        Stores.setting.serverFuncBtns.put(keys);
+        prop.put(keys);
-        setState(() {});
       },
     );
   }

lib/view/page/setting/seq/virt_key.dart

@@ -18,6 +18,8 @@ class SSHVirtKeySettingPage extends StatefulWidget {
 }
 
 class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
+  final prop = Stores.setting.sshVirtKeys;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -29,11 +31,10 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
   }
 
   Widget _buildBody() {
-    final keys_ = Stores.setting.sshVirtKeys.fetch();
+    return ValueListenableBuilder(
-    final keys = <int>[];
+      valueListenable: prop.listenable(),
-    for (final key in keys_) {
+      builder: (_, vals, __) {
-      keys.add(key);
+        final keys = List<int>.from(vals);
-    }
         final disabled = VirtKey.values
             .map((e) => e.index)
             .where((e) => !keys.contains(e))
@@ -61,8 +62,9 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
               context.showSnackBar(l10n.disabled);
               return;
             }
-        keys.moveByItem(keys, o, n, property: Stores.setting.sshVirtKeys);
+            keys.moveByItem(keys, o, n, property: prop);
-        setState(() {});
+          },
+        );
       },
     );
   }
@@ -93,8 +95,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
         } else {
           keys.remove(key);
         }
-        Stores.setting.sshVirtKeys.put(keys);
+        prop.put(keys);
-        setState(() {});
       },
     );
   }

macos/Runner.xcodeproj/project.pbxproj

@@ -439,7 +439,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
@@ -449,7 +449,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -574,7 +574,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
@@ -584,7 +584,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -604,7 +604,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 738;
+				CURRENT_PROJECT_VERSION = 740;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -615,7 +615,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.738;
+				MARKETING_VERSION = 1.0.740;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "Server Box";
 				PROVISIONING_PROFILE_SPECIFIER = "";