fix & opt

- fix docker not found regexp
- use en_US in docker cmd
-
This commit is contained in:
Junyuan Feng
2022-05-12 09:50:28 +08:00
parent 7e8e0e2efc
commit bfe7140a44
13 changed files with 114 additions and 62 deletions

View File

@@ -6,6 +6,7 @@ import 'package:toolbox/data/model/apt/upgrade_pkg_info.dart';
import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/provider/apt.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/url.dart';
import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/locator.dart';
import 'package:toolbox/view/widget/center_loading.dart';
@@ -152,7 +153,7 @@ class _AptManagePageState extends State<AptManagePage>
Padding(
padding: const EdgeInsets.all(17),
child: UrlText(
text: '${s.experimentalFeature}\n${s.reportBugsOnGithubIssue}',
text: '${s.experimentalFeature}\n${s.reportBugsOnGithubIssue(issueUrl)}',
replace: 'Github Issue',
textAlign: TextAlign.center,
),

View File

@@ -7,6 +7,7 @@ import 'package:toolbox/data/model/docker/ps.dart';
import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/provider/docker.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/url.dart';
import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/locator.dart';
import 'package:toolbox/view/widget/center_loading.dart';
@@ -71,16 +72,17 @@ class _DockerManagePageState extends State<DockerManagePage> {
return Consumer<DockerProvider>(builder: (_, docker, __) {
final running = docker.items;
if (docker.error != null && running == null) {
return Center(
child: Column(
return SizedBox.expand(child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: _media.size.height * 0.43,
),
const Icon(Icons.error, size: 37,),
const SizedBox(height: 27),
Text(docker.error!),
_buildSolution(docker.error!)
const SizedBox(height: 27),
Padding(padding: const EdgeInsets.all(17), child: _buildSolution(docker.error!),)
],
));
),);
}
if (running == null) {
_docker.refresh();
@@ -106,6 +108,8 @@ class _DockerManagePageState extends State<DockerManagePage> {
);
case 'no client':
return Text(s.waitConnection);
case 'invalid version':
return UrlText(text: s.invalidVersionHelp(issueUrl), replace: 'Github',);
default:
return Text(s.unknownError);
}

View File

@@ -9,6 +9,7 @@ import 'package:toolbox/data/res/color.dart';
import 'package:toolbox/data/res/font_style.dart';
import 'package:toolbox/data/res/icon/linux_icons.dart';
import 'package:toolbox/data/res/padding.dart';
import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/view/widget/round_rect_card.dart';
const style11 = TextStyle(fontSize: 11);
@@ -26,11 +27,13 @@ class ServerDetailPage extends StatefulWidget {
class _ServerDetailPageState extends State<ServerDetailPage>
with SingleTickerProviderStateMixin {
late MediaQueryData _media;
late S s;
@override
void didChangeDependencies() {
super.didChangeDependencies();
_media = MediaQuery.of(context);
s = S.of(context);
}
@override
@@ -298,10 +301,10 @@ class _ServerDetailPageState extends State<ServerDetailPage>
)
];
if (ns.devices.isEmpty) {
children.add(const Center(
children.add(Center(
child: Text(
'No interface.',
style: TextStyle(color: Colors.grey),
s.noInterface,
style: const TextStyle(color: Colors.grey, fontSize: 13),
),
));
} else {