#76 new: switch net view

This commit is contained in:
lollipopkit
2023-07-21 14:25:07 +08:00
parent 5a5e2fd1d1
commit 0d5707a1df
12 changed files with 158 additions and 24 deletions

View File

@@ -81,7 +81,6 @@ class _ServerDetailPageState extends State<ServerDetailPage>
);
});
},
buildDefaultDragHandles: false,
footer: height13,
children: _buildMainList(si.status),
),
@@ -378,7 +377,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
SizedBox(
width: width,
child: Text(
'${ns.speedIn(device: device)} | ${ns.totalIn(device: device)}',
'${ns.speedIn(device: device)} | ${ns.sizeIn(device: device)}',
style: textSize11,
textAlign: TextAlign.center,
textScaleFactor: 0.87,
@@ -387,7 +386,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
SizedBox(
width: width,
child: Text(
'${ns.speedOut(device: device)} | ${ns.totalOut(device: device)}',
'${ns.speedOut(device: device)} | ${ns.sizeOut(device: device)}',
style: textSize11,
textAlign: TextAlign.right,
textScaleFactor: 0.87,

View File

@@ -7,6 +7,7 @@ import 'package:nil/nil.dart';
import 'package:provider/provider.dart';
import 'package:toolbox/core/extension/order.dart';
import 'package:toolbox/core/utils/misc.dart';
import 'package:toolbox/data/model/app/net_view.dart';
import 'package:toolbox/data/model/server/snippet.dart';
import 'package:toolbox/data/provider/snippet.dart';
import 'package:toolbox/view/page/process.dart';
@@ -48,6 +49,7 @@ class _ServerPageState extends State<ServerPage>
late ServerProvider _serverProvider;
late SettingStore _settingStore;
late S _s;
late NetViewType _netViewType;
String? _tag;
@@ -56,6 +58,7 @@ class _ServerPageState extends State<ServerPage>
super.initState();
_serverProvider = locator<ServerProvider>();
_settingStore = locator<SettingStore>();
_netViewType = _settingStore.netViewType.fetch() ?? NetViewType.speed;
}
@override
@@ -117,7 +120,6 @@ class _ServerPageState extends State<ServerPage>
all: _s.all,
),
padding: const EdgeInsets.fromLTRB(7, 10, 7, 7),
buildDefaultDragHandles: false,
onReorder: (oldIndex, newIndex) => setState(() {
pro.serverOrder.moveByItem(
filtered,
@@ -173,7 +175,7 @@ class _ServerPageState extends State<ServerPage>
children: [
_buildPercentCircle(ss.cpu.usedPercent()),
_buildPercentCircle(ss.mem.usedPercent * 100),
_buildIOData('Conn:\n${ss.tcp.maxConn}', 'Fail:\n${ss.tcp.fail}'),
_buildNet(ss),
_buildIOData(
'Total:\n${rootDisk.size}', 'Used:\n${rootDisk.usedPercent}%')
],
@@ -330,6 +332,14 @@ class _ServerPageState extends State<ServerPage>
);
}
Widget _buildNet(ServerStatus ss) {
final data = _netViewType.build(ss);
return AnimatedSwitcher(
duration: const Duration(milliseconds: 177),
child: _buildIOData(data.up, data.down),
);
}
Widget _buildExplainText(String text) {
return SizedBox(
width: _media.size.width * 0.2,

View File

@@ -10,6 +10,7 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:toolbox/core/extension/locale.dart';
import 'package:toolbox/core/extension/navigator.dart';
import 'package:toolbox/core/route.dart';
import 'package:toolbox/data/model/app/net_view.dart';
import 'package:toolbox/data/model/app/tab.dart';
import 'package:toolbox/view/page/ssh/virt_key_setting.dart';
import 'package:toolbox/view/widget/input_field.dart';
@@ -47,6 +48,7 @@ class _SettingPageState extends State<SettingPage> {
final _editorDarkThemeKey = GlobalKey<PopupMenuButtonState<String>>();
final _keyboardTypeKey = GlobalKey<PopupMenuButtonState<int>>();
final _rotateQuarterKey = GlobalKey<PopupMenuButtonState<int>>();
final _netViewTypeKey = GlobalKey<PopupMenuButtonState<NetViewType>>();
late final SettingStore _setting;
late final ServerProvider _serverProvider;
@@ -65,6 +67,7 @@ class _SettingPageState extends State<SettingPage> {
final _editorDarkTheme = ValueNotifier('');
final _keyboardType = ValueNotifier(0);
final _rotateQuarter = ValueNotifier(0);
final _netViewType = ValueNotifier(NetViewType.speed);
final _pushToken = ValueNotifier<String?>(null);
@@ -91,6 +94,7 @@ class _SettingPageState extends State<SettingPage> {
_editorDarkTheme.value = _setting.editorDarkTheme.fetch()!;
_keyboardType.value = _setting.keyboardType.fetch()!;
_rotateQuarter.value = _setting.fullScreenRotateQuarter.fetch()!;
_netViewType.value = _setting.netViewType.fetch()!;
SharedPreferences.getInstance().then((value) => _sp = value);
}
@@ -164,6 +168,7 @@ class _SettingPageState extends State<SettingPage> {
Widget _buildServer() {
return Column(
children: [
_buildNetViewType(),
_buildUpdateInterval(),
_buildMaxRetry(),
_buildDiskIgnorePath(),
@@ -795,7 +800,7 @@ class _SettingPageState extends State<SettingPage> {
'none',
];
if (names.length != TextInputType.values.length) {
throw 'names.length != TextInputType.values.length';
throw Exception('names.length != TextInputType.values.length');
}
final items = TextInputType.values.map(
(key) {
@@ -892,4 +897,35 @@ class _SettingPageState extends State<SettingPage> {
},
);
}
Widget _buildNetViewType() {
final items = NetViewType.values
.map((e) => PopupMenuItem(
value: e,
child: Text(e.name),
))
.toList();
return ListTile(
title: Text('net view type'),
trailing: ValueBuilder(
listenable: _netViewType,
build: () => PopupMenuButton<NetViewType>(
key: _netViewTypeKey,
itemBuilder: (BuildContext context) => items,
initialValue: _netViewType.value,
onSelected: (idx) {
_netViewType.value = idx;
_setting.netViewType.put(idx);
},
child: Text(
_netViewType.value.name,
style: textSize15,
),
),
),
onTap: () {
_keyboardTypeKey.currentState?.showButtonMenu();
},
);
}
}

View File

@@ -71,7 +71,6 @@ class _SnippetListPageState extends State<SnippetListPage> {
return ReorderableListView.builder(
padding: const EdgeInsets.all(13),
itemCount: filtered.length,
buildDefaultDragHandles: false,
onReorder: (oldIdx, newIdx) => setState(() {
provider.snippets.moveByItem(
filtered,

View File

@@ -43,7 +43,6 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
final allKeys = [...keys, ...disabled];
return ReorderableListView.builder(
padding: const EdgeInsets.fromLTRB(11, 3, 0, 3),
buildDefaultDragHandles: false,
itemBuilder: (_, idx) {
final key = allKeys[idx];
return ListTile(