#88 #74 fix: firstWhere

This commit is contained in:
lollipopkit
2023-08-04 22:53:26 +08:00
parent 0250589be2
commit ee3e30d9b5
7 changed files with 52 additions and 27 deletions

View File

@@ -9,6 +9,7 @@ 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/model/server/disk.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/res/ui.dart';
import 'package:toolbox/data/store/setting.dart';
@@ -159,7 +160,7 @@ class _FullScreenPageState extends State<FullScreenPage> with AfterLayoutMixin {
ServerState cs,
ServerPrivateInfo spi,
) {
final rootDisk = ss.disk.firstWhere((element) => element.loc == '/');
final rootDisk = findRootDisk(ss.disk);
return InkWell(
onTap: () => AppRoute(
@@ -185,8 +186,8 @@ class _FullScreenPageState extends State<FullScreenPage> with AfterLayoutMixin {
_buildPercentCircle(ss.mem.usedPercent * 100),
_buildNet(ss),
_buildIOData(
'Total:\n${rootDisk.size}',
'Used:\n${rootDisk.usedPercent}%',
'Total:\n${rootDisk?.size}',
'Used:\n${rootDisk?.usedPercent}%',
)
],
),

View File

@@ -16,6 +16,7 @@ import 'package:toolbox/view/widget/tag/switcher.dart';
import '../../../core/route.dart';
import '../../../core/utils/ui.dart';
import '../../../data/model/server/disk.dart';
import '../../../data/model/server/server.dart';
import '../../../data/model/server/server_private_info.dart';
import '../../../data/model/server/server_status.dart';
@@ -162,8 +163,7 @@ class _ServerPageState extends State<ServerPage>
ServerState cs,
ServerPrivateInfo spi,
) {
final rootDisks = ss.disk.where((element) => element.loc == '/');
final rootDisk = rootDisks.isNotEmpty ? rootDisks.first : ss.disk.first;
final rootDisk = findRootDisk(ss.disk);
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -177,7 +177,7 @@ class _ServerPageState extends State<ServerPage>
_buildPercentCircle(ss.mem.usedPercent * 100),
_buildNet(ss),
_buildIOData(
'Total:\n${rootDisk.size}', 'Used:\n${rootDisk.usedPercent}%')
'Total:\n${rootDisk?.size}', 'Used:\n${rootDisk?.usedPercent}%')
],
),
height13,