From ad49593fe398372af7bf74c59a045d9c28fc5319 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Mon, 27 Nov 2023 17:35:15 +0800 Subject: [PATCH] opt. --- lib/core/channel/bg_run.dart | 4 +- lib/core/channel/home_widget.dart | 4 +- lib/core/persistant_store.dart | 4 +- lib/core/utils/icloud.dart | 4 +- lib/core/utils/platform/auth.dart | 4 +- lib/core/utils/share.dart | 4 +- lib/data/res/color.dart | 4 +- lib/data/res/default.dart | 4 +- lib/data/res/github_id.dart | 10 ++-- lib/data/res/highlight.dart | 4 +- lib/data/res/logger.dart | 4 +- lib/data/res/misc.dart | 4 +- lib/data/res/path.dart | 4 +- lib/data/res/provider.dart | 4 +- lib/data/res/rebuild.dart | 4 +- lib/data/res/status.dart | 4 +- lib/data/res/store.dart | 4 +- lib/data/res/terminal.dart | 4 +- lib/data/res/ui.dart | 4 +- lib/data/res/url.dart | 4 +- lib/view/page/server/detail.dart | 78 +++++++++++++++---------------- 21 files changed, 62 insertions(+), 102 deletions(-) diff --git a/lib/core/channel/bg_run.dart b/lib/core/channel/bg_run.dart index 1c1646fb..82a22b1f 100644 --- a/lib/core/channel/bg_run.dart +++ b/lib/core/channel/bg_run.dart @@ -1,9 +1,7 @@ import 'package:flutter/services.dart'; import 'package:toolbox/data/res/misc.dart'; -class BgRunMC { - const BgRunMC._(); - +abstract final class BgRunMC { static const _channel = MethodChannel('${Miscs.pkgName}/app_retain'); static void moveToBg() { diff --git a/lib/core/channel/home_widget.dart b/lib/core/channel/home_widget.dart index 77c85a50..683eb251 100644 --- a/lib/core/channel/home_widget.dart +++ b/lib/core/channel/home_widget.dart @@ -1,9 +1,7 @@ import 'package:flutter/services.dart'; import 'package:toolbox/data/res/misc.dart'; -class HomeWidgetMC { - const HomeWidgetMC._(); - +abstract final class HomeWidgetMC { static const _channel = MethodChannel('${Miscs.pkgName}/home_widget'); static void update() { diff --git a/lib/core/persistant_store.dart b/lib/core/persistant_store.dart index bb409e0b..18555cba 100644 --- a/lib/core/persistant_store.dart +++ b/lib/core/persistant_store.dart @@ -5,9 +5,7 @@ import 'package:flutter/foundation.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:toolbox/data/res/path.dart'; -// class SecureStore { -// SecureStore._(); - +// abstract final class SecureStore { // static const _secureStorage = FlutterSecureStorage(); // static HiveAesCipher? _cipher; diff --git a/lib/core/utils/icloud.dart b/lib/core/utils/icloud.dart index 34537375..deab1a69 100644 --- a/lib/core/utils/icloud.dart +++ b/lib/core/utils/icloud.dart @@ -25,11 +25,9 @@ class SyncResult { } } -class ICloud { +abstract final class ICloud { static const _containerId = 'iCloud.tech.lolli.serverbox'; - const ICloud._(); - /// Upload file to iCloud /// /// - [relativePath] is the path relative to [docDir], diff --git a/lib/core/utils/platform/auth.dart b/lib/core/utils/platform/auth.dart index 4d59dbaa..daba72c5 100644 --- a/lib/core/utils/platform/auth.dart +++ b/lib/core/utils/platform/auth.dart @@ -5,9 +5,7 @@ import 'package:local_auth/local_auth.dart'; import 'package:toolbox/core/utils/platform/base.dart'; import 'package:local_auth/error_codes.dart' as errs; -class BioAuth { - const BioAuth._(); - +abstract final class BioAuth { static final _auth = LocalAuthentication(); static bool get isPlatformSupported => isAndroid || isIOS || isWindows; diff --git a/lib/core/utils/share.dart b/lib/core/utils/share.dart index 63225253..c96edfee 100644 --- a/lib/core/utils/share.dart +++ b/lib/core/utils/share.dart @@ -5,9 +5,7 @@ import 'package:share_plus/share_plus.dart'; import 'package:toolbox/core/extension/context/locale.dart'; import 'package:toolbox/data/res/provider.dart'; -class Shares { - const Shares._(); - +abstract final class Shares { static Future files(List filePaths) async { for (final filePath in filePaths) { if (!await File(filePath).exists()) { diff --git a/lib/data/res/color.dart b/lib/data/res/color.dart index ceb8d0c5..bea50d93 100644 --- a/lib/data/res/color.dart +++ b/lib/data/res/color.dart @@ -4,9 +4,7 @@ import '../model/app/dynamic_color.dart'; late Color primaryColor; -class DynamicColors { - const DynamicColors._(); - +abstract final class DynamicColors { static const content = DynamicColor(Colors.black87, Colors.white70); static const bg = DynamicColor(Colors.white, Colors.black); static const progress = DynamicColor(Colors.black12, Colors.white10); diff --git a/lib/data/res/default.dart b/lib/data/res/default.dart index 044de65c..8ef79d17 100644 --- a/lib/data/res/default.dart +++ b/lib/data/res/default.dart @@ -2,9 +2,7 @@ import 'dart:ui'; import 'package:toolbox/data/model/ssh/virtual_key.dart'; -class Defaults { - const Defaults._(); - +abstract final class Defaults { // default server details page cards order static const detailCardOrder = [ 'uptime', diff --git a/lib/data/res/github_id.dart b/lib/data/res/github_id.dart index d0d6cb12..ceeae295 100644 --- a/lib/data/res/github_id.dart +++ b/lib/data/res/github_id.dart @@ -1,10 +1,8 @@ import 'package:toolbox/data/model/app/github_id.dart'; -class GithubIds { - const GithubIds._(); - +abstract final class GithubIds { // Thanks - // If you want to change the url, please open an issue. + // If you want to change your Github ID, please open an issue. static const contributors = { 'its-tom', 'RainSunMe', @@ -41,6 +39,8 @@ class GithubIds { 'balh55y', 'wc7086', 'michaelsara', - 'xingleiwu' + 'xingleiwu', + 'Cooper098', + 'xushuojie', }; } diff --git a/lib/data/res/highlight.dart b/lib/data/res/highlight.dart index c63162d3..7ac3a3d4 100644 --- a/lib/data/res/highlight.dart +++ b/lib/data/res/highlight.dart @@ -32,9 +32,7 @@ import 'package:highlight/languages/vim.dart'; import 'package:highlight/languages/xml.dart'; import 'package:highlight/languages/yaml.dart'; -class Highlights { - const Highlights._(); - +abstract final class Highlights { /// - KEY: fileNameSuffix /// - VAL: highlight static final all = { diff --git a/lib/data/res/logger.dart b/lib/data/res/logger.dart index 37f8a345..c738e428 100644 --- a/lib/data/res/logger.dart +++ b/lib/data/res/logger.dart @@ -1,8 +1,6 @@ import 'package:logging/logging.dart'; -class Loggers { - const Loggers._(); - +abstract final class Loggers { static final root = Logger('Root'); static final app = Logger('App'); static final parse = Logger('Parse'); diff --git a/lib/data/res/misc.dart b/lib/data/res/misc.dart index e373a46e..b0f9dee5 100644 --- a/lib/data/res/misc.dart +++ b/lib/data/res/misc.dart @@ -1,8 +1,6 @@ import 'dart:convert'; -class Miscs { - const Miscs._(); - +abstract final class Miscs { /// RegExp for number static final numReg = RegExp(r'\s{1,}'); diff --git a/lib/data/res/path.dart b/lib/data/res/path.dart index 4a46e88f..23a6e8e7 100644 --- a/lib/data/res/path.dart +++ b/lib/data/res/path.dart @@ -4,9 +4,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:toolbox/core/utils/platform/base.dart'; import 'package:toolbox/core/utils/platform/path.dart'; -class Paths { - const Paths._(); - +abstract final class Paths { static String? _docDir; static String? _sftpDir; static String? _fontDir; diff --git a/lib/data/res/provider.dart b/lib/data/res/provider.dart index ee105063..f12b4631 100644 --- a/lib/data/res/provider.dart +++ b/lib/data/res/provider.dart @@ -7,9 +7,7 @@ import 'package:toolbox/data/provider/sftp.dart'; import 'package:toolbox/data/provider/snippet.dart'; import 'package:toolbox/locator.dart'; -class Pros { - const Pros._(); - +abstract final class Pros { static final app = locator(); static final debug = locator(); static final docker = locator(); diff --git a/lib/data/res/rebuild.dart b/lib/data/res/rebuild.dart index 0cb9dece..f78cd8a4 100644 --- a/lib/data/res/rebuild.dart +++ b/lib/data/res/rebuild.dart @@ -1,7 +1,5 @@ import 'package:toolbox/data/model/app/rebuild.dart'; -class RebuildNodes { - const RebuildNodes._(); - +abstract final class RebuildNodes { static final app = RebuildNode(); } diff --git a/lib/data/res/status.dart b/lib/data/res/status.dart index df15f96f..4d9a02a9 100644 --- a/lib/data/res/status.dart +++ b/lib/data/res/status.dart @@ -8,9 +8,7 @@ import '../model/server/net_speed.dart'; import '../model/server/conn.dart'; import '../model/server/system.dart'; -class InitStatus { - const InitStatus._(); - +abstract final class InitStatus { static OneTimeCpuStatus get _initOneTimeCpuStatus => OneTimeCpuStatus( 'cpu', 0, diff --git a/lib/data/res/store.dart b/lib/data/res/store.dart index 2ad31488..17046894 100644 --- a/lib/data/res/store.dart +++ b/lib/data/res/store.dart @@ -7,9 +7,7 @@ import 'package:toolbox/data/store/setting.dart'; import 'package:toolbox/data/store/snippet.dart'; import 'package:toolbox/locator.dart'; -class Stores { - const Stores._(); - +abstract final class Stores { static final setting = locator(); static final server = locator(); static final docker = locator(); diff --git a/lib/data/res/terminal.dart b/lib/data/res/terminal.dart index 87ce10a1..5eb8f88c 100644 --- a/lib/data/res/terminal.dart +++ b/lib/data/res/terminal.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:xterm/ui.dart'; -class TerminalThemes { - const TerminalThemes._(); - +abstract final class TerminalThemes { static const dark = TerminalTheme( cursor: Color.fromARGB(137, 174, 175, 173), selection: Color.fromARGB(147, 174, 175, 173), diff --git a/lib/data/res/ui.dart b/lib/data/res/ui.dart index 264530a7..d9b9afed 100644 --- a/lib/data/res/ui.dart +++ b/lib/data/res/ui.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -class UIs { - const UIs._(); - +abstract final class UIs { /// Font style static const textSize9Grey = TextStyle(color: Colors.grey, fontSize: 9); diff --git a/lib/data/res/url.dart b/lib/data/res/url.dart index ef1cdf84..56d6a155 100644 --- a/lib/data/res/url.dart +++ b/lib/data/res/url.dart @@ -1,6 +1,4 @@ -class Urls { - const Urls._(); - +abstract final class Urls { static const resBase = 'https://res.lolli.tech/serverbox'; static const myGithub = 'https://github.com/lollipopkit'; static const appHelp = '$myGithub/flutter_server_box#-help'; diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 2ca91b10..40ad329c 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -325,47 +325,45 @@ class _ServerDetailPageState extends State if (processes.isNotEmpty) { children.addAll(processes.map((e) => _buildGpuProcessItem(e))); } - return CardX( - ListTile( - title: Text(item.name, style: UIs.textSize13), - leading: Text( - '${item.temp}°C', - style: UIs.textSize11Grey, - textScaler: _textFactor, - ), - subtitle: Text( - '${item.power} - ${mem.used} / ${mem.total} ${mem.unit}', - style: UIs.textSize11Grey, - textScaler: _textFactor, - ), - trailing: InkWell( - onTap: () { - final height = () { - if (processes.length > 5) { - return 5 * 47.0; - } - return processes.length * 47.0; - }(); - context.showRoundDialog( - title: Text(item.name), - child: SizedBox( - width: double.maxFinite, - height: height, - child: ListView.builder( - itemCount: processes.length, - itemBuilder: (_, idx) => _buildGpuProcessItem(processes[idx]), - ), + return ListTile( + title: Text(item.name, style: UIs.textSize13), + leading: Text( + '${item.temp}°C', + style: UIs.textSize11Grey, + textScaler: _textFactor, + ), + subtitle: Text( + '${item.power} - ${mem.used} / ${mem.total} ${mem.unit}', + style: UIs.textSize11Grey, + textScaler: _textFactor, + ), + trailing: InkWell( + onTap: () { + final height = () { + if (processes.length > 5) { + return 5 * 47.0; + } + return processes.length * 47.0; + }(); + context.showRoundDialog( + title: Text(item.name), + child: SizedBox( + width: double.maxFinite, + height: height, + child: ListView.builder( + itemCount: processes.length, + itemBuilder: (_, idx) => _buildGpuProcessItem(processes[idx]), ), - actions: [ - TextButton( - onPressed: () => context.pop(), - child: Text(l10n.close), - ) - ], - ); - }, - child: const Icon(Icons.info_outline, size: 17), - ), + ), + actions: [ + TextButton( + onPressed: () => context.pop(), + child: Text(l10n.close), + ) + ], + ); + }, + child: const Icon(Icons.info_outline, size: 17), ), ); }