BBreaking change

This commit is contained in:
LollipopKit
2021-10-26 07:31:42 +08:00
parent 44e9780e5a
commit a725604121
20 changed files with 710 additions and 183 deletions

View File

@@ -1,8 +1,13 @@
import 'package:after_layout/after_layout.dart';
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/provider/private_key.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/locator.dart';
import 'package:toolbox/view/page/private_key/edit.dart';
class ServerEditPage extends StatefulWidget {
const ServerEditPage({Key? key, this.spi}) : super(key: key);
@@ -25,6 +30,9 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
bool usePublicKey = false;
int _typeOptionIndex = -1;
final List<String> _keyInfo = ['', ''];
@override
void initState() {
super.initState();
@@ -34,7 +42,16 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: const Text('Edit')),
appBar: AppBar(title: const Text('Edit'), actions: [
widget.spi != null
? IconButton(
onPressed: () {
_serverProvider.delServer(widget.spi!);
Navigator.of(context).pop();
},
icon: const Icon(Icons.delete))
: const SizedBox()
]),
body: SingleChildScrollView(
padding: const EdgeInsets.all(17),
child: Column(
@@ -49,6 +66,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
TextField(
controller: ipController,
keyboardType: TextInputType.text,
autocorrect: false,
decoration: _buildDecoration('Host', icon: Icons.storage),
),
TextField(
@@ -60,6 +78,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
TextField(
controller: usernameController,
keyboardType: TextInputType.text,
autocorrect: false,
decoration: _buildDecoration('User', icon: Icons.account_box),
),
const SizedBox(height: 7),
@@ -71,37 +90,59 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
onChanged: (val) => setState(() => usePublicKey = val)),
],
),
usePublicKey
!usePublicKey
? TextField(
controller: keyController,
controller: passwordController,
obscureText: true,
keyboardType: TextInputType.text,
autocorrect: false,
maxLines: 10,
minLines: 5,
decoration:
_buildDecoration('Private Key', icon: Icons.vpn_key),
decoration: _buildDecoration('Pwd', icon: Icons.password),
onSubmitted: (_) => {},
)
: const SizedBox(),
TextField(
controller: passwordController,
obscureText: true,
keyboardType: TextInputType.text,
decoration: _buildDecoration('Pwd', icon: Icons.password),
onSubmitted: (_) => {},
),
usePublicKey
? Consumer<PrivateKeyProvider>(builder: (_, key, __) {
final tiles = key.infos
.map(
(e) => ListTile(
contentPadding: EdgeInsets.zero,
title: Text(e.id, textAlign: TextAlign.start),
trailing: _buildRadio(key.infos.indexOf(e),
e.privateKey, e.password)),
)
.toList();
tiles.add(ListTile(
title: const Text('Add a Private Key'),
contentPadding: EdgeInsets.zero,
trailing: IconButton(
icon: const Icon(Icons.add),
onPressed: () => AppRoute(const PrivateKeyEditPage(),
'private key edit page')
.go(context),
),
));
return ExpansionTile(
tilePadding: EdgeInsets.zero,
childrenPadding: EdgeInsets.zero,
title: const Text(
'Choose Key',
style: TextStyle(fontSize: 14),
),
children: tiles,
);
})
: const SizedBox()
],
),
),
floatingActionButton: FloatingActionButton(
child: const Icon(Icons.send),
onPressed: () {
final authorization = keyController.text.isEmpty
? passwordController.text
: {
"privateKey": keyController.text,
"passphrase": passwordController.text
};
if (usePublicKey && _typeOptionIndex == -1) {
showSnackBar(context, const Text('Please select a private key.'));
}
final authorization = usePublicKey
? {"privateKey": _keyInfo[0], "passphrase": _keyInfo[1]}
: passwordController.text;
final spi = ServerPrivateInfo(
name: nameController.text,
ip: ipController.text,
@@ -121,6 +162,20 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
);
}
Radio _buildRadio(int index, String key, String pwd) {
return Radio<int>(
value: index,
groupValue: _typeOptionIndex,
onChanged: (int? value) {
setState(() {
_typeOptionIndex = value!;
_keyInfo[0] = key;
_keyInfo[1] = pwd;
});
},
);
}
InputDecoration _buildDecoration(String label,
{TextStyle? textStyle, IconData? icon}) {
return InputDecoration(

View File

@@ -1,5 +1,5 @@
import 'package:after_layout/after_layout.dart';
import 'package:charts_flutter/flutter.dart' as chart;
import 'package:circle_chart/circle_chart.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
@@ -9,9 +9,9 @@ import 'package:toolbox/core/route.dart';
import 'package:toolbox/data/model/server_private_info.dart';
import 'package:toolbox/data/model/server_status.dart';
import 'package:toolbox/data/provider/server.dart';
import 'package:toolbox/data/store/setting.dart';
import 'package:toolbox/locator.dart';
import 'package:toolbox/view/page/server/server_edit.dart';
import 'package:toolbox/view/widget/circle_pie.dart';
import 'package:toolbox/view/page/server/edit.dart';
class ServerPage extends StatefulWidget {
const ServerPage({Key? key}) : super(key: key);
@@ -24,6 +24,7 @@ class _ServerPageState extends State<ServerPage>
with AutomaticKeepAliveClientMixin, AfterLayoutMixin {
late MediaQueryData _media;
late ThemeData _theme;
late Color _primaryColor;
late ServerProvider _serverProvider;
@@ -38,6 +39,7 @@ class _ServerPageState extends State<ServerPage>
super.didChangeDependencies();
_media = MediaQuery.of(context);
_theme = Theme.of(context);
_primaryColor = Color(locator<SettingStore>().primaryColor.fetch()!);
}
@override
@@ -102,19 +104,6 @@ class _ServerPageState extends State<ServerPage>
}
Widget _buildRealServerCard(ServerStatus ss, String serverName) {
final cpuData = [
IndexPercent(0, ss.cpuPercent!.toInt()),
IndexPercent(1, 100 - ss.cpuPercent!.toInt()),
];
final memData = <IndexPercent>[];
for (var e in ss.memList!) {
memData.add(IndexPercent(ss.memList!.indexOf(e), e!.toInt()));
}
final mem1 = memData[1];
memData[1] = memData.last;
memData.last = mem1;
final rootDisk =
ss.disk!.firstWhere((element) => element!.mountLocation == '/');
@@ -139,23 +128,9 @@ class _ServerPageState extends State<ServerPage>
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_buildPercentCircle(ss.cpuPercent!, 'CPU', [
chart.Series<IndexPercent, int>(
id: 'CPU',
domainFn: (IndexPercent cpu, _) => cpu.id,
measureFn: (IndexPercent cpu, _) => cpu.percent,
data: cpuData,
)
]),
_buildPercentCircle(ss.cpuPercent! + 0.01, 'CPU'),
_buildPercentCircle(
ss.memList![1]! / ss.memList![0]! * 100, 'Mem', [
chart.Series<IndexPercent, int>(
id: 'Mem',
domainFn: (IndexPercent mem, _) => mem.id,
measureFn: (IndexPercent mem, _) => mem.percent,
data: memData,
)
]),
ss.memList![1]! / ss.memList![0]! * 100 + 0.01, 'Mem'),
_buildIOData('Net', 'Conn:\n' + ss.tcp!.maxConn!.toString(),
'Fail:\n' + ss.tcp!.fail.toString()),
_buildIOData('Disk', 'Total:\n' + rootDisk!.size!,
@@ -172,59 +147,53 @@ class _ServerPageState extends State<ServerPage>
return SizedBox(
width: _media.size.width * 0.2,
height: _media.size.height * 0.1,
child: Stack(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Positioned.fill(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
up,
style: statusTextStyle,
textAlign: TextAlign.center,
),
const SizedBox(height: 3),
Text(
down + '\n',
style: statusTextStyle,
textAlign: TextAlign.center,
)
],
),
),
Text(
up,
style: statusTextStyle,
textAlign: TextAlign.center,
),
Positioned(
child: Text(title, textAlign: TextAlign.center),
bottom: 0,
left: 0,
right: 0)
const SizedBox(height: 3),
Text(
down + '\n',
style: statusTextStyle,
textAlign: TextAlign.center,
),
Text(title, textAlign: TextAlign.center)
],
),
);
}
Widget _buildPercentCircle(double percent, String title,
List<chart.Series<IndexPercent, int>> series) {
Widget _buildPercentCircle(double percent, String title) {
return SizedBox(
width: _media.size.width * 0.2,
height: _media.size.height * 0.1,
child: Stack(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
DonutPieChart(series),
Positioned.fill(
child: Center(
child: Text(
'${percent.toStringAsFixed(1)}%\n',
textAlign: TextAlign.center,
Stack(
children: [
CircleChart(
progressColor: _primaryColor,
progressNumber: percent,
maxNumber: 100,
width: _media.size.width * 0.37,
height: _media.size.height * 0.09,
),
),
Positioned.fill(
child: Center(
child: Text(
'${percent.toStringAsFixed(1)}%',
textAlign: TextAlign.center,
),
),
),
],
),
Positioned(
child: Text(title, textAlign: TextAlign.center),
bottom: 0,
left: 0,
right: 0)
Text(title, textAlign: TextAlign.center),
],
),
);