SelfPrivacy
/
selfprivacy.org.app
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update breaking fl_chart dependency

This commit is contained in:
Inex Code 2022-04-05 18:50:47 +03:00
parent 073b7bfcb6
commit bef625a934
4 changed files with 83 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/ui/pages/server_details/cpu_chart.dart
View File

@ -35,9 +35,7 @@ class CpuChart extends StatelessWidget {
spots: getSpots(), spots: getSpots(),
isCurved: true, isCurved: true,
barWidth: 1, barWidth: 1,
colors: [ color: Colors.red,
Colors.red,
],
dotData: FlDotData( dotData: FlDotData(
show: false, show: false,
), ),
@ -47,28 +45,45 @@ class CpuChart extends StatelessWidget {
maxY: 100, maxY: 100,
minX: data.length - 200, minX: data.length - 200,
titlesData: FlTitlesData( titlesData: FlTitlesData(
topTitles: SideTitles(showTitles: false), topTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)),
bottomTitles: SideTitles( bottomTitles: AxisTitles(
sideTitles: SideTitles(
interval: 20, interval: 20,
rotateAngle: 90.0, reservedSize: 50,
showTitles: true, getTitlesWidget: (value, titleMeta) {
getTextStyles: (_, __) => const TextStyle( return Padding(
fontSize: 10, padding: const EdgeInsets.all(8.0),
color: Colors.purple, child: RotatedBox(
fontWeight: FontWeight.bold, child: Text(bottomTitle(value.toInt()),
style: TextStyle(
fontSize: 10,
color: Colors.purple,
fontWeight: FontWeight.bold,
)),
quarterTurns: 1,
), ),
getTitles: (value) { );
return bottomTitle(value.toInt()); },
}), showTitles: true,
leftTitles: SideTitles( ),
getTextStyles: (_, __) => progressTextStyleLight.copyWith( ),
color: Theme.of(context).brightness == Brightness.dark leftTitles: AxisTitles(
? BrandColors.gray4 sideTitles: SideTitles(
: null, getTitlesWidget: (value, titleMeta) {
return Padding(
padding: EdgeInsets.only(right: 15),
child: Text(
value.toInt().toString(),
style: progressTextStyleLight.copyWith(
color: Theme.of(context).brightness == Brightness.dark
? BrandColors.gray4
: null,
),
));
},
interval: 25,
showTitles: false,
), ),
margin: 15,
interval: 25,
showTitles: true,
), ),
), ),
gridData: FlGridData(show: true), gridData: FlGridData(show: true),

71
lib/ui/pages/server_details/network_charts.dart
View File

@ -44,7 +44,7 @@ class NetworkChart extends StatelessWidget {
spots: getSpots(listData[0]), spots: getSpots(listData[0]),
isCurved: true, isCurved: true,
barWidth: 1, barWidth: 1,
colors: [Colors.red], color: Colors.red,
dotData: FlDotData( dotData: FlDotData(
show: false, show: false,
), ),
@ -53,7 +53,7 @@ class NetworkChart extends StatelessWidget {
spots: getSpots(listData[1]), spots: getSpots(listData[1]),
isCurved: true, isCurved: true,
barWidth: 1, barWidth: 1,
colors: [Colors.green], color: Colors.green,
dotData: FlDotData( dotData: FlDotData(
show: false, show: false,
), ),
@ -67,34 +67,51 @@ class NetworkChart extends StatelessWidget {
1.2, 1.2,
minX: listData[0].length - 200, minX: listData[0].length - 200,
titlesData: FlTitlesData( titlesData: FlTitlesData(
topTitles: SideTitles(showTitles: false), topTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)),
bottomTitles: SideTitles( bottomTitles: AxisTitles(
sideTitles: SideTitles(
interval: 20, interval: 20,
rotateAngle: 90.0, reservedSize: 50,
showTitles: true, getTitlesWidget: (value, titleMeta) {
getTextStyles: (_, __) => const TextStyle( return Padding(
fontSize: 10, padding: const EdgeInsets.all(8.0),
color: Colors.purple, child: RotatedBox(
fontWeight: FontWeight.bold, child: Text(bottomTitle(value.toInt()),
style: TextStyle(
fontSize: 10,
color: Colors.purple,
fontWeight: FontWeight.bold,
)),
quarterTurns: 1,
), ),
getTitles: (value) { );
return bottomTitle(value.toInt()); },
}), showTitles: true,
leftTitles: SideTitles( ),
reservedSize: 50, ),
margin: 5, leftTitles: AxisTitles(
interval: [ sideTitles: SideTitles(
...listData[0].map((e) => e.value), reservedSize: 50,
...listData[1].map((e) => e.value) getTitlesWidget: (value, titleMeta) {
].reduce(max) * return Padding(
2 / padding: EdgeInsets.only(right: 5),
10, child: Text(
getTextStyles: (_, __) => progressTextStyleLight.copyWith( value.toInt().toString(),
color: Theme.of(context).brightness == Brightness.dark style: progressTextStyleLight.copyWith(
? BrandColors.gray4 color: Theme.of(context).brightness == Brightness.dark
: null, ? BrandColors.gray4
: null,
),
));
},
interval: [
...listData[0].map((e) => e.value),
...listData[1].map((e) => e.value)
].reduce(max) *
2 /
10,
showTitles: false,
), ),
showTitles: true,
), ),
), ),
gridData: FlGridData(show: true), gridData: FlGridData(show: true),

2
pubspec.lock
View File

@ -301,7 +301,7 @@ packages:
name: fl_chart name: fl_chart
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.45.0" version: "0.50.1"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter

2
pubspec.yaml
View File

@ -17,7 +17,7 @@ dependencies:
easy_localization: ^3.0.0 easy_localization: ^3.0.0
either_option: ^2.0.1-dev.1 either_option: ^2.0.1-dev.1
equatable: ^2.0.3 equatable: ^2.0.3
fl_chart: ^0.45.0 fl_chart: ^0.50.1
flutter: flutter:
sdk: flutter sdk: flutter
flutter_bloc: ^8.0.1 flutter_bloc: ^8.0.1