SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2024-09-21 10:57:52 +00:00
Code Issues Projects Releases Wiki Activity

feat(charts): Implement disk usage chart for server screen

Browse source
This commit is contained in:
NaiJi 2024-08-05 12:43:52 +04:00 committed by Inex Code
parent 68f34dc7b7
commit bc121aa7ed
3 changed files with 155 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assets/translations/en.json
View file

@ -136,6 +136,7 @@
"day": "Day", "day": "Day",
"hour": "Hour", "hour": "Hour",
"cpu_title": "CPU Usage", "cpu_title": "CPU Usage",
"disk_title": "Disk Usage",
"network_title": "Network Usage", "network_title": "Network Usage",
"in": "In", "in": "In",
"out": "Out", "out": "Out",

24
lib/ui/pages/server_details/charts/chart.dart
View file

@ -161,7 +161,7 @@ class _Chart extends StatelessWidget {
children: [ children: [
Flexible( Flexible(
child: Text( child: Text(
'resource_chart.network_title'.tr(), 'resource_chart.disk_title'.tr(),
style: style:
Theme.of(context).textTheme.titleMedium?.copyWith( Theme.of(context).textTheme.titleMedium?.copyWith(
color: Theme.of(context) color: Theme.of(context)
@ -177,16 +177,16 @@ class _Chart extends StatelessWidget {
runSpacing: 8.0, runSpacing: 8.0,
alignment: WrapAlignment.end, alignment: WrapAlignment.end,
runAlignment: WrapAlignment.end, runAlignment: WrapAlignment.end,
children: [ children: state.diskMetrics?.diskMetrics.keys
Legend( .map<Widget>(
color: Theme.of(context).colorScheme.primary, (final diskId) => Legend(
text: 'resource_chart.in'.tr(), color:
), Theme.of(context).colorScheme.primary,
Legend( text: diskId,
color: Theme.of(context).colorScheme.tertiary, ),
text: 'resource_chart.out'.tr(), )
), .toList() ??
], [],
), ),
), ),
], ],
@ -321,7 +321,7 @@ Widget getDiskChart(final MetricsLoaded state) {
return SizedBox( return SizedBox(
height: 200, height: 200,
child: DiskChart( child: DiskChart(
listData: data.diskMetrics.values.toList(), diskData: data.diskMetrics,
period: state.period, period: state.period,
start: state.metrics.start, start: state.metrics.start,
), ),

310
lib/ui/pages/server_details/charts/disk_charts.dart
View file

@ -10,17 +10,17 @@ import 'package:selfprivacy/ui/pages/server_details/charts/bottom_title.dart';
class DiskChart extends StatelessWidget { class DiskChart extends StatelessWidget {
const DiskChart({ const DiskChart({
required this.listData, required this.diskData,
required this.period, required this.period,
required this.start, required this.start,
super.key, super.key,
}); });
final List<List<TimeSeriesData>> listData; final Map<String, List<TimeSeriesData>> diskData;
final Period period; final Period period;
final DateTime start; final DateTime start;
List<FlSpot> getSpots(final data) { List<FlSpot> getSpots(final List<TimeSeriesData> data) {
var i = 0; var i = 0;
final List<FlSpot> res = []; final List<FlSpot> res = [];
@ -33,182 +33,156 @@ class DiskChart extends StatelessWidget {
} }
@override @override
Widget build(final BuildContext context) => LineChart( Widget build(final BuildContext context) {
LineChartData( final anyDiskId = diskData.keys.toList()[0];
lineTouchData: LineTouchData( final diskDataMax = [
enabled: true, ...diskData.values.map<List<double>>(
touchTooltipData: LineTouchTooltipData( (final timeData) => timeData.map((final e) => e.value).toList(),
getTooltipColor: (final LineBarSpot _) => ),
Theme.of(context).colorScheme.surface, ].expand((final x) => x).reduce(max);
tooltipPadding: const EdgeInsets.all(8), return LineChart(
getTooltipItems: (final List<LineBarSpot> touchedBarSpots) { LineChartData(
final List<LineTooltipItem> res = []; lineTouchData: LineTouchData(
enabled: true,
touchTooltipData: LineTouchTooltipData(
getTooltipColor: (final LineBarSpot _) =>
Theme.of(context).colorScheme.surface,
tooltipPadding: const EdgeInsets.all(8),
getTooltipItems: (final List<LineBarSpot> touchedBarSpots) {
final List<LineTooltipItem> res = [];
bool timeShown = false; bool timeShown = false;
for (final spot in touchedBarSpots) {
final value = spot.y;
final date = diskData[anyDiskId]![spot.x.toInt()].time;
for (final spot in touchedBarSpots) { res.add(
final value = spot.y; LineTooltipItem(
final date = listData[0][spot.x.toInt()].time; '${timeShown ? '' : DateFormat('HH:mm dd.MM.yyyy').format(date)} ${diskData.keys.toList()[spot.barIndex]} ${value.toInt()}%',
TextStyle(
color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.bold,
),
),
);
res.add( timeShown = true;
LineTooltipItem( }
'${timeShown ? '' : DateFormat('HH:mm dd.MM.yyyy').format(date)} ${spot.barIndex == 0 ? 'resource_chart.in'.tr() : 'resource_chart.out'.tr()} ${DiskSize(byte: value.toInt()).toString()}',
TextStyle( return res;
color: Theme.of(context).colorScheme.onSurface, },
fontWeight: FontWeight.bold, ),
),
lineBarsData: diskData.values
.toList()
.map<LineChartBarData>(
(final timeData) => LineChartBarData(
spots: getSpots(timeData),
isCurved: false,
barWidth: 2,
color: Theme.of(context).colorScheme.primary,
dotData: const FlDotData(
show: false,
),
belowBarData: BarAreaData(
show: true,
gradient: LinearGradient(
colors: [
Theme.of(context).colorScheme.primary.withOpacity(0.5),
Theme.of(context).colorScheme.primary.withOpacity(0.0),
],
begin: Alignment.bottomCenter,
end: Alignment.topCenter,
),
),
),
)
.toList(),
minY: 0,
maxY: 100,
minX: 0,
titlesData: FlTitlesData(
topTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
bottomTitles: AxisTitles(
sideTitles: SideTitles(
interval: 40,
reservedSize: 30,
getTitlesWidget: (final value, final titleMeta) => Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
bottomTitle(
value.toInt(),
diskData[anyDiskId]!,
period,
),
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
), ),
), ),
); ),
showTitles: true,
timeShown = true;
}
return res;
},
), ),
), ),
lineBarsData: [ leftTitles: const AxisTitles(
// IN sideTitles: SideTitles(showTitles: false),
LineChartBarData(
spots: getSpots(listData[0]),
isCurved: false,
barWidth: 2,
color: Theme.of(context).colorScheme.primary,
dotData: const FlDotData(
show: false,
),
belowBarData: BarAreaData(
show: true,
gradient: LinearGradient(
colors: [
Theme.of(context).colorScheme.primary.withOpacity(0.5),
Theme.of(context).colorScheme.primary.withOpacity(0.0),
],
begin: Alignment.bottomCenter,
end: Alignment.topCenter,
),
),
),
// OUT
LineChartBarData(
spots: getSpots(listData[1]),
isCurved: false,
barWidth: 2,
color: Theme.of(context).colorScheme.tertiary,
dotData: const FlDotData(
show: false,
),
belowBarData: BarAreaData(
show: true,
gradient: LinearGradient(
colors: [
Theme.of(context).colorScheme.tertiary.withOpacity(0.5),
Theme.of(context).colorScheme.tertiary.withOpacity(0.0),
],
begin: Alignment.bottomCenter,
end: Alignment.topCenter,
),
),
),
],
minY: 0,
maxY: [
...listData[0].map((final e) => e.value),
...listData[1].map((final e) => e.value),
].reduce(max) *
1.2,
minX: 0,
titlesData: FlTitlesData(
topTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
bottomTitles: AxisTitles(
sideTitles: SideTitles(
interval: 40,
reservedSize: 30,
getTitlesWidget: (final value, final titleMeta) => Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
bottomTitle(
value.toInt(),
listData[0],
period,
),
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
showTitles: true,
),
),
leftTitles: const AxisTitles(
sideTitles: SideTitles(showTitles: false),
),
rightTitles: AxisTitles(
sideTitles: SideTitles(
reservedSize: 50,
getTitlesWidget: (final value, final titleMeta) => Padding(
padding: const EdgeInsets.only(left: 5),
child: Text(
DiskSize(byte: value.toInt()).toString(),
style: Theme.of(context).textTheme.labelSmall?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
),
interval: [
...listData[0].map((final e) => e.value),
...listData[1].map((final e) => e.value),
].reduce(max) *
2 /
6.5,
showTitles: true,
),
),
), ),
gridData: FlGridData( rightTitles: AxisTitles(
show: true, sideTitles: SideTitles(
drawVerticalLine: true, reservedSize: 50,
verticalInterval: 40, getTitlesWidget: (final value, final titleMeta) => Padding(
horizontalInterval: [ padding: const EdgeInsets.only(left: 5),
...listData[0].map((final e) => e.value), child: Text(
...listData[1].map((final e) => e.value), '${value.toInt()}%',
].reduce(max) * style: Theme.of(context).textTheme.labelSmall?.copyWith(
2 / color: Theme.of(context).colorScheme.onSurfaceVariant,
6.5, ),
getDrawingHorizontalLine: (final value) => FlLine( ),
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
strokeWidth: 1,
),
getDrawingVerticalLine: (final value) => FlLine(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
strokeWidth: 1,
),
),
borderData: FlBorderData(
show: true,
border: Border(
bottom: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
left: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
right: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
top: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
), ),
interval: diskDataMax * 2 / 6.5,
showTitles: true,
), ),
), ),
), ),
); gridData: FlGridData(
show: true,
drawVerticalLine: true,
verticalInterval: 40,
horizontalInterval: diskDataMax * 2 / 6.5,
getDrawingHorizontalLine: (final value) => FlLine(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
strokeWidth: 1,
),
getDrawingVerticalLine: (final value) => FlLine(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
strokeWidth: 1,
),
),
borderData: FlBorderData(
show: true,
border: Border(
bottom: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
left: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
right: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
top: BorderSide(
color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
width: 1,
),
),
),
),
);
}
bool checkToShowTitle( bool checkToShowTitle(
final double minValue, final double minValue,