diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart index 1038a1b4..7e23425c 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n.dart @@ -102,7 +102,7 @@ abstract class S { /// No description provided for @aboutThanks. /// /// In en, this message translates to: - /// **'\n\nThanks to the following people who participated in the test.'** + /// **'\nThanks to the following people who participated in the test.'** String get aboutThanks; /// No description provided for @addAServer. diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart index 4c5ea530..4ff9b683 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart @@ -8,7 +8,7 @@ class SEn extends S { String get about => 'About'; @override - String get aboutThanks => '\n\nThanks to the following people who participated in the test.'; + String get aboutThanks => '\nThanks to the following people who participated in the test.'; @override String get addAServer => 'add a server'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart index d4ba37d5..da7b9050 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart @@ -8,7 +8,7 @@ class SZh extends S { String get about => '关于'; @override - String get aboutThanks => '\n\n感谢以下参与软件测试的各位。'; + String get aboutThanks => '\n感谢以下参与软件测试的各位。'; @override String get addAServer => '添加服务器'; diff --git a/lib/core/extension/uint8list.dart b/lib/core/extension/uint8list.dart index ee330f55..63d991fa 100644 --- a/lib/core/extension/uint8list.dart +++ b/lib/core/extension/uint8list.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; extension FutureUint8ListX on Future { Future get string async => utf8.decode(await this); + Future get byteData async => (await this).buffer.asByteData(); } extension Uint8ListX on Uint8List { diff --git a/lib/core/utils/misc.dart b/lib/core/utils/misc.dart index 1095f413..6929e18e 100644 --- a/lib/core/utils/misc.dart +++ b/lib/core/utils/misc.dart @@ -6,6 +6,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:plain_notification_token/plain_notification_token.dart'; import 'package:share_plus/share_plus.dart'; +import 'package:toolbox/core/extension/uint8list.dart'; import 'platform.dart'; @@ -47,3 +48,9 @@ Future getToken() async { } return null; } + +Future loadFontFile(String localPath, String name) async { + var fontLoader = FontLoader(name); + fontLoader.addFont(File(localPath).readAsBytes().byteData); + await fontLoader.load(); +} diff --git a/lib/data/provider/server.dart b/lib/data/provider/server.dart index f84d1241..32327c44 100644 --- a/lib/data/provider/server.dart +++ b/lib/data/provider/server.dart @@ -158,7 +158,7 @@ class ServerProvider extends BusyProvider { // after connected s.cs = ServerState.connected; final writeResult = await s.client! - .run("echo '$shellCmd' > $shellPath && chmod +x $shellPath") + .run(installShellCmd) .string; // if write failed diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index cef5e046..e704f8c7 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -3,7 +3,8 @@ class BuildData { static const String name = "ServerBox"; static const int build = 233; - static const String engine = "Flutter 3.7.7 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 2ad6cd72c0 (7 days ago) • 2023-03-08 09:41:59 -0800\nEngine • revision 1837b5be5f\nTools • Dart 2.19.4 • DevTools 2.20.1\n"; + static const String engine = + "Flutter 3.7.7 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 2ad6cd72c0 (7 days ago) • 2023-03-08 09:41:59 -0800\nEngine • revision 1837b5be5f\nTools • Dart 2.19.4 • DevTools 2.20.1\n"; static const String buildAt = "2023-03-15 23:00:21.075300"; static const int modifications = 2; } diff --git a/lib/data/res/server_cmd.dart b/lib/data/res/server_cmd.dart index 889ff0f8..4a99d284 100644 --- a/lib/data/res/server_cmd.dart +++ b/lib/data/res/server_cmd.dart @@ -1,7 +1,10 @@ import 'build_data.dart'; const seperator = 'SrvBox'; -const shellPath = '.serverbox.sh'; +const serverBoxDir = r'$HOME/.config/server_box'; +const shellPath = '$serverBoxDir/mobile_app.sh'; +const installShellCmd = + "mkdir -p $serverBoxDir && echo '$shellCmd' > $shellPath && chmod +x $shellPath"; const shellCmd = """ # Script for app `${BuildData.name}` diff --git a/lib/data/res/sizedbox.dart b/lib/data/res/sizedbox.dart deleted file mode 100644 index 784f0b10..00000000 --- a/lib/data/res/sizedbox.dart +++ /dev/null @@ -1,5 +0,0 @@ -import 'package:flutter/widgets.dart'; - -const height13 = SizedBox(height: 13); -const width13 = SizedBox(width: 13); -const width7 = SizedBox(width: 7); diff --git a/lib/data/res/ui.dart b/lib/data/res/ui.dart index 4553edc5..0aa5577a 100644 --- a/lib/data/res/ui.dart +++ b/lib/data/res/ui.dart @@ -17,3 +17,9 @@ final appIcon = Image.asset('assets/app_icon.png'); /// Padding const roundRectCardPadding = EdgeInsets.symmetric(horizontal: 17, vertical: 13); + +/// SizedBox + +const height13 = SizedBox(height: 13); +const width13 = SizedBox(width: 13); +const width7 = SizedBox(width: 7); diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index fda572ae..0a10d335 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1,6 +1,6 @@ { "about": "About", - "aboutThanks": "\n\nThanks to the following people who participated in the test.", + "aboutThanks": "\nThanks to the following people who participated in the test.", "addAServer": "add a server", "addOne": "Add one", "addPrivateKey": "Add private key", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index a77e7422..b7aaf194 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -1,6 +1,6 @@ { "about": "关于", - "aboutThanks": "\n\n感谢以下参与软件测试的各位。", + "aboutThanks": "\n感谢以下参与软件测试的各位。", "addAServer": "添加服务器", "addOne": "前去新增", "addPrivateKey": "添加一个私钥", diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 73d629fc..d92b4182 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -9,7 +9,6 @@ import '../../../data/model/server/server.dart'; import '../../../data/model/server/server_status.dart'; import '../../../data/provider/server.dart'; import '../../../data/res/color.dart'; -import '../../../data/res/sizedbox.dart'; import '../../../data/res/ui.dart'; import '../../../data/store/setting.dart'; import '../../../locator.dart'; diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart index 67997b83..2d0d11fa 100644 --- a/lib/view/page/setting.dart +++ b/lib/view/page/setting.dart @@ -431,6 +431,7 @@ class _SettingPageState extends State { error: (error, trace) => Text('${_s.error}: $error'), noData: Text(_s.nullToken), success: (text) { + _pushToken = text; if (_pushToken == null) { text = _s.nullToken; }