android-apps-mirrors/Adguard-Home-Manager
0
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-06-28 20:09:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added ring chart home top items

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-10-21 21:06:38 +02:00
parent 7cd3744f70
commit 161628a72a
7 changed files with 512 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/l10n/app_en.arb
View file

@ -57,10 +57,10 @@
"serverStatusNotRefreshed": "Server status could not be refreshed", "serverStatusNotRefreshed": "Server status could not be refreshed",
"loadingStatus": "Loading status...", "loadingStatus": "Loading status...",
"errorLoadServerStatus": "Server status could not be loaded", "errorLoadServerStatus": "Server status could not be loaded",
"topQueriedDomains": "Top queried domains", "topQueriedDomains": "Queried domains",
"viewMore": "View more", "viewMore": "View more",
"topClients": "Top clients", "topClients": "Cients",
"topBlockedDomains": "Top blocked domains", "topBlockedDomains": "Blocked domains",
"appSettings": "App settings", "appSettings": "App settings",
"theme": "Theme", "theme": "Theme",
"light": "Light", "light": "Light",
@ -662,5 +662,8 @@
"topItemsOrderDescription": "Order the home screen top items lists", "topItemsOrderDescription": "Order the home screen top items lists",
"topItemsReorderInfo": "Hold and swipe an item to reorder it.", "topItemsReorderInfo": "Hold and swipe an item to reorder it.",
"discardChanges": "Discard changes", "discardChanges": "Discard changes",
"discardChangesDescription": "Are you sure you want to discard the changes?" "discardChangesDescription": "Are you sure you want to discard the changes?",
"others": "Others",
"showChart": "Show chart",
"hideChart": "Hide chart"
} }

11
lib/l10n/app_es.arb
View file

@ -57,10 +57,10 @@
"serverStatusNotRefreshed": "No se ha podido actualizar el estado del servidor", "serverStatusNotRefreshed": "No se ha podido actualizar el estado del servidor",
"loadingStatus": "Cargando estado...", "loadingStatus": "Cargando estado...",
"errorLoadServerStatus": "Error al cargar el estado", "errorLoadServerStatus": "Error al cargar el estado",
"topQueriedDomains": "Top dominios solicitados", "topQueriedDomains": "Dominios solicitados",
"viewMore": "Ver más", "viewMore": "Ver más",
"topClients": "Top clientes recurrentes", "topClients": "Clientes recurrentes",
"topBlockedDomains": "Top dominios bloqueados", "topBlockedDomains": "Dominios bloqueados",
"appSettings": "Ajustes de la app", "appSettings": "Ajustes de la app",
"theme": "Tema", "theme": "Tema",
"light": "Claro", "light": "Claro",
@ -662,5 +662,8 @@
"topItemsOrderDescription": "Ordena las listas de top de elementos en la pantalla de inicio", "topItemsOrderDescription": "Ordena las listas de top de elementos en la pantalla de inicio",
"topItemsReorderInfo": "Mantén presionado y desliza un elemento para reordenarlo.", "topItemsReorderInfo": "Mantén presionado y desliza un elemento para reordenarlo.",
"discardChanges": "Descartar cambios", "discardChanges": "Descartar cambios",
"discardChangesDescription": "¿Estás seguro de que deseas descartar los cambios realizados?" "discardChangesDescription": "¿Estás seguro de que deseas descartar los cambios realizados?",
"others": "Otros",
"showChart": "Mostrar gráfico",
"hideChart": "Ocultar gráfico"
} }

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

@ -175,110 +175,66 @@ class _HomeState extends State<Home> {
child: CombinedHomeChart(), child: CombinedHomeChart(),
), ),
if (width <= 700) ...appConfigProvider.homeTopItemsOrder.asMap().entries.map((item) { TopItemsLists(order: appConfigProvider.homeTopItemsOrder),
Widget list() {
switch (item.value) {
case HomeTopItems.queriedDomains:
return TopItems(
label: AppLocalizations.of(context)!.topQueriedDomains,
data: statusProvider.serverStatus!.stats.topQueriedDomains,
type: 'topQueriedDomains',
);
case HomeTopItems.blockedDomains:
return TopItems(
label: AppLocalizations.of(context)!.topBlockedDomains,
data: statusProvider.serverStatus!.stats.topBlockedDomains,
type: 'topBlockedDomains',
);
case HomeTopItems.recurrentClients:
return TopItems(
label: AppLocalizations.of(context)!.topClients,
data: statusProvider.serverStatus!.stats.topClients,
type: 'topClients',
clients: true,
);
default:
return const SizedBox();
}
}
return Column(
children: [
list(),
if (item.key < appConfigProvider.homeTopItemsOrder.length - 1) ...[
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Divider(
thickness: 1,
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.2),
),
),
const SizedBox(height: 16),
]
],
);
}),
if (width > 700) Column(
children: [
Wrap(
alignment: WrapAlignment.center,
children: appConfigProvider.homeTopItemsOrder.map((item) {
switch (item) {
case HomeTopItems.queriedDomains:
return Padding(
padding: const EdgeInsets.only(bottom: 16),
child: ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 500
),
child: TopItems(
label: AppLocalizations.of(context)!.topQueriedDomains,
data: statusProvider.serverStatus!.stats.topQueriedDomains,
type: 'topQueriedDomains',
),
),
);
case HomeTopItems.blockedDomains: // if (width > 700) Column(
return Padding( // children: [
padding: const EdgeInsets.only(bottom: 16), // Wrap(
child: ConstrainedBox( // alignment: WrapAlignment.center,
constraints: const BoxConstraints( // children: appConfigProvider.homeTopItemsOrder.map((item) {
maxWidth: 500 // switch (item) {
), // case HomeTopItems.queriedDomains:
child: TopItems( // return Padding(
label: AppLocalizations.of(context)!.topBlockedDomains, // padding: const EdgeInsets.only(bottom: 16),
data: statusProvider.serverStatus!.stats.topBlockedDomains, // child: ConstrainedBox(
type: 'topBlockedDomains', // constraints: const BoxConstraints(
), // maxWidth: 500
), // ),
); // child: TopItems(
// label: AppLocalizations.of(context)!.topQueriedDomains,
// data: statusProvider.serverStatus!.stats.topQueriedDomains,
// type: 'topQueriedDomains',
// ),
// ),
// );
case HomeTopItems.recurrentClients: // case HomeTopItems.blockedDomains:
return Padding( // return Padding(
padding: const EdgeInsets.only(bottom: 16), // padding: const EdgeInsets.only(bottom: 16),
child: ConstrainedBox( // child: ConstrainedBox(
constraints: const BoxConstraints( // constraints: const BoxConstraints(
maxWidth: 500 // maxWidth: 500
), // ),
child: TopItems( // child: TopItems(
label: AppLocalizations.of(context)!.topClients, // label: AppLocalizations.of(context)!.topBlockedDomains,
data: statusProvider.serverStatus!.stats.topClients, // data: statusProvider.serverStatus!.stats.topBlockedDomains,
type: 'topClients', // type: 'topBlockedDomains',
), // ),
), // ),
); // );
// case HomeTopItems.recurrentClients:
// return Padding(
// padding: const EdgeInsets.only(bottom: 16),
// child: ConstrainedBox(
// constraints: const BoxConstraints(
// maxWidth: 500
// ),
// child: TopItems(
// label: AppLocalizations.of(context)!.topClients,
// data: statusProvider.serverStatus!.stats.topClients,
// type: 'topClients',
// ),
// ),
// );
default: // default:
return const SizedBox(); // return const SizedBox();
} // }
}).toList(), // }).toList(),
), // ),
], // ],
) // )
]; ];
} }
@ -348,4 +304,75 @@ class _HomeState extends State<Home> {
), ),
); );
} }
}
class TopItemsLists extends StatelessWidget {
final List<HomeTopItems> order;
const TopItemsLists({
Key? key,
required this.order,
}) : super(key: key);
@override
Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
List<Widget> bottom = [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Divider(
thickness: 1,
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.2),
),
),
const SizedBox(height: 16),
];
return Column(
children: order.asMap().entries.map((item) {
switch (item.value) {
case HomeTopItems.queriedDomains:
return Column(
children: [
TopItems(
label: AppLocalizations.of(context)!.topQueriedDomains,
data: statusProvider.serverStatus!.stats.topQueriedDomains,
type: 'topQueriedDomains',
),
if (item.key < order.length - 1) ...bottom
],
);
case HomeTopItems.blockedDomains:
return Column(
children: [
TopItems(
label: AppLocalizations.of(context)!.topBlockedDomains,
data: statusProvider.serverStatus!.stats.topBlockedDomains,
type: 'topBlockedDomains',
),
if (item.key < order.length - 1) ...bottom
],
);
case HomeTopItems.recurrentClients:
return Column(
children: [
TopItems(
label: AppLocalizations.of(context)!.topClients,
data: statusProvider.serverStatus!.stats.topClients,
type: 'topClients',
clients: true,
),
if (item.key < order.length - 1) ...bottom
],
);
default:
return const SizedBox();
}
}).toList(),
);
}
} }

