mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-05-15 14:32:48 +00:00
Added date on home charts tooltip
This commit is contained in:
parent
97d113f162
commit
2fed0e584c
7 changed files with 194 additions and 23 deletions
|
@ -1,20 +1,57 @@
|
|||
import 'package:adguard_home_manager/screens/home/combined_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
import 'package:adguard_home_manager/screens/home/combined_chart.dart';
|
||||
|
||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||
|
||||
|
||||
class CustomCombinedLineChart extends StatelessWidget {
|
||||
final CombinedChartData inputData;
|
||||
final List<DateTime> dates;
|
||||
final BuildContext context;
|
||||
final bool daysInterval;
|
||||
|
||||
const CustomCombinedLineChart({
|
||||
Key? key,
|
||||
required this.inputData,
|
||||
required this.context,
|
||||
required this.dates,
|
||||
required this.daysInterval
|
||||
}) : super(key: key);
|
||||
|
||||
LineChartData mainData(Map<String, dynamic> data, ThemeMode selectedTheme) {
|
||||
String chartDate(DateTime date) {
|
||||
String twoDigits(int number) => number.toString().padLeft(2, '0');
|
||||
|
||||
String getMonth(int month) {
|
||||
final List<String> months = [
|
||||
AppLocalizations.of(context)!.january,
|
||||
AppLocalizations.of(context)!.february,
|
||||
AppLocalizations.of(context)!.march,
|
||||
AppLocalizations.of(context)!.april,
|
||||
AppLocalizations.of(context)!.may,
|
||||
AppLocalizations.of(context)!.june,
|
||||
AppLocalizations.of(context)!.july,
|
||||
AppLocalizations.of(context)!.august,
|
||||
AppLocalizations.of(context)!.september,
|
||||
AppLocalizations.of(context)!.october,
|
||||
AppLocalizations.of(context)!.november,
|
||||
AppLocalizations.of(context)!.december,
|
||||
];
|
||||
return months[month-1];
|
||||
}
|
||||
|
||||
if (daysInterval == true) {
|
||||
return "${date.day} ${getMonth(date.month).substring(0, 3)}";
|
||||
}
|
||||
else {
|
||||
return "${date.day} ${getMonth(date.month).substring(0, 3)} ${twoDigits(date.hour)}:00";
|
||||
}
|
||||
}
|
||||
|
||||
return LineChartData(
|
||||
gridData: FlGridData(
|
||||
show: false,
|
||||
|
@ -49,14 +86,26 @@ class CustomCombinedLineChart extends StatelessWidget {
|
|||
tooltipBgColor: selectedTheme == ThemeMode.light
|
||||
? const Color.fromRGBO(220, 220, 220, 0.9)
|
||||
: const Color.fromRGBO(35, 35, 35, 0.9),
|
||||
getTooltipItems: (items) => items.asMap().entries.map((item) => LineTooltipItem(
|
||||
"${data['lines'][item.key]['label']}: ${item.value.y.toInt().toString()}",
|
||||
TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 14,
|
||||
color: data['lines'][item.key]['color']
|
||||
)
|
||||
)).toList()
|
||||
getTooltipItems: (items) {
|
||||
return [
|
||||
LineTooltipItem(
|
||||
chartDate(dates[items[0].x.toInt()]),
|
||||
TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).colorScheme.onSurface
|
||||
)
|
||||
),
|
||||
...items.sublist(0, items.length-1).asMap().entries.map((item) => LineTooltipItem(
|
||||
"${data['lines'][item.key]['label']}: ${item.value.y.toInt().toString()}",
|
||||
TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 14,
|
||||
color: data['lines'][item.key]['color']
|
||||
)
|
||||
))
|
||||
];
|
||||
}
|
||||
),
|
||||
)
|
||||
);
|
||||
|
@ -89,8 +138,22 @@ class CustomCombinedLineChart extends StatelessWidget {
|
|||
return formattedData;
|
||||
}
|
||||
|
||||
List<Map<String, dynamic>> toDraw = [];
|
||||
List<FlSpot> datesLine(int number) {
|
||||
final List<FlSpot> formattedData = [];
|
||||
|
||||
for (int i = 0; i < number; i++) {
|
||||
formattedData.add(
|
||||
FlSpot(
|
||||
i.toDouble(),
|
||||
0
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return formattedData;
|
||||
}
|
||||
|
||||
List<Map<String, dynamic>> toDraw = [];
|
||||
toDraw.add({
|
||||
"data": dataLine(unformattedData.totalQueries.data),
|
||||
"color": unformattedData.totalQueries.color,
|
||||
|
@ -117,6 +180,10 @@ class CustomCombinedLineChart extends StatelessWidget {
|
|||
"label": unformattedData.replacedParental!.label
|
||||
});
|
||||
}
|
||||
toDraw.add({
|
||||
"data": datesLine(dates.length),
|
||||
"color": Colors.transparent,
|
||||
});
|
||||
|
||||
return {
|
||||
'lines': toDraw,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue