luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-14 05:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added date on home charts tooltip

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-07-10 20:45:03 +02:00
parent 97d113f162
commit 2fed0e584c
7 changed files with 194 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/screens/home/chart.dart
View file

@ -11,6 +11,7 @@ class HomeChart extends StatelessWidget {
final String primaryValue;
final String secondaryValue;
final Color color;
final int hoursInterval;
const HomeChart({
Key? key,
@ -18,22 +19,24 @@ class HomeChart extends StatelessWidget {
required this.label,
required this.primaryValue,
required this.secondaryValue,
required this.color
required this.color,
required this.hoursInterval
}) : super(key: key);
@override
Widget build(BuildContext context) {
final appConfigProvider = Provider.of<AppConfigProvider>(context);
bool isEmpty = true;
for (int item in data) {
if (item > 0) {
isEmpty = false;
break;
}
}
final bool isEmpty = data.any((i) => i == 0);
if (!(appConfigProvider.hideZeroValues == true && isEmpty == true)) {
List<DateTime> dateTimes = [];
DateTime currentDate = DateTime.now().subtract(Duration(hours: hoursInterval*data.length+1));
for (var i = 0; i < data.length; i++) {
currentDate = currentDate.add(Duration(hours: hoursInterval));
dateTimes.add(currentDate);
}
return Column(
children: [
Padding(
@ -109,6 +112,9 @@ class HomeChart extends StatelessWidget {
child: CustomLineChart(
data: data,
color: color,
dates: dateTimes,
daysInterval: hoursInterval == 24,
context: context,
)
),
],

17
lib/screens/home/combined_chart.dart
View file

@ -20,7 +20,7 @@ class CombinedChartData {
required this.totalQueries,
this.blockedFilters,
this.replacedSafeBrowsing,
this.replacedParental
this.replacedParental,
});
}
@ -149,6 +149,15 @@ class CombinedHomeChart extends StatelessWidget {
);
}
final hoursInterval = statusProvider.serverStatus!.stats.timeUnits == "days" ? 24 : 1;
List<DateTime> dateTimes = [];
DateTime currentDate = DateTime.now().subtract(Duration(hours: hoursInterval*statusProvider.serverStatus!.stats.dnsQueries.length+1));
for (var i = 0; i < statusProvider.serverStatus!.stats.dnsQueries.length; i++) {
currentDate = currentDate.add(Duration(hours: hoursInterval));
dateTimes.add(currentDate);
}
if (width > 700) {
return Column(
children: [
@ -170,6 +179,9 @@ class CombinedHomeChart extends StatelessWidget {
width: double.maxFinite,
child: CustomCombinedLineChart(
inputData: data,
context: context,
dates: dateTimes,
daysInterval: hoursInterval == 24,
),
),
),
@ -241,6 +253,9 @@ class CombinedHomeChart extends StatelessWidget {
width: double.maxFinite,
child: CustomCombinedLineChart(
inputData: data,
context: context,
dates: dateTimes,
daysInterval: hoursInterval == 24,
),
),
const SizedBox(height: 16),

4
lib/screens/home/home.dart
View file

@ -131,6 +131,7 @@ class _HomeState extends State<Home> {
primaryValue: intFormat(statusProvider.serverStatus!.stats.numDnsQueries, Platform.localeName),
secondaryValue: "${doubleFormat(statusProvider.serverStatus!.stats.avgProcessingTime*1000, Platform.localeName)} ms",
color: Colors.blue,
hoursInterval: statusProvider.serverStatus!.stats.timeUnits == "days" ? 24 : 1,
),
),
FractionallySizedBox(
@ -141,6 +142,7 @@ class _HomeState extends State<Home> {
primaryValue: intFormat(statusProvider.serverStatus!.stats.numBlockedFiltering, Platform.localeName),
secondaryValue: "${statusProvider.serverStatus!.stats.numDnsQueries > 0 ? doubleFormat((statusProvider.serverStatus!.stats.numBlockedFiltering/statusProvider.serverStatus!.stats.numDnsQueries)*100, Platform.localeName) : 0}%",
color: Colors.red,
hoursInterval: statusProvider.serverStatus!.stats.timeUnits == "days" ? 24 : 1,
),
),
FractionallySizedBox(
@ -151,6 +153,7 @@ class _HomeState extends State<Home> {
primaryValue: intFormat(statusProvider.serverStatus!.stats.numReplacedSafebrowsing, Platform.localeName),
secondaryValue: "${statusProvider.serverStatus!.stats.numDnsQueries > 0 ? doubleFormat((statusProvider.serverStatus!.stats.numReplacedSafebrowsing/statusProvider.serverStatus!.stats.numDnsQueries)*100, Platform.localeName) : 0}%",
color: Colors.green,
hoursInterval: statusProvider.serverStatus!.stats.timeUnits == "days" ? 24 : 1,
),
),
FractionallySizedBox(
@ -161,6 +164,7 @@ class _HomeState extends State<Home> {
primaryValue: intFormat(statusProvider.serverStatus!.stats.numReplacedParental, Platform.localeName),
secondaryValue: "${statusProvider.serverStatus!.stats.numDnsQueries > 0 ? doubleFormat((statusProvider.serverStatus!.stats.numReplacedParental/statusProvider.serverStatus!.stats.numDnsQueries)*100, Platform.localeName) : 0}%",
color: Colors.orange,
hoursInterval: statusProvider.serverStatus!.stats.timeUnits == "days" ? 24 : 1,
),
),
],