diff --git a/lib/app.dart b/lib/app.dart index f4b733a9..fb1fd822 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:toolbox/data/res/build_data.dart'; import 'package:toolbox/data/store/setting.dart'; import 'package:toolbox/locator.dart'; import 'package:toolbox/view/page/home.dart'; @@ -29,7 +30,7 @@ class MyApp extends StatelessWidget { final primaryColor = Color(value); final textStyle = TextStyle(color: primaryColor); return MaterialApp( - title: 'ToolBox', + title: BuildData.name, debugShowCheckedModeBanner: false, theme: ThemeData( primaryColor: primaryColor, diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 99ba6fcf..402c3af5 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 = "ToolBox"; - static const int build = 81; + static const int build = 82; static const String engine = "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (4 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n"; - static const String buildAt = "2022-01-11 13:16:48.400673"; - static const int modifications = 2; + static const String buildAt = "2022-01-11 13:31:16.586591"; + static const int modifications = 3; } diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index 0ef6429f..dc5fdbe9 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -71,7 +71,7 @@ class _MyHomePageState extends State title: GestureDetector( onLongPress: () => AppRoute(const DebugPage(), 'Debug Page').go(context), - child: const Text('ToolBox'), + child: const Text(BuildData.name), ), bottom: TabBar( indicatorColor: widget.primaryColor, diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 45ed5ac7..0a74f901 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -183,7 +183,13 @@ class _ServerPageState extends State case ServerConnectionState.connecting: return 'Connecting...'; case ServerConnectionState.failed: - return failedInfo ?? 'Failed'; + if (failedInfo == null) { + return 'Failed'; + } + if (failedInfo.contains('encypted')) { + return 'Please "save" this private key again.'; + } + return failedInfo; default: return 'Unknown State'; } diff --git a/make.dart b/make.dart index e0c3b9c8..4a635020 100755 --- a/make.dart +++ b/make.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'dart:io'; -const appName = 'ToolBox'; +const appName = 'ServerBox'; Future getGitCommitCount() async { final result = await Process.run('git', ['log', '--oneline']); diff --git a/pubspec.lock b/pubspec.lock index 76c7576d..f1e4ffd0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -123,7 +123,7 @@ packages: name: dartssh2 url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0-pre" dio: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index b79f8ef1..9a1e550d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: git: url: https://github.com/Countly/countly-sdk-flutter-bridge.git ref: master - dartssh2: ^2.2.0 + dartssh2: ^2.3.0-pre logging: ^1.0.2 flutter_material_color_picker: ^1.1.0+2 circle_chart: