Added view more top items page

This commit is contained in:
Juan Gilsanz Polo 2022-09-28 13:59:09 +02:00
parent c81cbaa025
commit 576731b97f
5 changed files with 109 additions and 13 deletions

View file

@ -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>> items = [];
values.forEach((key, value) {

View 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);
}

View file

@ -54,7 +54,8 @@ class Home extends StatelessWidget {
TopItems(
label: AppLocalizations.of(context)!.topQueriedDomains,
data: serversProvider.serverStatus.data!.stats.topQueriedDomains
data: serversProvider.serverStatus.data!.stats.topQueriedDomains,
type: 'topQueriedDomains',
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
@ -66,7 +67,8 @@ class Home extends StatelessWidget {
TopItems(
label: AppLocalizations.of(context)!.topBlockedDomains,
data: serversProvider.serverStatus.data!.stats.topBlockedDomains
data: serversProvider.serverStatus.data!.stats.topBlockedDomains,
type: 'topBlockedDomains',
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
@ -78,7 +80,8 @@ class Home extends StatelessWidget {
TopItems(
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

View file

@ -1,12 +1,16 @@
import 'package:flutter/material.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 {
final String type;
final String label;
final List<Map<String, dynamic>> data;
const TopItems({
Key? key,
required this.type,
required this.label,
required this.data,
}) : super(key: key);
@ -64,7 +68,14 @@ class TopItems extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.end,
children: [
TextButton(
onPressed: () => {},
onPressed: () => Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => TopItemsScreen(
type: type,
title: label,
)
)
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [

View 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)}%")
)
),
),
);
}
}