451
lib/screens/home/top_items.dart
View file

@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/custom_pie_chart.dart';
import 'package:adguard_home_manager/widgets/domain_options.dart'; import 'package:adguard_home_manager/widgets/domain_options.dart';
import 'package:adguard_home_manager/screens/top_items/top_items_modal.dart'; import 'package:adguard_home_manager/screens/top_items/top_items_modal.dart';
import 'package:adguard_home_manager/screens/top_items/top_items.dart'; import 'package:adguard_home_manager/screens/top_items/top_items.dart';
@ -15,7 +16,7 @@ import 'package:adguard_home_manager/providers/status_provider.dart';
import 'package:adguard_home_manager/providers/logs_provider.dart'; import 'package:adguard_home_manager/providers/logs_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart'; import 'package:adguard_home_manager/providers/app_config_provider.dart';
class TopItems extends StatelessWidget { class TopItems extends StatefulWidget {
final String type; final String type;
final String label; final String label;
final List<Map<String, dynamic>> data; final List<Map<String, dynamic>> data;
@ -29,104 +30,30 @@ class TopItems extends StatelessWidget {
this.clients this.clients
}) : super(key: key); }) : super(key: key);
@override
State<TopItems> createState() => _TopItemsState();
}
class _TopItemsState extends State<TopItems> {
bool _showChart = true;
final colors = [
Colors.red,
Colors.green,
Colors.blue,
Colors.orange,
Colors.teal,
Colors.grey
];
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context); final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context);
final width = MediaQuery.of(context).size.width; final width = MediaQuery.of(context).size.width;
Widget rowItem(Map<String, dynamic> item) {
String? name;
if (clients != null && clients == true) {
try {
name = statusProvider.serverStatus!.clients.firstWhere((c) => c.ids.contains(item.keys.toList()[0])).name;
} catch (e) {
// ---- //
}
}
return Material(
color: Colors.transparent,
child: DomainOptions(
item: item.keys.toList()[0],
isClient: type == 'topClients',
isBlocked: type == 'topBlockedDomains',
onTap: () {
if (type == 'topQueriedDomains' || type == 'topBlockedDomains') {
logsProvider.setSearchText(item.keys.toList()[0]);
logsProvider.setSelectedClients(null);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
searchText: item.keys.toList()[0],
clients: null
)
);
appConfigProvider.setSelectedScreen(2);
}
else if (type == 'topClients') {
logsProvider.setSearchText(null);
logsProvider.setSelectedClients([item.keys.toList()[0]]);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
searchText: null,
clients: [item.keys.toList()[0]]
)
);
}
},
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 8
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.keys.toList()[0],
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16,
color: Theme.of(context).colorScheme.onSurface
),
),
if (name != null) ...[
const SizedBox(height: 5),
Text(
name,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSurfaceVariant
),
),
]
],
),
),
Text(
item.values.toList()[0].toString(),
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
),
),
);
}
List<Map<String, dynamic>> generateData() { List<Map<String, dynamic>> generateData() {
switch (type) { switch (widget.type) {
case 'topQueriedDomains': case 'topQueriedDomains':
return statusProvider.serverStatus!.stats.topQueriedDomains; return statusProvider.serverStatus!.stats.topQueriedDomains;
@ -141,37 +68,123 @@ class TopItems extends StatelessWidget {
} }
} }
Map<String, double> chartData() {
Map<String, double> values = {};
widget.data.sublist(0, widget.data.length > 5 ? 5 : widget.data.length).forEach((element) {
values = {
...values,
element.keys.first: element.values.first.toDouble()
};
});
if (widget.data.length > 5) {
final int rest = List<int>.from(
widget.data.sublist(5, widget.data.length).map((e) => e.values.first.toInt())
).reduce((a, b) => a + b);
values = {
...values,
AppLocalizations.of(context)!.others: rest.toDouble()
};
}
return values;
}
final List<Widget> itemsList = widget.data.sublist(
0,
widget.data.length > 5 ? 5 : widget.data.length
).asMap().entries.map((e) => RowItem(
clients: widget.clients ?? false,
domain: e.value.keys.toList()[0],
number: e.value.values.toList()[0].toString(),
type: widget.type,
chartColor: _showChart ? colors[e.key] : null,
)).toList();
final Widget noItems = Padding(
padding: const EdgeInsets.only(
bottom: 20,
top: 10
),
child: Text(
AppLocalizations.of(context)!.noItems,
style: TextStyle(
fontSize: 16,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
);
final Widget chart = CustomPieChart(
data: chartData(),
colors: colors
);
return SizedBox( return SizedBox(
child: Column( child: Column(
children: [ children: [
Text( Padding(
label, padding: const EdgeInsets.symmetric(horizontal: 16),
style: TextStyle( child: Row(
fontSize: 18, mainAxisAlignment: width <= 700
fontWeight: FontWeight.w500, ? MainAxisAlignment.spaceBetween
color: Theme.of(context).colorScheme.onSurface : MainAxisAlignment.center,
children: [
Text(
widget.label,
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w500,
color: Theme.of(context).colorScheme.onSurface
),
),
if (width <= 700) TextButton(
onPressed: () => setState(() => _showChart = !_showChart),
child: Text(
_showChart
? AppLocalizations.of(context)!.hideChart
: AppLocalizations.of(context)!.showChart
)
)
],
), ),
), ),
const SizedBox(height: 20),
if (data.isEmpty) Padding( const SizedBox(height: 24),
padding: const EdgeInsets.only(
bottom: 20, if (widget.data.isEmpty) noItems,
top: 10 if (widget.data.isNotEmpty && width > 700) SizedBox(
), height: 240,
child: Text( child: Row(
AppLocalizations.of(context)!.noItems, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
style: TextStyle( children: [
fontSize: 16, Expanded(
color: Theme.of(context).colorScheme.onSurfaceVariant, flex: 1,
), child: Padding(
padding: const EdgeInsets.all(16),
child: chart,
)
),
Expanded(
flex: 2,
child: Column(
children: [
...itemsList,
OthersRowItem(items: widget.data)
]
),
)
],
), ),
), ),
if (data.isNotEmpty) rowItem(data[0]), if (widget.data.isNotEmpty && width <= 700) ...[
if (data.length >= 2) rowItem(data[1]), if (_showChart) ...[
if (data.length >= 3) rowItem(data[2]), chart,
if (data.length >= 4) rowItem(data[3]), const SizedBox(height: 16),
if (data.length >= 5) rowItem(data[4]), ],
if (data.length > 5) ...[ ...itemsList,
if (_showChart) OthersRowItem(items: widget.data)
],
if (widget.data.length > 5) ...[
const SizedBox(height: 20), const SizedBox(height: 20),
Padding( Padding(
padding: const EdgeInsets.only(right: 20), padding: const EdgeInsets.only(right: 20),
@ -185,9 +198,9 @@ class TopItems extends StatelessWidget {
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (context) => TopItemsModal( builder: (context) => TopItemsModal(
type: type, type: widget.type,
title: label, title: widget.label,
isClient: clients, isClient: widget.clients,
data: generateData(), data: generateData(),
) )
) )
@ -196,9 +209,9 @@ class TopItems extends StatelessWidget {
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (context) => TopItemsScreen( builder: (context) => TopItemsScreen(
type: type, type: widget.type,
title: label, title: widget.label,
isClient: clients, isClient: widget.clients,
data: generateData(), data: generateData(),
) )
) )
@ -226,4 +239,198 @@ class TopItems extends StatelessWidget {
), ),
); );
} }
}
class RowItem extends StatelessWidget {
final String type;
final Color? chartColor;
final String domain;
final String number;
final bool clients;
const RowItem({
Key? key,
required this.type,
this.chartColor,
required this.domain,
required this.number,
required this.clients
}) : super(key: key);
@override
Widget build(BuildContext context) {
final statusProvider = Provider.of<StatusProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
final logsProvider = Provider.of<LogsProvider>(context);
String? name;
if (clients == true) {
try {
name = statusProvider.serverStatus!.clients.firstWhere((c) => c.ids.contains(domain)).name;
} catch (e) {
// ---- //
}
}
return Material(
color: Colors.transparent,
child: DomainOptions(
item: domain,
isClient: type == 'topClients',
isBlocked: type == 'topBlockedDomains',
onTap: () {
if (type == 'topQueriedDomains' || type == 'topBlockedDomains') {
logsProvider.setSearchText(domain);
logsProvider.setSelectedClients(null);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
searchText: domain,
clients: null
)
);
appConfigProvider.setSelectedScreen(2);
}
else if (type == 'topClients') {
logsProvider.setSearchText(null);
logsProvider.setSelectedClients([domain]);
logsProvider.setAppliedFilters(
AppliedFiters(
selectedResultStatus: 'all',
searchText: null,
clients: [domain]
)
);
}
},
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 8
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Row(
children: [
if (chartColor != null) Container(
margin: const EdgeInsets.only(right: 16),
width: 12,
height: 12,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30),
color: chartColor
),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
domain,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16,
color: Theme.of(context).colorScheme.onSurface
),
),
if (name != null) ...[
const SizedBox(height: 5),
Text(
name,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSurfaceVariant
),
),
]
],
),
),
],
),
),
const SizedBox(width: 16),
Text(
number,
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
),
),
);
}
}
class OthersRowItem extends StatelessWidget {
final List<Map<String, dynamic>> items;
const OthersRowItem({
Key? key,
required this.items
}) : super(key: key);
@override
Widget build(BuildContext context) {
if (items.length <= 5) {
return const SizedBox();
}
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 8
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Row(
children: [
Container(
margin: const EdgeInsets.only(right: 16),
width: 12,
height: 12,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30),
color: Colors.grey
),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
AppLocalizations.of(context)!.others,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 16,
color: Theme.of(context).colorScheme.onSurface
),
),
],
),
),
],
),
),
const SizedBox(width: 16),
Text(
List<int>.from(
items.sublist(5, items.length).map((e) => e.values.first.toInt())
).reduce((a, b) => a + b).toString(),
style: TextStyle(
color: Theme.of(context).colorScheme.onSurface
),
)
],
),
);
}
} }

