Change model dir structure

This commit is contained in:
LollipopKit
2021-10-28 21:04:59 +08:00
parent 6426277406
commit 6db223ec5a
24 changed files with 71 additions and 51 deletions

View File

@@ -1,6 +1,6 @@
import 'package:after_layout/after_layout.dart';
import 'package:flutter/material.dart';
import 'package:toolbox/data/model/private_key_info.dart';
import 'package:toolbox/data/model/server/private_key_info.dart';
import 'package:toolbox/data/provider/private_key.dart';
import 'package:toolbox/locator.dart';
import 'package:toolbox/view/widget/input_decoration.dart';

View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:toolbox/data/model/server.dart';
import 'package:toolbox/data/model/server_status.dart';
import 'package:toolbox/data/model/server/server.dart';
import 'package:toolbox/data/model/server/server_status.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/color.dart';
import 'package:toolbox/data/res/linux_icons.dart';
@@ -54,7 +54,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
}
Widget _buildLinuxIcon(String sysVer) {
final iconPath = linuxIcons.search(sysVer.toLowerCase());
final iconPath = linuxIcons.search(sysVer);
if (iconPath == null) return const SizedBox();
return SizedBox(height: _media.size.height * 0.15, child: Image.asset(iconPath));
}
@@ -260,5 +260,5 @@ class _ServerDetailPageState extends State<ServerDetailPage>
));
}
static const ignorePath = ['/run', '/sys', '/dev/shm', '/snap'];
static const ignorePath = ['/run', '/sys', '/dev/shm', '/snap', '/var/lib/docker'];
}

View File

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:toolbox/core/route.dart';
import 'package:toolbox/core/utils.dart';
import 'package:toolbox/data/model/server_private_info.dart';
import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/provider/private_key.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/color.dart';

View File

@@ -6,9 +6,9 @@ import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
import 'package:get_it/get_it.dart';
import 'package:provider/provider.dart';
import 'package:toolbox/core/route.dart';
import 'package:toolbox/data/model/server.dart';
import 'package:toolbox/data/model/server_connection_state.dart';
import 'package:toolbox/data/model/server_status.dart';
import 'package:toolbox/data/model/server/server.dart';
import 'package:toolbox/data/model/server/server_connection_state.dart';
import 'package:toolbox/data/model/server/server_status.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/store/setting.dart';
import 'package:toolbox/locator.dart';
@@ -123,7 +123,7 @@ class _ServerPageState extends State<ServerPage>
style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
textScaleFactor: 1.0,
),
Text(getTopRightStr(cs, ss.uptime),
Text(getTopRightStr(cs, ss.cpu2Status.temp, ss.uptime),
textScaleFactor: 1.0,
style: TextStyle(
color: _theme.textTheme.bodyText1!.color!.withAlpha(100),
@@ -148,12 +148,12 @@ class _ServerPageState extends State<ServerPage>
);
}
String getTopRightStr(ServerConnectionState cs, String upTime) {
String getTopRightStr(ServerConnectionState cs, String temp, String upTime) {
switch (cs) {
case ServerConnectionState.disconnected:
return 'Disconnected';
case ServerConnectionState.connected:
return upTime == '' ? 'Loading...' : upTime;
return temp == '' ? (upTime == '' ? 'Loading...' : upTime) : temp;
case ServerConnectionState.connecting:
return 'Connecting...';
case ServerConnectionState.failed: