diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f67780fb..081ab6dd 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 368; + CURRENT_PROJECT_VERSION = 369; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.368; + MARKETING_VERSION = 1.0.369; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -491,7 +491,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 368; + CURRENT_PROJECT_VERSION = 369; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -499,7 +499,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.368; + MARKETING_VERSION = 1.0.369; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -516,7 +516,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 368; + CURRENT_PROJECT_VERSION = 369; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -524,7 +524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.368; + MARKETING_VERSION = 1.0.369; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/core/analysis.dart b/lib/core/analysis.dart index 86224a69..b6a2e0a8 100644 --- a/lib/core/analysis.dart +++ b/lib/core/analysis.dart @@ -1,7 +1,6 @@ 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'; import 'package:toolbox/core/build_mode.dart'; diff --git a/lib/core/update.dart b/lib/core/update.dart index bf5b565f..8a62726e 100644 --- a/lib/core/update.dart +++ b/lib/core/update.dart @@ -55,16 +55,22 @@ Future doUpdate(BuildContext context, {bool force = false}) async { return; } - final s = S.of(context)!; + final s = S.of(context); + if (s == null) { + showSnackBar(context, const Text('Null l10n')); + return; + } - if (update.build.min.current! > BuildData.build) { + final min = update.build.min.current; + + if (min != null && min > BuildData.build) { showRoundDialog( context: context, - child: Text('Current version is too low\nplease update to v$newest'), + child: Text(s.updateTipTooLow(newest)), actions: [ TextButton( onPressed: () => _doUpdate(url, context, s), - child: const Text('ok'), + child: Text(s.ok), ) ], ); @@ -73,7 +79,7 @@ Future doUpdate(BuildContext context, {bool force = false}) async { showSnackBarWithAction( context, - 'Update: v$newest\n${update.changelog.current}', + '${s.updateTip(newest)} \n${update.changelog.current}', s.update, () => _doUpdate(url, context, s), ); diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 17c34984..2f7c0937 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 368; + static const int build = 369; static const String engine = "3.10.3"; - static const String buildAt = "2023-06-27 14:36:00.133078"; - static const int modifications = 6; + static const String buildAt = "2023-06-27 14:47:02.701644"; + static const int modifications = 5; } diff --git a/lib/data/res/ui.dart b/lib/data/res/ui.dart index f6d21c6b..17237277 100644 --- a/lib/data/res/ui.dart +++ b/lib/data/res/ui.dart @@ -21,8 +21,6 @@ final appIcon = Image.asset('assets/app_icon.png'); const roundRectCardPadding = EdgeInsets.symmetric(horizontal: 17, vertical: 13); /// SizedBox - -const placeholder = SizedBox.shrink(); const height13 = SizedBox(height: 13); const width13 = SizedBox(width: 13); const width7 = SizedBox(width: 7); diff --git a/lib/view/page/docker.dart b/lib/view/page/docker.dart index b3f45a41..e61a0ce9 100644 --- a/lib/view/page/docker.dart +++ b/lib/view/page/docker.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/core/route.dart'; @@ -271,7 +272,7 @@ class _DockerManagePageState extends State { Widget _buildImages() { if (_docker.images == null) { - return placeholder; + return nil; } final items = _docker.images! .map( @@ -330,7 +331,7 @@ class _DockerManagePageState extends State { } Widget _buildLoading() { - if (!_docker.isBusy) return placeholder; + if (!_docker.isBusy) return nil; return Padding( padding: const EdgeInsets.all(17), child: Column( diff --git a/lib/view/page/full_screen.dart b/lib/view/page/full_screen.dart index 2985cc14..c84a5d26 100644 --- a/lib/view/page/full_screen.dart +++ b/lib/view/page/full_screen.dart @@ -6,6 +6,7 @@ import 'package:circle_chart/circle_chart.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:get_it/get_it.dart'; +import 'package:nil/nil.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/route.dart'; import 'package:toolbox/data/provider/server.dart'; @@ -144,7 +145,7 @@ class _FullScreenPageState extends State with AfterLayoutMixin { final id = pro.serverOrder[idx]; final s = pro.servers[id]; if (s == null) { - return placeholder; + return nil; } return _buildRealServerCard(s.status, s.state, s.spi); }, @@ -359,10 +360,10 @@ class _FullScreenPageState extends State with AfterLayoutMixin { @override Future afterFirstLayout(BuildContext context) async { + doUpdate(context); await GetIt.I.allReady(); await _serverProvider.loadLocalData(); await _serverProvider.refreshData(); - await doUpdate(context); if (!Analysis.enabled) { await Analysis.init(); } diff --git a/lib/view/page/pkg.dart b/lib/view/page/pkg.dart index c63d5b07..24a3010a 100644 --- a/lib/view/page/pkg.dart +++ b/lib/view/page/pkg.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/view/widget/input_field.dart'; @@ -133,7 +134,7 @@ class _PkgManagePageState extends State Widget _buildFAB(PkgProvider pkg) { if (pkg.isBusy || (pkg.upgradeable?.isEmpty ?? true)) { - return placeholder; + return nil; } return FloatingActionButton( onPressed: () { diff --git a/lib/view/page/private_key/edit.dart b/lib/view/page/private_key/edit.dart index e44af7dc..d0ffec0a 100644 --- a/lib/view/page/private_key/edit.dart +++ b/lib/view/page/private_key/edit.dart @@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/core/extension/numx.dart'; import 'package:toolbox/core/utils/misc.dart'; @@ -42,13 +43,12 @@ class _PrivateKeyEditPageState extends State late PrivateKeyProvider _provider; late S _s; - Widget _loading = placeholder; + Widget _loading = nil; @override void initState() { super.initState(); _provider = locator(); - _loading = placeholder; } @override @@ -79,7 +79,7 @@ class _PrivateKeyEditPageState extends State context.pop(); }, icon: const Icon(Icons.delete)) - : placeholder + : nil ], ); } @@ -107,7 +107,7 @@ class _PrivateKeyEditPageState extends State rethrow; } finally { setState(() { - _loading = placeholder; + _loading = nil; }); } if (widget.info != null) { diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 68d57079..b09c26af 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/order.dart'; import 'package:toolbox/data/model/server/cpu.dart'; @@ -238,7 +239,7 @@ class _ServerDetailPageState extends State } Widget _buildSwapView(Swap swap) { - if (swap.total == 0) return placeholder; + if (swap.total == 0) return nil; final used = swap.usedPercent * 100; final cached = swap.cached / swap.total * 100; return RoundRectCard( @@ -394,7 +395,7 @@ class _ServerDetailPageState extends State Widget _buildTemperature(Temperatures temps) { if (temps.isEmpty) { - return placeholder; + return nil; } final List children = [ const Row( diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart index 650472b1..13cc9852 100644 --- a/lib/view/page/server/edit.dart +++ b/lib/view/page/server/edit.dart @@ -1,6 +1,7 @@ import 'package:after_layout/after_layout.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/view/widget/input_field.dart'; @@ -99,7 +100,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { return AppBar( title: Text(_s.edit, style: textSize18), actions: [ - widget.spi != null ? delBtn : placeholder, + widget.spi != null ? delBtn : nil, ], ); } @@ -177,8 +178,8 @@ class _ServerEditPageState extends State with AfterLayoutMixin { hint: _s.pwd, onSubmitted: (_) => {}, ) - : placeholder, - usePublicKey ? _buildKeyAuth() : placeholder + : nil, + usePublicKey ? _buildKeyAuth() : nil ], ), ); diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 03b56200..5073a486 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -3,6 +3,7 @@ import 'package:circle_chart/circle_chart.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:get_it/get_it.dart'; +import 'package:nil/nil.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/core/extension/order.dart'; @@ -122,7 +123,7 @@ class _ServerPageState extends State } Widget _buildTagsSwitcher(List tags) { - if (tags.isEmpty) return placeholder; + if (tags.isEmpty) return nil; final items = [null, ...tags]; return Container( height: 37, @@ -168,7 +169,7 @@ class _ServerPageState extends State Widget _buildEachServerCard(Server? si) { if (si == null) { - return placeholder; + return nil; } return GestureDetector( key: Key(si.spi.id + (_tag ?? '')), diff --git a/lib/view/page/setting.dart b/lib/view/page/setting.dart index 99384330..b8382c4d 100644 --- a/lib/view/page/setting.dart +++ b/lib/view/page/setting.dart @@ -190,7 +190,7 @@ class _SettingPageState extends State { Widget _buildCheckUpdate() { return Consumer( - builder: (_, app, __) { + builder: (ctx, app, __) { String display; if (app.newestBuild != null) { if (app.newestBuild! > BuildData.build) { @@ -206,7 +206,7 @@ class _SettingPageState extends State { title: Text( display, ), - onTap: () => doUpdate(context, force: true), + onTap: () => doUpdate(ctx, force: true), ); }, ); diff --git a/lib/view/page/sftp/remote.dart b/lib/view/page/sftp/remote.dart index f20afbc5..ee09bbb4 100644 --- a/lib/view/page/sftp/remote.dart +++ b/lib/view/page/sftp/remote.dart @@ -4,6 +4,7 @@ import 'dart:typed_data'; import 'package:dartssh2/dartssh2.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/core/extension/sftpfile.dart'; import 'package:toolbox/data/res/misc.dart'; @@ -309,7 +310,7 @@ class _SFTPPageState extends State { title: Text(_s.edit), onTap: () => _edit(context, file), ) - : placeholder, + : nil, ListTile( leading: const Icon(Icons.delete), title: Text(_s.delete), @@ -326,7 +327,7 @@ class _SFTPPageState extends State { title: Text(_s.download), onTap: () => _download(context, file), ) - : placeholder, + : nil, ], ), ); diff --git a/lib/view/page/snippet/edit.dart b/lib/view/page/snippet/edit.dart index 00ca5caa..9c7f3176 100644 --- a/lib/view/page/snippet/edit.dart +++ b/lib/view/page/snippet/edit.dart @@ -1,6 +1,7 @@ import 'package:after_layout/after_layout.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:nil/nil.dart'; import 'package:toolbox/core/extension/navigator.dart'; import 'package:toolbox/view/widget/input_field.dart'; @@ -55,7 +56,7 @@ class _SnippetEditPageState extends State tooltip: _s.delete, icon: const Icon(Icons.delete), ) - : placeholder + : nil ], ), body: _buildBody(), diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 2b116c00..ceca1fdc 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 368; + CURRENT_PROJECT_VERSION = 369; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.368; + MARKETING_VERSION = 1.0.369; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 368; + CURRENT_PROJECT_VERSION = 369; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.368; + MARKETING_VERSION = 1.0.369; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 368; + CURRENT_PROJECT_VERSION = 369; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.368; + MARKETING_VERSION = 1.0.369; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/pubspec.lock b/pubspec.lock index 34d2289d..a38bf6b6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "8880b4cfe7b5b17d57c052a5a3a8cc1d4f546261c7cc8fbd717bd53f48db0568" + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a url: "https://pub.dev" source: hosted - version: "59.0.0" + version: "61.0.0" after_layout: dependency: "direct main" description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer - sha256: a89627f49b0e70e068130a36571409726b04dab12da7e5625941d2c8ec278b96 + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 url: "https://pub.dev" source: hosted - version: "5.11.1" + version: "5.13.0" archive: dependency: transitive description: @@ -37,18 +37,18 @@ packages: dependency: transitive description: name: args - sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" asn1lib: dependency: transitive description: name: asn1lib - sha256: ab96a1cb3beeccf8145c52e449233fe68364c9641623acd3adad66f8184f1039 + sha256: b74e3842a52c61f8819a1ec8444b4de5419b41a7465e69d4aa681445377398b0 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" async: dependency: transitive description: @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" build_config: dependency: transitive description: @@ -85,34 +85,34 @@ packages: dependency: transitive description: name: build_daemon - sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "4.0.0" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" build_runner: dependency: "direct dev" description: name: build_runner - sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.6" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" url: "https://pub.dev" source: hosted - version: "7.2.7" + version: "7.2.10" built_collection: dependency: transitive description: @@ -125,10 +125,10 @@ packages: dependency: transitive description: name: built_value - sha256: "2f17434bd5d52a26762043d6b43bb53b3acd029b4d9071a329f46d67ef297e6d" + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" url: "https://pub.dev" source: hosted - version: "8.5.0" + version: "8.6.1" characters: dependency: transitive description: @@ -166,10 +166,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.0" code_text_field: dependency: "direct main" description: @@ -198,10 +198,10 @@ packages: dependency: "direct main" description: name: countly_flutter - sha256: "9e5a852bb6fcf0923032ca9080c528d06310e57fe1235cb735b0a28bd277c213" + sha256: e228caeba582af9f7ebc574977f7a526538500933c323ffb123ef9a12aa7c248 url: "https://pub.dev" source: hosted - version: "22.09.0" + version: "23.6.0" cross_file: dependency: transitive description: @@ -222,18 +222,18 @@ packages: dependency: transitive description: name: csslib - sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" url: "https://pub.dev" source: hosted - version: "0.17.2" + version: "1.0.0" dart_style: dependency: transitive description: name: dart_style - sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" dartssh2: dependency: "direct main" description: @@ -246,10 +246,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "0894a098594263fe1caaba3520e3016d8a855caeb010a882273189cca10f11e9" + sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "5.2.1+1" easy_isolate: dependency: "direct main" description: @@ -266,22 +266,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.5" - extended_image: - dependency: "direct main" - description: - name: extended_image - sha256: a6b738d9b8d5513be72c545cc3e9c5c451fbee77c8db3cbec7c32ae85b82fb93 - url: "https://pub.dev" - source: hosted - version: "6.4.1" - extended_image_library: - dependency: transitive - description: - name: extended_image_library - sha256: "550743b43ab093aed35ef234500fcc7a304cbac1eca47b0cc991e07e88750758" - url: "https://pub.dev" - source: hosted - version: "3.4.2" fake_async: dependency: transitive description: @@ -294,10 +278,10 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" file: dependency: transitive description: @@ -310,10 +294,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff + sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432 url: "https://pub.dev" source: hosted - version: "5.2.10" + version: "5.3.2" fixnum: dependency: transitive description: @@ -339,10 +323,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" flutter_localizations: dependency: "direct main" description: flutter @@ -352,26 +336,26 @@ packages: dependency: "direct main" description: name: flutter_material_color_picker - sha256: "64432c3b13bbcc6f428bae9d2e75b1b3da1e6f3219979e08a3bd9f176781d9f2" + sha256: ca1e7749d228c9155ea24bce98e647cdbffa350e6f334f6c001f841cd3d9c987 url: "https://pub.dev" source: hosted - version: "1.1.0+2" + version: "1.2.0" flutter_native_splash: dependency: "direct dev" description: name: flutter_native_splash - sha256: af665ef80a213a9ed502845a3d7a61b9acca4100ee7e9f067a7440bc3acd6730 + sha256: ba45d8cfbd778478a74696b012f33ffb6b1760c9bc531b21e2964444a4870dae url: "https://pub.dev" source: hosted - version: "2.2.19" + version: "2.3.1" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0" + sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.0.15" flutter_test: dependency: "direct dev" description: flutter @@ -402,26 +386,26 @@ packages: dependency: "direct main" description: name: get_it - sha256: "43133b45f32f1d96bbaeb43ea35a50ce854981baa80f47c3e26ee2ad23bef113" + sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468" url: "https://pub.dev" source: hosted - version: "7.5.0" + version: "7.6.0" glob: dependency: transitive description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" graphs: dependency: transitive description: name: graphs - sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" highlight: dependency: "direct main" description: @@ -458,26 +442,10 @@ packages: dependency: transitive description: name: html - sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8" + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" url: "https://pub.dev" source: hosted - version: "0.15.3" - http: - dependency: transitive - description: - name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" - url: "https://pub.dev" - source: hosted - version: "0.13.6" - http_client_helper: - dependency: transitive - description: - name: http_client_helper - sha256: "14c6e756644339f561321dab021215475ba4779aa962466f59ccb3ecf66b36c3" - url: "https://pub.dev" - source: hosted - version: "2.0.4" + version: "0.15.4" http_multi_server: dependency: transitive description: @@ -546,18 +514,18 @@ packages: dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.1" logging: dependency: "direct main" description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" matcher: dependency: transitive description: @@ -598,6 +566,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + nil: + dependency: "direct main" + description: + name: nil + sha256: ef05770c48942876d843bf6a4822d35e5da0ff893a61f1d5ad96d15c4a659136 + url: "https://pub.dev" + source: hosted + version: "1.1.1" package_config: dependency: transitive description: @@ -618,10 +594,10 @@ packages: dependency: "direct main" description: name: path_provider - sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4 + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.0.15" path_provider_android: dependency: transitive description: @@ -634,18 +610,18 @@ packages: dependency: transitive description: name: path_provider_foundation - sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183 + sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.3" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" + sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.1.11" path_provider_platform_interface: dependency: transitive description: @@ -658,10 +634,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6 + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.7" pedantic: dependency: transitive description: @@ -674,10 +650,10 @@ packages: dependency: transitive description: name: petitparser - sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" pinenacl: dependency: transitive description: @@ -786,10 +762,10 @@ packages: dependency: "direct main" description: name: share_plus - sha256: "692261968a494e47323dcc8bc66d8d52e81bc27cb4b808e4e8d7e8079d4cc01a" + sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8 url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "7.0.2" share_plus_platform_interface: dependency: transitive description: @@ -798,14 +774,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.1" - share_plus_web: - dependency: "direct main" - description: - name: share_plus_web - sha256: eaef05fa8548b372253e772837dd1fbe4ce3aca30ea330765c945d7d4f7c9935 - url: "https://pub.dev" - source: hosted - version: "3.1.0" shelf: dependency: transitive description: @@ -831,18 +799,18 @@ packages: dependency: transitive description: name: source_gen - sha256: b20e191de6964e98032573cecb1d2b169d96ba63fdb586d24dcd1003ba7e94f6 + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" source_helper: dependency: transitive description: name: source_helper - sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" url: "https://pub.dev" source: hosted - version: "1.3.3" + version: "1.3.4" source_span: dependency: transitive description: @@ -911,34 +879,34 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" universal_io: dependency: transitive description: name: universal_io - sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d" + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.2" url_launcher: dependency: "direct main" description: name: url_launcher - sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e" + sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3 url: "https://pub.dev" source: hosted - version: "6.1.10" + version: "6.1.11" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "22f8db4a72be26e9e3a4aa3f194b1f7afbc76d20ec141f84be1d787db2155cbd" + sha256: "15f5acbf0dce90146a0f5a2c4a002b1814a6303c4c5c075aa2623b2d16156f03" url: "https://pub.dev" source: hosted - version: "6.0.31" + version: "6.0.36" url_launcher_ios: dependency: transitive description: @@ -967,18 +935,18 @@ packages: dependency: transitive description: name: url_launcher_platform_interface - sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370" + sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" + sha256: "6bb1e5d7fe53daf02a8fee85352432a40b1f868a81880e99ec7440113d5cfcab" url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.17" url_launcher_windows: dependency: transitive description: @@ -1007,10 +975,10 @@ packages: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" web_socket_channel: dependency: transitive description: @@ -1023,10 +991,10 @@ packages: dependency: transitive description: name: win32 - sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4 + sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "5.0.5" xdg_directories: dependency: transitive description: @@ -1039,10 +1007,10 @@ packages: dependency: transitive description: name: xml - sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" xterm: dependency: "direct main" description: @@ -1069,5 +1037,5 @@ packages: source: hosted version: "0.0.6" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.2 <4.0.0" flutter: ">=3.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7adddd46..08573d85 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,11 +34,10 @@ dependencies: provider: ^6.0.0 get_it: ^7.2.0 hive_flutter: ^1.1.0 - dio: ^5.1.1 + dio: ^5.2.1 after_layout: ^1.1.0 - extended_image: ^6.0.3 url_launcher: ^6.1.8 - countly_flutter: ^22.2.0 + countly_flutter: ^23.6.0 dartssh2: ^2.8.2 logging: ^1.0.2 flutter_material_color_picker: ^1.1.0+2 @@ -52,21 +51,21 @@ dependencies: r_upgrade: 0.3.8+2 path_provider: ^2.0.9 easy_isolate: ^1.3.0 - share_plus: 6.3.2 + share_plus: ^7.0.2 intl: ^0.18.0 - share_plus_web: ^3.1.0 # xterm: ^3.4.1 xterm: #path: ../xterm.dart git: ref: master url: https://github.com/lollipopkit/xterm.dart - file_picker: ^5.2.5 + file_picker: ^5.3.2 plain_notification_token: ^0.0.4 highlight: ^0.7.0 flutter_highlight: ^0.7.0 code_text_field: ^1.1.0 flutter_volume_controller: ^1.2.6 + nil: ^1.1.1 dev_dependencies: flutter_native_splash: ^2.1.6 diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100644 index 8aaa46ac..00000000 Binary files a/web/favicon.png and /dev/null differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png deleted file mode 100644 index b749bfef..00000000 Binary files a/web/icons/Icon-192.png and /dev/null differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48d..00000000 Binary files a/web/icons/Icon-512.png and /dev/null differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d76..00000000 Binary files a/web/icons/Icon-maskable-192.png and /dev/null differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c5669..00000000 Binary files a/web/icons/Icon-maskable-512.png and /dev/null differ diff --git a/web/index.html b/web/index.html deleted file mode 100644 index 0ef17a34..00000000 --- a/web/index.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - ServerBox - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/web/manifest.json b/web/manifest.json deleted file mode 100644 index 5fbd2500..00000000 --- a/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "toolbox", - "short_name": "toolbox", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -} diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png deleted file mode 100644 index 89ad08bc..00000000 Binary files a/web/splash/img/dark-1x.png and /dev/null differ diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png deleted file mode 100644 index 0ca0b444..00000000 Binary files a/web/splash/img/dark-2x.png and /dev/null differ diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png deleted file mode 100644 index f84d678b..00000000 Binary files a/web/splash/img/dark-3x.png and /dev/null differ diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png deleted file mode 100644 index 63cfa485..00000000 Binary files a/web/splash/img/dark-4x.png and /dev/null differ diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png deleted file mode 100644 index 89ad08bc..00000000 Binary files a/web/splash/img/light-1x.png and /dev/null differ diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png deleted file mode 100644 index 0ca0b444..00000000 Binary files a/web/splash/img/light-2x.png and /dev/null differ diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png deleted file mode 100644 index f84d678b..00000000 Binary files a/web/splash/img/light-3x.png and /dev/null differ diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png deleted file mode 100644 index 63cfa485..00000000 Binary files a/web/splash/img/light-4x.png and /dev/null differ diff --git a/web/splash/splash.js b/web/splash/splash.js deleted file mode 100644 index 3b6ed11f..00000000 --- a/web/splash/splash.js +++ /dev/null @@ -1,5 +0,0 @@ -function removeSplashFromWeb() { - document.getElementById("splash")?.remove(); - document.getElementById("splash-branding")?.remove(); - document.body.style.background = "transparent"; -} diff --git a/web/splash/style.css b/web/splash/style.css deleted file mode 100644 index e7514f17..00000000 --- a/web/splash/style.css +++ /dev/null @@ -1,62 +0,0 @@ -html { - height: 100% -} - -body { - margin: 0; - min-height: 100%; - background-color: #ffffff; - background-size: 100% 100%; -} - -.center { - margin: 0; - position: absolute; - top: 50%; - left: 50%; - -ms-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); -} - -.contain { - display:block; - width:100%; height:100%; - object-fit: contain; -} - -.stretch { - display:block; - width:100%; height:100%; -} - -.cover { - display:block; - width:100%; height:100%; - object-fit: cover; -} - -.bottom { - position: absolute; - bottom: 0; - left: 50%; - -ms-transform: translate(-50%, 0); - transform: translate(-50%, 0); -} - -.bottomLeft { - position: absolute; - bottom: 0; - left: 0; -} - -.bottomRight { - position: absolute; - bottom: 0; - right: 0; -} - -@media (prefers-color-scheme: dark) { - body { - background-color: #121212; - } -}