32
lib/widgets/custom_pie_chart.dart Normal file
View file

@ -0,0 +1,32 @@
import 'package:flutter/material.dart';
import 'package:pie_chart/pie_chart.dart';
class CustomPieChart extends StatelessWidget {
final Map<String, double> data;
final List<Color> colors;
const CustomPieChart({
Key? key,
required this.data,
required this.colors,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return PieChart(
dataMap: data,
animationDuration: const Duration(milliseconds: 800),
chartRadius: MediaQuery.of(context).size.width / 3,
colorList: colors,
initialAngleInDegree: 270,
chartType: ChartType.ring,
ringStrokeWidth: 12,
legendOptions: const LegendOptions(
showLegends: false
),
chartValuesOptions: const ChartValuesOptions(
showChartValues: false,
),
);
}
}

8
pubspec.lock
View file

@ -478,6 +478,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.4.0" version: "5.4.0"
pie_chart:
dependency: "direct main"
description:
name: pie_chart
sha256: "5dba6d0eb4718e8ed00a9079361cd8947c3f84ac5a5d76f05a27f4ec5e27589e"
url: "https://pub.dev"
source: hosted
version: "5.3.2"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:

1
pubspec.yaml
View file

@ -73,6 +73,7 @@ dependencies:
sentry_flutter: ^7.9.0 sentry_flutter: ^7.9.0
flutter_dotenv: ^5.0.2 flutter_dotenv: ^5.0.2
flutter_reorderable_list: ^1.3.1 flutter_reorderable_list: ^1.3.1
pie_chart: ^5.3.2
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: