mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-04-24 15:56:05 +00:00
Added view more top items page
This commit is contained in:
parent
c81cbaa025
commit
576731b97f
5 changed files with 109 additions and 13 deletions
|
@ -24,15 +24,6 @@ int? convertFromBoolToInt(bool value) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
double formatPercentage(double value) {
|
|
||||||
return (value * 100).truncateToDouble() / 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
String intFormat(int value, String locale) {
|
|
||||||
final f = NumberFormat("#,###", locale);
|
|
||||||
return f.format(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<Map<String, dynamic>> convertFromMapToList(Map<String, int> values) {
|
List<Map<String, dynamic>> convertFromMapToList(Map<String, int> values) {
|
||||||
List<Map<String, dynamic>> items = [];
|
List<Map<String, dynamic>> items = [];
|
||||||
values.forEach((key, value) {
|
values.forEach((key, value) {
|
||||||
|
|
11
lib/functions/number_format.dart
Normal file
11
lib/functions/number_format.dart
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
|
String intFormat(int value, String locale) {
|
||||||
|
final f = NumberFormat("#,###", locale);
|
||||||
|
return f.format(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
String doubleFormat(double value, String locale) {
|
||||||
|
final f = NumberFormat("#.##", locale);
|
||||||
|
return f.format(value);
|
||||||
|
}
|
|
@ -54,7 +54,8 @@ class Home extends StatelessWidget {
|
||||||
|
|
||||||
TopItems(
|
TopItems(
|
||||||
label: AppLocalizations.of(context)!.topQueriedDomains,
|
label: AppLocalizations.of(context)!.topQueriedDomains,
|
||||||
data: serversProvider.serverStatus.data!.stats.topQueriedDomains
|
data: serversProvider.serverStatus.data!.stats.topQueriedDomains,
|
||||||
|
type: 'topQueriedDomains',
|
||||||
),
|
),
|
||||||
const Padding(
|
const Padding(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 20),
|
padding: EdgeInsets.symmetric(horizontal: 20),
|
||||||
|
@ -66,7 +67,8 @@ class Home extends StatelessWidget {
|
||||||
|
|
||||||
TopItems(
|
TopItems(
|
||||||
label: AppLocalizations.of(context)!.topBlockedDomains,
|
label: AppLocalizations.of(context)!.topBlockedDomains,
|
||||||
data: serversProvider.serverStatus.data!.stats.topBlockedDomains
|
data: serversProvider.serverStatus.data!.stats.topBlockedDomains,
|
||||||
|
type: 'topBlockedDomains',
|
||||||
),
|
),
|
||||||
const Padding(
|
const Padding(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 20),
|
padding: EdgeInsets.symmetric(horizontal: 20),
|
||||||
|
@ -78,7 +80,8 @@ class Home extends StatelessWidget {
|
||||||
|
|
||||||
TopItems(
|
TopItems(
|
||||||
label: AppLocalizations.of(context)!.topClients,
|
label: AppLocalizations.of(context)!.topClients,
|
||||||
data: serversProvider.serverStatus.data!.stats.topClients
|
data: serversProvider.serverStatus.data!.stats.topClients,
|
||||||
|
type: 'topClients',
|
||||||
),
|
),
|
||||||
|
|
||||||
const SizedBox(height: 70) // To avoid content under fab
|
const SizedBox(height: 70) // To avoid content under fab
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/screens/top_items/top_items.dart';
|
||||||
|
|
||||||
class TopItems extends StatelessWidget {
|
class TopItems extends StatelessWidget {
|
||||||
|
final String type;
|
||||||
final String label;
|
final String label;
|
||||||
final List<Map<String, dynamic>> data;
|
final List<Map<String, dynamic>> data;
|
||||||
|
|
||||||
const TopItems({
|
const TopItems({
|
||||||
Key? key,
|
Key? key,
|
||||||
|
required this.type,
|
||||||
required this.label,
|
required this.label,
|
||||||
required this.data,
|
required this.data,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
@ -64,7 +68,14 @@ class TopItems extends StatelessWidget {
|
||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () => {},
|
onPressed: () => Navigator.of(context).push(
|
||||||
|
MaterialPageRoute(
|
||||||
|
builder: (context) => TopItemsScreen(
|
||||||
|
type: type,
|
||||||
|
title: label,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
|
|
80
lib/screens/top_items/top_items.dart
Normal file
80
lib/screens/top_items/top_items.dart
Normal file
|
@ -0,0 +1,80 @@
|
||||||
|
// ignore_for_file: use_build_context_synchronously
|
||||||
|
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/functions/number_format.dart';
|
||||||
|
import 'package:adguard_home_manager/providers/servers_provider.dart';
|
||||||
|
import 'package:adguard_home_manager/services/http_requests.dart';
|
||||||
|
|
||||||
|
class TopItemsScreen extends StatelessWidget {
|
||||||
|
final String type;
|
||||||
|
final String title;
|
||||||
|
|
||||||
|
const TopItemsScreen({
|
||||||
|
Key? key,
|
||||||
|
required this.type,
|
||||||
|
required this.title,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final serversProvider = Provider.of<ServersProvider>(context);
|
||||||
|
|
||||||
|
List<Map<String, dynamic>> data = [];
|
||||||
|
switch (type) {
|
||||||
|
case 'topQueriedDomains':
|
||||||
|
data = serversProvider.serverStatus.data!.stats.topQueriedDomains;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'topBlockedDomains':
|
||||||
|
data = serversProvider.serverStatus.data!.stats.topBlockedDomains;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'topClients':
|
||||||
|
data = serversProvider.serverStatus.data!.stats.topClients;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
int total = 0;
|
||||||
|
for (var element in data) {
|
||||||
|
total = total + int.parse(element.values.toList()[0].toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
title: Text(title),
|
||||||
|
),
|
||||||
|
body: RefreshIndicator(
|
||||||
|
onRefresh: () async {
|
||||||
|
final result = await getServerStatus(serversProvider.selectedServer!);
|
||||||
|
if (result['result'] == 'success') {
|
||||||
|
serversProvider.setServerStatusData(result['data']);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(AppLocalizations.of(context)!.serverStatusNotRefreshed),
|
||||||
|
backgroundColor: Colors.red,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: ListView.builder(
|
||||||
|
itemCount: data.length,
|
||||||
|
itemBuilder: (context, index) => ListTile(
|
||||||
|
title: Text(data[index].keys.toList()[0]),
|
||||||
|
trailing: Text(data[index].values.toList()[0].toString()),
|
||||||
|
subtitle: Text("${doubleFormat((data[index].values.toList()[0]/total*100), Platform.localeName)}%")
|
||||||
|
)
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue