update deps.
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -55,16 +55,22 @@ Future<void> 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<void> 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),
|
||||
);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<DockerManagePage> {
|
||||
|
||||
Widget _buildImages() {
|
||||
if (_docker.images == null) {
|
||||
return placeholder;
|
||||
return nil;
|
||||
}
|
||||
final items = _docker.images!
|
||||
.map(
|
||||
@@ -330,7 +331,7 @@ class _DockerManagePageState extends State<DockerManagePage> {
|
||||
}
|
||||
|
||||
Widget _buildLoading() {
|
||||
if (!_docker.isBusy) return placeholder;
|
||||
if (!_docker.isBusy) return nil;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(17),
|
||||
child: Column(
|
||||
|
||||
@@ -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<FullScreenPage> 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<FullScreenPage> with AfterLayoutMixin {
|
||||
|
||||
@override
|
||||
Future<void> 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();
|
||||
}
|
||||
|
||||
@@ -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<PkgManagePage>
|
||||
|
||||
Widget _buildFAB(PkgProvider pkg) {
|
||||
if (pkg.isBusy || (pkg.upgradeable?.isEmpty ?? true)) {
|
||||
return placeholder;
|
||||
return nil;
|
||||
}
|
||||
return FloatingActionButton(
|
||||
onPressed: () {
|
||||
|
||||
@@ -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<PrivateKeyEditPage>
|
||||
late PrivateKeyProvider _provider;
|
||||
late S _s;
|
||||
|
||||
Widget _loading = placeholder;
|
||||
Widget _loading = nil;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_provider = locator<PrivateKeyProvider>();
|
||||
_loading = placeholder;
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -79,7 +79,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
|
||||
context.pop();
|
||||
},
|
||||
icon: const Icon(Icons.delete))
|
||||
: placeholder
|
||||
: nil
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -107,7 +107,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
|
||||
rethrow;
|
||||
} finally {
|
||||
setState(() {
|
||||
_loading = placeholder;
|
||||
_loading = nil;
|
||||
});
|
||||
}
|
||||
if (widget.info != null) {
|
||||
|
||||
@@ -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<ServerDetailPage>
|
||||
}
|
||||
|
||||
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<ServerDetailPage>
|
||||
|
||||
Widget _buildTemperature(Temperatures temps) {
|
||||
if (temps.isEmpty) {
|
||||
return placeholder;
|
||||
return nil;
|
||||
}
|
||||
final List<Widget> children = [
|
||||
const Row(
|
||||
|
||||
@@ -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<ServerEditPage> 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<ServerEditPage> with AfterLayoutMixin {
|
||||
hint: _s.pwd,
|
||||
onSubmitted: (_) => {},
|
||||
)
|
||||
: placeholder,
|
||||
usePublicKey ? _buildKeyAuth() : placeholder
|
||||
: nil,
|
||||
usePublicKey ? _buildKeyAuth() : nil
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
@@ -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<ServerPage>
|
||||
}
|
||||
|
||||
Widget _buildTagsSwitcher(List<String> tags) {
|
||||
if (tags.isEmpty) return placeholder;
|
||||
if (tags.isEmpty) return nil;
|
||||
final items = <String?>[null, ...tags];
|
||||
return Container(
|
||||
height: 37,
|
||||
@@ -168,7 +169,7 @@ class _ServerPageState extends State<ServerPage>
|
||||
|
||||
Widget _buildEachServerCard(Server? si) {
|
||||
if (si == null) {
|
||||
return placeholder;
|
||||
return nil;
|
||||
}
|
||||
return GestureDetector(
|
||||
key: Key(si.spi.id + (_tag ?? '')),
|
||||
|
||||
@@ -190,7 +190,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
|
||||
Widget _buildCheckUpdate() {
|
||||
return Consumer<AppProvider>(
|
||||
builder: (_, app, __) {
|
||||
builder: (ctx, app, __) {
|
||||
String display;
|
||||
if (app.newestBuild != null) {
|
||||
if (app.newestBuild! > BuildData.build) {
|
||||
@@ -206,7 +206,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
title: Text(
|
||||
display,
|
||||
),
|
||||
onTap: () => doUpdate(context, force: true),
|
||||
onTap: () => doUpdate(ctx, force: true),
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
@@ -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<SFTPPage> {
|
||||
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<SFTPPage> {
|
||||
title: Text(_s.download),
|
||||
onTap: () => _download(context, file),
|
||||
)
|
||||
: placeholder,
|
||||
: nil,
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
@@ -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<SnippetEditPage>
|
||||
tooltip: _s.delete,
|
||||
icon: const Icon(Icons.delete),
|
||||
)
|
||||
: placeholder
|
||||
: nil
|
||||
],
|
||||
),
|
||||
body: _buildBody(),
|
||||
|
||||
Reference in New Issue
Block a user